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

server: Use unsigned long for request types that are 64bit in win64.

oldstable
Mike McCormack 2006-06-07 18:33:09 +09:00 committed by Alexandre Julliard
parent 202ef6901e
commit f386950fdd
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wine/server_protocol.h
View File

@ -2194,8 +2194,8 @@ struct send_message_request
int flags; int flags;
user_handle_t win; user_handle_t win;
unsigned int msg; unsigned int msg;
unsigned int wparam; unsigned long wparam;
unsigned int lparam; unsigned long lparam;
int x; int x;
int y; int y;
unsigned int time; unsigned int time;
@ -2250,8 +2250,8 @@ struct get_message_reply
int type; int type;
user_handle_t win; user_handle_t win;
unsigned int msg; unsigned int msg;
unsigned int wparam; unsigned long wparam;
unsigned int lparam; unsigned long lparam;
int x; int x;
int y; int y;
user_handle_t hook; user_handle_t hook;
@ -2316,7 +2316,7 @@ struct set_win_timer_request
unsigned int msg; unsigned int msg;
unsigned int id; unsigned int id;
unsigned int rate; unsigned int rate;
unsigned int lparam; unsigned long lparam;
}; };
struct set_win_timer_reply struct set_win_timer_reply
{ {
@ -4382,6 +4382,6 @@ union generic_reply
struct query_symlink_reply query_symlink_reply; struct query_symlink_reply query_symlink_reply;
}; };
#define SERVER_PROTOCOL_VERSION 234 #define SERVER_PROTOCOL_VERSION 235
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

10
server/protocol.def
View File

@ -1566,8 +1566,8 @@ enum char_info_mode
int flags; /* message flags (see below) */ int flags; /* message flags (see below) */
user_handle_t win; /* window handle */ user_handle_t win; /* window handle */
unsigned int msg; /* message code */ unsigned int msg; /* message code */
unsigned int wparam; /* parameters */ unsigned long wparam; /* parameters */
unsigned int lparam; /* parameters */ unsigned long lparam; /* parameters */
int x; /* x position */ int x; /* x position */
int y; /* y position */ int y; /* y position */
unsigned int time; /* message time */ unsigned int time; /* message time */
@ -1607,8 +1607,8 @@ enum message_type
int type; /* message type */ int type; /* message type */
user_handle_t win; /* window handle */ user_handle_t win; /* window handle */
unsigned int msg; /* message code */ unsigned int msg; /* message code */
unsigned int wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */ unsigned long wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */
unsigned int lparam; /* parameters (result for MSG_CALLBACK_RESULT) */ unsigned long lparam; /* parameters (result for MSG_CALLBACK_RESULT) */
int x; /* x position */ int x; /* x position */
int y; /* y position */ int y; /* y position */
user_handle_t hook; /* winevent hook handle */ user_handle_t hook; /* winevent hook handle */
@ -1654,7 +1654,7 @@ enum message_type
unsigned int msg; /* message to post */ unsigned int msg; /* message to post */
unsigned int id; /* timer id */ unsigned int id; /* timer id */
unsigned int rate; /* timer rate in ms */ unsigned int rate; /* timer rate in ms */
unsigned int lparam; /* message lparam (callback proc) */ unsigned long lparam; /* message lparam (callback proc) */
@REPLY @REPLY
unsigned int id; /* timer id */ unsigned int id; /* timer id */
@END @END

10
server/trace.c
View File

@ -2080,8 +2080,8 @@ static void dump_send_message_request( const struct send_message_request *req )
fprintf( stderr, " flags=%d,", req->flags ); fprintf( stderr, " flags=%d,", req->flags );
fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " win=%p,", req->win );
fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " msg=%08x,", req->msg );
fprintf( stderr, " wparam=%08x,", req->wparam ); fprintf( stderr, " wparam=%lx,", req->wparam );
fprintf( stderr, " lparam=%08x,", req->lparam ); fprintf( stderr, " lparam=%lx,", req->lparam );
fprintf( stderr, " x=%d,", req->x ); fprintf( stderr, " x=%d,", req->x );
fprintf( stderr, " y=%d,", req->y ); fprintf( stderr, " y=%d,", req->y );
fprintf( stderr, " time=%08x,", req->time ); fprintf( stderr, " time=%08x,", req->time );
@ -2111,8 +2111,8 @@ static void dump_get_message_reply( const struct get_message_reply *req )
fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " type=%d,", req->type );
fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " win=%p,", req->win );
fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " msg=%08x,", req->msg );
fprintf( stderr, " wparam=%08x,", req->wparam ); fprintf( stderr, " wparam=%lx,", req->wparam );
fprintf( stderr, " lparam=%08x,", req->lparam ); fprintf( stderr, " lparam=%lx,", req->lparam );
fprintf( stderr, " x=%d,", req->x ); fprintf( stderr, " x=%d,", req->x );
fprintf( stderr, " y=%d,", req->y ); fprintf( stderr, " y=%d,", req->y );
fprintf( stderr, " hook=%p,", req->hook ); fprintf( stderr, " hook=%p,", req->hook );
@ -2159,7 +2159,7 @@ static void dump_set_win_timer_request( const struct set_win_timer_request *req
fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " msg=%08x,", req->msg );
fprintf( stderr, " id=%08x,", req->id ); fprintf( stderr, " id=%08x,", req->id );
fprintf( stderr, " rate=%08x,", req->rate ); fprintf( stderr, " rate=%08x,", req->rate );
fprintf( stderr, " lparam=%08x", req->lparam ); fprintf( stderr, " lparam=%lx", req->lparam );
} }
static void dump_set_win_timer_reply( const struct set_win_timer_reply *req ) static void dump_set_win_timer_reply( const struct set_win_timer_reply *req )

1
tools/make_requests
View File

@ -29,6 +29,7 @@ my %formats =
"unsigned char" => "%02x", "unsigned char" => "%02x",
"unsigned short"=> "%04x", "unsigned short"=> "%04x",
"unsigned int" => "%08x", "unsigned int" => "%08x",
"unsigned long" => "%lx",
"void*" => "%p", "void*" => "%p",
"time_t" => "%ld (long)", "time_t" => "%ld (long)",
"size_t" => "%lu (unsigned long)", "size_t" => "%lu (unsigned long)",