wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Martin Storsjö : ntdll: Take ControlPcIsUnwound into account on arm64 too.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 94f7f52dac5fbc3b1abe7f38cabf38853b7af0f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f7f52dac5fbc3b1abe7f38… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Jun 7 14:12:46 2022 +0300 ntdll: Take ControlPcIsUnwound into account on arm64 too. This is the same modification as the previous patch, applied on arm64. It doesn't change the outcome for any of my tests though. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 034c78f6b4d..fba0da48a16 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -165,6 +165,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { LDR_DATA_TABLE_ENTRY *module; NTSTATUS status; + DWORD64 pc; dispatch->ImageBase = 0; dispatch->ScopeIndex = 0; @@ -175,14 +176,14 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX * signal frame. */ dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; + pc = context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0); /* first look for PE exception information */ - if ((dispatch->FunctionEntry = lookup_function_info( - context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0), + if ((dispatch->FunctionEntry = lookup_function_info(pc, &dispatch->ImageBase, &module ))) { - dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Pc, + dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, pc, dispatch->FunctionEntry, context, &dispatch->HandlerData, &dispatch->EstablisherFrame, NULL );

1 0

Martin Storsjö : ntdll: Use ControlPcIsUnwound for the RtlVirtualUnwind pc parameter in virtual_unwind.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: d007c91d46bb9868ccde0c32865c616b1f255827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d007c91d46bb9868ccde0c32… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Jun 7 14:10:07 2022 +0300 ntdll: Use ControlPcIsUnwound for the RtlVirtualUnwind pc parameter in virtual_unwind. Don't just use ControlPcIsUnwound for picking which RUNTIME_FUNCTION to use, but also use it for adjusting the pc value that is passed to RtlVirtualUnwind. This fixes one testcase (that I had missed to build and run before), where the pc points at the start of an epilogue (which would mean that no handler is returned from RtlVirtualUnwind). By taking ControlPcIsUnwound and adjusting the pc pointer, the unwind handler is returned and executed. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 01c911660de..c4cf557edaf 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -133,6 +133,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { LDR_DATA_TABLE_ENTRY *module; NTSTATUS status; + DWORD pc; dispatch->ImageBase = 0; dispatch->ScopeIndex = 0; @@ -143,14 +144,14 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX * signal frame. */ dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; + pc = context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0); /* first look for PE exception information */ - if ((dispatch->FunctionEntry = lookup_function_info( - context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0), + if ((dispatch->FunctionEntry = lookup_function_info(pc, (ULONG_PTR*)&dispatch->ImageBase, &module ))) { - dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Pc, + dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, pc, dispatch->FunctionEntry, context, &dispatch->HandlerData, (ULONG_PTR *)&dispatch->EstablisherFrame, NULL );

1 0

