diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1b7a92086e..14b4b8243b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -309,13 +309,13 @@ struct init_thread_request struct request_header __header; int unix_pid; int unix_tid; + int debug_level; void* teb; void* peb; void* entry; void* ldt_copy; int reply_fd; int wait_fd; - int debug_level; }; struct init_thread_reply { @@ -1430,9 +1430,9 @@ struct send_console_signal_reply struct read_directory_changes_request { struct request_header __header; + unsigned int filter; obj_handle_t handle; obj_handle_t event; - unsigned int filter; int subtree; int want_data; void* io_apc; @@ -2264,12 +2264,12 @@ struct send_hardware_message_request thread_id_t id; user_handle_t win; unsigned int msg; + unsigned int time; unsigned long wparam; unsigned long lparam; unsigned long info; int x; int y; - unsigned int time; }; struct send_hardware_message_reply { @@ -2290,8 +2290,8 @@ struct get_message_request struct get_message_reply { struct reply_header __header; - int type; user_handle_t win; + int type; unsigned int msg; unsigned long wparam; unsigned long lparam; @@ -2636,13 +2636,13 @@ struct get_window_info_reply struct set_window_info_request { struct request_header __header; - user_handle_t handle; unsigned int flags; + user_handle_t handle; unsigned int style; unsigned int ex_style; unsigned int id; - void* instance; int is_unicode; + void* instance; void* user_data; int extra_offset; data_size_t extra_size; @@ -2751,9 +2751,9 @@ struct get_window_tree_reply struct set_window_pos_request { struct request_header __header; + unsigned int flags; user_handle_t handle; user_handle_t previous; - unsigned int flags; rectangle_t window; rectangle_t client; /* VARARG(valid,rectangles); */ @@ -4426,6 +4426,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 250 +#define SERVER_PROTOCOL_VERSION 251 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index caddcc265d..769428750c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -297,13 +297,13 @@ struct token_groups @REQ(init_thread) int unix_pid; /* Unix pid of new thread */ int unix_tid; /* Unix tid of new thread */ + int debug_level; /* new debug level */ void* teb; /* TEB of new thread (in thread address space) */ void* peb; /* address of PEB (in thread address space) */ void* entry; /* thread entry point (in thread address space) */ void* ldt_copy; /* address of LDT copy (in thread address space) */ int reply_fd; /* fd for reply pipe */ int wait_fd; /* fd for blocking calls pipe */ - int debug_level; /* new debug level */ @REPLY process_id_t pid; /* process id of the new thread's process */ thread_id_t tid; /* thread id of the new thread */ @@ -1074,9 +1074,9 @@ enum char_info_mode /* enable directory change notifications */ @REQ(read_directory_changes) + unsigned int filter; /* notification filter */ obj_handle_t handle; /* handle to the directory */ obj_handle_t event; /* handle to the event */ - unsigned int filter; /* notification filter */ int subtree; /* watch the subtree? */ int want_data; /* flag indicating whether change data should be collected */ void* io_apc; /* APC routine to queue upon end of async */ @@ -1624,12 +1624,12 @@ enum message_type thread_id_t id; /* thread id */ user_handle_t win; /* window handle */ unsigned int msg; /* message code */ + unsigned int time; /* message time */ unsigned long wparam; /* parameters */ unsigned long lparam; /* parameters */ unsigned long info; /* extra info */ int x; /* x position */ int y; /* y position */ - unsigned int time; /* message time */ @END @@ -1641,8 +1641,8 @@ enum message_type unsigned int get_last; /* last message code to get */ unsigned int hw_id; /* id of the previous hardware message (or 0) */ @REPLY - int type; /* message type */ user_handle_t win; /* window handle */ + int type; /* message type */ unsigned int msg; /* message code */ unsigned long wparam; /* parameters */ unsigned long lparam; /* parameters */ @@ -1876,13 +1876,13 @@ enum message_type /* Set some information in a window */ @REQ(set_window_info) - user_handle_t handle; /* handle to the window */ unsigned int flags; /* flags for fields to set (see below) */ + user_handle_t handle; /* handle to the window */ unsigned int style; /* window style */ unsigned int ex_style; /* window extended style */ unsigned int id; /* window id */ - void* instance; /* creator instance */ int is_unicode; /* ANSI or unicode */ + void* instance; /* creator instance */ void* user_data; /* user-specific data */ int extra_offset; /* offset to set in extra bytes */ data_size_t extra_size; /* size to set in extra bytes */ @@ -1961,9 +1961,9 @@ enum message_type /* Set the position and Z order of a window */ @REQ(set_window_pos) + unsigned int flags; /* SWP_* flags */ user_handle_t handle; /* handle to the window */ user_handle_t previous; /* previous window in Z order */ - unsigned int flags; /* SWP_* flags */ rectangle_t window; /* window rectangle */ rectangle_t client; /* client rectangle */ VARARG(valid,rectangles); /* valid rectangles from WM_NCCALCSIZE */ diff --git a/server/trace.c b/server/trace.c index 1ca9b61eb9..160a8e13bc 100644 --- a/server/trace.c +++ b/server/trace.c @@ -688,13 +688,13 @@ static void dump_init_thread_request( const struct init_thread_request *req ) { fprintf( stderr, " unix_pid=%d,", req->unix_pid ); fprintf( stderr, " unix_tid=%d,", req->unix_tid ); + fprintf( stderr, " debug_level=%d,", req->debug_level ); fprintf( stderr, " teb=%p,", req->teb ); fprintf( stderr, " peb=%p,", req->peb ); fprintf( stderr, " entry=%p,", req->entry ); fprintf( stderr, " ldt_copy=%p,", req->ldt_copy ); fprintf( stderr, " reply_fd=%d,", req->reply_fd ); - fprintf( stderr, " wait_fd=%d,", req->wait_fd ); - fprintf( stderr, " debug_level=%d", req->debug_level ); + fprintf( stderr, " wait_fd=%d", req->wait_fd ); } static void dump_init_thread_reply( const struct init_thread_reply *req ) @@ -1495,9 +1495,9 @@ static void dump_send_console_signal_request( const struct send_console_signal_r static void dump_read_directory_changes_request( const struct read_directory_changes_request *req ) { + fprintf( stderr, " filter=%08x,", req->filter ); fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " event=%p,", req->event ); - fprintf( stderr, " filter=%08x,", req->filter ); fprintf( stderr, " subtree=%d,", req->subtree ); fprintf( stderr, " want_data=%d,", req->want_data ); fprintf( stderr, " io_apc=%p,", req->io_apc ); @@ -2113,12 +2113,12 @@ static void dump_send_hardware_message_request( const struct send_hardware_messa fprintf( stderr, " id=%04x,", req->id ); fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " msg=%08x,", req->msg ); + fprintf( stderr, " time=%08x,", req->time ); fprintf( stderr, " wparam=%lx,", req->wparam ); fprintf( stderr, " lparam=%lx,", req->lparam ); fprintf( stderr, " info=%lx,", req->info ); fprintf( stderr, " x=%d,", req->x ); - fprintf( stderr, " y=%d,", req->y ); - fprintf( stderr, " time=%08x", req->time ); + fprintf( stderr, " y=%d", req->y ); } static void dump_get_message_request( const struct get_message_request *req ) @@ -2132,8 +2132,8 @@ static void dump_get_message_request( const struct get_message_request *req ) static void dump_get_message_reply( const struct get_message_reply *req ) { - fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " win=%p,", req->win ); + fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " wparam=%lx,", req->wparam ); fprintf( stderr, " lparam=%lx,", req->lparam ); @@ -2375,13 +2375,13 @@ static void dump_get_window_info_reply( const struct get_window_info_reply *req static void dump_set_window_info_request( const struct set_window_info_request *req ) { - fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " flags=%08x,", req->flags ); + fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " style=%08x,", req->style ); fprintf( stderr, " ex_style=%08x,", req->ex_style ); fprintf( stderr, " id=%08x,", req->id ); - fprintf( stderr, " instance=%p,", req->instance ); fprintf( stderr, " is_unicode=%d,", req->is_unicode ); + fprintf( stderr, " instance=%p,", req->instance ); fprintf( stderr, " user_data=%p,", req->user_data ); fprintf( stderr, " extra_offset=%d,", req->extra_offset ); fprintf( stderr, " extra_size=%u,", req->extra_size ); @@ -2469,9 +2469,9 @@ static void dump_get_window_tree_reply( const struct get_window_tree_reply *req static void dump_set_window_pos_request( const struct set_window_pos_request *req ) { + fprintf( stderr, " flags=%08x,", req->flags ); fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " previous=%p,", req->previous ); - fprintf( stderr, " flags=%08x,", req->flags ); fprintf( stderr, " window=" ); dump_rectangle( &req->window ); fprintf( stderr, "," );