Jacek Caban : wineandroid: Use __wine_unix_call.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 218e469812aa948057824cd0c41850e390af45ef
URL:    https://gitlab.winehq.org/wine/wine/-/commit/218e469812aa948057824cd0c41850e...

Author: Jacek Caban 
Date:   Fri Jul 22 12:53:36 2022 +0200

wineandroid: Use __wine_unix_call.

---

dlls/wineandroid.drv/dllmain.c |  4 +---
 dlls/wineandroid.drv/init.c    | 10 ----------
 dlls/wineandroid.drv/unixlib.h |  4 +---
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c
index 6556a492505..b10491a22d8 100644
--- a/dlls/wineandroid.drv/dllmain.c
+++ b/dlls/wineandroid.drv/dllmain.c
@@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(android);

static unixlib_handle_t unix_handle;
-static NTSTATUS (CDECL *unix_call)( enum android_funcs code, void *params );

extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event );
 static HANDLE stop_event;
@@ -130,12 +129,11 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
         return FALSE;

params.register_window_callback = register_window_callback;
-    if (__wine_unix_call( unix_handle, unix_init, &params )) return FALSE;
+    if (ANDROID_CALL( init, &params )) return FALSE;

callback_table = NtCurrentTeb()->Peb->KernelCallbackTable;
     callback_table[client_start_device] = android_start_device;

-    unix_call = params.unix_call;
     return TRUE;
 }

diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index 83fe224dccf..cf97b25fbb7 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -562,8 +562,6 @@ JavaVM **p_java_vm = NULL;
 jobject *p_java_object = NULL;
 unsigned short *p_java_gdt_sel = NULL;

-static NTSTATUS CDECL unix_call( enum android_funcs code, void *params );
-
 static HRESULT android_init( void *arg )
 {
     struct init_params *params = arg;
@@ -609,7 +607,6 @@ static HRESULT android_init( void *arg )
 #endif
     }
     __wine_set_user_driver( &android_drv_funcs, WINE_GDI_DRIVER_VERSION );
-    params->unix_call = unix_call;
     return STATUS_SUCCESS;
 }

@@ -625,10 +622,3 @@ const unixlib_entry_t __wine_unix_call_funcs[] =

C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count );
-
-
-/* FIXME: Use __wine_unix_call instead */
-static NTSTATUS CDECL unix_call( enum android_funcs code, void *params )
-{
-    return __wine_unix_call_funcs[code]( params );
-}
diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h
index 2b4d02648e5..98da6528fd5 100644
--- a/dlls/wineandroid.drv/unixlib.h
+++ b/dlls/wineandroid.drv/unixlib.h
@@ -30,14 +30,12 @@ enum android_funcs
     unix_funcs_count
 };

-/* FIXME: Use __wine_unix_call when the rest of the stack is ready */
-#define ANDROID_CALL(func, params) unix_call( unix_ ## func, params )
+#define ANDROID_CALL(func, params) __wine_unix_call( unix_handle, unix_ ## func, params )

/* android_init params */
 struct init_params
 {
     PNTAPCFUNC register_window_callback;
-    NTSTATUS (CDECL *unix_call)( enum android_funcs code, void *params );
 };