From b4edb573fda7859af9419520b9f92c3ec50ed20a Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 29 Aug 2007 18:01:10 +0200
Subject: [PATCH] server: Message results should be stored as longs, not ints.

---
 include/wine/server_protocol.h | 6 +++---
 server/protocol.def            | 4 ++--
 server/queue.c                 | 6 +++---
 server/trace.c                 | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 71d07094291..936728ad274 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -2523,7 +2523,7 @@ struct get_message_reply
 struct reply_message_request
 {
     struct request_header __header;
-    unsigned int    result;
+    unsigned long   result;
     int             remove;
     /* VARARG(data,bytes); */
 };
@@ -2556,7 +2556,7 @@ struct get_message_reply_request
 struct get_message_reply_reply
 {
     struct reply_header __header;
-    unsigned int    result;
+    unsigned long   result;
     /* VARARG(data,bytes); */
 };
 
@@ -4731,6 +4731,6 @@ union generic_reply
     struct make_process_system_reply make_process_system_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 310
+#define SERVER_PROTOCOL_VERSION 311
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/protocol.def b/server/protocol.def
index aaf6c2ec838..0ce75f52a94 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1878,7 +1878,7 @@ enum message_type
 
 /* Reply to a sent message */
 @REQ(reply_message)
-    unsigned int    result;    /* message result */
+    unsigned long   result;    /* message result */
     int             remove;    /* should we remove the message? */
     VARARG(data,bytes);        /* message data for sent messages */
 @END
@@ -1896,7 +1896,7 @@ enum message_type
 @REQ(get_message_reply)
     int             cancel;    /* cancel message if not ready? */
 @REPLY
-    unsigned int    result;    /* message result */
+    unsigned long   result;    /* message result */
     VARARG(data,bytes);        /* message data for sent messages */
 @END
 
diff --git a/server/queue.c b/server/queue.c
index 3220fcb6619..5188f0d7826 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -56,8 +56,8 @@ struct message_result
     struct msg_queue      *sender;        /* sender queue */
     struct msg_queue      *receiver;      /* receiver queue */
     int                    replied;       /* has it been replied to? */
-    unsigned int           result;        /* reply result */
     unsigned int           error;         /* error code to pass back to sender */
+    unsigned long          result;        /* reply result */
     struct message        *callback_msg;  /* message to queue for callback */
     void                  *data;          /* message reply data */
     unsigned int           data_size;     /* size of message reply data */
@@ -437,7 +437,7 @@ static inline void remove_result_from_sender( struct message_result *result )
 }
 
 /* store the message result in the appropriate structure */
-static void store_message_result( struct message_result *res, unsigned int result,
+static void store_message_result( struct message_result *res, unsigned long result,
                                   unsigned int error )
 {
     res->result  = result;
@@ -626,7 +626,7 @@ static void receive_message( struct msg_queue *queue, struct message *msg,
 }
 
 /* set the result of the current received message */
-static void reply_message( struct msg_queue *queue, unsigned int result,
+static void reply_message( struct msg_queue *queue, unsigned long result,
                            unsigned int error, int remove, const void *data, data_size_t len )
 {
     struct message_result *res = queue->recv_result;
diff --git a/server/trace.c b/server/trace.c
index d0c4e0e8e31..e707e47f66d 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -2327,7 +2327,7 @@ static void dump_get_message_reply( const struct get_message_reply *req )
 
 static void dump_reply_message_request( const struct reply_message_request *req )
 {
-    fprintf( stderr, " result=%08x,", req->result );
+    fprintf( stderr, " result=%lx,", req->result );
     fprintf( stderr, " remove=%d,", req->remove );
     fprintf( stderr, " data=" );
     dump_varargs_bytes( cur_size );
@@ -2347,7 +2347,7 @@ static void dump_get_message_reply_request( const struct get_message_reply_reque
 
 static void dump_get_message_reply_reply( const struct get_message_reply_reply *req )
 {
-    fprintf( stderr, " result=%08x,", req->result );
+    fprintf( stderr, " result=%lx,", req->result );
     fprintf( stderr, " data=" );
     dump_varargs_bytes( cur_size );
 }