Fix some incorrect uses of the ok macro where the result depends on

the evaluation order of its arguments.

diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c
index 3c1d17b4f3ade5285b10d91fcaea235013010d6a..92ae9bf52c174fb2abafcc13bce2cfe49b17b9a1 100644 (file)
--- a/dlls/kernel/tests/file.c
+++ b/dlls/kernel/tests/file.c
@@ -571,9 +571,11 @@ static void test_CopyFileA(void)
        "WriteFile error %ld\n", GetLastError());
     ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n");
     /* get the file time and change it to prove the difference */
-    ok(GetFileTime(hfile, NULL, NULL, &ft1), "GetFileTime error %ld\n", GetLastError());
+    ret = GetFileTime(hfile, NULL, NULL, &ft1);
+    ok( ret, "GetFileTime error %ld\n", GetLastError());
     ft1.dwLowDateTime -= 600000000; /* 60 second */
-    ok(SetFileTime(hfile, NULL, NULL, &ft1), "SetFileTime error %ld\n", GetLastError());
+    ret = SetFileTime(hfile, NULL, NULL, &ft1);
+    ok( ret, "SetFileTime error %ld\n", GetLastError());
     GetFileTime(hfile, NULL, NULL, &ft1);  /* get the actual time back */
     CloseHandle(hfile);
 
@@ -595,7 +597,8 @@ static void test_CopyFileA(void)
     ok(ret == sizeof(prefix), "destination file has wrong size %ld\n", ret);
 
     /* make sure that destination has the same filetime */
-    ok(ret = GetFileTime(hfile, NULL, NULL, &ft2), "GetFileTime error %ld\n", GetLastError());
+    ret = GetFileTime(hfile, NULL, NULL, &ft2);
+    ok( ret, "GetFileTime error %ld\n", GetLastError());
     ok(CompareFileTime(&ft1, &ft2) == 0, "destination file has wrong filetime\n");
 
     SetLastError(0xdeadbeef);

diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c
index 42e93db4e57deaaa07653cb2cf97c882920c3061..3deba4ef80866d0828f7204761728a1156683abf 100644 (file)
--- a/dlls/user/tests/msg.c
+++ b/dlls/user/tests/msg.c
@@ -5202,6 +5202,7 @@ static DWORD WINAPI cbt_global_hook_thread_proc(void *param)
 
 static void test_winevents(void)
 {
+    BOOL ret;
     MSG msg;
     HWND hwnd, hwnd2;
     UINT i;
@@ -5243,7 +5244,8 @@ static void test_winevents(void)
 
     ok_sequence(WmGlobalHookSeq_2, "global hook 2", FALSE);
 
-    ok(UnhookWindowsHookEx(hCBT_global_hook), "UnhookWindowsHookEx error %ld", GetLastError());
+    ret = UnhookWindowsHookEx(hCBT_global_hook);
+    ok( ret, "UnhookWindowsHookEx error %ld", GetLastError());
 
     PostThreadMessageA(tid, WM_QUIT, 0, 0);
     ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
@@ -5304,7 +5306,8 @@ static void test_winevents(void)
 
     ok_sequence(WmWinEventCaretSeq, "caret winevent", FALSE);
 
-    ok(pUnhookWinEvent(hhook), "UnhookWinEvent error %ld\n", GetLastError());
+    ret = pUnhookWinEvent(hhook);
+    ok( ret, "UnhookWinEvent error %ld\n", GetLastError());
 
     PostThreadMessageA(tid, WM_QUIT, 0, 0);
     ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
@@ -5349,7 +5352,8 @@ static void test_winevents(void)
     ok(!PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "msg queue should be empty\n");
     ok_sequence(WmWinEventCaretSeq_2, "caret winevent for out of context proc", FALSE);
 
-    ok(pUnhookWinEvent(hhook), "UnhookWinEvent error %ld\n", GetLastError());
+    ret = pUnhookWinEvent(hhook);
+    ok( ret, "UnhookWinEvent error %ld\n", GetLastError());
 
     PostThreadMessageA(tid, WM_QUIT, 0, 0);
     ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
@@ -5363,6 +5367,7 @@ static void test_winevents(void)
 
 static void test_set_hook(void)
 {
+    BOOL ret;
     HHOOK hhook;
     HWINEVENTHOOK hwinevent_hook;
     HMODULE user32 = GetModuleHandleA("user32.dll");
@@ -5438,7 +5443,8 @@ static void test_set_hook(void)
        0, win_event_proc, GetCurrentProcessId(), 0, WINEVENT_OUTOFCONTEXT);
     ok(hwinevent_hook != 0, "SetWinEventHook error %ld\n", GetLastError());
     ok(GetLastError() == 0xdeadbeef, "unexpected error %ld\n", GetLastError());
-    ok(pUnhookWinEvent(hwinevent_hook), "UnhookWinEvent error %ld\n", GetLastError());
+    ret = pUnhookWinEvent(hwinevent_hook);
+    ok( ret, "UnhookWinEvent error %ld\n", GetLastError());
 
 todo_wine {
     /* This call succeeds under win2k SP4, but fails under Wine.
@@ -5448,7 +5454,8 @@ todo_wine {
        0, win_event_proc, 0xdeadbeef, 0, WINEVENT_OUTOFCONTEXT);
     ok(hwinevent_hook != 0, "SetWinEventHook error %ld\n", GetLastError());
     ok(GetLastError() == 0xdeadbeef, "unexpected error %ld\n", GetLastError());
-    ok(pUnhookWinEvent(hwinevent_hook), "UnhookWinEvent error %ld\n", GetLastError());
+    ret = pUnhookWinEvent(hwinevent_hook);
+    ok( ret, "UnhookWinEvent error %ld\n", GetLastError());
 }
 
     SetLastError(0xdeadbeef);
@@ -5554,6 +5561,7 @@ static const struct message destroy_window_with_children[] = {
 
 static void test_DestroyWindow(void)
 {
+    BOOL ret;
     HWND parent, child1, child2, child3, child4, test;
     UINT child_id = WND_CHILD_ID + 1;
 
@@ -5654,7 +5662,8 @@ todo_wine {
     ok(test == child4, "wrong capture window %p\n", test);
 
     test_DestroyWindow_flag = TRUE;
-    ok(DestroyWindow(parent), "DestroyWindow() error %ld\n", GetLastError());
+    ret = DestroyWindow(parent);
+    ok( ret, "DestroyWindow() error %ld\n", GetLastError());
     test_DestroyWindow_flag = FALSE;
     ok_sequence(destroy_window_with_children, "destroy window with children", 0);
 
@@ -5744,6 +5753,7 @@ static void test_DispatchMessage(void)
 
 START_TEST(msg)
 {
+    BOOL ret;
     HMODULE user32 = GetModuleHandleA("user32.dll");
     FARPROC pSetWinEventHook = GetProcAddress(user32, "SetWinEventHook");
     FARPROC pUnhookWinEvent = GetProcAddress(user32, "UnhookWinEvent");
@@ -5777,7 +5787,8 @@ START_TEST(msg)
     test_winevents();
 
     /* Fix message sequences before removing 3 lines below */
-    ok(pUnhookWinEvent(hEvent_hook), "UnhookWinEvent error %ld\n", GetLastError());
+    ret = pUnhookWinEvent(hEvent_hook);
+    ok( ret, "UnhookWinEvent error %ld\n", GetLastError());
     pUnhookWinEvent = 0;
     hEvent_hook = 0;
 
@@ -5797,7 +5808,8 @@ START_TEST(msg)
     UnhookWindowsHookEx(hCBT_hook);
     if (pUnhookWinEvent)
     {
-       ok(pUnhookWinEvent(hEvent_hook), "UnhookWinEvent error %ld\n", GetLastError());
+       ret = pUnhookWinEvent(hEvent_hook);
+       ok( ret, "UnhookWinEvent error %ld\n", GetLastError());
        SetLastError(0xdeadbeef);
        ok(!pUnhookWinEvent(hEvent_hook), "UnhookWinEvent succeeded\n");
        ok(GetLastError() == ERROR_INVALID_HANDLE || /* Win2k */

diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c
index 2057626ad670b09abc1ddb85a3c89ebae7415c8b..32eda0f823edce03ec38a90e628987a797e19e62 100644 (file)
--- a/dlls/user/tests/win.c
+++ b/dlls/user/tests/win.c
@@ -2407,6 +2407,7 @@ static void test_nccalcscroll(HWND parent)
 
 static void test_SetParent(void)
 {
+    BOOL ret;
     HWND desktop = GetDesktopWindow();
     BOOL is_win9x = GetWindowLongPtrW(desktop, GWLP_WNDPROC) == 0;
     HWND parent, child1, child2, child3, child4;
@@ -2475,7 +2476,8 @@ todo_wine {
         check_parents(child4, desktop, child2, child2, child2, child4, parent);
     }
 
-    ok(DestroyWindow(parent), "DestroyWindow() error %ld\n", GetLastError());
+    ret = DestroyWindow(parent);
+    ok( ret, "DestroyWindow() error %ld\n", GetLastError());
 
     ok(!IsWindow(parent), "parent still exists\n");
     ok(!IsWindow(child1), "child1 still exists\n");