December 2008 - Wine-Commits

Henri Verbeet : d3d9: Use separate codepaths for failure and NULL return values in GetVertexShader () / GetPixelShader().
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: 8da71ca6a66d4543e0f51e83196f7429413bd3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da71ca6a66d4543e0f51e831… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 16:31:22 2008 +0100 d3d9: Use separate codepaths for failure and NULL return values in GetVertexShader() / GetPixelShader(). --- dlls/d3d9/pixelshader.c | 20 +++++++++++++++----- dlls/d3d9/vertexshader.c | 19 ++++++++++++++----- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 059116a..dddda28 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -170,11 +170,21 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9EX iface, ID EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &object); - if (hrc == D3D_OK && object != NULL) { - hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)ppShader); - IWineD3DPixelShader_Release(object); - } else { - *ppShader = NULL; + if (SUCCEEDED(hrc)) + { + if (object) + { + hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)ppShader); + IWineD3DPixelShader_Release(object); + } + else + { + *ppShader = NULL; + } + } + else + { + WARN("(%p) : Call to IWineD3DDevice_GetPixelShader failed %u (device %p)\n", This, hrc, This->WineD3DDevice); } LeaveCriticalSection(&d3d9_cs); diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 6172225..6478b68 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -166,11 +166,20 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9EX iface, I TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader); - if(hrc == D3D_OK && pShader != NULL){ - hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader); - IWineD3DVertexShader_Release(pShader); - } else { - *ppShader = NULL; + if (SUCCEEDED(hrc)) + { + if (pShader) + { + hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader); + IWineD3DVertexShader_Release(pShader); + } + else + { + *ppShader = NULL; + } + } + else + { WARN("(%p) : Call to IWineD3DDevice_GetVertexShader failed %u (device %p)\n", This, hrc, This->WineD3DDevice); } LeaveCriticalSection(&d3d9_cs);

1 0

Henri Verbeet : wined3d: Get rid of the glname field in struct SHADER_OPCODE.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: 6f5af4047f16d0b8b850efcbcd254f97ff3ac654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5af4047f16d0b8b850efcbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 16:31:21 2008 +0100 wined3d: Get rid of the glname field in struct SHADER_OPCODE. It's only used for shader_hw_map2gl() and vshader_hw_rsq_rcp(), and we can handle those the same way we handle the GLSL equivalents. --- dlls/wined3d/arb_program_shader.c | 46 +++++++++- dlls/wined3d/pixelshader.c | 170 ++++++++++++++++++------------------ dlls/wined3d/vertexshader.c | 116 +++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 186 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f5af4047f16d0b8b850e…

1 0

Henri Verbeet : d3d8: Port the d3d9 stateblock tests to d3d8.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: ff409280e776d6c2d302092084dffbe648cec9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff409280e776d6c2d30209208… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 29 16:31:21 2008 +0100 d3d8: Port the d3d9 stateblock tests to d3d8. --- dlls/d3d8/tests/Makefile.in | 1 + dlls/d3d8/tests/stateblock.c | 1551 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1552 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff409280e776d6c2d3020…

1 0

