From 620d8c01eabcc660d75b2eece42170ce71d20d28 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <reactos-git_serge_171003@gautherie.fr>
Date: Mon, 24 Sep 2018 16:46:46 +0200
Subject: [PATCH] [USER32_APITEST:WNDPROC] Improve failure handling

ROSTESTS-316
---
 modules/rostests/apitests/user32/WndProc.c | 61 +++++++++++++++++-----
 1 file changed, 47 insertions(+), 14 deletions(-)

diff --git a/modules/rostests/apitests/user32/WndProc.c b/modules/rostests/apitests/user32/WndProc.c
index fddbd0fa20e..8c3049161b2 100644
--- a/modules/rostests/apitests/user32/WndProc.c
+++ b/modules/rostests/apitests/user32/WndProc.c
@@ -9,6 +9,8 @@
 
 /* Used wine Redraw test for proof in principle. */
 
+#define WMPAINT_COUNT_THRESHOLD 10
+
 /* Global variables to trigger exit from loop */
 static int redrawComplete, WMPAINT_count;
 
@@ -32,13 +34,14 @@ static LRESULT WINAPI redraw_window_procA(
     switch (msg)
     {
         case WM_PAINT:
-            trace("doing WM_PAINT %d\n", WMPAINT_count);
             WMPAINT_count++;
+            trace("Doing WM_PAINT %d/%d\n", WMPAINT_count, WMPAINT_COUNT_THRESHOLD);
 
-            if (WMPAINT_count > 10 && redrawComplete == 0)
+            if (WMPAINT_count > WMPAINT_COUNT_THRESHOLD && redrawComplete == 0)
             {
                 PAINTSTRUCT ps;
 
+                trace("Calling *Paint()\n");
                 BeginPaint(hwnd, &ps);
                 EndPaint(hwnd, &ps);
                 return 1;
@@ -47,11 +50,13 @@ static LRESULT WINAPI redraw_window_procA(
             // This will force one stack corruption "ret" fault with normal window
             // procedure callback.
 #ifdef __MINGW32__
+            trace("Executing __MINGW32__ stack corruption code\n");
             asm ("movl $0, %eax\n\t"
                  "leave\n\t"
                  "ret");
 #elif defined(_M_IX86)
 //#ifdef _MSC_VER
+            trace("Executing MSVC x86 stack corruption code\n");
             __asm
               {
                  mov eax, 0
@@ -59,16 +64,22 @@ static LRESULT WINAPI redraw_window_procA(
                  ret
               }
 #else
-            trace("unimplemented\n");
+            ok(FALSE, "FIXME: stack corruption code is unimplemented\n");
 #endif
+
+            break;
+        default:
+            trace("Doing empty default: msg = %u\n", msg);
     }
 
+    trace("Calling DefWindowProc()\n");
     return DefWindowProc(hwnd, msg, wparam, lparam);
 }
 
 static void test_wndproc(void)
 {
     WNDCLASSA cls;
+    ATOM clsAtom;
     HWND hwndMain;
 
     cls.style = CS_DBLCLKS;
@@ -82,32 +93,54 @@ static void test_wndproc(void)
     cls.lpszMenuName = NULL;
     cls.lpszClassName = "RedrawWindowClass";
 
-    if (!RegisterClassA(&cls))
+    clsAtom = RegisterClassA(&cls);
+    ok(clsAtom != 0, "RegisterClassA() failed: LastError = %lu\n", GetLastError());
+
+    if (clsAtom == 0)
     {
-        trace("Register failed %d\n", (int)GetLastError());
+        skip("No Class atom\n");
         return;
     }
 
-    hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW,
+    hwndMain = CreateWindowA(cls.lpszClassName, "Main Window", WS_OVERLAPPEDWINDOW,
                              CW_USEDEFAULT, 0, 100, 100, NULL, NULL, NULL, NULL);
+    ok(hwndMain != NULL, "CreateWindowA() failed: LastError = %lu\n", GetLastError());
+
+    ok(WMPAINT_count == 0,
+       "Multiple unexpected WM_PAINT calls = %d\n", WMPAINT_count);
+
+    if (hwndMain == NULL)
+    {
+        skip("No Window\n");
+        ok(UnregisterClassA(cls.lpszClassName, cls.hInstance) != 0,
+           "UnregisterClassA() failed: LastError = %lu\n", GetLastError());
+        return;
+    }
 
-    ok(WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count);
     ShowWindow(hwndMain, SW_SHOW);
-    ok(WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count);
+    ok(WMPAINT_count == 0,
+       "Multiple unexpected WM_PAINT calls = %d\n", WMPAINT_count);
+
     RedrawWindow(hwndMain, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN);
     ok(WMPAINT_count == 1 || broken(WMPAINT_count == 0), /* sometimes on win9x */
-       "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count);
-    redrawComplete = TRUE;
-    ok(WMPAINT_count < 10, "RedrawWindow (RDW_UPDATENOW) never completed (%d)\n", WMPAINT_count);
+       "Multiple unexpected WM_PAINT calls = %d\n", WMPAINT_count);
 
-    /* clean up */
-    DestroyWindow(hwndMain);
+    redrawComplete = TRUE;
+    ok(WMPAINT_count < WMPAINT_COUNT_THRESHOLD,
+       "RedrawWindow (RDW_UPDATENOW) never completed (%d/%d)\n",
+       WMPAINT_count, WMPAINT_COUNT_THRESHOLD);
+
+    ok(DestroyWindow(hwndMain) != 0,
+       "DestroyWindow() failed: LastError = %lu\n", GetLastError());
+
+    ok(UnregisterClassA(cls.lpszClassName, cls.hInstance) != 0,
+       "UnregisterClassA() failed: LastError = %lu\n", GetLastError());
 }
 
 START_TEST(WndProc)
 {
 #ifdef __RUNTIME_CHECKS__
-    skip("This test breaks MSVC runtime checks!");
+    skip("This test breaks MSVC runtime checks!\n");
     return;
 #endif /* __RUNTIME_CHECKS__ */