December 2009 - Wine-commits

Henri Verbeet : ddraw/tests: Add tests for ddraw window proc handling.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: e79a6b20d2bc465860ba986750aae4a6397c8da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79a6b20d2bc465860ba98675… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:55 2009 +0100 ddraw/tests: Add tests for ddraw window proc handling. --- dlls/ddraw/tests/d3d.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ee49dc8..5f08929 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3077,6 +3077,101 @@ static void SetRenderTargetTest(void) IDirectDrawSurface7_Release(newrt); } +static UINT expect_message; + +static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (expect_message && message == expect_message) expect_message = 0; + + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +static void test_wndproc(void) +{ + IDirectDraw7 *ddraw7; + WNDCLASSA wc = {0}; + LONG_PTR proc; + HWND window; + HRESULT hr; + ULONG ref; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + wc.lpfnWndProc = test_proc; + wc.lpszClassName = "d3d7_test_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("d3d7_test_wndproc_wc", "d3d7_test", + WS_MAXIMIZE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + expect_message = WM_SETFOCUS; + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + todo_wine ok(!expect_message, "Expected message %#x, but didn't receive it.\n", expect_message); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + todo_wine ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + todo_wine ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + +done: + expect_message = 0; + DestroyWindow(window); + UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(d3d) { init_function_pointers(); @@ -3111,4 +3206,6 @@ START_TEST(d3d) TextureLoadTest(); D3D1_releaseObjects(); } + + test_wndproc(); }

1 0

Henri Verbeet : wined3d: Change an ERR to a TRACE in IWineD3DEventQueryImpl_GetData().
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: d5a8637ecce0d1e02f8d7a0294a5524861d70b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a8637ecce0d1e02f8d7a029… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:56 2009 +0100 wined3d: Change an ERR to a TRACE in IWineD3DEventQueryImpl_GetData(). This is allowed behaviour. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index f3e51de..a8295cc 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -347,7 +347,7 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void if (!query->context) { - ERR("Query not started, returning TRUE.\n"); + TRACE("Query not started, returning TRUE.\n"); *data = TRUE; return S_OK;

1 0

Henri Verbeet : wined3d: Change an ERR to a WARN in IWineD3DVolumeImpl_UnlockBox().
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 35d5e7669e6f6b122d6a215db07b74267e15173d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d5e7669e6f6b122d6a215db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:57 2009 +0100 wined3d: Change an ERR to a WARN in IWineD3DVolumeImpl_UnlockBox(). Trying to unlock a volume that isn't locked is questionable behaviour on the side of the application, but not an internal error. --- dlls/wined3d/volume.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index fa4cb29..7f65f2a 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -281,9 +281,10 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DL static HRESULT WINAPI IWineD3DVolumeImpl_UnlockBox(IWineD3DVolume *iface) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - if (!This->locked) { - ERR("trying to lock unlocked volume@%p\n", This); - return WINED3DERR_INVALIDCALL; + if (!This->locked) + { + WARN("Trying to unlock unlocked volume %p.\n", iface); + return WINED3DERR_INVALIDCALL; } TRACE("(%p) : unlocking volume\n", This); This->locked = FALSE;

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_GetBackBuffer().
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: bd1ec9eb0211179b56d9a494e8f18780e5dac9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1ec9eb0211179b56d9a494e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:58 2009 +0100 wined3d: Cleanup IWineD3DDeviceImpl_GetBackBuffer(). --- dlls/wined3d/device.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9d603d5..bedccb0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4009,22 +4009,31 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTexture(IWineD3DDevice *iface, DWORD /***** * Get Back Buffer *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_GetBackBuffer(IWineD3DDevice *iface, UINT iSwapChain, UINT BackBuffer, WINED3DBACKBUFFER_TYPE Type, - IWineD3DSurface **ppBackBuffer) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSwapChain *swapChain; +static HRESULT WINAPI IWineD3DDeviceImpl_GetBackBuffer(IWineD3DDevice *iface, UINT swapchain_idx, + UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, IWineD3DSurface **backbuffer) +{ + IWineD3DSwapChain *swapchain; HRESULT hr; - TRACE("(%p) : BackBuf %d Type %d SwapChain %d returning %p\n", This, BackBuffer, Type, iSwapChain, *ppBackBuffer); + TRACE("iface %p, swapchain_idx %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", + iface, swapchain_idx, backbuffer_idx, backbuffer_type, backbuffer); - hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapChain); - if (hr == WINED3D_OK) { - hr = IWineD3DSwapChain_GetBackBuffer(swapChain, BackBuffer, Type, ppBackBuffer); - IWineD3DSwapChain_Release(swapChain); - } else { - *ppBackBuffer = NULL; + hr = IWineD3DDeviceImpl_GetSwapChain(iface, swapchain_idx, &swapchain); + if (FAILED(hr)) + { + WARN("Failed to get swapchain %u, hr %#x.\n", swapchain_idx, hr); + return hr; } - return hr; + + hr = IWineD3DSwapChain_GetBackBuffer(swapchain, backbuffer_idx, backbuffer_type, backbuffer); + IWineD3DSwapChain_Release(swapchain); + if (FAILED(hr)) + { + WARN("Failed to get backbuffer %u, hr %#x.\n", backbuffer_idx, hr); + return hr; + } + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_GetDeviceCaps(IWineD3DDevice *iface, WINED3DCAPS* pCaps) {

1 0

Henri Verbeet : msi: Remove an unused field from the string table.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 2102dbe854b24ffe7f63692f189d3ec426e9ae11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2102dbe854b24ffe7f63692f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:59 2009 +0100 msi: Remove an unused field from the string table. --- dlls/msi/string.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 5359104..3bdc436 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -55,7 +55,6 @@ struct string_table UINT freeslot; UINT codepage; UINT sortcount; - BOOL valid_index; msistring *strings; /* an array of strings */ UINT *sorted; /* index */ };

1 0

Alexandre Julliard : user32/tests: Always reset events when starting a WaitForInputIdle test.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: ea4babc5115d2790a49172ab3a1d2ec710243811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4babc5115d2790a49172ab3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:50:24 2009 +0100 user32/tests: Always reset events when starting a WaitForInputIdle test. --- dlls/user32/tests/msg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90ec5a0..efa5b12 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12038,9 +12038,9 @@ static const struct { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, { 0, 0, FALSE }, { 0, 0, FALSE }, -/* 10 */ { 0, 0, FALSE }, +/* 10 */ { 0, 0, TRUE }, { 0, 0, FALSE }, - { 0, WAIT_FAILED, FALSE }, + { 0, WAIT_TIMEOUT, TRUE }, }; static void do_wait_idle_child( int arg ) @@ -12112,7 +12112,7 @@ static void do_wait_idle_child( int arg ) Sleep( 200 ); hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); SetTimer( hwnd, 3, 1, NULL ); - Sleep( 1000 ); + Sleep( 200 ); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE|PM_NOYIELD )) DispatchMessage( &msg ); break; case 8: @@ -12207,6 +12207,8 @@ static void test_WaitForInputIdle( char *argv0 ) for (i = 0; i < sizeof(wait_idle_expect)/sizeof(wait_idle_expect[0]); i++) { + ResetEvent( start_event ); + ResetEvent( end_event ); sprintf( path, "%s msg %u", argv0, i ); ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); ok( ret, "CreateProcess '%s' failed err %u.\n", path, GetLastError() );

