[PATCH] user32: remove side effects from assert()s

Marcus Meissner marcus at jet.franken.de
Sun Jun 9 15:39:54 CDT 2013


 1030096 Side effect in assertion
 1030095 Side effect in assertion
 1030094 Side effect in assertion
 1030093 Side effect in assertion
---
 dlls/user32/tests/win.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 2d9faaa..357c0db 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -1523,10 +1523,14 @@ static void test_MDI_child_stack(HWND mdi_client)
     cs.style   = 0;
     cs.lParam  = (LPARAM)mdi_lParam_test_message;
 
-    assert(child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs));
-    assert(child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs));
-    assert(child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs));
-    assert(child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs));
+    child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs);
+    ok(child_1, "expected child_1 to be non NULL");
+    child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs);
+    ok(child_2, "expected child_2 to be non NULL");
+    child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs);
+    ok(child_3, "expected child_3 to be non NULL");
+    child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs);
+    ok(child_4, "expected child_4 to be non NULL");
 
     stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
     stack[1] = GetWindow(stack[0], GW_HWNDNEXT);
-- 
1.7.10.4




More information about the wine-patches mailing list