wineandroid: Move wine_create_desktop_to dllmain.c.

dlls/wineandroid.drv/android.h

@@ -112,6 +112,10 @@ extern void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_fla
                                       const RECT *visible_rect, const RECT *valid_rects,
                                       struct window_surface *surface ) DECLSPEC_HIDDEN;
 
+/* unixlib interface */
+
+extern NTSTATUS android_create_desktop( void *arg ) DECLSPEC_HIDDEN;
+
 extern unsigned int screen_width DECLSPEC_HIDDEN;
 extern unsigned int screen_height DECLSPEC_HIDDEN;
 extern RECT virtual_screen_rect DECLSPEC_HIDDEN;

dlls/wineandroid.drv/dllmain.c

@@ -34,3 +34,12 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
     DisableThreadLibraryCalls( inst );
     return !ANDROID_CALL(init, NULL);
 }
+
+
+/***********************************************************************
+ *           wine_create_desktop (wineandroid.@)
+ */
+BOOL CDECL wine_create_desktop( UINT width, UINT height )
+{
+    return ANDROID_CALL( create_desktop, NULL );
+}

dlls/wineandroid.drv/init.c

@@ -603,6 +603,7 @@ static HRESULT android_init( void *arg )
 
 const unixlib_entry_t __wine_unix_call_funcs[] =
 {
+    android_create_desktop,
     android_init,
 };
 

dlls/wineandroid.drv/unixlib.h

@@ -21,6 +21,7 @@
 
 enum android_funcs
 {
+    unix_create_desktop,
     unix_init,
     unix_funcs_count
 };

dlls/wineandroid.drv/window.c

@@ -1668,9 +1668,9 @@ LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
 
 
 /***********************************************************************
- *           ANDROID_create_desktop
+ *           android_create_desktop
  */
-BOOL CDECL ANDROID_create_desktop( UINT width, UINT height )
+NTSTATUS android_create_desktop( void *arg )
 {
     /* wait until we receive the surface changed event */
     while (!screen_width)
@@ -1682,5 +1682,5 @@ BOOL CDECL ANDROID_create_desktop( UINT width, UINT height )
         }
         process_events( QS_ALLINPUT );
     }
-    return TRUE;
+    return 0;
 }

dlls/wineandroid.drv/wineandroid.drv.spec

 # Desktop
-@ cdecl wine_create_desktop(long long) ANDROID_create_desktop
+@ cdecl wine_create_desktop(long long)