Alexandros Frantzis : winewayland.drv: Read and dispatch Wayland events.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4a69ec6f9679dade8b65c26774d8827d55ec7f34
URL:    https://gitlab.winehq.org/wine/wine/-/commit/4a69ec6f9679dade8b65c26774d8827...

Author: Alexandros Frantzis 
Date:   Mon Apr 24 11:11:16 2023 +0300

winewayland.drv: Read and dispatch Wayland events.

Create a dedicated thread from which we read and dispatch Wayland events
(beyond the initial ones).

---

dlls/winewayland.drv/dllmain.c         | 20 ++++++++++++++++++++
 dlls/winewayland.drv/unixlib.h         |  1 +
 dlls/winewayland.drv/waylanddrv_main.c | 12 ++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/dlls/winewayland.drv/dllmain.c b/dlls/winewayland.drv/dllmain.c
index 89d981a4314..d040620957b 100644
--- a/dlls/winewayland.drv/dllmain.c
+++ b/dlls/winewayland.drv/dllmain.c
@@ -20,8 +20,25 @@

#include "waylanddrv_dll.h"

+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv);
+
+static DWORD WINAPI wayland_read_events_thread(void *arg)
+{
+    WAYLANDDRV_UNIX_CALL(read_events, NULL);
+    /* This thread terminates only if an unrecoverable error occurred
+     * during event reading (e.g., the connection to the Wayland
+     * compositor is broken). */
+    ERR("Failed to read events from the compositor, terminating process\n");
+    TerminateProcess(GetCurrentProcess(), 1);
+    return 0;
+}
+
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
 {
+    DWORD tid;
+
     if (reason != DLL_PROCESS_ATTACH) return TRUE;

DisableThreadLibraryCalls(instance);
@@ -30,5 +47,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
     if (WAYLANDDRV_UNIX_CALL(init, NULL))
         return FALSE;

+    /* Read wayland events from a dedicated thread. */
+    CloseHandle(CreateThread(NULL, 0, wayland_read_events_thread, NULL, 0, &tid));
+
     return TRUE;
 }
diff --git a/dlls/winewayland.drv/unixlib.h b/dlls/winewayland.drv/unixlib.h
index 427837523e3..dc3bfdf8893 100644
--- a/dlls/winewayland.drv/unixlib.h
+++ b/dlls/winewayland.drv/unixlib.h
@@ -26,6 +26,7 @@
 enum waylanddrv_unix_func
 {
     waylanddrv_unix_func_init,
+    waylanddrv_unix_func_read_events,
     waylanddrv_unix_func_count,
 };

diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c
index a9297edc500..a578db76c66 100644
--- a/dlls/winewayland.drv/waylanddrv_main.c
+++ b/dlls/winewayland.drv/waylanddrv_main.c
@@ -49,9 +49,20 @@ err:
     return STATUS_UNSUCCESSFUL;
 }

+static NTSTATUS waylanddrv_unix_read_events(void *arg)
+{
+    while (wl_display_dispatch_queue(process_wayland.wl_display,
+                                     process_wayland.wl_event_queue) != -1)
+        continue;
+    /* This function only returns on a fatal error, e.g., if our connection
+     * to the Wayland server is lost. */
+    return STATUS_UNSUCCESSFUL;
+}
+
 const unixlib_entry_t __wine_unix_call_funcs[] =
 {
     waylanddrv_unix_init,
+    waylanddrv_unix_read_events,
 };

C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == waylanddrv_unix_func_count);
@@ -61,6 +72,7 @@ C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == waylanddrv_unix_func_count);
 const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
 {
     waylanddrv_unix_init,
+    waylanddrv_unix_read_events,
 };

C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == waylanddrv_unix_func_count);