Alexandre Julliard : server: Make padding explicit in the wake_up_reply structure.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7560a890225a8ab56c326206224fe9bedc69aefa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7560a890225a8ab56c32620622...

Author: Alexandre Julliard 
Date:   Tue Dec 30 15:15:06 2008 +0100

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 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 1845692..6499753 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 e51c24c..f064838 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 98a24d8..9681c1a 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))