kernel32/tests: Get rid of assert() in debugger.c

[André Hentschel]

---
 dlls/kernel32/tests/debugger.c | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c
index 41e4f1a..ad39134 100644
--- a/dlls/kernel32/tests/debugger.c
+++ b/dlls/kernel32/tests/debugger.c
@@ -19,7 +19,6 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 
 #include <windows.h>
 #include <winternl.h>
@@ -131,7 +130,7 @@ static void save_blackbox(const char* logfile, void* blackbox, int size)
     CloseHandle(hFile);
 }
 
-static int load_blackbox(const char* logfile, void* blackbox, int size)
+static BOOL load_blackbox(const char* logfile, void* blackbox, int size)
 {
     HANDLE hFile;
     DWORD read;
@@ -141,14 +140,14 @@ static int load_blackbox(const char* logfile, void* blackbox, int size)
     if (hFile == INVALID_HANDLE_VALUE)
     {
         ok(0, "unable to open '%s'\n", logfile);
-        return 0;
+        return FALSE;
     }
     SetLastError(0xdeadbeef);
     ret=ReadFile(hFile, blackbox, size, &read, NULL);
     ok(ret, "ReadFile failed: %d\n", GetLastError());
     ok(read == size, "wrong size for '%s': read=%d\n", logfile, read);
     CloseHandle(hFile);
-    return 1;
+    return TRUE;
 }
 
 typedef struct
@@ -328,8 +327,10 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks)
         TerminateProcess(info.hProcess, WAIT_TIMEOUT);
         WaitForSingleObject(info.hProcess, 5000);
         CloseHandle(info.hProcess);
-        assert(DeleteFileA(dbglog) != 0);
-        assert(DeleteFileA(childlog) != 0);
+        bRet = DeleteFileA(dbglog);
+        ok(bRet, "DeleteFileA: error %d\n", GetLastError());
+        bRet = DeleteFileA(childlog);
+        ok(bRet, "DeleteFileA: error %d\n", GetLastError());
         win_skip("Giving up on child process\n");
         return;
     }
@@ -364,16 +365,20 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks)
     skip_crash_and_debug = broken(wait_code == WAIT_TIMEOUT);
     if (skip_crash_and_debug)
     {
-        assert(DeleteFileA(dbglog) != 0);
-        assert(DeleteFileA(childlog) != 0);
+        bRet = DeleteFileA(dbglog);
+        ok(bRet, "DeleteFileA: error %d\n", GetLastError());
+        bRet = DeleteFileA(childlog);
+        ok(bRet, "DeleteFileA: error %d\n", GetLastError());
         win_skip("Giving up on debugger\n");
         return;
     }
 #endif
     ok(wait_code == WAIT_OBJECT_0, "Timed out waiting for the debugger\n");
 
-    assert(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox)));
-    assert(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox)));
+    bRet = load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox));
+    ok(bRet, "load_blackbox: error %d\n", GetLastError());
+    bRet = load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox));
+    ok(bRet, "load_blackbox: error %d\n", GetLastError());
 
     ok(dbg_blackbox.argc == 6, "wrong debugger argument count: %d\n", dbg_blackbox.argc);
     ok(dbg_blackbox.pid == crash_blackbox.pid, "the child and debugged pids don't match: %d != %d\n", crash_blackbox.pid, dbg_blackbox.pid);
@@ -382,8 +387,10 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks)
     ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err);
     ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.detach_err);
 
-    assert(DeleteFileA(dbglog) != 0);
-    assert(DeleteFileA(childlog) != 0);
+    bRet = DeleteFileA(dbglog);
+    ok(bRet, "DeleteFileA: error %d\n", GetLastError());
+    bRet = DeleteFileA(childlog);
+    ok(bRet, "DeleteFileA: error %d\n", GetLastError());
 }
 
 static void crash_and_winedbg(HKEY hkey, const char* argv0)
@@ -659,7 +666,8 @@ static void test_debug_loop(int argc, char **argv)
     ret = CloseHandle(pi.hProcess);
     ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
 
-    load_blackbox(blackbox_file, &blackbox, sizeof(blackbox));
+    ret = load_blackbox(blackbox_file, &blackbox, sizeof(blackbox));
+    ok(ret, "load_blackbox: error %d\n", GetLastError());
     ok(!blackbox.failures, "Got %d failures from child process.\n", blackbox.failures);
 
     ret = DeleteFileA(blackbox_file);
@@ -803,7 +811,8 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child)
     ret = CloseHandle(pi.hProcess);
     ok(ret, "CloseHandle failed, last error %d.\n", GetLastError());
 
-    load_blackbox(blackbox_file, &blackbox, sizeof(blackbox));
+    ret = load_blackbox(blackbox_file, &blackbox, sizeof(blackbox));
+    ok(ret, "load_blackbox: error %d\n", GetLastError());
     ok(!blackbox.failures, "Got %d failures from child process.\n", blackbox.failures);
 
     ret = DeleteFileA(blackbox_file);
-- 
1.8.1.2