server: Rearrange a few fields to avoid wasting padding space on 64 bits.
diff --git a/server/protocol.def b/server/protocol.def
index caddcc2..7694287 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -297,13 +297,13 @@
@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 @@
/* 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 @@
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 @@
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 @@
/* 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 @@
/* 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 */
