[PATCH] kernel32/tests: Don't test functions directly when reporting GetLastError()

[André Hentschel]

Signed-off-by: André Hentschel 
---
 dlls/kernel32/tests/actctx.c | 40 ++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
index 4dede37227f..2b8c3d710a2 100644
--- a/dlls/kernel32/tests/actctx.c
+++ b/dlls/kernel32/tests/actctx.c
@@ -3271,13 +3271,25 @@ static void clean_sxs_info(sxs_info *info)
     if (info->handle_context)
         ReleaseActCtx(info->handle_context);
     if (*info->path_dll)
-        ok(DeleteFileA(info->path_dll), "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError());
+    {
+        BOOL ret = DeleteFileA(info->path_dll);
+        ok(ret, "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError());
+    }
     if (*info->path_manifest_exe)
-        ok(DeleteFileA(info->path_manifest_exe), "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError());
+    {
+        BOOL ret = DeleteFileA(info->path_manifest_exe);
+        ok(ret, "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError());
+    }
     if (*info->path_manifest_dll)
-        ok(DeleteFileA(info->path_manifest_dll), "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError());
+    {
+        BOOL ret = DeleteFileA(info->path_manifest_dll);
+        ok(ret, "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError());
+    }
     if (*info->path_tmp)
-        ok(RemoveDirectoryA(info->path_tmp), "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError());
+    {
+        BOOL ret = RemoveDirectoryA(info->path_tmp);
+        ok(ret, "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError());
+    }
 }

static void get_application_directory(char *buffer, int buffer_size)
@@ -3348,7 +3360,10 @@ cleanup:
     if (dll.module)
         FreeLibrary(dll.module);
     if (*path_dll_local)
-        ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError());
+    {
+        BOOL success = DeleteFileA(path_dll_local);
+        ok(success, "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError());
+    }
     clean_sxs_info(&dll);
 }

@@ -3385,7 +3400,10 @@ cleanup:
     if (dll.module)
         FreeLibrary(dll.module);
     if (*path_dll_local)
-        ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError());
+    {
+        BOOL success = DeleteFileA(path_dll_local);
+        ok(success, "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError());
+    }
     clean_sxs_info(&dll);
 }

@@ -3423,7 +3441,10 @@ cleanup:
     if (dll.module)
         FreeLibrary(dll.module);
     if (*path_dll_local)
-        ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError());
+    {
+        success = DeleteFileA(path_dll_local);
+        ok(success, "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError());
+    }
     clean_sxs_info(&dll);
 }

@@ -3486,7 +3507,10 @@ cleanup:
     if (module_msvcr)
         FreeLibrary(module_msvcr);
     if (*path_manifest)
-        ok(DeleteFileA(path_manifest), "DeleteFileA failed for %s: %d\n", path_manifest, GetLastError());
+    {
+        success = DeleteFileA(path_manifest);
+        ok(success, "DeleteFileA failed for %s: %d\n", path_manifest, GetLastError());
+    }
 }

static void run_sxs_test(int run)

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=55045

Your paranoid android.

=== wxppro (32 bit report) ===

kernel32:
0b34:actctx: unhandled exception c0000005 at 7C910567

=== w2003std (32 bit report) ===

kernel32:
01ac:actctx: unhandled exception c0000005 at 7C82CE70