1 0

Alexandre Julliard : server: Don' t set the idle event when a queue is destroyed, instead return success in WaitForInputIdle on process exit.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: d1dc48d8dc3b492935ca41f67593a59310abe919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dc48d8dc3b492935ca41f67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:20:46 2009 +0100 server: Don't set the idle event when a queue is destroyed, instead return success in WaitForInputIdle on process exit. --- dlls/user32/message.c | 2 +- server/process.c | 5 +++++ server/queue.c | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 8916cae..285a24c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3338,7 +3338,7 @@ DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) switch (ret) { case WAIT_OBJECT_0: - return WAIT_FAILED; + return 0; case WAIT_OBJECT_0+2: process_sent_messages(); break; diff --git a/server/process.c b/server/process.c index 51193b7..8f47870 100644 --- a/server/process.c +++ b/server/process.c @@ -634,6 +634,11 @@ static void process_killed( struct process *process ) if (handles) release_object( handles ); process->winstation = 0; process->desktop = 0; + if (process->idle_event) + { + release_object( process->idle_event ); + process->idle_event = NULL; + } /* close the console attached to this process, if any */ free_console( process ); diff --git a/server/queue.c b/server/queue.c index c5841c9..b7cbc64 100644 --- a/server/queue.c +++ b/server/queue.c @@ -298,12 +298,6 @@ void free_msg_queue( struct thread *thread ) { release_object( process->queue ); process->queue = NULL; - if (process->idle_event) - { - set_event( process->idle_event ); - release_object( process->idle_event ); - process->idle_event = NULL; - } } release_object( thread->queue ); thread->queue = NULL;

1 0

Alexandre Julliard : server: Don' t reset the idle event when the client stops waiting.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: b57cc5561bd2eb2736331b94c1d309b22c2a1b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57cc5561bd2eb2736331b94c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:22:34 2009 +0100 server: Don't reset the idle event when the client stops waiting. --- dlls/user32/tests/msg.c | 2 +- server/queue.c | 9 --------- 2 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index efa5b12..d721bda 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12040,7 +12040,7 @@ static const struct { 0, 0, FALSE }, /* 10 */ { 0, 0, TRUE }, { 0, 0, FALSE }, - { 0, WAIT_TIMEOUT, TRUE }, + { 0, WAIT_TIMEOUT, FALSE }, }; static void do_wait_idle_child( int arg ) diff --git a/server/queue.c b/server/queue.c index b7cbc64..2c8140d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -794,19 +794,10 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent static void msg_queue_remove_queue(struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - struct process *process = entry->thread->process; remove_queue( obj, entry ); if (queue->fd && list_empty( &obj->wait_queue )) /* last on the queue is gone */ set_fd_events( queue->fd, 0 ); - - assert( entry->thread->queue == queue ); - - /* if waiting on the main process queue, reset the idle event */ - if (process->queue == queue) - { - if (process->idle_event) reset_event( process->idle_event ); - } } static void msg_queue_dump( struct object *obj, int verbose )

