[PATCH v10 05/10] wineandroid.drv: Route kernel callbacks through user32.

[Torge Matthies]

From: Torge Matthies

Signed-off-by: Torge Matthies 
---
 dlls/wineandroid.drv/android.h | 1 +
 dlls/wineandroid.drv/device.c  | 4 +++-
 dlls/wineandroid.drv/dllmain.c | 9 ++-------
 dlls/wineandroid.drv/init.c    | 2 ++
 dlls/wineandroid.drv/unixlib.h | 7 +------
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h
index 22652f11d27..f767ceb4187 100644
--- a/dlls/wineandroid.drv/android.h
+++ b/dlls/wineandroid.drv/android.h
@@ -120,6 +120,7 @@ extern NTSTATUS android_java_init( void *arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS android_java_uninit( void *arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS android_register_window( void *arg ) DECLSPEC_HIDDEN;
 extern PNTAPCFUNC register_window_callback;
+extern user32_callback_func start_device;

extern unsigned int screen_width DECLSPEC_HIDDEN;
 extern unsigned int screen_height DECLSPEC_HIDDEN;
diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c
index b7292b5faf1..bd0d5cf5925 100644
--- a/dlls/wineandroid.drv/device.c
+++ b/dlls/wineandroid.drv/device.c
@@ -1180,7 +1180,9 @@ void start_android_device(void)
 {
     void *ret_ptr;
     ULONG ret_len;
-    thread = ULongToHandle( KeUserModeCallback( client_start_device, NULL, 0, &ret_ptr, &ret_len ));
+    struct user32_callback_params cbparams = { start_device };
+    NTSTATUS ret = KeUserModeCallback( NtUserDispatchCallback, &cbparams, sizeof(cbparams), &ret_ptr, &ret_len );
+    thread = ULongToHandle( ret );
 }

diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c
index b10491a22d8..1e3c0d20631 100644
--- a/dlls/wineandroid.drv/dllmain.c
+++ b/dlls/wineandroid.drv/dllmain.c
@@ -119,7 +119,6 @@ static void CALLBACK register_window_callback( ULONG_PTR arg1, ULONG_PTR arg2, U
 BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
 {
     struct init_params params;
-    void **callback_table;

if (reason == DLL_PROCESS_ATTACH) return TRUE;

@@ -129,12 +128,8 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
         return FALSE;

params.register_window_callback = register_window_callback;
-    if (ANDROID_CALL( init, &params )) return FALSE;
-
-    callback_table = NtCurrentTeb()->Peb->KernelCallbackTable;
-    callback_table[client_start_device] = android_start_device;
-
-    return TRUE;
+    params.start_device = android_start_device;
+    return !ANDROID_CALL( init, &params );
 }

diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index 4308725dcee..0d0f36fd1cf 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -53,6 +53,7 @@ static int device_init_done;
 static BOOL force_display_devices_refresh;

PNTAPCFUNC register_window_callback;
+user32_callback_func start_device;

typedef struct
 {
@@ -586,6 +587,7 @@ static HRESULT android_init( void *arg )
     pthread_mutexattr_destroy( &attr );

register_window_callback = params->register_window_callback;
+    start_device = params->start_device;

if ((java_vm = *p_java_vm))  /* running under Java */
     {
diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h
index 98da6528fd5..4cdc6f7a407 100644
--- a/dlls/wineandroid.drv/unixlib.h
+++ b/dlls/wineandroid.drv/unixlib.h
@@ -36,6 +36,7 @@ enum android_funcs
 struct init_params
 {
     PNTAPCFUNC register_window_callback;
+    user32_callback_func start_device;
 };

@@ -54,9 +55,3 @@ struct register_window_params
     UINT_PTR arg2;
     UINT_PTR arg3;
 };
-
-
-enum
-{
-    client_start_device = NtUserDriverCallbackFirst,
-};