system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 07:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

server: Make atom_t an unsigned int to avoid padding issues.

Browse source
This commit is contained in:
Alexandre Julliard 2008-12-30 23:17:52 +01:00
parent fa8643805b
commit 0c914e475d
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/user32/class.c
View file

@ -135,7 +135,7 @@ static BOOL set_server_info( HWND hwnd, INT offset, LONG_PTR newval, UINT size )
{ {
case GCW_ATOM: case GCW_ATOM:
req->flags = SET_CLASS_ATOM; req->flags = SET_CLASS_ATOM;
req->atom = newval; req->atom = LOWORD(newval);
case GCL_STYLE: case GCL_STYLE:
req->flags = SET_CLASS_STYLE; req->flags = SET_CLASS_STYLE;
req->style = newval; req->style = newval;

8
include/wine/server_protocol.h
View file

@ -17,7 +17,7 @@
typedef unsigned int obj_handle_t; typedef unsigned int obj_handle_t;
typedef unsigned int user_handle_t; typedef unsigned int user_handle_t;
typedef unsigned short atom_t; typedef unsigned int atom_t;
typedef unsigned int process_id_t; typedef unsigned int process_id_t;
typedef unsigned int thread_id_t; typedef unsigned int thread_id_t;
typedef unsigned int data_size_t; typedef unsigned int data_size_t;
@ -148,7 +148,7 @@ typedef __int64 timeout_t;
typedef struct typedef struct
{ {
atom_t atom; atom_t atom;
short string; int string;
lparam_t data; lparam_t data;
} property_data_t; } property_data_t;
@ -2857,7 +2857,7 @@ struct get_window_info_reply
process_id_t pid; process_id_t pid;
thread_id_t tid; thread_id_t tid;
atom_t atom; atom_t atom;
short int is_unicode; int is_unicode;
}; };
@ -5061,6 +5061,6 @@ union generic_reply
struct set_window_layered_info_reply set_window_layered_info_reply; struct set_window_layered_info_reply set_window_layered_info_reply;
}; };
#define SERVER_PROTOCOL_VERSION 376 #define SERVER_PROTOCOL_VERSION 377
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

6
server/protocol.def
View file

@ -33,7 +33,7 @@
typedef unsigned int obj_handle_t; typedef unsigned int obj_handle_t;
typedef unsigned int user_handle_t; typedef unsigned int user_handle_t;
typedef unsigned short atom_t; typedef unsigned int atom_t;
typedef unsigned int process_id_t; typedef unsigned int process_id_t;
typedef unsigned int thread_id_t; typedef unsigned int thread_id_t;
typedef unsigned int data_size_t; typedef unsigned int data_size_t;
@ -164,7 +164,7 @@ typedef __int64 timeout_t;
typedef struct typedef struct
{ {
atom_t atom; /* property atom */ atom_t atom; /* property atom */
short string; /* was atom a string originally? */ int string; /* was atom a string originally? */
lparam_t data; /* data stored in property */ lparam_t data; /* data stored in property */
} property_data_t; } property_data_t;
@ -2106,7 +2106,7 @@ enum message_type
process_id_t pid; /* process owning the window */ process_id_t pid; /* process owning the window */
thread_id_t tid; /* thread owning the window */ thread_id_t tid; /* thread owning the window */
atom_t atom; /* class atom */ atom_t atom; /* class atom */
short int is_unicode; /* ANSI or unicode */ int is_unicode; /* ANSI or unicode */
@END @END

2
tools/make_requests
View file

@ -31,7 +31,7 @@ my %formats =
"unsigned int" => [ 4, 4, "%08x" ], "unsigned int" => [ 4, 4, "%08x" ],
"data_size_t" => [ 4, 4, "%u" ], "data_size_t" => [ 4, 4, "%u" ],
"obj_handle_t" => [ 4, 4, "%04x" ], "obj_handle_t" => [ 4, 4, "%04x" ],
"atom_t" => [ 2, 2, "%04x" ], "atom_t" => [ 4, 4, "%04x" ],
"user_handle_t" => [ 4, 4, "%08x" ], "user_handle_t" => [ 4, 4, "%08x" ],
"process_id_t" => [ 4, 4, "%04x" ], "process_id_t" => [ 4, 4, "%04x" ],
"thread_id_t" => [ 4, 4, "%04x" ], "thread_id_t" => [ 4, 4, "%04x" ],