Rebase against 6a7bfbab10d653f6724e2917e0552515520e4fb3.

This commit is contained in:
Elizabeth Figura
2024-08-22 19:07:19 -05:00
parent ae46f56f2c
commit 5fad8dd101
10 changed files with 93 additions and 84 deletions

View File

@@ -1,4 +1,4 @@
From 0c5b3442fb0cef821b43009cc827d0a340319bce Mon Sep 17 00:00:00 2001
From 170ea84514f98820468b139967f0321105524770 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,11 +9,11 @@ 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 6a2c6663b0f..1e5d7dcbf0a 100644
index 0e06939f67d..5f68addc204 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -317,7 +317,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data,
if (data->shaped) return 0;
@@ -308,7 +308,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;
- if (ex_style & WS_EX_LAYERED) return 0;
@@ -21,7 +21,7 @@ index 6a2c6663b0f..1e5d7dcbf0a 100644
if ((style & WS_CAPTION) == WS_CAPTION)
{
@@ -2785,8 +2785,9 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, cons
@@ -2669,8 +2669,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 */
@@ -33,5 +33,5 @@ index 6a2c6663b0f..1e5d7dcbf0a 100644
if (needs_icon) fetch_icon_data( hwnd, 0, 0 );
if (needs_map) map_window( hwnd, new_style );
--
2.43.0
2.45.2