November 2023 - Wine-commits

Alexandre Julliard : makefiles: Remove support for obsolete source variables.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 440771ed41ab8fc8c7f73f59dec2a8bceda7bb50 URL: https://gitlab.winehq.org/wine/wine/-/commit/440771ed41ab8fc8c7f73f59dec2a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 13:06:38 2023 +0100 makefiles: Remove support for obsolete source variables. --- dlls/apisetschema/Makefile.in | 3 +- dlls/icmp/Makefile.in | 3 +- dlls/mferror/Makefile.in | 3 +- dlls/normaliz/Makefile.in | 3 +- dlls/ole32/Makefile.in | 1 + dlls/security/Makefile.in | 3 +- dlls/sfc/Makefile.in | 3 +- dlls/usp10/Makefile.in | 3 +- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wmi/Makefile.in | 3 +- libs/faudio/Makefile.in | 3 +- tools/make_makefiles | 116 ++++++++------------------------------- tools/makedep.c | 27 +-------- 13 files changed, 45 insertions(+), 127 deletions(-)

1 0

Jacek Caban : winecrt0: Initial ARM64EC support.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 7c8794312a4c6715a098c6d0ff7ff514bd78a60a URL: https://gitlab.winehq.org/wine/wine/-/commit/7c8794312a4c6715a098c6d0ff7ff5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 29 10:41:36 2023 +0200 winecrt0: Initial ARM64EC support. --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/arm64ec.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index f78f1b8e98c..863e5ed4190 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,6 +1,7 @@ STATICLIB = libwinecrt0.a SOURCES = \ + arm64ec.c \ crt_dllmain.c \ crt_fltused.c \ debug.c \ diff --git a/dlls/winecrt0/arm64ec.c b/dlls/winecrt0/arm64ec.c new file mode 100644 index 00000000000..949de0a4e0c --- /dev/null +++ b/dlls/winecrt0/arm64ec.c @@ -0,0 +1,127 @@ +/* + * Arm64EC support + * + * Copyright 2023 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __arm64ec__ + +#include "windef.h" +#include "winnt.h" +#include "wine/asm.h" + +void *__os_arm64x_check_call = 0; +void *__os_arm64x_check_icall_cfg = 0; +void *__os_arm64x_dispatch_call_no_redirect = 0; +void *__os_arm64x_dispatch_fptr = 0; +void *__os_arm64x_dispatch_ret = 0; +void *__os_arm64x_get_x64_information = 0; +void *__os_arm64x_set_x64_information = 0; + +void *__os_arm64x_helper0 = 0; +void *__os_arm64x_helper1 = 0; +void *__os_arm64x_helper2 = 0; +void *__os_arm64x_helper3 = 0; +void *__os_arm64x_helper4 = 0; +void *__os_arm64x_helper5 = 0; +void *__os_arm64x_helper6 = 0; +void *__os_arm64x_helper7 = 0; +void *__os_arm64x_helper8 = 0; + +void *__guard_check_icall_fptr = 0; +void *__guard_dispatch_icall_fptr = 0; + +asm( ".section .data,\"drw\"\n" + ".balign 8\n" + ".globl __os_arm64x_dispatch_icall\n" + "__os_arm64x_dispatch_icall:\n" + ".globl __os_arm64x_check_icall\n" + "__os_arm64x_check_icall:\n" + ".xword 0\n" ); + +__ASM_GLOBAL_FUNC( __icall_helper_arm64ec, + "stp fp, lr, [sp, #-0x10]!\n\t" + __ASM_SEH( ".seh_save_fplr_x 16\n\t" ) + "mov fp, sp\n\t" + __ASM_SEH( ".seh_set_fp\n\t" ) + __ASM_SEH( ".seh_endprologue\n\t" ) + "adrp x16, __os_arm64x_dispatch_icall\n\t" + "ldr x16, [x16, #:lo12:__os_arm64x_dispatch_icall]\n\t" + "blr x16\n\t" + __ASM_SEH( ".seh_startepilogue\n\t" ) + "ldp fp, lr, [sp], #0x10\n\t" + __ASM_SEH( ".seh_save_fplr_x 0x10\n\t" ) + __ASM_SEH( ".seh_endepilogue\n\t" ) + "br x11" ) + +asm( "\t.section .rdata,\"dr\"\n" + "\t.globl __chpe_metadata\n" + "\t.balign 4\n" + "__chpe_metadata:\n" + "\t.word 1\n" + "\t.rva __hybrid_code_map\n" + "\t.word __hybrid_code_map_count\n" + "\t.rva __x64_code_ranges_to_entry_points\n" + "\t.rva __arm64x_redirection_metadata\n" + "\t.rva __os_arm64x_dispatch_call_no_redirect\n" + "\t.rva __os_arm64x_dispatch_ret\n" + "\t.rva __os_arm64x_check_call\n" + "\t.rva __os_arm64x_check_icall\n" + "\t.rva __os_arm64x_check_icall_cfg\n" + "\t.rva __arm64x_native_entrypoint\n" + "\t.rva __hybrid_auxiliary_iat\n" + "\t.word __x64_code_ranges_to_entry_points_count\n" + "\t.word __arm64x_redirection_metadata_count\n" + "\t.rva __os_arm64x_get_x64_information\n" + "\t.rva __os_arm64x_set_x64_information\n" + "\t.rva __arm64x_extra_rfe_table\n" + "\t.word __arm64x_extra_rfe_table_size\n" + "\t.rva __os_arm64x_dispatch_fptr\n" + "\t.rva __hybrid_auxiliary_iat_copy\n" + "\t.rva __os_arm64x_helper0\n" + "\t.rva __os_arm64x_helper1\n" + "\t.rva __os_arm64x_helper2\n" + "\t.rva __os_arm64x_helper3\n" + "\t.rva __os_arm64x_helper4\n" + "\t.rva __os_arm64x_helper5\n" + "\t.rva __os_arm64x_helper6\n" + "\t.rva __os_arm64x_helper7\n" + "\t.rva __os_arm64x_helper8\n" ); + +asm( "\t.section .rdata,\"dr\"\n" + "\t.globl _load_config_used\n" + "\t.balign 8\n" + "_load_config_used:\n" + "\t.word 0x140\n" + "\t.fill 0x54, 1, 0\n" + "\t.xword 0\n" /* FIXME: __security_cookie */ + "\t.fill 0x10, 1, 0\n" + "\t.xword __guard_check_icall_fptr\n" + "\t.xword __guard_dispatch_icall_fptr\n" + "\t.xword __guard_fids_table\n" + "\t.xword __guard_fids_count\n" + "\t.xword __guard_flags\n" + "\t.xword 0\n" + "\t.xword __guard_iat_table\n" + "\t.xword __guard_iat_count\n" + "\t.xword __guard_longjmp_table\n" + "\t.xword __guard_longjmp_count\n" + "\t.xword 0\n" + "\t.xword __chpe_metadata\n" + "\t.fill 0x78, 1, 0\n" ); + +#endif /* __arm64ec__ */

