From 71cb6bd13a469fa35ce5b99f1f5e1f6bf495fb85 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Mon, 16 Feb 2009 13:03:29 +0300 Subject: [PATCH 2/2] Re-generate some files. --- include/config.h.in | 6 ++++++ include/wine/server_protocol.h | 20 +++++++++++++++++++- server/request.h | 13 +++++++++---- server/trace.c | 15 +++++++++++++++ 4 files changed, 49 insertions(+), 5 deletions(-) diff --git a/include/config.h.in b/include/config.h.in index f1c4194..8bc153b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -330,6 +330,9 @@ /* Define to 1 if you have the `ossaudio' library (-lossaudio). */ #undef HAVE_LIBOSSAUDIO +/* Define if you have the libusb library and header */ +#undef HAVE_LIBUSB + /* Define if you have the libxml2 library */ #undef HAVE_LIBXML2 @@ -960,6 +963,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_USB_H + /* Define to 1 if you have the `usleep' function. */ #undef HAVE_USLEEP diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fcf062b..ac49346 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4310,6 +4310,8 @@ struct get_next_device_request_reply struct reply_header __header; obj_handle_t next; ioctl_code_t code; + process_id_t pid; + char __pad_20[4]; client_ptr_t user_ptr; data_size_t in_size; data_size_t out_size; @@ -4491,6 +4493,19 @@ struct set_window_layered_info_reply }; + +struct get_device_name_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_device_name_reply +{ + struct reply_header __header; + /* VARARG(name,unicode_str); */ +}; + + enum request { REQ_new_process, @@ -4729,6 +4744,7 @@ enum request REQ_add_fd_completion, REQ_get_window_layered_info, REQ_set_window_layered_info, + REQ_get_device_name, REQ_NB_REQUESTS }; @@ -4972,6 +4988,7 @@ union generic_request struct add_fd_completion_request add_fd_completion_request; struct get_window_layered_info_request get_window_layered_info_request; struct set_window_layered_info_request set_window_layered_info_request; + struct get_device_name_request get_device_name_request; }; union generic_reply { @@ -5213,8 +5230,9 @@ union generic_reply struct add_fd_completion_reply add_fd_completion_reply; struct get_window_layered_info_reply get_window_layered_info_reply; struct set_window_layered_info_reply set_window_layered_info_reply; + struct get_device_name_reply get_device_name_reply; }; -#define SERVER_PROTOCOL_VERSION 381 +#define SERVER_PROTOCOL_VERSION 382 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/request.h b/server/request.h index b8d78f3..7d0174e 100644 --- a/server/request.h +++ b/server/request.h @@ -347,6 +347,7 @@ DECL_HANDLER(set_completion_info); DECL_HANDLER(add_fd_completion); DECL_HANDLER(get_window_layered_info); DECL_HANDLER(set_window_layered_info); +DECL_HANDLER(get_device_name); #ifdef WANT_REQUEST_HANDLERS @@ -589,6 +590,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_add_fd_completion, (req_handler)req_get_window_layered_info, (req_handler)req_set_window_layered_info, + (req_handler)req_get_device_name, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -1825,10 +1827,11 @@ C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, prev) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, status) == 20 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, next) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, code) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, user_ptr) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 28 ); -C_ASSERT( sizeof(struct get_next_device_request_reply) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, pid) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, user_ptr) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 36 ); +C_ASSERT( sizeof(struct get_next_device_request_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct make_process_system_reply, event) == 8 ); C_ASSERT( sizeof(struct make_process_system_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_statistics_request, handle) == 12 ); @@ -1884,6 +1887,8 @@ C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, color_key) == 16 C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, alpha) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, flags) == 24 ); C_ASSERT( sizeof(struct set_window_layered_info_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_device_name_request, handle) == 12 ); +C_ASSERT( sizeof(struct get_device_name_reply) == 8 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 9643feb..aaaa3ac 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3868,6 +3868,7 @@ static void dump_get_next_device_request_reply( const struct get_next_device_req fprintf( stderr, " code=" ); dump_ioctl_code( &req->code ); fprintf( stderr, "," ); + fprintf( stderr, " pid=%04x,", req->pid ); fprintf( stderr, " user_ptr=" ); dump_uint64( &req->user_ptr ); fprintf( stderr, "," ); @@ -4013,6 +4014,17 @@ static void dump_set_window_layered_info_request( const struct set_window_layere fprintf( stderr, " flags=%08x", req->flags ); } +static void dump_get_device_name_request( const struct get_device_name_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_device_name_reply( const struct get_device_name_reply *req ) +{ + fprintf( stderr, " name=" ); + dump_varargs_unicode_str( cur_size ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4250,6 +4262,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_add_fd_completion_request, (dump_func)dump_get_window_layered_info_request, (dump_func)dump_set_window_layered_info_request, + (dump_func)dump_get_device_name_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4489,6 +4502,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_window_layered_info_reply, NULL, + (dump_func)dump_get_device_name_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4728,6 +4742,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "add_fd_completion", "get_window_layered_info", "set_window_layered_info", + "get_device_name", }; static const struct -- 1.6.1.3.GIT