From 7104b9b6ba12698cd07d11166b5d851773444af2 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 15 Aug 2024 08:35:27 +1000 Subject: [PATCH] Rebase against 75f8de6bd41c945abe230e8fd1d8645f30b7667f. --- ...-statment-when-creating-a-descriptor.patch | 25 ---------------- ...Propgate-win32_funcs-to-all-children.patch | 29 ------------------- ...ling-of-window-attributes-for-WS_EX_.patch | 18 +++++++----- ...ow-Query-the-X-server-for-the-actual.patch | 14 ++++----- staging/upstream-commit | 2 +- 5 files changed, 18 insertions(+), 70 deletions(-) delete mode 100644 patches/odbc32-fixes/0018-odbc32-Pass-statment-when-creating-a-descriptor.patch delete mode 100644 patches/odbc32-fixes/0019-odbc32-Propgate-win32_funcs-to-all-children.patch diff --git a/patches/odbc32-fixes/0018-odbc32-Pass-statment-when-creating-a-descriptor.patch b/patches/odbc32-fixes/0018-odbc32-Pass-statment-when-creating-a-descriptor.patch deleted file mode 100644 index 61bff1e1..00000000 --- a/patches/odbc32-fixes/0018-odbc32-Pass-statment-when-creating-a-descriptor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From daff4a3d283837c83f33bcc0141af4078e6251ac Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Wed, 14 Aug 2024 07:52:10 +1000 -Subject: [PATCH] odbc32: Pass statment when creating a descriptor - ---- - dlls/odbc32/proxyodbc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c -index c12910161ab..2e55e1ee06e 100644 ---- a/dlls/odbc32/proxyodbc.c -+++ b/dlls/odbc32/proxyodbc.c -@@ -547,7 +547,7 @@ static SQLRETURN alloc_descriptors( struct statement *stmt ) - unsigned int i; - for (i = 0; i < ARRAY_SIZE(stmt->desc); i++) - { -- if (!(stmt->desc[i] = create_descriptor( NULL ))) -+ if (!(stmt->desc[i] = create_descriptor( stmt ))) - { - free_descriptors( stmt ); - return SQL_ERROR; --- -2.43.0 - diff --git a/patches/odbc32-fixes/0019-odbc32-Propgate-win32_funcs-to-all-children.patch b/patches/odbc32-fixes/0019-odbc32-Propgate-win32_funcs-to-all-children.patch deleted file mode 100644 index 87facce0..00000000 --- a/patches/odbc32-fixes/0019-odbc32-Propgate-win32_funcs-to-all-children.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9b5c4a85620c6f86a368d420221199da2f794c63 Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Wed, 14 Aug 2024 07:51:18 +1000 -Subject: [PATCH] odbc32: Propgate win32_funcs to all children - ---- - dlls/odbc32/proxyodbc.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c -index 932560015b8..c12910161ab 100644 ---- a/dlls/odbc32/proxyodbc.c -+++ b/dlls/odbc32/proxyodbc.c -@@ -397,7 +397,11 @@ static void init_object( struct object *obj, UINT32 type, struct object *parent - obj->parent = parent; - list_init( &obj->entry ); - list_init( &obj->children ); -- if (parent) list_add_tail( &parent->children, &obj->entry ); -+ if (parent) -+ { -+ list_add_tail( &parent->children, &obj->entry ); -+ obj->win32_funcs = parent->win32_funcs; -+ } - InitializeCriticalSectionEx( &obj->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); - obj->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": object.cs"); - } --- -2.43.0 - diff --git a/patches/winex11-Window_Style/0001-winex11-Fix-handling-of-window-attributes-for-WS_EX_.patch b/patches/winex11-Window_Style/0001-winex11-Fix-handling-of-window-attributes-for-WS_EX_.patch index ae709983..5bf806a7 100644 --- a/patches/winex11-Window_Style/0001-winex11-Fix-handling-of-window-attributes-for-WS_EX_.patch +++ b/patches/winex11-Window_Style/0001-winex11-Fix-handling-of-window-attributes-for-WS_EX_.patch @@ -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 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 diff --git a/patches/winex11.drv-Query_server_position/0001-winex11.drv-window-Query-the-X-server-for-the-actual.patch b/patches/winex11.drv-Query_server_position/0001-winex11.drv-window-Query-the-X-server-for-the-actual.patch index 2a7cd285..2e39be97 100644 --- a/patches/winex11.drv-Query_server_position/0001-winex11.drv-window-Query-the-X-server-for-the-actual.patch +++ b/patches/winex11.drv-Query_server_position/0001-winex11.drv-window-Query-the-X-server-for-the-actual.patch @@ -1,4 +1,4 @@ -From 4fac3395e30a703108f7c814795abbad99cd8282 Mon Sep 17 00:00:00 2001 +From 65e44ef0e0b049ccd98f6d4c9c9e4676090dd1b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= Date: Mon, 24 Dec 2018 14:26:57 +0200 Subject: [PATCH] winex11.drv/window: Query the X server for the actual rect of @@ -22,10 +22,10 @@ Signed-off-by: Gabriel Ivăncescu 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c -index 4c4e47884ff..78da3bf6b32 100644 +index 1e5d7dcbf0a..3362446bc4c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c -@@ -206,6 +206,25 @@ static BOOL has_owned_popups( HWND hwnd ) +@@ -222,6 +222,25 @@ static BOOL has_owned_popups( HWND hwnd ) return ret; } @@ -51,16 +51,16 @@ index 4c4e47884ff..78da3bf6b32 100644 /*********************************************************************** * alloc_win_data -@@ -2507,7 +2526,8 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, +@@ -2761,7 +2780,8 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, cons { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || (!event_type && !(new_style & WS_MINIMIZE) && -- !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) -+ !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ) && +- !is_window_rect_mapped( &new_rects->window ) && is_window_rect_mapped( &old_window_rect ))) ++ !is_window_rect_mapped( &new_rects->window ) && is_window_rect_mapped( &old_window_rect ) && + !is_actual_window_rect_mapped( data ))) { release_win_data( data ); unmap_window( hwnd ); -- -2.35.1 +2.43.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index ab007cd7..9761502c 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -eef229cc1eb77c3236ab4e210a6a276b65173e39 +75f8de6bd41c945abe230e8fd1d8645f30b7667f