Rebase against f232252951fec637758f6b2c4eeda1c0e0650310.

This commit is contained in:
Alistair Leslie-Hughes
2021-09-16 09:35:15 +10:00
parent ad56d6b3d3
commit d918a0ca3f
8 changed files with 41 additions and 260 deletions

View File

@@ -1,8 +1,7 @@
From 064570eb530a73e822bf19ccb9bc31cd3654c504 Mon Sep 17 00:00:00 2001
From f8f70e240299a518c8ce6dec56b7f0c318a14e7f 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 2/2] user32/tests: Test a recursive activation loop on
WM_ACTIVATE
Subject: [PATCH] user32/tests: Test a recursive activation loop on WM_ACTIVATE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -16,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 64f7eeecf3..191e7bfffb 100644
index 37a31eefa89..ec85a07b28a 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -4772,6 +4772,39 @@ static void test_showwindow(void)
@@ -5083,6 +5083,39 @@ static void test_showwindow(void)
flush_sequence();
}
@@ -59,7 +58,7 @@ index 64f7eeecf3..191e7bfffb 100644
static void test_sys_menu(void)
{
HWND hwnd;
@@ -9699,6 +9732,48 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP
@@ -10078,6 +10111,48 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP
return ret;
}
@@ -108,7 +107,7 @@ index 64f7eeecf3..191e7bfffb 100644
static LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg)
@@ -9796,6 +9871,10 @@ static BOOL RegisterWindowClasses(void)
@@ -10175,6 +10250,10 @@ static BOOL RegisterWindowClasses(void)
cls.lpszClassName = "ShowWindowClass";
if(!RegisterClassA(&cls)) return FALSE;
@@ -119,7 +118,7 @@ index 64f7eeecf3..191e7bfffb 100644
cls.lpfnWndProc = PopupMsgCheckProcA;
cls.lpszClassName = "TestPopupClass";
if(!RegisterClassA(&cls)) return FALSE;
@@ -9851,6 +9930,7 @@ static BOOL is_our_logged_class(HWND hwnd)
@@ -10230,6 +10309,7 @@ static BOOL is_our_logged_class(HWND hwnd)
{
if (!lstrcmpiA(buf, "TestWindowClass") ||
!lstrcmpiA(buf, "ShowWindowClass") ||
@@ -127,14 +126,14 @@ index 64f7eeecf3..191e7bfffb 100644
!lstrcmpiA(buf, "TestParentClass") ||
!lstrcmpiA(buf, "TestPopupClass") ||
!lstrcmpiA(buf, "SimpleWindowClass") ||
@@ -17756,6 +17836,7 @@ START_TEST(msg)
test_messages();
test_setwindowpos();
@@ -18476,6 +18556,7 @@ START_TEST(msg)
hEvent_hook = 0;
test_showwindow();
+ test_recursive_activation();
invisible_parent_tests();
test_mdi_messages();
test_button_messages();
--
2.17.1
2.33.0