wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b5e17b669a90d961a93f6092ebc3736ff8ca9cd6.

Browse Source
This commit is contained in:
Zebediah Figura
2021-09-14 21:44:56 -05:00
parent 5f19a81589
commit ad56d6b3d3
8 changed files with 24 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/user32-message-order/0001-user32-Fix-messages-sent-on-a-window-without-WS_CHIL.patch
View File

@@ -1,4 +1,4 @@
From ef8db03ac854f6f58ee8787f80b22c35efc69850 Mon Sep 17 00:00:00 2001
From f71bf1dbfced899bffb9f5baf0015f82779f81b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
Date: Wed, 16 Sep 2020 17:35:09 +0300
Subject: [PATCH] user32: Fix messages sent on a window without WS_CHILD, but
@@ -22,18 +22,18 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index d6be31a7d8b..aaff4f94e2f 100644
index d61c813b492..92076573b90 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -16708,6 +16708,7 @@ static const struct message WmSetParentSeq_2[] = {
@@ -16796,6 +16796,7 @@ static const struct message WmSetParentSeq_2[] = {
{ HCBT_ACTIVATE, hook|optional },
{ EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 },
{ EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 },
{ WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE },
+ { WM_QUERYNEWPALETTE, sent|optional },
{ WM_NCACTIVATE, sent|wparam|optional, 1 },
{ WM_ACTIVATE, sent|wparam|optional, 1 },
{ HCBT_SETFOCUS, hook|optional },
@@ -16778,7 +16779,7 @@ static void test_SetParent(void)
@@ -16866,7 +16867,7 @@ static void test_SetParent(void)
SetParent(popup, child);
flush_events();
@@ -43,10 +43,10 @@ index d6be31a7d8b..aaff4f94e2f 100644
ok(GetWindowLongA(popup, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n");
ok(!IsWindowVisible(popup), "IsWindowVisible() should return FALSE\n");
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index de5d50d4c3a..fc8f2cd478c 100644
index fa2f7e6fede..5d9401f13a4 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -1130,8 +1130,8 @@ static BOOL show_window( HWND hwnd, INT cmd )
@@ -1144,8 +1144,8 @@ static BOOL show_window( HWND hwnd, INT cmd )
}
swp = new_swp;
@@ -57,7 +57,7 @@ index de5d50d4c3a..fc8f2cd478c 100644
{
/* if parent is not visible simply toggle WS_VISIBLE and return */
if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 );
@@ -1980,8 +1980,11 @@ static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int par
@@ -2042,8 +2042,11 @@ static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int par
if (winpos->cy < 0) winpos->cy = 0;
else if (winpos->cy > 32767) winpos->cy = 32767;
@@ -72,5 +72,5 @@ index de5d50d4c3a..fc8f2cd478c 100644
if (wndPtr->dwStyle & WS_VISIBLE) winpos->flags &= ~SWP_SHOWWINDOW;
else
--
2.30.2
2.33.0