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

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jan 21 15:16:21 CST 2015


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

Author: André Hentschel <nerv at dawncrow.de>
Date:   Tue Jan 20 23:56:41 2015 +0100

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

---

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

diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index 056f95b..3570676 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -89,7 +89,7 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD
 {
     struct rpcThreadArgs rpcargs;
     HANDLE thread;
-    DWORD threadId;
+    DWORD threadId, ret;
 
     rpcargs.returnValue = 0;
     rpcargs.lastError = GetLastError();
@@ -102,7 +102,8 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD
 
     thread = CreateThread(NULL, 0, rpcThreadMain, (void *)&rpcargs, 0, &threadId);
     ok(thread != NULL, "CreateThread failed. %d\n", GetLastError());
-    ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError());
+    ret = WaitForSingleObject(thread, INFINITE);
+    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError());
     CloseHandle(thread);
 
     SetLastError(rpcargs.lastError);




More information about the wine-cvs mailing list