system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 08:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

wineandroid: Use the user driver interface to create host desktops.

Browse source
This commit is contained in:
Rémi Bernon 2023-05-29 14:12:25 +02:00 committed by Alexandre Julliard
parent f7d45533d1
commit e0d3683d89
6 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/wineandroid.drv/android.h
View file

@ -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;

9
dlls/wineandroid.drv/dllmain.c
View file

@ -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 );
}

2
dlls/wineandroid.drv/init.c
View file

@ -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,

1
dlls/wineandroid.drv/unixlib.h
View file

@ -21,7 +21,6 @@
enum android_funcs
{
unix_create_desktop,
unix_dispatch_ioctl,
unix_init,
unix_java_init,

4
dlls/wineandroid.drv/window.c
View file

@ -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)

2
dlls/wineandroid.drv/wineandroid.drv.spec
View file

@ -1,2 +0,0 @@
# Desktop
@ cdecl wine_create_desktop(long long)