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

[André Hentschel]

Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
---
 dlls/kernel32/tests/debugger.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c
index 0a43fe91e64..962b308b6dc 100644
--- a/dlls/kernel32/tests/debugger.c
+++ b/dlls/kernel32/tests/debugger.c
@@ -1332,8 +1332,8 @@ static void test_debugger(const char *argv0)
         status = NtSuspendThread(thread, NULL);
         ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError());
 
-        ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER),
-           "ContinueDebugEvent failed, last error:%u\n", GetLastError());
+        ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER);
+        ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError());
         ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n");
 
         status = NtResumeThread(thread, NULL);
@@ -1350,8 +1350,8 @@ static void test_debugger(const char *argv0)
         ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode);
         de = ctx.ev;
 
-        ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER),
-           "ContinueDebugEvent failed, last error:%u\n", GetLastError());
+        ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER);
+        ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError());
 
         ctx.ev.dwDebugEventCode = -1;
         next_event(&ctx, WAIT_EVENT_TIMEOUT);
@@ -1462,8 +1462,8 @@ static void test_debugger(const char *argv0)
 
         status = NtSuspendThread(thread_b, NULL);
         ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError());
-        ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER),
-           "ContinueDebugEvent failed, last error:%u\n", GetLastError());
+        ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER);
+        ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError());
 
         ctx.ev.dwDebugEventCode = -1;
         next_event(&ctx, WAIT_EVENT_TIMEOUT);
@@ -1485,8 +1485,8 @@ static void test_debugger(const char *argv0)
         {
             status = pNtSuspendProcess(pi.hProcess);
             ok(!status, "NtSuspendProcess failed, last error:%u\n", GetLastError());
-            ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER),
-               "ContinueDebugEvent failed, last error:%u\n", GetLastError());
+            ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER);
+            ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError());
             ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n");
 
             status = NtResumeThread(thread_b, NULL);
-- 
2.25.1

[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=83604

Your paranoid android.


=== w1064 (32 bit report) ===

kernel32:
debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtF1A8.tmp'
debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtF1A8.tmp
debugger.c:657: Test failed: the child and debugged pids don't match: 8116 != 7972

=== w1064 (testbot log) ===

The task timed out

=== w10pro64 (32 bit report) ===

kernel32:
debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtF765.tmp'
debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtF765.tmp
debugger.c:657: Test failed: the child and debugged pids don't match: 7384 != 8012

=== w10pro64 (testbot log) ===

The task timed out

=== w1064v1809 (64 bit report) ===

kernel32:
debugger.c:1661: Test failed: unexpected instruction pointer 00007FFFB75AF844

=== w1064 (64 bit report) ===

kernel32:
debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtEE6C.tmp'
debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtEE6C.tmp
debugger.c:657: Test failed: the child and debugged pids don't match: 8156 != 7932

=== w1064_2qxl (64 bit report) ===

kernel32:
debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wt15AB.tmp'
debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wt15AB.tmp
debugger.c:657: Test failed: the child and debugged pids don't match: 7196 != 7160

=== w10pro64 (64 bit report) ===

kernel32:
debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtF5A0.tmp'
debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtF5A0.tmp
debugger.c:657: Test failed: the child and debugged pids don't match: 7328 != 4756

=== w10pro64 (testbot log) ===

The task timed out

=== w10pro64_ar (64 bit report) ===

kernel32:
debugger.c:1661: Test failed: unexpected instruction pointer 00007FFD44C2BEA4

=== w10pro64_zh_CN (64 bit report) ===

kernel32:
debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtF263.tmp'
debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtF263.tmp
debugger.c:657: Test failed: the child and debugged pids don't match: 8172 != 8132