wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 221fdb09b4c20da45e9834aa0cae27dcc75ea27b.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-01-05 09:57:51 +11:00
parent a3710ff21f
commit d87ec36ccf
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "9b12eae9ea445bbdeae196312fb65d20cdf27745"
echo "221fdb09b4c20da45e9834aa0cae27dcc75ea27b"
}
# Show version information

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

@ -1,18 +1,18 @@
From 97b7b28a83e4b6ae0bf7e1d66d8d22ac71cedf7f Mon Sep 17 00:00:00 2001
From 70372a81598712fc6f66557ce494fa08c8aa5de4 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Sat, 24 Jan 2015 05:12:49 +0100
Subject: winex11: Fix handling of window attributes for WS_EX_LAYERED |
WS_EX_COMPOSITED.
Subject: [PATCH] winex11: Fix handling of window attributes for WS_EX_LAYERED
| WS_EX_COMPOSITED.
---
dlls/winex11.drv/window.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
dlls/winex11.drv/window.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 06e2294..7c4a829 100644
index 89549461cce..7e8f9352716 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -260,7 +260,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
@@ -324,7 +324,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,16 +21,15 @@ index 06e2294..7c4a829 100644
if ((style & WS_CAPTION) == WS_CAPTION)
{
@@ -2320,7 +2320,8 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags
@@ -2529,7 +2529,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags
BOOL needs_map = TRUE;
/* layered windows are mapped only once their attributes are set */
- if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED) needs_map = data->layered;
- if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)
+ if ((GetWindowLongW( hwnd, GWL_EXSTYLE ) & (WS_EX_LAYERED | WS_EX_COMPOSITED)) == WS_EX_LAYERED)
+ needs_map = data->layered;
needs_map = data->layered || IsRectEmpty( rectWindow );
release_win_data( data );
if (needs_icon) fetch_icon_data( hwnd, 0, 0 );
if (needs_map) map_window( hwnd, new_style );
--
2.2.1
2.29.2

2
staging/upstream-commit
View File

@ -1 +1 @@
0aa6f8e2ea1e3f2e852bef1a07d0d1f983870150
221fdb09b4c20da45e9834aa0cae27dcc75ea27b