1 0

Alexandre Julliard : server: Any thread can set the idle event, don' t treat the first one differently.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 7d4e28480d0ce4bc3286bf59349084f106465d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4e28480d0ce4bc3286bf593… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:25:01 2009 +0100 server: Any thread can set the idle event, don't treat the first one differently. --- dlls/user32/tests/msg.c | 21 +++++++++++++++++++++ server/process.c | 2 -- server/process.h | 2 -- server/queue.c | 16 ++-------------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d721bda..2d5477c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12041,13 +12041,26 @@ static const struct /* 10 */ { 0, 0, TRUE }, { 0, 0, FALSE }, { 0, WAIT_TIMEOUT, FALSE }, + { 0, 0, FALSE }, }; +static DWORD CALLBACK do_wait_idle_child_thread( void *arg ) +{ + MSG msg; + + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + Sleep( 200 ); + MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); + return 0; +} + static void do_wait_idle_child( int arg ) { WNDCLASS cls; MSG msg; HWND hwnd = 0; + HANDLE thread; + DWORD id; HANDLE start_event = OpenEventA( EVENT_ALL_ACCESS, FALSE, "test_WaitForInputIdle_start" ); HANDLE end_event = OpenEventA( EVENT_ALL_ACCESS, FALSE, "test_WaitForInputIdle_end" ); @@ -12146,6 +12159,14 @@ static void do_wait_idle_child( int arg ) MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); SetEvent( start_event ); break; + case 13: + SetEvent( start_event ); + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + Sleep( 200 ); + thread = CreateThread( NULL, 0, do_wait_idle_child_thread, NULL, 0, &id ); + WaitForSingleObject( thread, 10000 ); + CloseHandle( thread ); + break; } WaitForSingleObject( end_event, 2000 ); CloseHandle( start_event ); diff --git a/server/process.c b/server/process.c index 8f47870..379bec6 100644 --- a/server/process.c +++ b/server/process.c @@ -328,7 +328,6 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; process->idle_event = NULL; - process->queue = NULL; process->peb = 0; process->ldt_copy = 0; process->winstation = 0; @@ -423,7 +422,6 @@ static void process_destroy( struct object *obj ) if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); - if (process->queue) release_object( process->queue ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); } diff --git a/server/process.h b/server/process.h index 250c5ce..87e12e0 100644 --- a/server/process.h +++ b/server/process.h @@ -23,7 +23,6 @@ #include "object.h" -struct msg_queue; struct atom_table; struct handle_table; struct startup_info; @@ -75,7 +74,6 @@ struct process enum startup_state startup_state; /* startup state */ struct startup_info *startup_info; /* startup info while init is in progress */ struct event *idle_event; /* event for input idle */ - struct msg_queue *queue; /* main message queue */ obj_handle_t winstation; /* main handle to process window station */ obj_handle_t desktop; /* handle to desktop to use for new threads */ struct token *token; /* security token associated with this process */ diff --git a/server/queue.c b/server/queue.c index 2c8140d..3b7b449 100644 --- a/server/queue.c +++ b/server/queue.c @@ -280,8 +280,6 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ for (i = 0; i < NB_MSG_KINDS; i++) list_init( &queue->msg_list[i] ); thread->queue = queue; - if (!thread->process->queue) - thread->process->queue = (struct msg_queue *)grab_object( queue ); } release_object( input ); return queue; @@ -290,15 +288,8 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ /* free the message queue of a thread at thread exit */ void free_msg_queue( struct thread *thread ) { - struct process *process = thread->process; - remove_thread_hooks( thread ); if (!thread->queue) return; - if (process->queue == thread->queue) /* is it the process main queue? */ - { - release_object( process->queue ); - process->queue = NULL; - } release_object( thread->queue ); thread->queue = NULL; } @@ -780,11 +771,8 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent set_error( STATUS_ACCESS_DENIED ); return 0; } - /* if waiting on the main process queue, set the idle event */ - if (process->queue == queue) - { - if (process->idle_event) set_event( process->idle_event ); - } + if (process->idle_event) set_event( process->idle_event ); + if (queue->fd && list_empty( &obj->wait_queue )) /* first on the queue */ set_fd_events( queue->fd, POLLIN ); add_queue( obj, entry );

