Jacek Caban : ole32: Don' t stop processing messages after WM_QUIT in CoWaitForMultipleHandles.
Alexandre Julliard
julliard at winehq.org
Tue Jan 23 16:09:49 CST 2018
Module: wine
Branch: master
Commit: 2e66aa59b22d490081f4fea576305ce1fa5c8174
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e66aa59b22d490081f4fea576305ce1fa5c8174
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Jan 22 17:05:51 2018 +0100
ole32: Don't stop processing messages after WM_QUIT in CoWaitForMultipleHandles.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ole32/compobj.c | 3 ---
dlls/ole32/tests/compobj.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index d002887..598081b 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -4564,9 +4564,6 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
TRACE("received WM_QUIT message\n");
post_quit = TRUE;
exit_code = msg.wParam;
- /* no longer need to process messages */
- message_loop = FALSE;
- break;
}
else
{
diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 83595cb..a36e791 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -2971,10 +2971,8 @@ static void test_CoWaitForMultipleHandles(void)
success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE);
ok(success, "PeekMessageA failed, error %u\n", GetLastError());
success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE);
- todo_wine
ok(!success, "PeekMessageA succeeded\n");
success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE);
- todo_wine
ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n");
index = WaitForSingleObject(thread, 200);
ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
@@ -2991,7 +2989,6 @@ static void test_CoWaitForMultipleHandles(void)
success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE);
ok(success, "PeekMessageA failed, error %u\n", GetLastError());
success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE);
- todo_wine
ok(!success, "PeekMessageA succeeded\n");
success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE);
ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n");
More information about the wine-cvs
mailing list