marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Message results should be stored as longs, not ints.

oldstable
Alexandre Julliard 2007-08-29 18:01:10 +02:00
parent 572771ebfa
commit b4edb573fd
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wine/server_protocol.h
View File

@ -2523,7 +2523,7 @@ struct get_message_reply
struct reply_message_request struct reply_message_request
{ {
struct request_header __header; struct request_header __header;
unsigned int result; unsigned long result;
int remove; int remove;
/* VARARG(data,bytes); */ /* VARARG(data,bytes); */
}; };
@ -2556,7 +2556,7 @@ struct get_message_reply_request
struct get_message_reply_reply struct get_message_reply_reply
{ {
struct reply_header __header; struct reply_header __header;
unsigned int result; unsigned long result;
/* VARARG(data,bytes); */ /* VARARG(data,bytes); */
}; };
@ -4731,6 +4731,6 @@ union generic_reply
struct make_process_system_reply make_process_system_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 */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

4
server/protocol.def
View File

@ -1878,7 +1878,7 @@ enum message_type
/* Reply to a sent message */ /* Reply to a sent message */
@REQ(reply_message) @REQ(reply_message)
unsigned int result; /* message result */ unsigned long result; /* message result */
int remove; /* should we remove the message? */ int remove; /* should we remove the message? */
VARARG(data,bytes); /* message data for sent messages */ VARARG(data,bytes); /* message data for sent messages */
@END @END
@ -1896,7 +1896,7 @@ enum message_type
@REQ(get_message_reply) @REQ(get_message_reply)
int cancel; /* cancel message if not ready? */ int cancel; /* cancel message if not ready? */
@REPLY @REPLY
unsigned int result; /* message result */ unsigned long result; /* message result */
VARARG(data,bytes); /* message data for sent messages */ VARARG(data,bytes); /* message data for sent messages */
@END @END

6
server/queue.c
View File

@ -56,8 +56,8 @@ struct message_result
struct msg_queue *sender; /* sender queue */ struct msg_queue *sender; /* sender queue */
struct msg_queue *receiver; /* receiver queue */ struct msg_queue *receiver; /* receiver queue */
int replied; /* has it been replied to? */ int replied; /* has it been replied to? */
unsigned int result; /* reply result */
unsigned int error; /* error code to pass back to sender */ unsigned int error; /* error code to pass back to sender */
unsigned long result; /* reply result */
struct message *callback_msg; /* message to queue for callback */ struct message *callback_msg; /* message to queue for callback */
void *data; /* message reply data */ void *data; /* message reply data */
unsigned int data_size; /* size of 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 */ /* 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 ) unsigned int error )
{ {
res->result = result; 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 */ /* 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 ) unsigned int error, int remove, const void *data, data_size_t len )
{ {
struct message_result *res = queue->recv_result; struct message_result *res = queue->recv_result;

4
server/trace.c
View File

@ -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 ) 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, " remove=%d,", req->remove );
fprintf( stderr, " data=" ); fprintf( stderr, " data=" );
dump_varargs_bytes( cur_size ); 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 ) 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=" ); fprintf( stderr, " data=" );
dump_varargs_bytes( cur_size ); dump_varargs_bytes( cur_size );
} }