From 12a129586baf9b8c626602b5f5e1030a35e1312a Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 25 Nov 2022 10:18:08 +0100
Subject: [PATCH] ws2_32: Use the Unix call helpers.

---
 dlls/ws2_32/protocol.c       | 4 +---
 dlls/ws2_32/socket.c         | 3 +--
 dlls/ws2_32/ws2_32_private.h | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c
index 6e7e8eee18a..1f840832c7a 100644
--- a/dlls/ws2_32/protocol.c
+++ b/dlls/ws2_32/protocol.c
@@ -27,9 +27,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
-unixlib_handle_t ws_unix_handle = 0;
-
-#define WS_CALL(func, params) __wine_unix_call( ws_unix_handle, ws_unix_ ## func, params )
+#define WS_CALL(func, params) WINE_UNIX_CALL( ws_unix_ ## func, params )
 
 static char *get_fqdn(void)
 {
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 115451c3b58..e8a04e2e714 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -582,8 +582,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )
     switch (reason)
     {
     case DLL_PROCESS_ATTACH:
-        return !NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs,
-                                      &ws_unix_handle, sizeof(ws_unix_handle), NULL );
+        return !__wine_init_unix_call();
 
     case DLL_THREAD_DETACH:
         free_per_thread_data();
diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h
index b21936a34e1..41d9e512488 100644
--- a/dlls/ws2_32/ws2_32_private.h
+++ b/dlls/ws2_32/ws2_32_private.h
@@ -145,6 +145,4 @@ enum ws_unix_funcs
     ws_unix_getnameinfo,
 };
 
-extern unixlib_handle_t ws_unix_handle DECLSPEC_HIDDEN;
-
 #endif