wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 19816afd8ca5f86e23f8e6d7f10b0bfe61326786.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2025-11-19 09:33:59 +11:00
parent 4741f1abc6
commit 3bb1cddffc
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/winex11-Window_Style/0001-winex11-Fix-handling-of-window-attributes-for-WS_EX_.patch
View File

@@ -1,4 +1,4 @@
From b7e91a68996298890b45a006a3888b18f23d0708 Mon Sep 17 00:00:00 2001
From aa950dc54c214e96f4970a1a55a96f18c291ade7 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Sat, 24 Jan 2015 05:12:49 +0100
Subject: [PATCH] winex11: Fix handling of window attributes for WS_EX_LAYERED
@@ -9,7 +9,7 @@ Subject: [PATCH] winex11: Fix handling of window attributes for WS_EX_LAYERED
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index e9edc0022c8..f3cbb858798 100644
index df5e2156b1c..660856495b0 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -457,7 +457,7 @@ static unsigned long get_mwm_decorations_for_style( DWORD style, DWORD ex_style
@@ -21,15 +21,15 @@ index e9edc0022c8..f3cbb858798 100644
if ((style & WS_CAPTION) == WS_CAPTION)
{
@@ -3116,7 +3116,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, HWND owner_hint, UIN
debugstr_window_rects(new_rects), new_style, swp_flags );
@@ -3197,7 +3197,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, HWND owner_hint, UIN
/* layered windows are mapped only once their attributes are set */
- if (ex_style & WS_EX_LAYERED && !data->layered && !IsRectEmpty( &new_rects->window )) new_style &= ~WS_VISIBLE;
+ if ((ex_style & (WS_EX_LAYERED | WS_EX_COMPOSITED)) == WS_EX_LAYERED && !data->layered && !IsRectEmpty( &new_rects->window )) new_style &= ~WS_VISIBLE;
XFlush( gdi_display ); /* make sure painting is done before we move the window */
if (data->pending_state.wm_state == WithdrawnState && (new_style & WS_VISIBLE) &&
- (ex_style & WS_EX_LAYERED) && !data->layered && !IsRectEmpty( &new_rects->window ))
+ (ex_style & (WS_EX_LAYERED | WS_EX_COMPOSITED)) == WS_EX_LAYERED && !data->layered && !IsRectEmpty( &new_rects->window ))
{
WARN( "win %p/%lx is layered, delaying mapping\n", hwnd, data->whole_window );
new_style &= ~WS_VISIBLE;
--
2.51.0

2
staging/upstream-commit
View File

@@ -1 +1 @@
6a966678e89c0c2090b7684a1c2ebfb0a295b9a8
19816afd8ca5f86e23f8e6d7f10b0bfe61326786