André Hentschel : ntoskrnl.exe/tests: Don' t test functions directly when reporting GetLastError().

[Alexandre Julliard]

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

Author: André Hentschel 
Date:   Thu May  3 19:27:55 2018 +0200

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

Signed-off-by: André Hentschel 
Signed-off-by: Alexandre Julliard

---

dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index 5887d94..40de760 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -68,8 +68,10 @@ static void unload_driver(SC_HANDLE service)
     ControlService(service, SERVICE_CONTROL_STOP, &status);
     while (status.dwCurrentState == SERVICE_STOP_PENDING)
     {
+        BOOL ret;
         Sleep(100);
-        ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError());
+        ret = QueryServiceStatus(service, &status);
+        ok(ret, "QueryServiceStatus failed: %u\n", GetLastError());
     }
     ok(status.dwCurrentState == SERVICE_STOPPED,
        "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState);
@@ -121,11 +123,13 @@ static SC_HANDLE load_driver(char *filename)
     ok(ret, "StartService failed: %u\n", GetLastError());

/* wait for the service to start up properly */
-    ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError());
+    ret = QueryServiceStatus(service, &status);
+    ok(ret, "QueryServiceStatus failed: %u\n", GetLastError());
     while (status.dwCurrentState == SERVICE_START_PENDING)
     {
         Sleep(100);
-        ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError());
+        ret = QueryServiceStatus(service, &status);
+        ok(ret, "QueryServiceStatus failed: %u\n", GetLastError());
     }
     ok(status.dwCurrentState == SERVICE_RUNNING,
        "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState);
@@ -194,6 +198,7 @@ START_TEST(ntoskrnl)
 {
     char filename[MAX_PATH];
     SC_HANDLE service;
+    BOOL ret;

HMODULE hntdll = GetModuleHandleA("ntdll.dll");
     pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U");
@@ -205,5 +210,6 @@ START_TEST(ntoskrnl)
     main_test();

unload_driver(service);
-    ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError());
+    ret = DeleteFileA(filename);
+    ok(ret, "DeleteFile failed: %u\n", GetLastError());
 }