From e0d3683d8947cd9a3cb20acdf69091b183a90861 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 29 May 2023 14:12:25 +0200
Subject: [PATCH] wineandroid: Use the user driver interface to create host
 desktops.

---
 dlls/wineandroid.drv/android.h            | 2 +-
 dlls/wineandroid.drv/dllmain.c            | 9 ---------
 dlls/wineandroid.drv/init.c               | 2 +-
 dlls/wineandroid.drv/unixlib.h            | 1 -
 dlls/wineandroid.drv/window.c             | 4 ++--
 dlls/wineandroid.drv/wineandroid.drv.spec | 2 --
 6 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h
index 0d073a63bcc..d12cfa28f04 100644
--- a/dlls/wineandroid.drv/android.h
+++ b/dlls/wineandroid.drv/android.h
@@ -87,6 +87,7 @@ extern INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) DECLSP
 extern UINT ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) DECLSPEC_HIDDEN;
 extern SHORT ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) DECLSPEC_HIDDEN;
 extern void ANDROID_SetCursor( HCURSOR handle ) DECLSPEC_HIDDEN;
+extern BOOL ANDROID_CreateDesktop( const WCHAR *name, UINT width, UINT height ) DECLSPEC_HIDDEN;
 extern BOOL ANDROID_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN;
 extern void ANDROID_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN;
 extern BOOL ANDROID_ProcessEvents( DWORD mask ) DECLSPEC_HIDDEN;
@@ -112,7 +113,6 @@ extern void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_fla
 
 /* unixlib interface */
 
-extern NTSTATUS android_create_desktop( void *arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS android_dispatch_ioctl( void *arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS android_java_init( void *arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS android_java_uninit( void *arg ) DECLSPEC_HIDDEN;
diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c
index 3f6dbd388eb..320e47e88d2 100644
--- a/dlls/wineandroid.drv/dllmain.c
+++ b/dlls/wineandroid.drv/dllmain.c
@@ -132,12 +132,3 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
 
     return TRUE;
 }
-
-
-/***********************************************************************
- *           wine_create_desktop (wineandroid.@)
- */
-BOOL CDECL wine_create_desktop( UINT width, UINT height )
-{
-    return ANDROID_CALL( create_desktop, NULL );
-}
diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index f2423d96407..d4308df5eba 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -350,6 +350,7 @@ static const struct user_driver_funcs android_drv_funcs =
     .pChangeDisplaySettings = ANDROID_ChangeDisplaySettings,
     .pGetCurrentDisplaySettings = ANDROID_GetCurrentDisplaySettings,
     .pUpdateDisplayDevices = ANDROID_UpdateDisplayDevices,
+    .pCreateDesktop = ANDROID_CreateDesktop,
     .pCreateWindow = ANDROID_CreateWindow,
     .pDesktopWindowProc = ANDROID_DesktopWindowProc,
     .pDestroyWindow = ANDROID_DestroyWindow,
@@ -610,7 +611,6 @@ static HRESULT android_init( void *arg )
 
 const unixlib_entry_t __wine_unix_call_funcs[] =
 {
-    android_create_desktop,
     android_dispatch_ioctl,
     android_init,
     android_java_init,
diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h
index a180e6660c8..f1ba25720fd 100644
--- a/dlls/wineandroid.drv/unixlib.h
+++ b/dlls/wineandroid.drv/unixlib.h
@@ -21,7 +21,6 @@
 
 enum android_funcs
 {
-    unix_create_desktop,
     unix_dispatch_ioctl,
     unix_init,
     unix_java_init,
diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c
index 533983ecf1e..2b65f804938 100644
--- a/dlls/wineandroid.drv/window.c
+++ b/dlls/wineandroid.drv/window.c
@@ -1670,9 +1670,9 @@ LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
 
 
 /***********************************************************************
- *           android_create_desktop
+ *           ANDROID_CreateDesktop
  */
-NTSTATUS android_create_desktop( void *arg )
+BOOL ANDROID_CreateDesktop( const WCHAR *name, UINT width, UINT height )
 {
     /* wait until we receive the surface changed event */
     while (!screen_width)
diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec
index 22b97356521..e69de29bb2d 100644
--- a/dlls/wineandroid.drv/wineandroid.drv.spec
+++ b/dlls/wineandroid.drv/wineandroid.drv.spec
@@ -1,2 +0,0 @@
-# Desktop
-@ cdecl wine_create_desktop(long long)
-- 
2.11.4.GIT