From 6022a7a8fe207f6ef3fa4500c3121689432a966b609cb86a448c74c00e09df59 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 21 Aug 2024 15:52:25 +0000 Subject: [PATCH] - 6256.patch: fixes wayland backend OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1142 --- 6256.patch | 34 ++++++++++++++++++++++++++++++++++ wine.changes | 5 +++++ wine.spec | 3 ++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 6256.patch diff --git a/6256.patch b/6256.patch new file mode 100644 index 0000000..6e6dd65 --- /dev/null +++ b/6256.patch @@ -0,0 +1,34 @@ +From 720648159bb3f7cabb4be206d15555eb6950452a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Bernon?= +Date: Mon, 12 Aug 2024 11:19:36 +0200 +Subject: [PATCH] win32u: Don't request a host window surface for child + windows. + +Fixes: b9879d5adc1cd98a6ceb7d087c4533fdd487bedb +--- + dlls/win32u/window.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c +index 8e1ec0370ed..ce30b8b870e 100644 +--- a/dlls/win32u/window.c ++++ b/dlls/win32u/window.c +@@ -1844,6 +1844,7 @@ static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, + RECT *visible_rect, RECT *surface_rect ) + { + BOOL shaped, needs_surface, create_opaque, is_layered; ++ HWND parent = NtUserGetAncestor( hwnd, GA_PARENT ); + struct window_surface *new_surface; + RECT dummy; + HRGN shape; +@@ -1853,6 +1854,7 @@ static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, + + *visible_rect = *window_rect; + if (!user_driver->pWindowPosChanging( hwnd, swp_flags, shaped, window_rect, client_rect, visible_rect )) needs_surface = FALSE; ++ else if (parent && parent != NtUserGetDesktopWindow()) needs_surface = FALSE; + else if (swp_flags & SWP_HIDEWINDOW) needs_surface = FALSE; + else if (swp_flags & SWP_SHOWWINDOW) needs_surface = TRUE; + else needs_surface = !!(NtUserGetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE); +-- +GitLab + diff --git a/wine.changes b/wine.changes index f79ebfa..23e79b4 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 09:16:21 UTC 2024 - llyyr + +- 6256.patch: fixes wayland backend + ------------------------------------------------------------------- Mon Aug 12 13:57:22 UTC 2024 - Marcus Meissner diff --git a/wine.spec b/wine.spec index 2655905..7c31808 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package wine # # Copyright (c) 2024 SUSE LLC # @@ -177,6 +177,7 @@ Source8: wine-rpmlintrc # SUSE specific patches # - currently none, but add them here #Patch0: 0001-mf-tests-Remove-static-specifier-on-variables-refere.patch +Patch0: https://gitlab.winehq.org/wine/wine/-/merge_requests/6256.patch Recommends: wine-gecko >= 2.47.4 Conflicts: wine-gecko < 2.47.4 Recommends: wine-mono >= 9.2.0