=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: kernel32/tests: Don' t test functions directly when reporting GetLastError().

Alexandre Julliard julliard at winehq.org
Tue Jan 2 13:19:01 CST 2018


Module: wine
Branch: master
Commit: a1da7dbd2b63321fa91546e64d6c24003eefe78b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a1da7dbd2b63321fa91546e64d6c24003eefe78b

Author: André Hentschel <nerv at dawncrow.de>
Date:   Sat Dec 30 19:57:58 2017 +0100

kernel32/tests: Don't test functions directly when reporting GetLastError().

Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/tests/process.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 07067ab..d0d623f 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -3035,7 +3035,7 @@ static void test_SuspendProcessNewThread(void)
     PVOID exe_base, exit_thread_ptr;
     IMAGE_NT_HEADERS nt_header;
     HANDLE thread_handle = NULL;
-    DWORD exit_code = 0;
+    DWORD dret, exit_code = 0;
     CONTEXT ctx;
 
     exit_thread_ptr = GetProcAddress(hkernel32, "ExitThread");
@@ -3097,8 +3097,10 @@ static void test_SuspendProcessNewThread(void)
 #endif
 
     ResumeThread( thread_handle );
-    ok(WaitForSingleObject(thread_handle, 60000) == WAIT_OBJECT_0, "Waiting for remote thread failed (%d)\n", GetLastError());
-    ok(GetExitCodeThread(thread_handle, &exit_code), "Failed to retrieve remote thread exit code (%d)\n", GetLastError());
+    dret = WaitForSingleObject(thread_handle, 60000);
+    ok(dret == WAIT_OBJECT_0, "Waiting for remote thread failed (%d)\n", GetLastError());
+    ret = GetExitCodeThread(thread_handle, &exit_code);
+    ok(ret, "Failed to retrieve remote thread exit code (%d)\n", GetLastError());
     ok(exit_code == 0x1234, "Invalid remote thread exit code\n");
 
     ret = are_imports_resolved(pi.hProcess, exe_base, &nt_header);




More information about the wine-cvs mailing list