André Zwing : kernelbase/tests: Don't test functions directly when reporting GetLastError().

[Alexandre Julliard]

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

Author: André Zwing <nerv(a)dawncrow.de>
Date:   Tue Dec 28 20:09:49 2021 +0100

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

Signed-off-by: André Zwing <nerv(a)dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/kernelbase/tests/process.c | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c
index a28411f4e5b..1a008be9a7b 100644
--- a/dlls/kernelbase/tests/process.c
+++ b/dlls/kernelbase/tests/process.c
@@ -35,6 +35,7 @@ static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE);
 static void test_CompareObjectHandles(void)
 {
     HANDLE h1, h2;
+    BOOL ret;
 
     if (!pCompareObjectHandles)
     {
@@ -42,24 +43,24 @@ static void test_CompareObjectHandles(void)
         return;
     }
 
-    ok( pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() ),
-        "comparing GetCurrentProcess() to self failed with %u\n", GetLastError() );
+    ret = pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() );
+    ok( ret, "comparing GetCurrentProcess() to self failed with %u\n", GetLastError() );
 
-    ok( pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() ),
-        "comparing GetCurrentThread() to self failed with %u\n", GetLastError() );
+    ret = pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() );
+    ok( ret, "comparing GetCurrentThread() to self failed with %u\n", GetLastError() );
 
     SetLastError(0);
-    ok( !pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() ) &&
-        GetLastError() == ERROR_NOT_SAME_OBJECT,
+    ret = pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() );
+    ok( !ret && GetLastError() == ERROR_NOT_SAME_OBJECT,
         "comparing GetCurrentProcess() to GetCurrentThread() returned %u\n", GetLastError() );
 
     h1 = NULL;
-    ok( DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
-                         &h1, 0, FALSE, DUPLICATE_SAME_ACCESS ),
-        "failed to duplicate current process handle: %u\n", GetLastError() );
+    ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
+                           &h1, 0, FALSE, DUPLICATE_SAME_ACCESS );
+    ok( ret, "failed to duplicate current process handle: %u\n", GetLastError() );
 
-    ok( pCompareObjectHandles( GetCurrentProcess(), h1 ),
-        "comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() );
+    ret = pCompareObjectHandles( GetCurrentProcess(), h1 );
+    ok( ret, "comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() );
 
     CloseHandle( h1 );
 
@@ -67,12 +68,12 @@ static void test_CompareObjectHandles(void)
     ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
 
     h2 = NULL;
-    ok( DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(),
-                         &h2, 0, FALSE, DUPLICATE_SAME_ACCESS ),
-        "failed to duplicate handle %p: %u\n", h1, GetLastError() );
+    ret = DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(),
+                           &h2, 0, FALSE, DUPLICATE_SAME_ACCESS );
+    ok( ret, "failed to duplicate handle %p: %u\n", h1, GetLastError() );
 
-    ok( pCompareObjectHandles( h1, h2 ),
-        "comparing %p with %p failed with %u\n", h1, h2, GetLastError() );
+    ret = pCompareObjectHandles( h1, h2 );
+    ok( ret, "comparing %p with %p failed with %u\n", h1, h2, GetLastError() );
 
     CloseHandle( h2 );
 
@@ -80,7 +81,8 @@ static void test_CompareObjectHandles(void)
     ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
 
     SetLastError(0);
-    ok( !pCompareObjectHandles( h1, h2 ) && GetLastError() == ERROR_NOT_SAME_OBJECT,
+    ret = pCompareObjectHandles( h1, h2 );
+    ok( !ret && GetLastError() == ERROR_NOT_SAME_OBJECT,
         "comparing %p with %p returned %u\n", h1, h2, GetLastError() );
 
     CloseHandle( h2 );