rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

- 0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch:

Browse Source 
fixed wayland

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1117
This commit is contained in:
Marcus Meissner 2024-06-23 11:24:04 +00:00 committed by Git OBS Bridge
parent 9aa383d821
commit 37baaf773d
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch Normal file
View File

@ -0,0 +1,33 @@
From 1e701a6b3798ecfd688ad1ff405dbb62b3d214c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sat, 15 Jun 2024 18:36:50 +0200
Subject: [PATCH] winewayland: Avoid crashing when the dummy window surface is
used.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56840
Signed-off-by: Marcus Meissner <marcus@jet.franken.de>
---
dlls/winewayland.drv/window_surface.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c
index fb3b8750001..888fa74c085 100644
--- a/dlls/winewayland.drv/window_surface.c
+++ b/dlls/winewayland.drv/window_surface.c
@@ -489,8 +489,12 @@ failed:
void wayland_window_surface_update_wayland_surface(struct window_surface *window_surface,
struct wayland_surface *wayland_surface)
{
- struct wayland_window_surface *wws = wayland_window_surface_cast(window_surface);
+ struct wayland_window_surface *wws;
+
+ /* ignore calls with the dummy surface */
+ if (window_surface->funcs != &wayland_window_surface_funcs) return;
+ wws = wayland_window_surface_cast(window_surface);
window_surface_lock(window_surface);
TRACE("surface=%p hwnd=%p wayland_surface=%p\n", wws, window_surface->hwnd, wayland_surface);
--
2.45.2

6
wine.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jun 23 11:23:40 UTC 2024 - Marcus Meissner <meissner@suse.com>
- 0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch:
fixed wayland
-------------------------------------------------------------------
Sat Jun 15 14:49:37 UTC 2024 - Marcus Meissner <meissner@suse.com>

2
wine.spec
View File

@ -177,6 +177,8 @@ Source8: wine-rpmlintrc
# SUSE specific patches
# - currently none, but add them here
Patch0: 0001-mf-tests-help-older-compilers-by-using-defines.patch
# 1e701a6b3798ecfd688ad1ff405dbb62b3d214c6 fixing wayland
Patch1: 0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch
Recommends: wine-gecko >= 2.47.4
Conflicts: wine-gecko < 2.47.4
Recommends: wine-mono >= 9.0.0