diff --git a/patches/user32-MessageBox_WS_EX_TOPMOST/0001-user32-tests-Add-some-tests-to-see-when-MessageBox-g.patch b/patches/user32-MessageBox_WS_EX_TOPMOST/0001-user32-tests-Add-some-tests-to-see-when-MessageBox-g.patch index 12892c2a..91cb2f4c 100644 --- a/patches/user32-MessageBox_WS_EX_TOPMOST/0001-user32-tests-Add-some-tests-to-see-when-MessageBox-g.patch +++ b/patches/user32-MessageBox_WS_EX_TOPMOST/0001-user32-tests-Add-some-tests-to-see-when-MessageBox-g.patch @@ -1,18 +1,18 @@ -From 95fd970d76fc01963d2590a962603439b944472d Mon Sep 17 00:00:00 2001 +From 53e12fde2c97a0beb5f83b243caffb7db393624d Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 18 Feb 2016 10:17:46 +0800 Subject: user32/tests: Add some tests to see when MessageBox gains WS_EX_TOPMOST style. --- - dlls/user32/tests/dialog.c | 112 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 112 insertions(+) + dlls/user32/tests/dialog.c | 113 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 113 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c -index eede834..71a2f48 100644 +index a6cd1be..4be1ae7 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c -@@ -1443,12 +1443,124 @@ static void test_timer_message(void) +@@ -1472,12 +1472,125 @@ static void test_timer_message(void) DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, timer_message_dlg_proc); } @@ -60,6 +60,7 @@ index eede834..71a2f48 100644 + } + } + ++ Sleep(50); + return hwnd; +} + @@ -96,7 +97,7 @@ index eede834..71a2f48 100644 + hwnd = wait_for_window(params.caption); + ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); + todo_wine_if(test[i].ex_style == WS_EX_TOPMOST) -+ ok((ex_style & test[i].ex_style) == test[i].ex_style, "%d: got window ex_style %#x\n", i, ex_style); ++ ok((ex_style & WS_EX_TOPMOST) == test[i].ex_style, "%d: got window ex_style %#x\n", i, ex_style); + + PostMessageA(hwnd, WM_COMMAND, IDCANCEL, 0); + @@ -118,7 +119,7 @@ index eede834..71a2f48 100644 + hwnd = wait_for_window(params.caption); + ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); + todo_wine_if(test[i].ex_style == WS_EX_TOPMOST) -+ ok((ex_style & test[i].ex_style) == test[i].ex_style, "%d: got window ex_style %#x\n", i, ex_style); ++ ok((ex_style & WS_EX_TOPMOST) == test[i].ex_style, "%d: got window ex_style %#x\n", i, ex_style); + + PostMessageA(hwnd, WM_COMMAND, IDCANCEL, 0); + diff --git a/patches/user32-MessageBox_WS_EX_TOPMOST/0002-user32-MessageBox-should-be-topmost-when-MB_SYSTEMMO.patch b/patches/user32-MessageBox_WS_EX_TOPMOST/0002-user32-MessageBox-should-be-topmost-when-MB_SYSTEMMO.patch index 774f9afa..a7aab108 100644 --- a/patches/user32-MessageBox_WS_EX_TOPMOST/0002-user32-MessageBox-should-be-topmost-when-MB_SYSTEMMO.patch +++ b/patches/user32-MessageBox_WS_EX_TOPMOST/0002-user32-MessageBox-should-be-topmost-when-MB_SYSTEMMO.patch @@ -1,4 +1,4 @@ -From 6da3751e3a45b8753f5605e93d669f4ff1bb78e1 Mon Sep 17 00:00:00 2001 +From dcbc830fec12f4de0dd759d0ca7e780173d82716 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 18 Feb 2016 10:22:29 +0800 Subject: user32: MessageBox should be topmost when MB_SYSTEMMODAL style is @@ -25,23 +25,23 @@ index 2ba98c9..e5dc120 100644 HeapFree( GetProcessHeap(), 0, buffer ); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c -index 71a2f48..416e914 100644 +index e80b581..24a549f 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c -@@ -1522,7 +1522,6 @@ static void test_MessageBox(void) +@@ -1551,7 +1551,6 @@ static void test_MessageBox(void) hwnd = wait_for_window(params.caption); ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); - todo_wine_if(test[i].ex_style == WS_EX_TOPMOST) - ok((ex_style & test[i].ex_style) == test[i].ex_style, "%d: got window ex_style %#x\n", i, ex_style); + ok((ex_style & WS_EX_TOPMOST) == test[i].ex_style, "%d: got window ex_style %#x\n", i, ex_style); PostMessageA(hwnd, WM_COMMAND, IDCANCEL, 0); -@@ -1544,7 +1543,6 @@ static void test_MessageBox(void) +@@ -1573,7 +1572,6 @@ static void test_MessageBox(void) hwnd = wait_for_window(params.caption); ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); - todo_wine_if(test[i].ex_style == WS_EX_TOPMOST) - ok((ex_style & test[i].ex_style) == test[i].ex_style, "%d: got window ex_style %#x\n", i, ex_style); + ok((ex_style & WS_EX_TOPMOST) == test[i].ex_style, "%d: got window ex_style %#x\n", i, ex_style); PostMessageA(hwnd, WM_COMMAND, IDCANCEL, 0); --