[PATCH] user32/tests: Don't trace the test_topmost() window handles.

Francois Gouget fgouget at codeweavers.com
Sun Dec 29 17:09:47 CST 2019


They change from one run to the next, causing the failures to always
look new. Also for the topmost failures the window handle is irrelevant:
all that matters is which window got the wrong results.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---

See the Windows XP failures:
https://test.winehq.org/data/fa97cbdf14883fb301dcc0a5264369f8ed184182/xp_fg-winxp-lusr/user32:win.html

For instance:
win.c:10896: Test failed: hwnd 02B4007C topmost state is wrong
win.c:10899: Test failed: 02B4007C: expected NOT topmost
win.c:11126: Test failed: hwnd 00180266 topmost state is wrong

 dlls/user32/tests/win.c | 278 ++++++++++++++++++++--------------------
 1 file changed, 139 insertions(+), 139 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index bb4eebfd0fa..46784cec43f 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -10809,99 +10809,99 @@ static void test_topmost(void)
     state[1] = hwnd;
     state[2] = hwnd2;
 
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, 0, hwnd2, owner, FALSE);
 
     swp_after(hwnd, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
     swp_after(hwnd, HWND_TOP);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
     swp_after(hwnd, HWND_NOTOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
     swp_after(hwnd2, hwnd);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
     swp_after(hwnd, hwnd2);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
     swp_after(hwnd2, HWND_TOP);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
     swp_after(owner, HWND_TOPMOST);
 todo_wine
-    ok(is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(is_topmost(owner), "owner should be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(is_topmost(hwnd2), "hwnd2 should be topmost\n");
     swp_after(hwnd, HWND_NOTOPMOST);
-    ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd2 should NOT be topmost\n");
     if (0) /*win7 64-bit is broken*/
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     swp_after(hwnd2, HWND_NOTOPMOST);
-    ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, 0, hwnd2, owner, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
     swp_after(hwnd, HWND_BOTTOM);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, 0, hwnd2, owner, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
     swp_after(hwnd, hwnd2);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, 0, hwnd2, owner, FALSE);
     /* FIXME: compensate todo_wine above */
     swp_after(hwnd, HWND_NOTOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, 0, hwnd2, owner, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
@@ -10921,161 +10921,161 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
     state[4] = hwnd_child;
     state[5] = hwnd_grandchild;
 
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd2), "hwnd2 should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
+    ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
 
     swp_after(hwnd, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
+    ok(is_topmost(hwnd_child), "child should be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(is_topmost(hwnd_child2), "child2 should be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
     swp_after(hwnd, HWND_NOTOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
+    ok(is_topmost(hwnd_child), "child should be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(is_topmost(hwnd_child2), "child2 should be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
     swp_after(hwnd_child, HWND_NOTOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(is_topmost(hwnd), "hwnd should be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
+    ok(is_topmost(hwnd_child), "child should be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(is_topmost(hwnd_child2), "child2 should be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, TRUE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
     swp_after(hwnd_grandchild, HWND_NOTOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd_child, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(is_topmost(hwnd_child), "child should be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
     swp_after(hwnd_child, HWND_TOP);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(is_topmost(hwnd_child), "child should be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
     swp_after(hwnd, HWND_NOTOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "grandchild should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd_child, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(is_topmost(hwnd_child), "child should be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
     swp_after(hwnd, HWND_NOTOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd_grandchild, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE);
     swp_after(hwnd_child2, HWND_NOTOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
+    ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
@@ -11083,23 +11083,23 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd_child, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(is_topmost(hwnd_child), "child should be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
     swp_after(hwnd_child, HWND_BOTTOM);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, 0, hwnd2, owner, FALSE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
@@ -11107,23 +11107,23 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */
     reset_window_state(state, ARRAY_SIZE(state));
 
     swp_after(hwnd_child, HWND_TOPMOST);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
 todo_wine
-    ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
-    ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(is_topmost(hwnd_child), "child should be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
+    ok(is_topmost(hwnd_grandchild), "grandchild should be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE);
     swp_after(hwnd_child, hwnd_child2);
-    ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner);
-    ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd);
-    ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child);
-    ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2);
+    ok(!is_topmost(owner), "owner should NOT be topmost\n");
+    ok(!is_topmost(hwnd), "hwnd should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child), "child should NOT be topmost\n");
+    ok(!is_topmost(hwnd_child2), "child2 should NOT be topmost\n");
 todo_wine
-    ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild);
+    ok(!is_topmost(hwnd_grandchild), "grandchild should NOT be topmost\n");
 if (!is_wine) /* FIXME: remove once Wine is fixed */
     check_z_order(hwnd, hwnd2, 0, owner, FALSE);
 if (!is_wine) /* FIXME: remove once Wine is fixed */
-- 
2.20.1



More information about the wine-devel mailing list