Alexandre Julliard : server: Make timer callback function and argument client_ptr_t instead of void pointers .
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: 9b92a59115d151dc59e527fd3c5bed502df19013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b92a59115d151dc59e527fd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 17:43:01 2008 +0100 server: Make timer callback function and argument client_ptr_t instead of void pointers. --- dlls/ntdll/sync.c | 10 +++++++--- include/wine/server_protocol.h | 12 ++++++------ server/protocol.def | 10 +++++----- server/timer.c | 6 +++--- server/trace.c | 13 +++++++++---- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a5767f3..d38d510 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -671,8 +671,8 @@ NTSTATUS WINAPI NtSetTimer(IN HANDLE handle, req->handle = wine_server_obj_handle( handle ); req->period = period; req->expire = when->QuadPart; - req->callback = callback; - req->arg = callback_arg; + req->callback = wine_server_client_ptr( callback ); + req->arg = wine_server_client_ptr( callback_arg ); status = wine_server_call( req ); if (state) *state = reply->signaled; } @@ -856,9 +856,13 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) user_apc = TRUE; break; case APC_TIMER: - call->timer.func( call->timer.arg, (DWORD)call->timer.time, (DWORD)(call->timer.time >> 32) ); + { + void (WINAPI *func)(void*, unsigned int, unsigned int) = wine_server_get_ptr( call->timer.func ); + func( wine_server_get_ptr( call->timer.arg ), + (DWORD)call->timer.time, (DWORD)(call->timer.time >> 32) ); user_apc = TRUE; break; + } case APC_ASYNC_IO: result->type = call->type; result->async_io.status = call->async_io.func( call->async_io.user, diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 07b72d7..a65932e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -277,10 +277,10 @@ typedef union } user; struct { - enum apc_type type; - void (__stdcall *func)(void*, unsigned int, unsigned int); + enum apc_type type; + client_ptr_t func; timeout_t time; - void *arg; + client_ptr_t arg; } timer; struct { @@ -2203,9 +2203,9 @@ struct set_timer_request struct request_header __header; obj_handle_t handle; timeout_t expire; + client_ptr_t callback; + client_ptr_t arg; int period; - void* callback; - void* arg; }; struct set_timer_reply { @@ -5052,6 +5052,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 362 +#define SERVER_PROTOCOL_VERSION 363 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index c0212e2..ca32a41 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -293,10 +293,10 @@ typedef union } user; struct { - enum apc_type type; /* APC_TIMER */ - void (__stdcall *func)(void*, unsigned int, unsigned int); + enum apc_type type; /* APC_TIMER */ + client_ptr_t func; /* void (__stdcall *func)(void*, unsigned int, unsigned int); */ timeout_t time; /* absolute time of expiration */ - void *arg; /* user argument */ + client_ptr_t arg; /* user argument */ } timer; struct { @@ -1669,9 +1669,9 @@ enum char_info_mode @REQ(set_timer) obj_handle_t handle; /* handle to the timer */ timeout_t expire; /* next expiration absolute time */ + client_ptr_t callback; /* callback function */ + client_ptr_t arg; /* callback argument */ int period; /* timer period in ms */ - void* callback; /* callback function */ - void* arg; /* callback argument */ @REPLY int signaled; /* was the timer signaled before this call ? */ @END diff --git a/server/timer.c b/server/timer.c index 5afe663..b38eae7 100644 --- a/server/timer.c +++ b/server/timer.c @@ -46,8 +46,8 @@ struct timer timeout_t when; /* next expiration */ struct timeout_user *timeout; /* timeout user */ struct thread *thread; /* thread that set the APC function */ - void *callback; /* callback APC function */ - void *arg; /* callback argument */ + client_ptr_t callback; /* callback APC function */ + client_ptr_t arg; /* callback argument */ }; static void timer_dump( struct object *obj, int verbose ); @@ -160,7 +160,7 @@ static int cancel_timer( struct timer *timer ) /* set the timer expiration and period */ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period, - void *callback, void *arg ) + client_ptr_t callback, client_ptr_t arg ) { int signaled = cancel_timer( timer ); if (timer->manual) diff --git a/server/trace.c b/server/trace.c index 7e3ccf5..a986d95 100644 --- a/server/trace.c +++ b/server/trace.c @@ -125,7 +125,8 @@ static void dump_apc_call( const apc_call_t *call ) case APC_TIMER: fprintf( stderr, "APC_TIMER,time=" ); dump_timeout( &call->timer.time ); - fprintf( stderr, ",arg=%p", call->timer.arg ); + fprintf( stderr, ",arg=" ); + dump_uint64( &call->timer.arg ); break; case APC_ASYNC_IO: fprintf( stderr, "APC_ASYNC_IO,func=%p,user=%p,sb=%p,status=%s", @@ -2166,9 +2167,13 @@ static void dump_set_timer_request( const struct set_timer_request *req ) fprintf( stderr, " expire=" ); dump_timeout( &req->expire ); fprintf( stderr, "," ); - fprintf( stderr, " period=%d,", req->period ); - fprintf( stderr, " callback=%p,", req->callback ); - fprintf( stderr, " arg=%p", req->arg ); + fprintf( stderr, " callback=" ); + dump_uint64( &req->callback ); + fprintf( stderr, "," ); + fprintf( stderr, " arg=" ); + dump_uint64( &req->arg ); + fprintf( stderr, "," ); + fprintf( stderr, " period=%d", req->period ); } static void dump_set_timer_reply( const struct set_timer_reply *req )

1 0

Alexandre Julliard : server: Make hook procedures client_ptr_t instead of void pointers.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: cc55fd317ad78b569f10359aef421bd831749d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc55fd317ad78b569f10359ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 17:35:35 2008 +0100 server: Make hook procedures client_ptr_t instead of void pointers. --- dlls/user32/hook.c | 20 ++++++++++---------- dlls/user32/message.c | 2 +- include/wine/server_protocol.h | 12 ++++++------ server/hook.c | 6 +++--- server/protocol.def | 10 +++++----- server/queue.c | 2 +- server/trace.c | 18 +++++++++++++----- server/user.h | 2 +- 8 files changed, 40 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc55fd317ad78b569f103…

1 0

Alexandre Julliard : server: Make the device opaque data a client_ptr_t instead of a void pointer.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: 923310aa54f02db2273929366f4cc5cf40c7c9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=923310aa54f02db2273929366… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 17:28:40 2008 +0100 server: Make the device opaque data a client_ptr_t instead of a void pointer. --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- include/wine/server_protocol.h | 6 +++--- server/device.c | 2 +- server/protocol.def | 4 ++-- server/trace.c | 8 ++++++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0087683..f6d7d1e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -225,7 +225,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) { code = reply->code; ioctl = reply->next; - device = reply->user_ptr; + device = wine_server_get_ptr( reply->user_ptr ); in_size = reply->in_size; out_size = reply->out_size; } @@ -491,7 +491,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, req->attributes = 0; req->rootdir = 0; req->manager = wine_server_obj_handle( manager ); - req->user_ptr = device; + req->user_ptr = wine_server_client_ptr( device ); if (name) wine_server_add_data( req, name->Buffer, name->Length ); if (!(status = wine_server_call( req ))) handle = wine_server_ptr_handle( reply->handle ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 20fc81f..807889b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4118,7 +4118,7 @@ struct create_device_request unsigned int attributes; obj_handle_t rootdir; obj_handle_t manager; - void* user_ptr; + client_ptr_t user_ptr; /* VARARG(name,unicode_str); */ }; struct create_device_reply @@ -4154,7 +4154,7 @@ struct get_next_device_request_reply struct reply_header __header; obj_handle_t next; ioctl_code_t code; - void* user_ptr; + client_ptr_t user_ptr; data_size_t in_size; data_size_t out_size; /* VARARG(next_data,bytes); */ @@ -5052,6 +5052,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 360 +#define SERVER_PROTOCOL_VERSION 361 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 754b257..48bccd2 100644 --- a/server/device.c +++ b/server/device.c @@ -112,7 +112,7 @@ struct device struct object obj; /* object header */ struct device_manager *manager; /* manager for this device (or NULL if deleted) */ struct fd *fd; /* file descriptor for ioctl */ - void *user_ptr; /* opaque ptr for client side */ + client_ptr_t user_ptr; /* opaque ptr for client side */ struct list entry; /* entry in device manager list */ struct list requests; /* list of pending ioctl requests */ }; diff --git a/server/protocol.def b/server/protocol.def index 66c2e01..ffb8661 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2961,7 +2961,7 @@ enum message_type unsigned int attributes; /* object attributes */ obj_handle_t rootdir; /* root directory */ obj_handle_t manager; /* device manager */ - void* user_ptr; /* opaque ptr for use by client */ + client_ptr_t user_ptr; /* opaque ptr for use by client */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the device */ @@ -2983,7 +2983,7 @@ enum message_type @REPLY obj_handle_t next; /* handle to the next ioctl */ ioctl_code_t code; /* ioctl code */ - void* user_ptr; /* opaque ptr for the device */ + client_ptr_t user_ptr; /* opaque ptr for the device */ data_size_t in_size; /* total needed input size */ data_size_t out_size; /* needed output size */ VARARG(next_data,bytes); /* input data of the next ioctl */ diff --git a/server/trace.c b/server/trace.c index 9530fde..e9a9b36 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3729,7 +3729,9 @@ static void dump_create_device_request( const struct create_device_request *req fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " rootdir=%04x,", req->rootdir ); fprintf( stderr, " manager=%04x,", req->manager ); - fprintf( stderr, " user_ptr=%p,", req->user_ptr ); + fprintf( stderr, " user_ptr=" ); + dump_uint64( &req->user_ptr ); + fprintf( stderr, "," ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); } @@ -3759,7 +3761,9 @@ static void dump_get_next_device_request_reply( const struct get_next_device_req fprintf( stderr, " code=" ); dump_ioctl_code( &req->code ); fprintf( stderr, "," ); - fprintf( stderr, " user_ptr=%p,", req->user_ptr ); + fprintf( stderr, " user_ptr=" ); + dump_uint64( &req->user_ptr ); + fprintf( stderr, "," ); fprintf( stderr, " in_size=%u,", req->in_size ); fprintf( stderr, " out_size=%u,", req->out_size ); fprintf( stderr, " next_data=" );

