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

user32: The per-window user data must be a DWORD_PTR.

oldstable
Alexandre Julliard 2006-10-04 21:49:11 +02:00
parent e0dcf4fddb
commit 81c1472449
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/user/win.c
View File

@ -1780,7 +1780,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod
case GWL_EXSTYLE: retvalue = reply->old_ex_style; break;
case GWLP_ID: retvalue = reply->old_id; break;
case GWLP_HINSTANCE: retvalue = (ULONG_PTR)reply->old_instance; break;
case GWLP_USERDATA: retvalue = (ULONG_PTR)reply->old_user_data; break;
case GWLP_USERDATA: retvalue = reply->old_user_data; break;
default:
if (offset >= 0) retvalue = get_win_data( &reply->old_extra_value, size );
else SetLastError( ERROR_INVALID_INDEX );
@ -1982,7 +1982,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B
break;
case GWLP_USERDATA:
req->flags = SET_WIN_USERDATA;
req->user_data = (void *)newval;
req->user_data = newval;
break;
default:
req->flags = SET_WIN_EXTRA;
@ -2014,7 +2014,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B
break;
case GWLP_USERDATA:
wndPtr->userdata = newval;
retval = (ULONG_PTR)reply->old_user_data;
retval = reply->old_user_data;
break;
default:
retval = get_win_data( (char *)wndPtr->wExtra + offset, size );

2
include/win.h
View File

@ -57,7 +57,7 @@ typedef struct tagWND
HICON hIcon; /* window's icon */
HICON hIconSmall; /* window's small icon */
int cbWndExtra; /* class cbWndExtra at window creation */
DWORD userdata; /* User private data */
DWORD_PTR userdata; /* User private data */
DWORD wExtra[1]; /* Window extra bytes */
} WND;

6
include/wine/server_protocol.h
View File

@ -2643,7 +2643,7 @@ struct set_window_info_request
unsigned int id;
int is_unicode;
void* instance;
void* user_data;
unsigned long user_data;
int extra_offset;
data_size_t extra_size;
unsigned long extra_value;
@ -2655,7 +2655,7 @@ struct set_window_info_reply
unsigned int old_ex_style;
unsigned int old_id;
void* old_instance;
void* old_user_data;
unsigned long old_user_data;
unsigned long old_extra_value;
};
#define SET_WIN_STYLE 0x01
@ -4426,6 +4426,6 @@ union generic_reply
struct query_symlink_reply query_symlink_reply;
};
#define SERVER_PROTOCOL_VERSION 251
#define SERVER_PROTOCOL_VERSION 252
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */

4
server/protocol.def
View File

@ -1883,7 +1883,7 @@ enum message_type
unsigned int id; /* window id */
int is_unicode; /* ANSI or unicode */
void* instance; /* creator instance */
void* user_data; /* user-specific data */
unsigned long user_data; /* user-specific data */
int extra_offset; /* offset to set in extra bytes */
data_size_t extra_size; /* size to set in extra bytes */
unsigned long extra_value; /* value to set in extra bytes */
@ -1892,7 +1892,7 @@ enum message_type
unsigned int old_ex_style; /* old window extended style */
unsigned int old_id; /* old window id */
void* old_instance; /* old creator instance */
void* old_user_data; /* old user-specific data */
unsigned long old_user_data; /* old user-specific data */
unsigned long old_extra_value; /* old value in extra bytes */
@END
#define SET_WIN_STYLE 0x01

4
server/trace.c
View File

@ -2382,7 +2382,7 @@ static void dump_set_window_info_request( const struct set_window_info_request *
fprintf( stderr, " id=%08x,", req->id );
fprintf( stderr, " is_unicode=%d,", req->is_unicode );
fprintf( stderr, " instance=%p,", req->instance );
fprintf( stderr, " user_data=%p,", req->user_data );
fprintf( stderr, " user_data=%lx,", req->user_data );
fprintf( stderr, " extra_offset=%d,", req->extra_offset );
fprintf( stderr, " extra_size=%u,", req->extra_size );
fprintf( stderr, " extra_value=%lx", req->extra_value );
@ -2394,7 +2394,7 @@ static void dump_set_window_info_reply( const struct set_window_info_reply *req
fprintf( stderr, " old_ex_style=%08x,", req->old_ex_style );
fprintf( stderr, " old_id=%08x,", req->old_id );
fprintf( stderr, " old_instance=%p,", req->old_instance );
fprintf( stderr, " old_user_data=%p,", req->old_user_data );
fprintf( stderr, " old_user_data=%lx,", req->old_user_data );
fprintf( stderr, " old_extra_value=%lx", req->old_extra_value );
}

4
server/window.c
View File

@ -78,7 +78,7 @@ struct window
unsigned int id; /* window id */
void* instance; /* creator instance */
int is_unicode; /* ANSI or unicode */
void* user_data; /* user-specific data */
unsigned long user_data; /* user-specific data */
WCHAR *text; /* window caption text */
unsigned int paint_flags; /* various painting flags */
int prop_inuse; /* number of in-use window properties */
@ -401,7 +401,7 @@ static struct window *create_window( struct window *parent, struct window *owner
win->id = 0;
win->instance = NULL;
win->is_unicode = 1;
win->user_data = NULL;
win->user_data = 0;
win->text = NULL;
win->paint_flags = 0;
win->prop_inuse = 0;