Alexandre Julliard : server: Make the message extra info 64 bits on
Win64.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Aug 9 10:37:19 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 672bfc2d6299047520eb61f87b08addf225689d9
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=672bfc2d6299047520eb61f87b08addf225689d9
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Aug 9 17:10:14 2006 +0200
server: Make the message extra info 64 bits on Win64.
---
dlls/user/user_private.h | 2 +-
include/wine/server_protocol.h | 8 ++++----
server/protocol.def | 6 +++---
server/queue.c | 4 ++--
server/trace.c | 8 ++++----
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h
index ffb2796..00e9b45 100644
--- a/dlls/user/user_private.h
+++ b/dlls/user/user_private.h
@@ -174,7 +174,7 @@ struct user_thread_info
struct hook16_queue_info *hook16_info; /* 10 Opaque pointer for 16-bit hook support */
DWORD GetMessageTimeVal; /* 14 Value for GetMessageTime */
DWORD GetMessagePosVal; /* 18 Value for GetMessagePos */
- DWORD GetMessageExtraInfoVal; /* 1c Value for GetMessageExtraInfo */
+ ULONG_PTR GetMessageExtraInfoVal; /* 1c Value for GetMessageExtraInfo */
HCURSOR cursor; /* 20 Current cursor */
INT cursor_count; /* 24 Cursor show count */
UINT active_hooks; /* 28 Bitmap of active hooks */
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 08c085b..b8c8a7c 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -2199,7 +2199,7 @@ struct send_message_request
unsigned int msg;
unsigned long wparam;
unsigned long lparam;
- unsigned int info;
+ unsigned long info;
int timeout;
void* callback;
/* VARARG(data,bytes); */
@@ -2243,10 +2243,10 @@ struct send_hardware_message_request
unsigned int msg;
unsigned long wparam;
unsigned long lparam;
+ unsigned long info;
int x;
int y;
unsigned int time;
- unsigned int info;
};
struct send_hardware_message_reply
{
@@ -2272,12 +2272,12 @@ struct get_message_reply
unsigned int msg;
unsigned long wparam;
unsigned long lparam;
+ unsigned long info;
int x;
int y;
user_handle_t hook;
void* hook_proc;
unsigned int time;
- unsigned int info;
unsigned int hw_id;
unsigned int active_hooks;
data_size_t total;
@@ -4405,6 +4405,6 @@ union generic_reply
struct query_symlink_reply query_symlink_reply;
};
-#define SERVER_PROTOCOL_VERSION 245
+#define SERVER_PROTOCOL_VERSION 246
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/protocol.def b/server/protocol.def
index 27122ab..0d014dd 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1571,7 +1571,7 @@ #define SNAP_MODULE 0x00000008
unsigned int msg; /* message code */
unsigned long wparam; /* parameters */
unsigned long lparam; /* parameters */
- unsigned int info; /* extra info */
+ unsigned long info; /* extra info */
int timeout; /* timeout for reply */
void* callback; /* callback address */
VARARG(data,bytes); /* message data for sent messages */
@@ -1603,10 +1603,10 @@ #define SEND_MSG_ABORT_IF_HUNG 0x01
unsigned int msg; /* message code */
unsigned long wparam; /* parameters */
unsigned long lparam; /* parameters */
+ unsigned long info; /* extra info */
int x; /* x position */
int y; /* y position */
unsigned int time; /* message time */
- unsigned int info; /* extra info */
@END
@@ -1623,12 +1623,12 @@ #define SEND_MSG_ABORT_IF_HUNG 0x01
unsigned int msg; /* message code */
unsigned long wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */
unsigned long lparam; /* parameters (result for MSG_CALLBACK_RESULT) */
+ unsigned long info; /* extra info (callback argument for MSG_CALLBACK_RESULT) */
int x; /* x position */
int y; /* y position */
user_handle_t hook; /* winevent hook handle */
void* hook_proc; /* winevent hook proc address */
unsigned int time; /* message time */
- unsigned int info; /* extra info (callback argument for MSG_CALLBACK_RESULT) */
unsigned int hw_id; /* id if hardware message */
unsigned int active_hooks; /* active hooks bitmap */
data_size_t total; /* total size of extra data */
diff --git a/server/queue.c b/server/queue.c
index 7a77bd4..24767b6 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -72,10 +72,10 @@ struct message
unsigned int msg; /* message code */
unsigned long wparam; /* parameters */
unsigned long lparam; /* parameters */
+ unsigned long info; /* extra info */
int x; /* x position */
int y; /* y position */
unsigned int time; /* message time */
- unsigned int info; /* extra info */
user_handle_t hook; /* winevent hook handle */
void *hook_proc; /* winevent hook proc address */
void *data; /* message data for sent messages */
@@ -520,7 +520,7 @@ static void result_timeout( void *privat
static struct message_result *alloc_message_result( struct msg_queue *send_queue,
struct msg_queue *recv_queue,
struct message *msg, int timeout,
- void *callback, unsigned int callback_data )
+ void *callback, unsigned long callback_data )
{
struct message_result *result = mem_alloc( sizeof(*result) );
if (result)
diff --git a/server/trace.c b/server/trace.c
index d4f8fed..a84752a 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -2091,7 +2091,7 @@ static void dump_send_message_request( c
fprintf( stderr, " msg=%08x,", req->msg );
fprintf( stderr, " wparam=%lx,", req->wparam );
fprintf( stderr, " lparam=%lx,", req->lparam );
- fprintf( stderr, " info=%08x,", req->info );
+ fprintf( stderr, " info=%lx,", req->info );
fprintf( stderr, " timeout=%d,", req->timeout );
fprintf( stderr, " callback=%p,", req->callback );
fprintf( stderr, " data=" );
@@ -2110,10 +2110,10 @@ static void dump_send_hardware_message_r
fprintf( stderr, " msg=%08x,", req->msg );
fprintf( stderr, " wparam=%lx,", req->wparam );
fprintf( stderr, " lparam=%lx,", req->lparam );
+ fprintf( stderr, " info=%lx,", req->info );
fprintf( stderr, " x=%d,", req->x );
fprintf( stderr, " y=%d,", req->y );
- fprintf( stderr, " time=%08x,", req->time );
- fprintf( stderr, " info=%08x", req->info );
+ fprintf( stderr, " time=%08x", req->time );
}
static void dump_get_message_request( const struct get_message_request *req )
@@ -2132,12 +2132,12 @@ static void dump_get_message_reply( cons
fprintf( stderr, " msg=%08x,", req->msg );
fprintf( stderr, " wparam=%lx,", req->wparam );
fprintf( stderr, " lparam=%lx,", req->lparam );
+ fprintf( stderr, " info=%lx,", req->info );
fprintf( stderr, " x=%d,", req->x );
fprintf( stderr, " y=%d,", req->y );
fprintf( stderr, " hook=%p,", req->hook );
fprintf( stderr, " hook_proc=%p,", req->hook_proc );
fprintf( stderr, " time=%08x,", req->time );
- fprintf( stderr, " info=%08x,", req->info );
fprintf( stderr, " hw_id=%08x,", req->hw_id );
fprintf( stderr, " active_hooks=%08x,", req->active_hooks );
fprintf( stderr, " total=%u,", req->total );
More information about the wine-cvs
mailing list