Accepting request 1195152 from Emulators
- 6256.patch: fixes wayland backend (forwarded request 1195038 from llyyr) OBS-URL: https://build.opensuse.org/request/show/1195152 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=447
This commit is contained in:
commit
657eb2707e
34
6256.patch
Normal file
34
6256.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 720648159bb3f7cabb4be206d15555eb6950452a Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
||||||
|
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
|
||||||
|
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 21 09:16:21 UTC 2024 - llyyr <llyyr@yukari.in>
|
||||||
|
|
||||||
|
- 6256.patch: fixes wayland backend
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 12 13:57:22 UTC 2024 - Marcus Meissner <meissner@suse.com>
|
Mon Aug 12 13:57:22 UTC 2024 - Marcus Meissner <meissner@suse.com>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file
|
# spec file for package wine
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
@ -177,6 +177,7 @@ Source8: wine-rpmlintrc
|
|||||||
# SUSE specific patches
|
# SUSE specific patches
|
||||||
# - currently none, but add them here
|
# - currently none, but add them here
|
||||||
#Patch0: 0001-mf-tests-Remove-static-specifier-on-variables-refere.patch
|
#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
|
Recommends: wine-gecko >= 2.47.4
|
||||||
Conflicts: wine-gecko < 2.47.4
|
Conflicts: wine-gecko < 2.47.4
|
||||||
Recommends: wine-mono >= 9.2.0
|
Recommends: wine-mono >= 9.2.0
|
||||||
|
Loading…
Reference in New Issue
Block a user