1 0

Alexandre Julliard : winecrt0: Implement setjmp/longjmp for ARM64EC.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: dd77c32fc6eda6502cca5ca5bc11d07cad48a6a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd77c32fc6eda6502cca5ca5bc11d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 16:50:38 2023 +0100 winecrt0: Implement setjmp/longjmp for ARM64EC. --- dlls/winecrt0/exception.c | 2 +- dlls/winecrt0/setjmp.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 2c9b85737c9..3187189dd1c 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -41,7 +41,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, "call " __ASM_STDCALL("RtlUnwind",16) "\n\t" "call *16(%ebp)" ) -#elif defined(__x86_64__) +#elif defined(__x86_64__) && !defined(__arm64ec__) __ASM_GLOBAL_FUNC( __wine_rtl_unwind, "pushq %rbp\n\t" diff --git a/dlls/winecrt0/setjmp.c b/dlls/winecrt0/setjmp.c index ffb3b243e75..ebae94aa396 100644 --- a/dlls/winecrt0/setjmp.c +++ b/dlls/winecrt0/setjmp.c @@ -50,6 +50,58 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, "addl $4,%esp\n\t" /* get rid of return address */ "jmp *20(%ecx)\n\t" /* jmp_buf.Eip */ ) +#elif defined(__arm64ec__) + +int __cdecl __attribute__((naked)) __wine_setjmpex( __wine_jmp_buf *buf, EXCEPTION_REGISTRATION_RECORD *frame ) +{ + asm( "stp x29, x30, [sp, #-16]!\n\t" + "stp x1, x27, [x0]\n\t" /* jmp_buf->Frame,Rbx */ + "add x1, sp, #16\n\t" + "stp x1, x29, [x0, #0x10]\n\t" /* jmp_buf->Rsp,Rbp */ + "mov x29, sp\n\t" + "stp x25, x26, [x0, #0x20]\n\t" /* jmp_buf->Rsi,Rdi */ + "stp x19, x20, [x0, #0x30]\n\t" /* jmp_buf->R12,R13 */ + "stp x21, x22, [x0, #0x40]\n\t" /* jmp_buf->R14,R15 */ + "str x30, [x0, #0x50]\n\t" /* jmp_buf->Rip */ + "stp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->Xmm8,Xmm9 */ + "stp d10, d11, [x0, #0xa0]\n\t" /* jmp_buf->Xmm10,Xmm11 */ + "stp d12, d13, [x0, #0xc0]\n\t" /* jmp_buf->Xmm12,Xmm13 */ + "stp d14, d15, [x0, #0xe0]\n\t" /* jmp_buf->Xmm14,Xmm15 */ + "adrp x8, " __ASM_NAME("__os_arm64x_get_x64_information") "\n\t" + "ldr x8, [x8, :lo12:" __ASM_NAME("__os_arm64x_get_x64_information") "]\n\t" + "add x1, x0, #0x58\n\t" /* jmp_buf->Mxcsr */ + "mov x0, #0\n\t" + "blr x8\n\t" + "mov x0, #0\n\t" + "ldp x29, x30, [sp], #16\n\t" + "ret" ); +} + +void __cdecl __attribute__((naked)) __wine_longjmp( __wine_jmp_buf *buf, int retval ) +{ + asm( "mov x19, x0\n\t" + "mov x20, x1\n\t" + "adrp x8, " __ASM_NAME("__os_arm64x_set_x64_information") "\n\t" + "ldr x8, [x8, :lo12:" __ASM_NAME("__os_arm64x_set_x64_information") "]\n\t" + "ldr w1, [x0, #0x58]\n\t" /* jmp_buf->Mxcsr */ + "mov x0, #0\n\t" + "blr x8\n\t" + "mov x1, x19\n\t" /* jmp_buf */ + "mov x0, x20\n\t" /* retval */ + "ldr x27, [x1, #0x08]\n\t" /* jmp_buf->Rbx */ + "ldp x2, x29, [x1, #0x10]\n\t" /* jmp_buf->Rsp,Rbp */ + "ldp x25, x26, [x1, #0x20]\n\t" /* jmp_buf->Rsi,Rdi */ + "ldp x19, x20, [x1, #0x30]\n\t" /* jmp_buf->R12,R13 */ + "ldp x21, x22, [x1, #0x40]\n\t" /* jmp_buf->R14,R15 */ + "ldr x30, [x1, #0x50]\n\t" /* jmp_buf->Rip */ + "ldp d8, d9, [x1, #0x80]\n\t" /* jmp_buf->Xmm8,Xmm9 */ + "ldp d10, d11, [x1, #0x90]\n\t" /* jmp_buf->Xmm10,Xmm11 */ + "ldp d12, d13, [x1, #0xa0]\n\t" /* jmp_buf->Xmm12,Xmm13 */ + "ldp d14, d15, [x1, #0xb0]\n\t" /* jmp_buf->Xmm14,Xmm15 */ + "mov sp, x2\n\t" + "ret" ); +} + #elif defined(__x86_64__) __ASM_GLOBAL_FUNC( __wine_setjmpex,

