Mike McCormack : server:
Use unsigned long for request types that are 64bit in win64.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jun 7 07:49:25 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: f386950fdd1bb500dc0b2c77db74c77490e84cc0
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f386950fdd1bb500dc0b2c77db74c77490e84cc0
Author: Mike McCormack <mike at codeweavers.com>
Date: Wed Jun 7 18:33:09 2006 +0900
server: Use unsigned long for request types that are 64bit in win64.
---
include/wine/server_protocol.h | 12 ++++++------
server/protocol.def | 10 +++++-----
server/trace.c | 10 +++++-----
tools/make_requests | 1 +
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 315ae44..7481eb1 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -2194,8 +2194,8 @@ struct send_message_request
int flags;
user_handle_t win;
unsigned int msg;
- unsigned int wparam;
- unsigned int lparam;
+ unsigned long wparam;
+ unsigned long lparam;
int x;
int y;
unsigned int time;
@@ -2250,8 +2250,8 @@ struct get_message_reply
int type;
user_handle_t win;
unsigned int msg;
- unsigned int wparam;
- unsigned int lparam;
+ unsigned long wparam;
+ unsigned long lparam;
int x;
int y;
user_handle_t hook;
@@ -2316,7 +2316,7 @@ struct set_win_timer_request
unsigned int msg;
unsigned int id;
unsigned int rate;
- unsigned int lparam;
+ unsigned long lparam;
};
struct set_win_timer_reply
{
@@ -4382,6 +4382,6 @@ union generic_reply
struct query_symlink_reply query_symlink_reply;
};
-#define SERVER_PROTOCOL_VERSION 234
+#define SERVER_PROTOCOL_VERSION 235
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/protocol.def b/server/protocol.def
index 0e18ab3..c313df1 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1566,8 +1566,8 @@ #define SNAP_MODULE 0x00000008
int flags; /* message flags (see below) */
user_handle_t win; /* window handle */
unsigned int msg; /* message code */
- unsigned int wparam; /* parameters */
- unsigned int lparam; /* parameters */
+ unsigned long wparam; /* parameters */
+ unsigned long lparam; /* parameters */
int x; /* x position */
int y; /* y position */
unsigned int time; /* message time */
@@ -1607,8 +1607,8 @@ #define SEND_MSG_ABORT_IF_HUNG 0x01
int type; /* message type */
user_handle_t win; /* window handle */
unsigned int msg; /* message code */
- unsigned int wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */
- unsigned int lparam; /* parameters (result for MSG_CALLBACK_RESULT) */
+ unsigned long wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */
+ unsigned long lparam; /* parameters (result for MSG_CALLBACK_RESULT) */
int x; /* x position */
int y; /* y position */
user_handle_t hook; /* winevent hook handle */
@@ -1654,7 +1654,7 @@ #define GET_MSG_SENT_ONLY 2 /* only g
unsigned int msg; /* message to post */
unsigned int id; /* timer id */
unsigned int rate; /* timer rate in ms */
- unsigned int lparam; /* message lparam (callback proc) */
+ unsigned long lparam; /* message lparam (callback proc) */
@REPLY
unsigned int id; /* timer id */
@END
diff --git a/server/trace.c b/server/trace.c
index 1c1cfc0..98f622c 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -2080,8 +2080,8 @@ static void dump_send_message_request( c
fprintf( stderr, " flags=%d,", req->flags );
fprintf( stderr, " win=%p,", req->win );
fprintf( stderr, " msg=%08x,", req->msg );
- fprintf( stderr, " wparam=%08x,", req->wparam );
- fprintf( stderr, " lparam=%08x,", req->lparam );
+ fprintf( stderr, " wparam=%lx,", req->wparam );
+ fprintf( stderr, " lparam=%lx,", req->lparam );
fprintf( stderr, " x=%d,", req->x );
fprintf( stderr, " y=%d,", req->y );
fprintf( stderr, " time=%08x,", req->time );
@@ -2111,8 +2111,8 @@ static void dump_get_message_reply( cons
fprintf( stderr, " type=%d,", req->type );
fprintf( stderr, " win=%p,", req->win );
fprintf( stderr, " msg=%08x,", req->msg );
- fprintf( stderr, " wparam=%08x,", req->wparam );
- fprintf( stderr, " lparam=%08x,", req->lparam );
+ fprintf( stderr, " wparam=%lx,", req->wparam );
+ fprintf( stderr, " lparam=%lx,", req->lparam );
fprintf( stderr, " x=%d,", req->x );
fprintf( stderr, " y=%d,", req->y );
fprintf( stderr, " hook=%p,", req->hook );
@@ -2159,7 +2159,7 @@ static void dump_set_win_timer_request(
fprintf( stderr, " msg=%08x,", req->msg );
fprintf( stderr, " id=%08x,", req->id );
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 )
diff --git a/tools/make_requests b/tools/make_requests
index a34b430..a11cc24 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -29,6 +29,7 @@ (
"unsigned char" => "%02x",
"unsigned short"=> "%04x",
"unsigned int" => "%08x",
+ "unsigned long" => "%lx",
"void*" => "%p",
"time_t" => "%ld (long)",
"size_t" => "%lu (unsigned long)",
More information about the wine-cvs
mailing list