1 0

Alexandre Julliard : server: Don' t set the idle event when waiting for a message reply.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 92e704edc50828f710a6d859216113a28ebf6430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e704edc50828f710a6d8592… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 17:32:15 2009 +0100 server: Don't set the idle event when waiting for a message reply. --- dlls/user32/tests/msg.c | 2 +- server/queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2d5477c..052bef2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12031,7 +12031,7 @@ static const struct /* 0 */ { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, { WAIT_TIMEOUT, 0, FALSE }, { WAIT_TIMEOUT, 0, FALSE }, - { WAIT_TIMEOUT, WAIT_TIMEOUT, TRUE }, + { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, /* 5 */ { WAIT_TIMEOUT, 0, FALSE }, { WAIT_TIMEOUT, 0, FALSE }, diff --git a/server/queue.c b/server/queue.c index 3b7b449..3ab8d00 100644 --- a/server/queue.c +++ b/server/queue.c @@ -771,7 +771,7 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent set_error( STATUS_ACCESS_DENIED ); return 0; } - if (process->idle_event) set_event( process->idle_event ); + if (process->idle_event && !(queue->wake_mask & QS_SMRESULT)) set_event( process->idle_event ); if (queue->fd && list_empty( &obj->wait_queue )) /* first on the queue */ set_fd_events( queue->fd, POLLIN );

1 0