[PATCH 0/1] MR6027: winewayland.drv: Enable support wl_shm protocol version 2.

[Grigory Vasilyev (＠h0tc0d3)]

If the wayland compositor suports wl_shm v2 then use it.
Wlroots already supports wl_shm v2.

References:

1) https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/22dab77d28ee8527c240...

2) https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/335

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6027

[PATCH 1/1] winewayland.drv: Enable support wl_shm protocol version 2.

[Grigory Vasilyev]

From: Grigory Vasilyev <h0tc0d3(a)gmail.com>

If the wayland compositor suports wl_shm v2 then use it.
---
 dlls/winewayland.drv/wayland.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c
index c94b35e173c..2ca8cc3bddd 100644
--- a/dlls/winewayland.drv/wayland.c
+++ b/dlls/winewayland.drv/wayland.c
@@ -127,7 +127,8 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
     }
     else if (strcmp(interface, "wl_shm") == 0)
     {
-        process_wayland.wl_shm = wl_registry_bind(registry, id, &wl_shm_interface, 1);
+        process_wayland.wl_shm = wl_registry_bind(registry, id, &wl_shm_interface,
+                                                  version < 2 ? 1 : 2);
     }
     else if (strcmp(interface, "wl_seat") == 0)
     {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6027

[PATCH 1/1] winewayland.drv: Enable support wl_shm protocol version 2.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=146905

Your paranoid android.


=== debian11b (64 bit WoW report) ===

ddraw:
ddraw4.c:3962: Test failed: Expected message 0x5, but didn't receive it.
ddraw4.c:3971: Test failed: Expected (0,0)-(1024,768), got (-32000,-32000)-(-31840,-31969).
ddraw4.c:4041: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31969).
ddraw4.c:4066: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31969).

[PATCH 0/1] MR6027: winewayland.drv: Enable support wl_shm protocol version 2. - closed

[Grigory Vasilyev (＠h0tc0d3)]

This merge request was closed by Grigory Vasilyev.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6027