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 75f8de6bd41c945abe230e8fd1d8645f30b7667f.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2024-08-15 08:35:27 +10:00
parent 51d8ac0717
commit 7104b9b6ba
5 changed files with 18 additions and 70 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,18 +1,18 @@
From 3f9023d5bc2872b835f99cc6657c60ea086d23a0 Mon Sep 17 00:00:00 2001
From 0c5b3442fb0cef821b43009cc827d0a340319bce 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
| WS_EX_COMPOSITED.
---
dlls/winex11.drv/window.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
dlls/winex11.drv/window.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 8b191ca23ed..5c4b37130ac 100644
index 6a2c6663b0f..1e5d7dcbf0a 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -325,7 +325,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
@@ -317,7 +317,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
if (data->shaped) return 0;
if (ex_style & WS_EX_TOOLWINDOW) return 0;
@@ -21,15 +21,17 @@ index 8b191ca23ed..5c4b37130ac 100644
if ((style & WS_CAPTION) == WS_CAPTION)
{
@@ -2526,7 +2526,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
@@ -2785,8 +2785,9 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, cons
BOOL needs_map = TRUE;
/* layered windows are mapped only once their attributes are set */
- if (NtUserGetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)
+ if ((NtUserGetWindowLongW( hwnd, GWL_EXSTYLE ) & (WS_EX_LAYERED | WS_EX_COMPOSITED)) == WS_EX_LAYERED)
needs_map = data->layered || IsRectEmpty( rectWindow );
needs_map = data->layered || IsRectEmpty( &new_rects->window );
+
release_win_data( data );
if (needs_icon) fetch_icon_data( hwnd, 0, 0 );
if (needs_map) map_window( hwnd, new_style );
--
2.35.1
2.43.0