Rebase against e956c4ec71dd0f41090df3863e6f937963b2b7d9.

This commit is contained in:
Elizabeth Figura
2025-04-02 18:32:00 -05:00
parent e1b2c45272
commit 8924ee42d8
12 changed files with 47 additions and 263 deletions

View File

@@ -1,4 +1,4 @@
From 170ea84514f98820468b139967f0321105524770 Mon Sep 17 00:00:00 2001
From c30eb624c99b01d7b6e1c3e21cf40869cd3075a8 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,10 +9,10 @@ Subject: [PATCH] winex11: Fix handling of window attributes for WS_EX_LAYERED
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 0e06939f67d..5f68addc204 100644
index a733d566d4f..4099d2b9879 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -308,7 +308,7 @@ static unsigned long get_mwm_decorations_for_style( DWORD style, DWORD ex_style
@@ -448,7 +448,7 @@ static unsigned long get_mwm_decorations_for_style( DWORD style, DWORD ex_style
unsigned long ret = 0;
if (ex_style & WS_EX_TOOLWINDOW) return 0;
@@ -21,7 +21,7 @@ index 0e06939f67d..5f68addc204 100644
if ((style & WS_CAPTION) == WS_CAPTION)
{
@@ -2669,8 +2669,9 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, cons
@@ -3080,8 +3080,9 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, HWND owner_hint, UIN
BOOL needs_map = TRUE;
/* layered windows are mapped only once their attributes are set */
@@ -31,7 +31,7 @@ index 0e06939f67d..5f68addc204 100644
+
release_win_data( data );
if (needs_icon) fetch_icon_data( hwnd, 0, 0 );
if (needs_map) map_window( hwnd, new_style );
if (needs_map) map_window( hwnd, new_style, activate );
--
2.45.2
2.47.2