From 0e10e6ab552c6d122e148c65a18d4081b0fbda3c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 28 Nov 2022 11:40:22 +0100
Subject: [PATCH] gphoto2.ds: Use the Unix call helpers.

---
 dlls/gphoto2.ds/gphoto2_main.c | 4 +---
 dlls/gphoto2.ds/unixlib.h      | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
index 68c628b4d89..a47fdcc67f4 100644
--- a/dlls/gphoto2.ds/gphoto2_main.c
+++ b/dlls/gphoto2.ds/gphoto2_main.c
@@ -477,7 +477,6 @@ static TW_UINT16 GPHOTO2_XferGroupSet (pTW_IDENTITY pOrigin,
 }
 
 HINSTANCE GPHOTO2_instance = 0;
-unixlib_handle_t gphoto2_handle = 0;
 
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
@@ -488,8 +487,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
         case DLL_PROCESS_ATTACH:
 	    GPHOTO2_instance = hinstDLL;
             DisableThreadLibraryCalls(hinstDLL);
-            NtQueryVirtualMemory( GetCurrentProcess(), hinstDLL, MemoryWineUnixFuncs,
-                                  &gphoto2_handle, sizeof(gphoto2_handle), NULL );
+            __wine_init_unix_call();
             break;
     }
 
diff --git a/dlls/gphoto2.ds/unixlib.h b/dlls/gphoto2.ds/unixlib.h
index bc2f086694e..0e8ea87f93e 100644
--- a/dlls/gphoto2.ds/unixlib.h
+++ b/dlls/gphoto2.ds/unixlib.h
@@ -71,6 +71,4 @@ enum gphoto2_funcs
     unix_close_file,
 };
 
-extern unixlib_handle_t gphoto2_handle DECLSPEC_HIDDEN;
-
-#define GPHOTO2_CALL( func, params ) __wine_unix_call( gphoto2_handle, unix_ ## func, params )
+#define GPHOTO2_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )