Alexandre Julliard : winex11.drv: Use the Unix call helpers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cb713d60066ac88a75aa74edf3af03fa0e2e817c
URL:    https://gitlab.winehq.org/wine/wine/-/commit/cb713d60066ac88a75aa74edf3af03f...

Author: Alexandre Julliard 
Date:   Thu Nov 24 10:30:16 2022 +0100

winex11.drv: Use the Unix call helpers.

---

dlls/winex11.drv/dllmain.c | 6 +-----
 dlls/winex11.drv/unixlib.h | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c
index 8ed0e40d1ac..500a4a6bc44 100644
--- a/dlls/winex11.drv/dllmain.c
+++ b/dlls/winex11.drv/dllmain.c
@@ -23,7 +23,6 @@

HMODULE x11drv_module = 0;
-unixlib_handle_t x11drv_handle;

typedef NTSTATUS (*callback_func)( UINT arg );
@@ -74,10 +73,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )

DisableThreadLibraryCalls( instance );
     x11drv_module = instance;
-    if (NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs,
-                              &x11drv_handle, sizeof(x11drv_handle), NULL ))
-        return FALSE;
-
+    if (__wine_init_unix_call()) return FALSE;
     if (X11DRV_CALL( init, &params )) return FALSE;

callback_table = NtCurrentTeb()->Peb->KernelCallbackTable;
diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h
index e8b243d67a1..7dc1d9f0ca7 100644
--- a/dlls/winex11.drv/unixlib.h
+++ b/dlls/winex11.drv/unixlib.h
@@ -36,8 +36,7 @@ enum x11drv_funcs
     unix_funcs_count,
 };

-extern unixlib_handle_t x11drv_handle DECLSPEC_HIDDEN;
-#define X11DRV_CALL(func, params) __wine_unix_call( x11drv_handle, unix_ ## func, params )
+#define X11DRV_CALL(func, params) WINE_UNIX_CALL( unix_ ## func, params )

/* x11drv_create_desktop params */
 struct create_desktop_params