Martin Storsjö : ntdll: Add SEH unwind info in ARM assembly functions/trampolines.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 2d43653a2e789ed67a3c66db92276783b849051c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d43653a2e789ed67a3c66db… Author: Martin Storsjö <martin(a)martin.st> Date: Wed May 11 00:52:10 2022 +0300 ntdll: Add SEH unwind info in ARM assembly functions/trampolines. Clang generates SEH unwind info on ARM in both MSVC and mingw mode since Clang 15. The unwind info gets which gets enabled automatically by building with a new enough compiler. For functions/trampolines that are implemented in assembly, the unwind information needs to be provided by hand - in particular for cases where unwinding should be diverted. Contrary to AArch64, Clang got SEH assembler directives directly from the start when SEH was implemented (when the __SEH__ compiler define gets set), so there's no need for compiler version checks (like for AArch64 in include/wine/asm.h), but the default check for __SEH__ works fine for enabling the __ARM_SEH() macro. Use a custom unwind opcode in the private opcode space for unwinding to a specific CONTEXT instead of up to the caller. (Contrary to AArch64, there's no specific unwind opcode for restoring a full CONTEXT, but the unwind opcode space does have a couple unallocated values marked as "available", which can be used for vendor specific needs here.) This fixes unwinding in ARM PE builds. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7872962bbbe..01c911660de 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -731,6 +731,8 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, WARN( "unsupported code %02x\n", *ptr ); else if (*ptr <= 0xef && ((val & 0xff) <= 0x0f)) /* ldr lr, [sp], #x */ pop_lr( 4 * (val & 0x0f), context, ptrs ); + else if (*ptr == 0xf4) /* Custom private (unallocated) opcode, saved a full CONTEXT on the stack */ + memcpy( context, (DWORD *)context->Sp, sizeof(CONTEXT) ); else if (*ptr <= 0xf4) /* Available */ WARN( "unsupported code %02x\n", *ptr ); else if (*ptr <= 0xf5) /* vpop {dS-dE} */ @@ -1075,11 +1077,18 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec ); __ASM_GLOBAL_FUNC( call_consolidate_callback, "push {r0-r2,lr}\n\t" + __ASM_SEH(".seh_nop\n\t") "sub sp, sp, #0x1a0\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r1, r0\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r0, sp\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r2, #0x1a0\n\t" + __ASM_SEH(".seh_nop_w\n\t") "bl " __ASM_NAME("memcpy") "\n\t" + __ASM_SEH(".seh_custom 0xf4\n\t") /* A custom (unallocated) SEH opcode for CONTEXT on stack */ + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa 13, 0\n\t") __ASM_CFI(".cfi_escape 0x0f,0x04,0x7d,0xb8,0x00,0x06\n\t") /* DW_CFA_def_cfa_expression: DW_OP_breg13 + 56, DW_OP_deref */ __ASM_CFI(".cfi_escape 0x10,0x04,0x02,0x7d,0x14\n\t") /* DW_CFA_expression: R4 DW_OP_breg13 + 20 */ @@ -1300,6 +1309,8 @@ extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PUCHAR nonvolatile); __ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, "push {r4-r11,lr}\n\t" + __ASM_SEH(".seh_save_regs_w {r4-r11,lr}\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa 13, 36\n\t") __ASM_CFI(".cfi_offset r4, -36\n\t") @@ -1410,7 +1421,10 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, */ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "push {r0, lr}\n\t" + __ASM_SEH(".seh_save_regs {r0, lr}\n\t") "sub sp, sp, #0x1a0\n\t" /* sizeof(CONTEXT) */ + __ASM_SEH(".seh_stackalloc 0x1a0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 424\n\t") __ASM_CFI(".cfi_offset lr, -4\n\t") "mov r0, sp\n\t" /* context */

1 0

Jacek Caban : mmdevapi: Remove android from default driver list.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 9a8fdc724beb6b70b7ea503807a75b6dc5ab3752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a8fdc724beb6b70b7ea5038… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 02:38:36 2022 +0200 mmdevapi: Remove android from default driver list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mmdevapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index a814433810a..5e0e6728763 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -102,7 +102,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) { - static WCHAR default_list[] = L"pulse,alsa,oss,coreaudio,android"; + static WCHAR default_list[] = L"pulse,alsa,oss,coreaudio"; DriverFuncs driver; HKEY key; WCHAR reg_list[256], *p, *next, *driver_list = default_list;

1 0

Jacek Caban : wineandroid: Build with msvcrt.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 5e737175573a900fb895491cd64ecbfd93bd988e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e737175573a900fb895491c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 6 22:32:48 2022 +0200 wineandroid: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 7 +++---- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/device.c | 11 +++++++---- dlls/wineandroid.drv/dllmain.c | 10 +++++++++- dlls/wineandroid.drv/init.c | 12 +++++++++++- dlls/wineandroid.drv/keyboard.c | 4 ++++ dlls/wineandroid.drv/opengl.c | 4 ++++ dlls/wineandroid.drv/unixlib.h | 3 ++- dlls/wineandroid.drv/window.c | 15 ++++++++++----- 9 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 4c4b63d2e78..a56ef3dc290 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,9 +1,8 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineandroid.drv -IMPORTS = user32 ntoskrnl win32u -EXTRALIBS = $(PTHREAD_LIBS) - -EXTRADLLFLAGS = -mcygwin +UNIXLIB = wineandroid.so +IMPORTS = ntoskrnl +EXTRALIBS = -lwin32u $(PTHREAD_LIBS) C_SRCS = \ device.c \ diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 22652f11d27..57f566b3cfd 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -120,6 +120,8 @@ 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 NTSTATUS (WINAPI *pNtWaitForMultipleObjects)( ULONG,const HANDLE*,BOOLEAN, + BOOLEAN,const LARGE_INTEGER* ) DECLSPEC_HIDDEN; 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 fa11e0d071e..62bcbae72f3 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <assert.h> @@ -1174,10 +1178,9 @@ NTSTATUS android_java_uninit( void *arg ) void start_android_device(void) { - /* FIXME: use KeUserModeCallback instead */ - NTSTATUS (WINAPI *func)(void *, ULONG) = - ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[client_start_device]; - func( NULL, 0 ); + void *ret_ptr; + ULONG ret_len; + thread = ULongToHandle( KeUserModeCallback( client_start_device, NULL, 0, &ret_ptr, &ret_len )); } diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 79b3c2c62a4..81581591770 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -32,6 +32,9 @@ 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; static HANDLE thread; @@ -122,13 +125,18 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) if (reason == DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); + if (NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, + &unix_handle, sizeof(unix_handle), NULL )) + return FALSE; params.register_window_callback = register_window_callback; - if (ANDROID_CALL( init, &params )) return FALSE; + params.pNtWaitForMultipleObjects = NtWaitForMultipleObjects; + if (__wine_unix_call( unix_handle, unix_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 527eda7a241..170ccb064a7 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #define NONAMELESSSTRUCT #define NONAMELESSUNION #include "config.h" @@ -558,6 +562,10 @@ 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 ); +NTSTATUS (WINAPI *pNtWaitForMultipleObjects)( ULONG,const HANDLE*,BOOLEAN, + BOOLEAN,const LARGE_INTEGER* ); + static HRESULT android_init( void *arg ) { struct init_params *params = arg; @@ -603,6 +611,8 @@ static HRESULT android_init( void *arg ) #endif } __wine_set_user_driver( &android_drv_funcs, WINE_GDI_DRIVER_VERSION ); + pNtWaitForMultipleObjects = params->pNtWaitForMultipleObjects; + params->unix_call = unix_call; return STATUS_SUCCESS; } @@ -621,7 +631,7 @@ C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); /* FIXME: Use __wine_unix_call instead */ -NTSTATUS unix_call( enum android_funcs code, void *params ) +static NTSTATUS CDECL unix_call( enum android_funcs code, void *params ) { return __wine_unix_call_funcs[code]( params ); } diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index e92079c0f59..82035cc14dd 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -26,6 +26,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index d7026be6599..911f6e3f3d1 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -24,6 +24,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <assert.h> diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h index 8a94bb1253a..92d28176ee7 100644 --- a/dlls/wineandroid.drv/unixlib.h +++ b/dlls/wineandroid.drv/unixlib.h @@ -31,13 +31,14 @@ enum android_funcs }; /* FIXME: Use __wine_unix_call when the rest of the stack is ready */ -extern NTSTATUS unix_call( enum android_funcs func, void *arg ) DECLSPEC_HIDDEN; #define ANDROID_CALL(func, params) unix_call( unix_ ## func, params ) /* android_init params */ struct init_params { PNTAPCFUNC register_window_callback; + NTSTATUS (WINAPI *pNtWaitForMultipleObjects)( ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER* ); + NTSTATUS (CDECL *unix_call)( enum android_funcs code, void *params ); }; diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 3860e0a2772..c580a36c828 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -20,6 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -1164,14 +1168,15 @@ static const struct static int get_cursor_system_id( const ICONINFOEXW *info ) { const struct system_cursors *cursors; + const WCHAR *module; unsigned int i; - HMODULE module; if (info->szResName[0]) return 0; /* only integer resources are supported here */ - if (!(module = GetModuleHandleW( info->szModName ))) return 0; + if ((module = wcsrchr( info->szModName, '\\' ))) module++; + else module = info->szModName; for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) - if (GetModuleHandleW( module_cursors[i].name ) == module) break; + if (!wcsicmp( module, module_cursors[i].name )) break; if (i == ARRAY_SIZE( module_cursors )) return 0; cursors = module_cursors[i].cursors; @@ -1207,8 +1212,8 @@ NTSTATUS ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles if (current_event) mask = 0; if (process_events( mask )) return count - 1; } - return NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), - !!(flags & MWMO_ALERTABLE), timeout ); + return pNtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), + !!(flags & MWMO_ALERTABLE), timeout ); } /**********************************************************************

1 0

Jacek Caban : win32u: Use public name for SetThreadDpiAwarenessContext.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 84bed157e82a8c49d200645bcc780f0f83c93016 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84bed157e82a8c49d200645b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 6 22:52:39 2022 +0200 win32u: Use public name for SetThreadDpiAwarenessContext. To allow using it in drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/dce.c | 16 ++++++++-------- dlls/win32u/message.c | 6 +++--- dlls/win32u/sysparams.c | 6 ++++-- dlls/win32u/win32u_private.h | 1 - dlls/win32u/window.c | 28 ++++++++++++++-------------- 5 files changed, 29 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84bed157e82a8c49d200…

1 0

Jacek Caban : wineandroid: Use unixlib interface for register_window_callback.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: ca4c6716771b7c083892f3dfed95272bfe388223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca4c6716771b7c083892f3df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 01:50:48 2022 +0200 wineandroid: Use unixlib interface for register_window_callback. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/device.c | 16 +++++++++------- dlls/wineandroid.drv/dllmain.c | 12 +++++++++++- dlls/wineandroid.drv/init.c | 6 ++++++ dlls/wineandroid.drv/unixlib.h | 17 +++++++++++++++++ 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index c73ab6bc765..22652f11d27 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -118,6 +118,8 @@ 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; +extern NTSTATUS android_register_window( void *arg ) DECLSPEC_HIDDEN; +extern PNTAPCFUNC register_window_callback; 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 b49b691b27a..fa11e0d071e 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -516,21 +516,22 @@ static struct native_win_data *create_native_win_data( HWND hwnd, BOOL opengl ) return data; } -static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) +NTSTATUS android_register_window( void *arg ) { - HWND hwnd = (HWND)arg1; - struct ANativeWindow *win = (struct ANativeWindow *)arg2; - BOOL opengl = arg3; + struct register_window_params *params = arg; + HWND hwnd = (HWND)params->arg1; + struct ANativeWindow *win = (struct ANativeWindow *)params->arg2; + BOOL opengl = params->arg3; struct native_win_data *data = get_native_win_data( hwnd, opengl ); - if (!win) return; /* do nothing and hold on to the window until we get a new surface */ + if (!win) return 0; /* do nothing and hold on to the window until we get a new surface */ if (!data || data->parent == win) { pANativeWindow_release( win ); if (data) NtUserPostMessage( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p (unchanged)\n", hwnd, data, win ); - return; + return 0; } release_native_window( data ); @@ -543,12 +544,13 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR unwrap_java_call(); NtUserPostMessage( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p\n", hwnd, data, win ); + return 0; } /* register a native window received from the Java side for use in ioctls */ void register_native_window( HWND hwnd, struct ANativeWindow *win, BOOL opengl ) { - NtQueueApcThread( thread, register_native_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, opengl ); + NtQueueApcThread( thread, register_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, opengl ); } void init_gralloc( const struct hw_module_t *module ) diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 37539fa5756..79b3c2c62a4 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -104,17 +104,27 @@ static NTSTATUS WINAPI android_start_device(void *param, ULONG size) } +static void CALLBACK register_window_callback( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) +{ + struct register_window_params params = { .arg1 = arg1, .arg2 = arg2, .arg3 = arg3 }; + ANDROID_CALL( register_window, &params ); +} + + /*********************************************************************** * dll initialisation routine */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { + struct init_params params; void **callback_table; if (reason == DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); - if (ANDROID_CALL( init, NULL )) 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; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index b5f0b69fcec..527eda7a241 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -48,6 +48,8 @@ static RECT monitor_rc_work; static int device_init_done; static BOOL force_display_devices_refresh; +PNTAPCFUNC register_window_callback; + typedef struct { struct gdi_physdev dev; @@ -558,6 +560,7 @@ unsigned short *p_java_gdt_sel = NULL; static HRESULT android_init( void *arg ) { + struct init_params *params = arg; pthread_mutexattr_t attr; jclass class; jobject object; @@ -581,6 +584,8 @@ static HRESULT android_init( void *arg ) pthread_mutex_init( &win_data_mutex, &attr ); pthread_mutexattr_destroy( &attr ); + register_window_callback = params->register_window_callback; + if ((java_vm = *p_java_vm)) /* running under Java */ { #ifdef __i386__ @@ -608,6 +613,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = android_init, android_java_init, android_java_uninit, + android_register_window, }; diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h index 2838047f4fe..8a94bb1253a 100644 --- a/dlls/wineandroid.drv/unixlib.h +++ b/dlls/wineandroid.drv/unixlib.h @@ -26,6 +26,7 @@ enum android_funcs unix_init, unix_java_init, unix_java_uninit, + unix_register_window, unix_funcs_count }; @@ -33,6 +34,13 @@ enum android_funcs extern NTSTATUS unix_call( enum android_funcs func, void *arg ) DECLSPEC_HIDDEN; #define ANDROID_CALL(func, params) unix_call( unix_ ## func, params ) +/* android_init params */ +struct init_params +{ + PNTAPCFUNC register_window_callback; +}; + + /* android_ioctl params */ struct ioctl_params { @@ -41,6 +49,15 @@ struct ioctl_params }; +/* android_register_window params */ +struct register_window_params +{ + UINT_PTR arg1; + UINT_PTR arg2; + UINT_PTR arg3; +}; + + enum { client_start_device = NtUserDriverCallbackFirst,

1 0

Jacek Caban : wineandroid: Move device thread to dllmain.c.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: f07ebeca072780475b5ee5bc2af4ad27d2de723c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f07ebeca072780475b5ee5bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 15:48:13 2022 +0200 wineandroid: Move device thread to dllmain.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/android.h | 3 ++ dlls/wineandroid.drv/device.c | 71 ++++++++++----------------------- dlls/wineandroid.drv/dllmain.c | 89 +++++++++++++++++++++++++++++++++++++++++- dlls/wineandroid.drv/init.c | 3 ++ dlls/wineandroid.drv/unixlib.h | 16 ++++++++ 5 files changed, 130 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f07ebeca072780475b5e…

1 0

Jacek Caban : wineandroid: Directly use ntdll instead of kernel32.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 196b4e5916dfeb44e289114580543baf64a6a5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=196b4e5916dfeb44e2891145… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 16:07:18 2022 +0200 wineandroid: Directly use ntdll instead of kernel32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/device.c | 60 +++++++++++++++++++++++++++++-------------- dlls/wineandroid.drv/window.c | 12 ++++----- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index b54eabbcc75..b4f332d2cef 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -331,8 +331,8 @@ static int duplicate_fd( HANDLE client, int fd ) HANDLE handle, ret = 0; if (!wine_server_fd_to_handle( dup(fd), GENERIC_READ | SYNCHRONIZE, 0, &handle )) - DuplicateHandle( GetCurrentProcess(), handle, client, &ret, - 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); + NtDuplicateObject( GetCurrentProcess(), handle, client, &ret, + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); if (!ret) return -1; return HandleToLong( ret ); @@ -347,8 +347,8 @@ static int map_native_handle( union native_handle_buffer *dest, const native_han if (mapping) /* only duplicate the mapping handle */ { HANDLE ret = 0; - if (!DuplicateHandle( GetCurrentProcess(), mapping, client, &ret, - 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE )) + if (!NtDuplicateObject( GetCurrentProcess(), mapping, client, &ret, + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE )) return -ENOSPC; dest->handle.numFds = 0; dest->handle.numInts = 1; @@ -434,7 +434,7 @@ static int register_buffer( struct native_win_data *win, struct ANativeWindowBuf TRACE( "%p %p evicting buffer %p id %d from cache\n", win->hwnd, win->parent, win->buffers[i], i ); win->buffers[i]->common.decRef( &win->buffers[i]->common ); - if (win->mappings[i]) UnmapViewOfFile( win->mappings[i] ); + if (win->mappings[i]) NtUnmapViewOfSection( GetCurrentProcess(), win->mappings[i] ); } win->buffers[i] = buffer; @@ -442,9 +442,16 @@ static int register_buffer( struct native_win_data *win, struct ANativeWindowBuf if (mapping) { - *mapping = CreateFileMappingW( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, - buffer->stride * buffer->height * 4, NULL ); - win->mappings[i] = MapViewOfFile( *mapping, FILE_MAP_READ, 0, 0, 0 ); + OBJECT_ATTRIBUTES attr; + LARGE_INTEGER size; + SIZE_T count = 0; + size.QuadPart = buffer->stride * buffer->height * 4; + InitializeObjectAttributes( &attr, NULL, OBJ_OPENIF, NULL, NULL ); + NtCreateSection( mapping, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, + &attr, &size, PAGE_READWRITE, 0, INVALID_HANDLE_VALUE ); + NtMapViewOfSection( *mapping, GetCurrentProcess(), &win->mappings[i], 0, 0, + NULL, &count, ViewShare, 0, PAGE_READONLY ); } buffer->common.incRef( &buffer->common ); *is_new = 1; @@ -473,7 +480,7 @@ static void release_native_window( struct native_win_data *data ) for (i = 0; i < NB_CACHED_BUFFERS; i++) { if (data->buffers[i]) data->buffers[i]->common.decRef( &data->buffers[i]->common ); - if (data->mappings[i]) UnmapViewOfFile( data->mappings[i] ); + if (data->mappings[i]) NtUnmapViewOfSection( GetCurrentProcess(), data->mappings[i] ); data->buffer_lru[i] = -1; } memset( data->buffers, 0, sizeof(data->buffers) ); @@ -823,9 +830,12 @@ static NTSTATUS dequeueBuffer_ioctl( void *data, DWORD in_size, DWORD out_size, res->generation = win_data->generation; if (is_new) { - HANDLE process = OpenProcess( PROCESS_DUP_HANDLE, FALSE, current_client_id() ); + OBJECT_ATTRIBUTES attr = { .Length = sizeof(attr) }; + CLIENT_ID cid = { .UniqueProcess = UlongToHandle( current_client_id() ) }; + HANDLE process; + NtOpenProcess( &process, PROCESS_DUP_HANDLE, &attr, &cid ); map_native_handle( &res->native_handle, buffer->handle, mapping, process ); - CloseHandle( process ); + NtClose( process ); *ret_size = sizeof( *res ); } wait_fence_and_close( fence ); @@ -1212,10 +1222,19 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void if (!device) { - HANDLE file = CreateFileW( deviceW, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - if (file == INVALID_HANDLE_VALUE) return -ENOENT; - if (InterlockedCompareExchangePointer( &device, file, NULL )) CloseHandle( file ); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + + RtlInitUnicodeString( &name, deviceW ); + InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, NULL, NULL ); + status = NtCreateFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, + FILE_NON_DIRECTORY_FILE, NULL, 0 ); + if (status) return -ENOENT; + if (InterlockedCompareExchangePointer( &device, file, NULL )) NtClose( file ); } status = NtDeviceIoControlFile( device, NULL, NULL, NULL, &iosb, ANDROID_IOCTL(code), @@ -1223,7 +1242,7 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void if (status == STATUS_FILE_DELETED) { WARN( "parent process is gone\n" ); - ExitProcess( 1 ); + NtTerminateProcess( 0, 1 ); } if (out_size) *out_size = iosb.Information; return status_to_android_error( status ); @@ -1254,7 +1273,7 @@ static void buffer_decRef( struct android_native_base_t *base ) if (!InterlockedDecrement( &buffer->ref )) { if (!is_in_desktop_process()) gralloc_release_buffer( &buffer->buffer ); - if (buffer->bits) UnmapViewOfFile( buffer->bits ); + if (buffer->bits) NtUnmapViewOfSection( GetCurrentProcess(), buffer->bits ); free( buffer ); } } @@ -1299,9 +1318,12 @@ static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuff if (use_win32) { + LARGE_INTEGER zero = { .QuadPart = 0 }; + SIZE_T count = 0; HANDLE mapping = LongToHandle( res.native_handle.handle.data[0] ); - buf->bits = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); - CloseHandle( mapping ); + NtMapViewOfSection( mapping, GetCurrentProcess(), &buf->bits, 0, 0, &zero, &count, + ViewShare, 0, PAGE_READWRITE ); + NtClose( mapping ); } else if (!is_in_desktop_process()) { diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index a5d6a98cd3f..3860e0a2772 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -367,12 +367,12 @@ static void init_event_queue(void) if (pipe2( event_pipe, O_CLOEXEC | O_NONBLOCK ) == -1) { ERR( "could not create data\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } if (wine_server_fd_to_handle( event_pipe[0], GENERIC_READ | SYNCHRONIZE, 0, &handle )) { ERR( "Can't allocate handle for event fd\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } SERVER_START_REQ( set_queue_fd ) { @@ -383,9 +383,9 @@ static void init_event_queue(void) if (ret) { ERR( "Can't store handle for event fd %x\n", ret ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } - CloseHandle( handle ); + NtClose( handle ); desktop_tid = GetCurrentThreadId(); } @@ -1450,9 +1450,9 @@ void ANDROID_SetCursor( HCURSOR handle ) static DWORD last_cursor_change; if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || - GetTickCount() - last_cursor_change > 100) + NtGetTickCount() - last_cursor_change > 100) { - last_cursor_change = GetTickCount(); + last_cursor_change = NtGetTickCount(); if (handle) {

1 0

Jacek Caban : wineandroid: Use libc for memory allocation.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: wine Branch: master Commit: 08fff518c687b46e0bff926e055925dcd70b4094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08fff518c687b46e0bff926e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 15:32:21 2022 +0200 wineandroid: Use libc for memory allocation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/device.c | 16 +++++++-------- dlls/wineandroid.drv/init.c | 4 ++-- dlls/wineandroid.drv/opengl.c | 17 ++++++++-------- dlls/wineandroid.drv/window.c | 45 +++++++++++++++++++++---------------------- 4 files changed, 41 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08fff518c687b46e0bff…

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022