From 7560a890225a8ab56c326206224fe9bedc69aefa Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 30 Dec 2008 15:15:06 +0100 Subject: [PATCH] server: Make padding explicit in the wake_up_reply structure. --- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/thread.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1845692aa4e..64997532c97 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -137,6 +137,7 @@ struct wake_up_reply { client_ptr_t cookie; int signaled; + int __pad; }; @@ -5058,6 +5059,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 367 +#define SERVER_PROTOCOL_VERSION 368 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index e51c24ca972..f064838f7d6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -153,6 +153,7 @@ struct wake_up_reply { client_ptr_t cookie; /* magic cookie that was passed in select_request */ int signaled; /* wait result */ + int __pad; }; /* NT-style timeout, in 100ns units, negative means relative timeout */ diff --git a/server/thread.c b/server/thread.c index 98a24d81b4d..9681c1ab58e 100644 --- a/server/thread.c +++ b/server/thread.c @@ -565,6 +565,7 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s struct wake_up_reply reply; int ret; + memset( &reply, 0, sizeof(reply) ); reply.cookie = cookie; reply.signaled = signaled; if ((ret = write( get_unix_fd( thread->wait_fd ), &reply, sizeof(reply) )) == sizeof(reply))