Rémi Bernon : user32/tests: Move test_mdi early in the test list.

Alexandre Julliard julliard at winehq.org
Mon Feb 7 15:56:06 CST 2022


Module: wine
Branch: master
Commit: fb9237cf343497d4c96152d08667f97d9643a307
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fb9237cf343497d4c96152d08667f97d9643a307

Author: Rémi Bernon <rbernon at codeweavers.com>
Date:   Mon Feb  7 09:30:09 2022 +0100

user32/tests: Move test_mdi early in the test list.

The test gets spurious GetScrollInfo SB_HORZ failures if some other
windows were created before using CW_USEDEFAULT positions, for instance
the window from test_capture_4.

This happened on some Win10 VMs, and was thought to be fixed with
9b5346df86bf1a85336ed03a67a630970ce08e9f, but it then broke the test on
some other VMs. This is hopefully a better fix, and it reverts the
previous one too.

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52507
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/tests/win.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 8ec6d8af064..8614a048c4d 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -2256,7 +2256,7 @@ static void test_mdi(void)
     mdi_hwndMain = CreateWindowExA(0, "MDI_parent_Class", "MDI parent window",
                                    WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX |
                                    WS_MAXIMIZEBOX /*| WS_VISIBLE*/,
-                                   200, 100, CW_USEDEFAULT, CW_USEDEFAULT,
+                                   100, 100, CW_USEDEFAULT, CW_USEDEFAULT,
                                    GetDesktopWindow(), 0,
                                    GetModuleHandleA(NULL), NULL);
     assert(mdi_hwndMain);
@@ -12644,6 +12644,10 @@ START_TEST(win)
 
     our_pid = GetWindowThreadProcessId(hwndMain, NULL);
 
+    /* This test is sensitive to other windows created with
+     * CW_USEDEFAULT position, execute it early too */
+    test_mdi();
+
     /* Add the tests below this line */
     test_child_window_from_point();
     test_window_from_point(argv[0]);
@@ -12665,7 +12669,6 @@ START_TEST(win)
     test_parent_owner();
     test_enum_thread_windows();
 
-    test_mdi();
     test_icons();
     test_SetWindowPos(hwndMain, hwndMain2);
     test_SetMenu(hwndMain);




More information about the wine-cvs mailing list