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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 50347810a148a50ee0717db287e74dc84f62cfb8
URL:    https://gitlab.winehq.org/wine/wine/-/commit/50347810a148a50ee0717db287e74dc...

Author: Alexandre Julliard 
Date:   Thu Nov 24 10:31:07 2022 +0100

wineandroid.drv: Use the Unix call helpers.

---

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

diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c
index ca3583b574f..3f6dbd388eb 100644
--- a/dlls/wineandroid.drv/dllmain.c
+++ b/dlls/wineandroid.drv/dllmain.c
@@ -32,8 +32,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(android);

-static unixlib_handle_t unix_handle;
-
 extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event );
 static HANDLE stop_event;
 static HANDLE thread;
@@ -124,9 +122,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
     if (reason == DLL_PROCESS_ATTACH) return TRUE;

DisableThreadLibraryCalls( inst );
-    if (NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs,
-                              &unix_handle, sizeof(unix_handle), NULL ))
-        return FALSE;
+    if (__wine_init_unix_call()) return FALSE;

params.register_window_callback = register_window_callback;
     if (ANDROID_CALL( init, &params )) return FALSE;
diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h
index 98da6528fd5..a180e6660c8 100644
--- a/dlls/wineandroid.drv/unixlib.h
+++ b/dlls/wineandroid.drv/unixlib.h
@@ -30,7 +30,7 @@ enum android_funcs
     unix_funcs_count
 };

-#define ANDROID_CALL(func, params) __wine_unix_call( unix_handle, unix_ ## func, params )
+#define ANDROID_CALL(func, params) WINE_UNIX_CALL( unix_ ## func, params )

/* android_init params */
 struct init_params