1 0

Alexandre Julliard : ntdll: Add a stub ARM64EC CPU backend.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: cbaa3d08041b7a0a465c852f09a3f620798d86f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbaa3d08041b7a0a465c852f09a3f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 17:28:05 2023 +0100 ntdll: Add a stub ARM64EC CPU backend. --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/signal_arm64ec.c | 227 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 7 +- 3 files changed, 230 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 7aa1652507d..d3f2a0e5523 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -37,6 +37,7 @@ SOURCES = \ sec.c \ signal_arm.c \ signal_arm64.c \ + signal_arm64ec.c \ signal_i386.c \ signal_x86_64.c \ string.c \ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c new file mode 100644 index 00000000000..4f39c24bfe1 --- /dev/null +++ b/dlls/ntdll/signal_arm64ec.c @@ -0,0 +1,227 @@ +/* + * ARM64EC signal handling routines + * + * Copyright 1999, 2005, 2023 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __arm64ec__ + +#include <stdlib.h> +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "wine/exception.h" +#include "wine/list.h" +#include "ntdll_misc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(unwind); +WINE_DECLARE_DEBUG_CHANNEL(relay); + + +/******************************************************************* + * KiUserExceptionDispatcher (NTDLL.@) + */ +NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + FIXME( "not implemented\n" ); + return STATUS_INVALID_DISPOSITION; +} + + +/******************************************************************* + * KiUserApcDispatcher (NTDLL.@) + */ +void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, + PNTAPCFUNC apc ) +{ + FIXME( "not implemented\n" ); +} + + +/******************************************************************* + * KiUserCallbackDispatcher (NTDLL.@) + */ +void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +{ + FIXME( "not implemented\n" ); +} + + +/************************************************************************** + * RtlIsEcCode (NTDLL.@) + */ +BOOLEAN WINAPI RtlIsEcCode( const void *ptr ) +{ + const UINT64 *map = (const UINT64 *)NtCurrentTeb()->Peb->EcCodeBitMap; + ULONG_PTR page = (ULONG_PTR)ptr / page_size; + return (map[page / 64] >> (page & 63)) & 1; +} + + +/*********************************************************************** + * RtlCaptureContext (NTDLL.@) + */ +void WINAPI RtlCaptureContext( CONTEXT *context ) +{ + FIXME( "not implemented\n" ); +} + + +/******************************************************************* + * RtlRestoreContext (NTDLL.@) + */ +void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) +{ + FIXME( "not implemented\n" ); +} + + +/********************************************************************** + * RtlVirtualUnwind (NTDLL.@) + */ +PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, + RUNTIME_FUNCTION *function, CONTEXT *context, + PVOID *data, ULONG64 *frame_ret, + KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr ) +{ + FIXME( "not implemented\n" ); + return NULL; +} + + +/******************************************************************* + * RtlUnwindEx (NTDLL.@) + */ +void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec, + PVOID retval, CONTEXT *context, UNWIND_HISTORY_TABLE *table ) +{ + FIXME( "not implemented\n" ); +} + + +/******************************************************************* + * RtlUnwind (NTDLL.@) + */ +void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) +{ + FIXME( "not implemented\n" ); +} + + +/******************************************************************* + * _local_unwind (NTDLL.@) + */ +void WINAPI _local_unwind( void *frame, void *target_ip ) +{ + CONTEXT context; + RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); +} + + +/******************************************************************* + * __C_specific_handler (NTDLL.@) + */ +EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, + void *frame, + CONTEXT *context, + struct _DISPATCHER_CONTEXT *dispatch ) +{ + FIXME( "not implemented\n" ); + return ExceptionContinueSearch; +} + + +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "not implemented\n" ); + return 0; +} + + +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +void __attribute__((naked)) __chkstk(void) +{ + asm( "ret" ); +} + + +/*********************************************************************** + * RtlRaiseException (NTDLL.@) + */ +void WINAPI RtlRaiseException( struct _EXCEPTION_RECORD * rec) +{ + FIXME( "not implemented\n" ); +} + + +/*********************************************************************** + * RtlUserThreadStart (NTDLL.@) + */ +void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + pBaseThreadInitThunk( 0, (LPTHREAD_START_ROUTINE)entry, arg ); + } + __EXCEPT(call_unhandled_exception_filter) + { + NtTerminateProcess( GetCurrentProcess(), GetExceptionCode() ); + } + __ENDTRY +} + + +/****************************************************************** + * LdrInitializeThunk (NTDLL.@) + */ +void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) +{ + loader_init( context, (void **)&context->Rcx ); + TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->Rcx, (void *)context->Rdx ); + NtContinue( context, TRUE ); +} + + +/********************************************************************** + * DbgBreakPoint (NTDLL.@) + */ +void __attribute__((naked)) DbgBreakPoint(void) +{ + asm( "brk #0xf000; ret" ); +} + + +/********************************************************************** + * DbgUserBreakPoint (NTDLL.@) + */ +void __attribute__((naked)) DbgUserBreakPoint(void) +{ + asm( "brk #0xf000; ret" ); +} + +#endif /* __arm64ec__ */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ae658910868..ff02cdc5fdc 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef __x86_64__ +#if defined(__x86_64__) && !defined(__arm64ec__) #include <stdlib.h> #include <stdarg.h> @@ -711,10 +711,7 @@ void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) */ BOOLEAN WINAPI RtlIsEcCode( const void *ptr ) { - const UINT64 *map = (const UINT64 *)NtCurrentTeb()->Peb->EcCodeBitMap; - ULONG_PTR page = (ULONG_PTR)ptr / page_size; - if (!map) return FALSE; - return (map[page / 64] >> (page & 63)) & 1; + return FALSE; }

1 0

Alexandre Julliard : ntdll: Don't use x86-64 assembly on ARM64EC.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 220a70bee268415925d1ae747611f48e51665e64 URL: https://gitlab.winehq.org/wine/wine/-/commit/220a70bee268415925d1ae747611f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 18:55:39 2023 +0100 ntdll: Don't use x86-64 assembly on ARM64EC. --- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/process.c | 6 +++++- dlls/ntdll/relay.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a87f4d1f5e..93edc237405 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -304,7 +304,7 @@ __ASM_GLOBAL_FUNC(call_dll_entry_point, __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -#elif defined(__x86_64__) +#elif defined(__x86_64__) && !defined(__arm64ec__) extern BOOL CDECL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ); /* Some apps modify rbx in TLS entry point. */ __ASM_GLOBAL_FUNC(call_dll_entry_point, @@ -379,7 +379,7 @@ struct stub const char *name; const void* entry; }; -#elif defined(__aarch64__) +#elif defined(__aarch64__) || defined(__arm64ec__) struct stub { DWORD ldr_x0; /* ldr x0, $dll */ @@ -443,7 +443,7 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->dll = dll; stub->name = name; stub->entry = stub_entry_point; -#elif defined(__aarch64__) +#elif defined(__aarch64__) || defined(__arm64ec__) stub->ldr_x0 = 0x580000a0; /* ldr x0, #20 ($dll) */ stub->ldr_x1 = 0x580000c1; /* ldr x1, #24 ($name) */ stub->mov_x2_lr = 0xaa1e03e2; /* mov x2, lr */ diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 3ca4195ab3d..f3b899a43f8 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -249,7 +249,11 @@ NTSTATUS WINAPI RtlWow64GetThreadSelectorEntry( HANDLE handle, THREAD_DESCRIPTOR if (RtlWow64GetThreadContext( handle, &context )) { /* hardcoded values */ -#ifdef __x86_64__ +#ifdef __arm64ec__ + context.SegCs = 0x33; + context.SegSs = 0x2b; + context.SegFs = 0x53; +#elif defined(__x86_64__) context.SegCs = 0x23; __asm__( "movw %%fs,%0" : "=m" (context.SegFs) ); __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index adc8267ae1f..b6046bb661f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) +#if (defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)) && !defined(__arm64ec__) struct relay_descr /* descriptor for a module */ {

1 0

Alexandre Julliard : ntdll: Export __chkstk_arm64ec().
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: d3722971efd2a8153b96ce5ac9e4c17ad37734fa URL: https://gitlab.winehq.org/wine/wine/-/commit/d3722971efd2a8153b96ce5ac9e4c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 20:08:34 2023 +0100 ntdll: Export __chkstk_arm64ec(). --- dlls/kernel32/kernel32.spec | 1 + dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm64ec.c | 11 +++++++++++ 3 files changed, 13 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1deeb2a2ca5..7e2a2ae8064 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1670,6 +1670,7 @@ @ stdcall -import ZombifyActCtx(ptr) @ stdcall -arch=arm,x86_64 -private __C_specific_handler(ptr long ptr ptr) NTDLL.__C_specific_handler @ cdecl -arch=arm,x86_64 -norelay __chkstk() NTDLL.__chkstk +@ cdecl -arch=arm64ec -norelay __chkstk_arm64ec() NTDLL.__chkstk_arm64ec @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c09157a369b..1908a089d44 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1506,6 +1506,7 @@ @ cdecl -private -arch=i386 _CIsqrt() @ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) @ cdecl -arch=!i386 -norelay __chkstk() +@ cdecl -arch=arm64ec -norelay __chkstk_arm64ec() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 4f39c24bfe1..be22278a252 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -170,6 +170,17 @@ void __attribute__((naked)) __chkstk(void) } +/************************************************************************** + * __chkstk_arm64ec (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +void __attribute__((naked)) __chkstk_arm64ec(void) +{ + asm( "ret" ); +} + + /*********************************************************************** * RtlRaiseException (NTDLL.@) */

1 0

Alexandros Frantzis : win32u: Assume thread dpi for rect in NtUserIsWindowRectFullScreen.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: a75e2b49ca3446045639e933202d71ecdf217095 URL: https://gitlab.winehq.org/wine/wine/-/commit/a75e2b49ca3446045639e933202d71… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Nov 14 10:11:15 2023 +0200 win32u: Assume thread dpi for rect in NtUserIsWindowRectFullScreen. Assume that the window rect passed NtUserIsWindowRectFullScreen is expressed in terms of thread dpi and convert monitor rects accordingly for proper matching. --- dlls/win32u/sysparams.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4f2a299dd16..b134c5af680 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2327,11 +2327,16 @@ static BOOL is_window_rect_full_screen( const RECT *rect ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { + RECT monrect; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; - if (rect->left <= monitor->rc_monitor.left && rect->right >= monitor->rc_monitor.right && - rect->top <= monitor->rc_monitor.top && rect->bottom >= monitor->rc_monitor.bottom) + monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), + get_thread_dpi() ); + + if (rect->left <= monrect.left && rect->right >= monrect.right && + rect->top <= monrect.top && rect->bottom >= monrect.bottom) { ret = TRUE; break;

1 0

Alexandros Frantzis : win32u: Respect per-monitor thread dpi awareness when getting window from point.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 07d3846d370e85b8f7a3c6b3e214702d43fd07f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/07d3846d370e85b8f7a3c6b3e21470… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Nov 14 10:19:30 2023 +0200 win32u: Respect per-monitor thread dpi awareness when getting window from point. --- dlls/win32u/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 4a57e0abde7..69dd8caba5d 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2229,8 +2229,10 @@ HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) int i, res; HWND ret, *list; POINT win_pt; + int dpi; if (!hwnd) hwnd = get_desktop_window(); + if (!(dpi = get_thread_dpi())) dpi = get_win_monitor_dpi( hwnd ); *hittest = HTNOWHERE; @@ -2254,7 +2256,7 @@ HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) *hittest = HTCLIENT; break; } - win_pt = map_dpi_point( pt, get_thread_dpi(), get_dpi_for_window( list[i] )); + win_pt = map_dpi_point( pt, dpi, get_dpi_for_window( list[i] )); res = send_message( list[i], WM_NCHITTEST, 0, MAKELPARAM( win_pt.x, win_pt.y )); if (res != HTTRANSPARENT) {

1 0

Rémi Bernon : winebus.sys: Ignore events on unsupported axes.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 7d74938b0c9253fc8bf05f5ef943f99f6bf7e1ae URL: https://gitlab.winehq.org/wine/wine/-/commit/7d74938b0c9253fc8bf05f5ef943f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 11 15:39:28 2023 +0100 winebus.sys: Ignore events on unsupported axes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55660 --- dlls/winebus.sys/bus_sdl.c | 69 ++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index cd6166a91a8..9b0e7226fa5 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -246,49 +246,50 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) return TRUE; } +static const USAGE_AND_PAGE absolute_axis_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, +}; +static const USAGE_AND_PAGE relative_axis_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, +}; + static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) { const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_JOYSTICK}; - static const USAGE_AND_PAGE absolute_usages[] = - { - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, - }; - static const USAGE_AND_PAGE relative_usages[] = - { - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, - }; struct sdl_device *impl = impl_from_unix_device(iface); int i, button_count, axis_count, ball_count, hat_count; USAGE_AND_PAGE physical_usage; axis_count = pSDL_JoystickNumAxes(impl->sdl_joystick); if (options.split_controllers) axis_count = min(6, axis_count - impl->axis_offset); - if (axis_count > ARRAY_SIZE(absolute_usages)) + if (axis_count > ARRAY_SIZE(absolute_axis_usages)) { - FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); - axis_count = ARRAY_SIZE(absolute_usages); + FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_axis_usages)); + axis_count = ARRAY_SIZE(absolute_axis_usages); } ball_count = pSDL_JoystickNumBalls(impl->sdl_joystick); - if (ball_count > ARRAY_SIZE(relative_usages) / 2) + if (ball_count > ARRAY_SIZE(relative_axis_usages) / 2) { - FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_usages)); - ball_count = ARRAY_SIZE(relative_usages) / 2; + FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_axis_usages)); + ball_count = ARRAY_SIZE(relative_axis_usages) / 2; } if (impl->axis_offset == 0) @@ -337,15 +338,15 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) for (i = 0; i < axis_count; i++) { - if (!hid_device_add_axes(iface, 1, absolute_usages[i].UsagePage, - &absolute_usages[i].Usage, FALSE, -32768, 32767)) + if (!hid_device_add_axes(iface, 1, absolute_axis_usages[i].UsagePage, + &absolute_axis_usages[i].Usage, FALSE, -32768, 32767)) return STATUS_NO_MEMORY; } for (i = 0; i < ball_count; i++) { - if (!hid_device_add_axes(iface, 2, relative_usages[2 * i].UsagePage, - &relative_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) + if (!hid_device_add_axes(iface, 2, relative_axis_usages[2 * i].UsagePage, + &relative_axis_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) return STATUS_NO_MEMORY; } @@ -840,6 +841,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e { SDL_JoyAxisEvent *ie = &event->jaxis; + if (ie->axis >= ARRAY_SIZE(absolute_axis_usages)) break; hid_device_set_abs_axis(iface, ie->axis, ie->value); bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); break; @@ -848,6 +850,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e { SDL_JoyBallEvent *ie = &event->jball; + if (ie->ball >= ARRAY_SIZE(relative_axis_usages) / 2) break; hid_device_set_rel_axis(iface, 2 * ie->ball, ie->xrel); hid_device_set_rel_axis(iface, 2 * ie->ball + 1, ie->yrel); bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len);

1 0

Rémi Bernon : windows.gaming.input: Fix inverted start / select gamepad buttons.
by Alexandre Julliard 14 Nov '23

14 Nov '23

Module: wine Branch: master Commit: 79bb13332fa7aa4c19eabd4f68b1387ad4774000 URL: https://gitlab.winehq.org/wine/wine/-/commit/79bb13332fa7aa4c19eabd4f68b138… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 9 10:59:27 2023 +0100 windows.gaming.input: Fix inverted start / select gamepad buttons. --- dlls/windows.gaming.input/gamepad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 112ec49a1d3..0d7cd690821 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -273,8 +273,8 @@ static HRESULT WINAPI gamepad_GetCurrentReading( IGamepad *iface, struct Gamepad if (state.buttons[3]) value->Buttons |= GamepadButtons_Y; if (state.buttons[4]) value->Buttons |= GamepadButtons_LeftShoulder; if (state.buttons[5]) value->Buttons |= GamepadButtons_RightShoulder; - if (state.buttons[6]) value->Buttons |= GamepadButtons_Menu; - if (state.buttons[7]) value->Buttons |= GamepadButtons_View; + if (state.buttons[6]) value->Buttons |= GamepadButtons_View; + if (state.buttons[7]) value->Buttons |= GamepadButtons_Menu; if (state.buttons[8]) value->Buttons |= GamepadButtons_LeftThumbstick; if (state.buttons[9]) value->Buttons |= GamepadButtons_RightThumbstick;

1 0