1 0

Alexandre Julliard : server: Make the class opaque data a client_ptr_t instead of a void pointer.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: 0cd3ff6cbe3979ce207527f79884c49ad53a2905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd3ff6cbe3979ce207527f79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 17:24:33 2008 +0100 server: Make the class opaque data a client_ptr_t instead of a void pointer. --- dlls/user32/class.c | 4 ++-- dlls/user32/win.c | 4 ++-- include/wine/server_protocol.h | 8 ++++---- server/class.c | 4 ++-- server/protocol.def | 6 +++--- server/trace.c | 10 +++++++--- server/user.h | 2 +- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 478ff4f..51e6faf 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -357,7 +357,7 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local req->instance = wine_server_client_ptr( hInstance ); req->extra = classExtra; req->win_extra = winExtra; - req->client_ptr = classPtr; + req->client_ptr = wine_server_client_ptr( classPtr ); req->atom = classPtr->atomName; if (!req->atom && name) wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) ); ret = !wine_server_call_err( req ); @@ -628,7 +628,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) req->instance = wine_server_client_ptr( hInstance ); if (!(req->atom = get_int_atom_value(className)) && className) wine_server_add_data( req, className, strlenW(className) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) classPtr = reply->client_ptr; + if (!wine_server_call_err( req )) classPtr = wine_server_get_ptr( reply->client_ptr ); } SERVER_END_REQ; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index de10de6..08649e8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -117,11 +117,11 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, wine_server_add_data( req, name, strlenW(name)*sizeof(WCHAR) ); if (!wine_server_call_err( req )) { - handle = wine_server_ptr_handle( reply->handle ); + handle = wine_server_ptr_handle( reply->handle ); full_parent = wine_server_ptr_handle( reply->parent ); full_owner = wine_server_ptr_handle( reply->owner ); extra_bytes = reply->extra; - class = reply->class_ptr; + class = wine_server_get_ptr( reply->class_ptr ); } } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4dcd50d..20fc81f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2789,7 +2789,7 @@ struct create_window_reply user_handle_t parent; user_handle_t owner; int extra; - void* class_ptr; + client_ptr_t class_ptr; }; @@ -3661,7 +3661,7 @@ struct create_class_request mod_handle_t instance; int extra; int win_extra; - void* client_ptr; + client_ptr_t client_ptr; /* VARARG(name,unicode_str); */ }; struct create_class_reply @@ -3682,7 +3682,7 @@ struct destroy_class_request struct destroy_class_reply { struct reply_header __header; - void* client_ptr; + client_ptr_t client_ptr; }; @@ -5052,6 +5052,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 359 +#define SERVER_PROTOCOL_VERSION 360 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/class.c b/server/class.c index 1833a28..0e402ba 100644 --- a/server/class.c +++ b/server/class.c @@ -49,7 +49,7 @@ struct window_class mod_handle_t instance; /* module instance */ unsigned int style; /* class style */ int win_extra; /* number of window extra bytes */ - void *client_ptr; /* pointer to class in client address space */ + client_ptr_t client_ptr; /* pointer to class in client address space */ int nb_extra_bytes; /* number of extra bytes */ char extra_bytes[1]; /* extra bytes storage */ }; @@ -141,7 +141,7 @@ atom_t get_class_atom( struct window_class *class ) return class->atom; } -void *get_class_client_ptr( struct window_class *class ) +client_ptr_t get_class_client_ptr( struct window_class *class ) { return class->client_ptr; } diff --git a/server/protocol.def b/server/protocol.def index daa15b7..66c2e01 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2059,7 +2059,7 @@ enum message_type user_handle_t parent; /* full handle of parent */ user_handle_t owner; /* full handle of owner */ int extra; /* number of extra bytes */ - void* class_ptr; /* pointer to class in client address space */ + client_ptr_t class_ptr; /* pointer to class in client address space */ @END @@ -2646,7 +2646,7 @@ enum message_type mod_handle_t instance; /* module instance */ int extra; /* number of extra class bytes */ int win_extra; /* number of window extra bytes */ - void* client_ptr; /* pointer to class in client address space */ + client_ptr_t client_ptr; /* pointer to class in client address space */ VARARG(name,unicode_str); /* class name */ @REPLY atom_t atom; /* resulting class atom */ @@ -2659,7 +2659,7 @@ enum message_type mod_handle_t instance; /* module instance */ VARARG(name,unicode_str); /* class name */ @REPLY - void* client_ptr; /* pointer to class in client address space */ + client_ptr_t client_ptr; /* pointer to class in client address space */ @END diff --git a/server/trace.c b/server/trace.c index fb717d0..9530fde 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2623,7 +2623,8 @@ static void dump_create_window_reply( const struct create_window_reply *req ) fprintf( stderr, " parent=%08x,", req->parent ); fprintf( stderr, " owner=%08x,", req->owner ); fprintf( stderr, " extra=%d,", req->extra ); - fprintf( stderr, " class_ptr=%p", req->class_ptr ); + fprintf( stderr, " class_ptr=" ); + dump_uint64( &req->class_ptr ); } static void dump_destroy_window_request( const struct destroy_window_request *req ) @@ -3327,7 +3328,9 @@ static void dump_create_class_request( const struct create_class_request *req ) fprintf( stderr, "," ); fprintf( stderr, " extra=%d,", req->extra ); fprintf( stderr, " win_extra=%d,", req->win_extra ); - fprintf( stderr, " client_ptr=%p,", req->client_ptr ); + fprintf( stderr, " client_ptr=" ); + dump_uint64( &req->client_ptr ); + fprintf( stderr, "," ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); } @@ -3349,7 +3352,8 @@ static void dump_destroy_class_request( const struct destroy_class_request *req static void dump_destroy_class_reply( const struct destroy_class_reply *req ) { - fprintf( stderr, " client_ptr=%p", req->client_ptr ); + fprintf( stderr, " client_ptr=" ); + dump_uint64( &req->client_ptr ); } static void dump_set_class_info_request( const struct set_class_info_request *req ) diff --git a/server/user.h b/server/user.h index d319410..b4f35a8 100644 --- a/server/user.h +++ b/server/user.h @@ -148,7 +148,7 @@ extern void release_class( struct window_class *class ); extern int is_desktop_class( struct window_class *class ); extern int is_hwnd_message_class( struct window_class *class ); extern atom_t get_class_atom( struct window_class *class ); -extern void *get_class_client_ptr( struct window_class *class ); +extern client_ptr_t get_class_client_ptr( struct window_class *class ); /* windows station functions */

