Piotr Caban : ole32/tests: Fix new failures in CoWaitForMultipleHandles tests.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Jul 31 17:25:55 CDT 2015


Module: wine
Branch: master
Commit: 9fd75e865073e304573877e6a312fdff6d6f7476
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9fd75e865073e304573877e6a312fdff6d6f7476

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Jul 31 00:39:00 2015 +0200

ole32/tests: Fix new failures in CoWaitForMultipleHandles tests.

---

 dlls/ole32/tests/compobj.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 1dc3af0..ecd8fb0 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -2145,16 +2145,16 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg)
     index = 0xdeadbeef;
     PostMessageA(hWnd, WM_DDE_FIRST, 0, 0);
     hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index);
-    ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr);
-    ok(index == 0, "expected index 0, got %u\n", index);
+    ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr);
+    ok(index==0 || index==0xdeadbeef/* Win 8 */, "expected index 0, got %u\n", index);
     success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE);
     ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n");
 
     index = 0xdeadbeef;
     PostMessageA(hWnd, WM_USER, 0, 0);
     hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index);
-    ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr);
-    ok(index == 0, "expected index 0, got %u\n", index);
+    ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr);
+    ok(index==0 || index==0xdeadbeef/* Win 8 */, "expected index 0, got %u\n", index);
     success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE);
     ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n");
 




More information about the wine-cvs mailing list