Skip to content

W
wine-winehq
Commit 672bfc2d authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

server: Make the message extra info 64 bits on Win64.

parent d3b30967
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
dlls/user/user_private.h
View file @ 672bfc2d
......@@ -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 */
......
include/wine/server_protocol.h
View file @ 672bfc2d
......@@ -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 */
server/protocol.def
View file @ 672bfc2d
......@@ -1571,7 +1571,7 @@ enum char_info_mode
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 @@ enum message_type
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 @@ enum message_type
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 */
......
server/queue.c
View file @ 672bfc2d
......@@ -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 *private )
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)
......
server/trace.c
View file @ 672bfc2d
......@@ -2091,7 +2091,7 @@ static void dump_send_message_request( const struct send_message_request *req )
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_request( const struct send_hardware_messa
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( const struct get_message_reply *req )
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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment