Rebase against 16e73be10d940c9c04101a47687a6f8a385c2b0f.

This commit is contained in:
Zebediah Figura
2021-09-17 17:45:25 -05:00
parent 3a06c15dd2
commit fdcc8bec48
9 changed files with 105 additions and 105 deletions

View File

@@ -1,4 +1,4 @@
From f8f70e240299a518c8ce6dec56b7f0c318a14e7f Mon Sep 17 00:00:00 2001
From c36fdad49464375eaf3696df6915c12e3e3e894c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
Date: Mon, 22 Jul 2019 15:29:26 +0300
Subject: [PATCH] user32/tests: Test a recursive activation loop on WM_ACTIVATE
@@ -15,10 +15,10 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
1 file changed, 81 insertions(+)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 37a31eefa89..ec85a07b28a 100644
index 64054147a62..7a85e556f34 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -5083,6 +5083,39 @@ static void test_showwindow(void)
@@ -5106,6 +5106,39 @@ static void test_showwindow(void)
flush_sequence();
}
@@ -58,7 +58,7 @@ index 37a31eefa89..ec85a07b28a 100644
static void test_sys_menu(void)
{
HWND hwnd;
@@ -10078,6 +10111,48 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP
@@ -10101,6 +10134,48 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP
return ret;
}
@@ -107,7 +107,7 @@ index 37a31eefa89..ec85a07b28a 100644
static LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg)
@@ -10175,6 +10250,10 @@ static BOOL RegisterWindowClasses(void)
@@ -10198,6 +10273,10 @@ static BOOL RegisterWindowClasses(void)
cls.lpszClassName = "ShowWindowClass";
if(!RegisterClassA(&cls)) return FALSE;
@@ -118,7 +118,7 @@ index 37a31eefa89..ec85a07b28a 100644
cls.lpfnWndProc = PopupMsgCheckProcA;
cls.lpszClassName = "TestPopupClass";
if(!RegisterClassA(&cls)) return FALSE;
@@ -10230,6 +10309,7 @@ static BOOL is_our_logged_class(HWND hwnd)
@@ -10253,6 +10332,7 @@ static BOOL is_our_logged_class(HWND hwnd)
{
if (!lstrcmpiA(buf, "TestWindowClass") ||
!lstrcmpiA(buf, "ShowWindowClass") ||
@@ -127,13 +127,13 @@ index 37a31eefa89..ec85a07b28a 100644
!lstrcmpiA(buf, "TestPopupClass") ||
!lstrcmpiA(buf, "SimpleWindowClass") ||
@@ -18476,6 +18556,7 @@ START_TEST(msg)
hEvent_hook = 0;
test_messages();
test_setwindowpos();
test_showwindow();
+ test_recursive_activation();
invisible_parent_tests();
test_mdi_messages();
test_button_messages();
/* Fix message sequences before removing 4 lines below */
--
2.33.0