1 0

Alexandre Julliard : server: Make the select cookie a client_ptr_t instead of a void pointer.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: 45c991937ac0ba0a634df9db3ced2d811fd4ef24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c991937ac0ba0a634df9db3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 17:19:26 2008 +0100 server: Make the select cookie a client_ptr_t instead of a void pointer. --- dlls/ntdll/sync.c | 4 ++-- include/wine/server_protocol.h | 8 ++++---- server/protocol.def | 6 +++--- server/thread.c | 18 ++++++++---------- server/trace.c | 4 +++- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0614eea..a5767f3 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -812,7 +812,7 @@ static int wait_reply( void *cookie ) if (ret == sizeof(reply)) { if (!reply.cookie) break; /* thread got killed */ - if (reply.cookie == cookie) return reply.signaled; + if (wine_server_get_ptr(reply.cookie) == cookie) return reply.signaled; /* we stole another reply, wait for the real one */ signaled = wait_reply( cookie ); /* and now put the wrong one back in the pipe */ @@ -1091,7 +1091,7 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN SERVER_START_REQ( select ) { req->flags = flags; - req->cookie = &cookie; + req->cookie = wine_server_client_ptr( &cookie ); req->signal = wine_server_obj_handle( signal_object ); req->prev_apc = apc_handle; req->timeout = abs_timeout; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b263a2d..4dcd50d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -135,8 +135,8 @@ struct send_fd struct wake_up_reply { - void *cookie; - int signaled; + client_ptr_t cookie; + int signaled; }; @@ -860,7 +860,7 @@ struct select_request { struct request_header __header; int flags; - void* cookie; + client_ptr_t cookie; obj_handle_t signal; obj_handle_t prev_apc; timeout_t timeout; @@ -5052,6 +5052,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 358 +#define SERVER_PROTOCOL_VERSION 359 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 6f8dd2c..daa15b7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -151,8 +151,8 @@ struct send_fd /* structure sent by the server on the wait fifo */ struct wake_up_reply { - void *cookie; /* magic cookie that was passed in select_request */ - int signaled; /* wait result */ + client_ptr_t cookie; /* magic cookie that was passed in select_request */ + int signaled; /* wait result */ }; /* NT-style timeout, in 100ns units, negative means relative timeout */ @@ -748,7 +748,7 @@ typedef union /* Wait for handles */ @REQ(select) int flags; /* wait flags (see below) */ - void* cookie; /* magic cookie to return to client */ + client_ptr_t cookie; /* magic cookie to return to client */ obj_handle_t signal; /* object to signal (0 if none) */ obj_handle_t prev_apc; /* handle to previous APC */ timeout_t timeout; /* timeout */ diff --git a/server/thread.c b/server/thread.c index 1eeb59f..98a24d8 100644 --- a/server/thread.c +++ b/server/thread.c @@ -58,7 +58,7 @@ struct thread_wait struct thread *thread; /* owner thread */ int count; /* count of objects */ int flags; - void *cookie; /* magic cookie to return to client */ + client_ptr_t cookie; /* magic cookie to return to client */ timeout_t timeout; struct timeout_user *user; struct wait_queue_entry queues[1]; @@ -560,7 +560,7 @@ static int check_wait( struct thread *thread ) } /* send the wakeup signal to a thread */ -static int send_thread_wakeup( struct thread *thread, void *cookie, int signaled ) +static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int signaled ) { struct wake_up_reply reply; int ret; @@ -583,15 +583,14 @@ static int send_thread_wakeup( struct thread *thread, void *cookie, int signaled int wake_thread( struct thread *thread ) { int signaled, count; - void *cookie; + client_ptr_t cookie; for (count = 0; thread->wait; count++) { if ((signaled = check_wait( thread )) == -1) break; cookie = thread->wait->cookie; - if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d cookie=%p\n", - thread->id, signaled, cookie ); + if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); end_wait( thread ); if (send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ break; @@ -604,14 +603,13 @@ static void thread_timeout( void *ptr ) { struct thread_wait *wait = ptr; struct thread *thread = wait->thread; - void *cookie = wait->cookie; + client_ptr_t cookie = wait->cookie; wait->user = NULL; if (thread->wait != wait) return; /* not the top-level wait, ignore it */ if (thread->suspend + thread->process->suspend > 0) return; /* suspended, ignore it */ - if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d cookie=%p\n", - thread->id, (int)STATUS_TIMEOUT, cookie ); + if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=TIMEOUT\n", thread->id ); end_wait( thread ); if (send_thread_wakeup( thread, cookie, STATUS_TIMEOUT ) == -1) return; /* check if other objects have become signaled in the meantime */ @@ -634,7 +632,7 @@ static int signal_object( obj_handle_t handle ) } /* select on a list of handles */ -static timeout_t select_on( unsigned int count, void *cookie, const obj_handle_t *handles, +static timeout_t select_on( unsigned int count, client_ptr_t cookie, const obj_handle_t *handles, int flags, timeout_t timeout, obj_handle_t signal_obj ) { int ret; @@ -916,7 +914,7 @@ void kill_thread( struct thread *thread, int violent_death ) if (thread->wait) { while (thread->wait) end_wait( thread ); - send_thread_wakeup( thread, NULL, STATUS_PENDING ); + send_thread_wakeup( thread, 0, STATUS_PENDING ); /* if it is waiting on the socket, we don't need to send a SIGQUIT */ violent_death = 0; } diff --git a/server/trace.c b/server/trace.c index f63e20a..fb717d0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1175,7 +1175,9 @@ static void dump_open_thread_reply( const struct open_thread_reply *req ) static void dump_select_request( const struct select_request *req ) { fprintf( stderr, " flags=%d,", req->flags ); - fprintf( stderr, " cookie=%p,", req->cookie ); + fprintf( stderr, " cookie=" ); + dump_uint64( &req->cookie ); + fprintf( stderr, "," ); fprintf( stderr, " signal=%04x,", req->signal ); fprintf( stderr, " prev_apc=%04x,", req->prev_apc ); fprintf( stderr, " timeout=" );

1 0

Alexandre Julliard : server: Store debugging output strings as client_ptr_t instead of void pointers.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: 93737d5575000f8427776389bad1b0d44d93e9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=93737d5575000f8427776389b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 17:12:20 2008 +0100 server: Store debugging output strings as client_ptr_t instead of void pointers. --- dlls/kernel32/debugger.c | 6 +++--- include/wine/server_protocol.h | 12 ++++++------ server/protocol.def | 10 +++++----- server/trace.c | 15 +++++++++------ 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index b50f0c3..645fca9 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -112,7 +112,7 @@ BOOL WINAPI WaitForDebugEvent( event->u.UnloadDll.lpBaseOfDll = wine_server_get_ptr( data.info.unload_dll.base ); break; case OUTPUT_DEBUG_STRING_EVENT: - event->u.DebugString.lpDebugStringData = data.info.output_string.string; + event->u.DebugString.lpDebugStringData = wine_server_get_ptr( data.info.output_string.string ); event->u.DebugString.fUnicode = data.info.output_string.unicode; event->u.DebugString.nDebugStringLength = data.info.output_string.length; break; @@ -237,7 +237,7 @@ void WINAPI OutputDebugStringA( LPCSTR str ) { SERVER_START_REQ( output_debug_string ) { - req->string = (void *)str; + req->string = wine_server_client_ptr( str ); req->unicode = 0; req->length = strlen(str) + 1; wine_server_call( req ); @@ -264,7 +264,7 @@ void WINAPI OutputDebugStringW( LPCWSTR str ) { SERVER_START_REQ( output_debug_string ) { - req->string = (void *)str; + req->string = wine_server_client_ptr( str ); req->unicode = 1; req->length = (lstrlenW(str) + 1) * sizeof(WCHAR); wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d538d80..b263a2d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -97,9 +97,9 @@ struct debug_event_unload_dll }; struct debug_event_output_string { - void *string; - int unicode; - int length; + client_ptr_t string; + int unicode; + data_size_t length; }; struct debug_event_rip_info { @@ -1873,9 +1873,9 @@ struct get_exception_status_reply struct output_debug_string_request { struct request_header __header; - void* string; + data_size_t length; + client_ptr_t string; int unicode; - int length; }; struct output_debug_string_reply { @@ -5052,6 +5052,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 357 +#define SERVER_PROTOCOL_VERSION 358 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 69d5928..6f8dd2c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -113,9 +113,9 @@ struct debug_event_unload_dll }; struct debug_event_output_string { - void *string; /* string to display (in debugged process address space) */ - int unicode; /* is it Unicode? */ - int length; /* string length */ + client_ptr_t string; /* string to display (in debugged process address space) */ + int unicode; /* is it Unicode? */ + data_size_t length; /* string length */ }; struct debug_event_rip_info { @@ -1462,9 +1462,9 @@ enum char_info_mode /* Send an output string to the debugger */ @REQ(output_debug_string) - void* string; /* string to display (in debugged process address space) */ + data_size_t length; /* string length */ + client_ptr_t string; /* string to display (in debugged process address space) */ int unicode; /* is it Unicode? */ - int length; /* string length */ @END diff --git a/server/trace.c b/server/trace.c index 3cafe4a..f63e20a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -485,9 +485,10 @@ static void dump_varargs_debug_event( data_size_t size ) fputc( '}', stderr ); break; case OUTPUT_DEBUG_STRING_EVENT: - fprintf( stderr, "{output_string,data=%p,unicode=%d,len=%d}", - event->info.output_string.string, event->info.output_string.unicode, - event->info.output_string.length ); + fprintf( stderr, "{output_string,string=" ); + dump_uint64( &event->info.output_string.string ); + fprintf( stderr, ",unicode=%d,len=%u}", + event->info.output_string.unicode, event->info.output_string.length ); break; case RIP_EVENT: fprintf( stderr, "{rip,err=%d,type=%d}", @@ -1922,9 +1923,11 @@ static void dump_get_exception_status_reply( const struct get_exception_status_r static void dump_output_debug_string_request( const struct output_debug_string_request *req ) { - fprintf( stderr, " string=%p,", req->string ); - fprintf( stderr, " unicode=%d,", req->unicode ); - fprintf( stderr, " length=%d", req->length ); + fprintf( stderr, " length=%u,", req->length ); + fprintf( stderr, " string=" ); + dump_uint64( &req->string ); + fprintf( stderr, "," ); + fprintf( stderr, " unicode=%d", req->unicode ); } static void dump_continue_debug_event_request( const struct continue_debug_event_request *req )

1 0

Alexandre Julliard : server: Make module handles always 64-bit.
by Alexandre Julliard Dec. 30, 2008

Dec. 30, 2008

Module: wine Branch: master Commit: f2c4e09e8082fbc78405c3c999bb3ba412bf7ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c4e09e8082fbc78405c3c99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 16:47:51 2008 +0100 server: Make module handles always 64-bit. --- dlls/kernel32/debugger.c | 6 ++-- dlls/ntdll/loader.c | 6 ++-- dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 2 +- dlls/user32/class.c | 10 +++--- dlls/user32/win.c | 10 +++--- include/wine/server.h | 12 +++++++ include/wine/server_protocol.h | 14 ++++---- server/protocol.def | 12 +++--- server/trace.c | 69 +++++++++++++++++++++++++++------------- server/window.c | 2 +- tools/make_requests | 2 +- 12 files changed, 92 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2c4e09e8082fbc78405c…

1 0