November 2023 - Wine-Commits

Alexandre Julliard : ntdll: Export __chkstk_arm64ec().
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

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

Alexandre Julliard : ntdll: Add a stub ARM64EC CPU backend.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

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 : winecrt0: Implement setjmp/longjmp for ARM64EC.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

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

Jacek Caban : winecrt0: Initial ARM64EC support.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

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

Michael Stefaniuc : dmsynth: Remove superfluous casts to self.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: ad1ba07880a234b43089423c925b5179641bedf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad1ba07880a234b43089423c925b51… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:33:30 2023 +0100 dmsynth: Remove superfluous casts to self. --- dlls/dmsynth/synthsink.c | 2 +- dlls/dmsynth/tests/dmsynth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index d0a89358652..9263ff56349 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -320,7 +320,7 @@ static HRESULT synth_sink_activate(struct synth_sink *This) else { synth_sink_get_format(This, &format); - desc.lpwfxFormat = (WAVEFORMATEX *)&format; + desc.lpwfxFormat = &format; desc.dwBufferBytes = format.nAvgBytesPerSec; if (FAILED(hr = IDirectMusicSynthSink_GetDesiredBufferSize(iface, &desc.dwBufferBytes))) ERR("Failed to get desired buffer size, hr %#lx\n", hr); diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index ad09a651094..ad9f706aada 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -1134,11 +1134,11 @@ static void test_IDirectMusicSynth(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IReferenceClock_GetTime(latency_clock, &time); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, (BYTE **)&raw); + hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, &raw); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicBuffer_GetUsedBytes(buffer, &len); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicSynth_PlayBuffer(synth, time, (BYTE *)raw, len); + hr = IDirectMusicSynth_PlayBuffer(synth, time, raw, len); ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicBuffer_Release(buffer); IReferenceClock_Release(latency_clock);

1 0

Michael Stefaniuc : dmusic: Remove superfluous casts to self.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 055e6322161a40b14103da5ed7e03404294cca83 URL: https://gitlab.winehq.org/wine/wine/-/commit/055e6322161a40b14103da5ed7e034… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 13 19:34:31 2023 +0100 dmusic: Remove superfluous casts to self. --- dlls/dmusic/dmobject.c | 2 +- dlls/dmusic/tests/dmusic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 8cb4719c4e6..9ba1f239167 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -466,7 +466,7 @@ HRESULT stream_get_object(IStream *stream, DMUS_OBJECTDESC *desc, REFIID iid, vo if (SUCCEEDED(hr = stream_get_loader(stream, &loader))) { - hr = IDirectMusicLoader_GetObject(loader, desc, iid, (void **)ret_iface); + hr = IDirectMusicLoader_GetObject(loader, desc, iid, ret_iface); IDirectMusicLoader_Release(loader); } diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index f71c0600366..3b2f7d9160e 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -1078,7 +1078,7 @@ static void test_port_download(void) ok(hr == S_OK, "got %#lx\n", hr); size = 0xdeadbeef; buffer = invalid_ptr; - hr = IDirectMusicDownload_GetBuffer(download, (void **)&buffer, &size); + hr = IDirectMusicDownload_GetBuffer(download, &buffer, &size); ok(hr == S_OK, "got %#lx\n", hr); ok(size == 1, "got %#lx\n", size); ok(buffer != invalid_ptr, "got %p\n", buffer);

1 0

Rémi Bernon : winewayland.drv: Basic handling of Wayland keyboard events.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: f58946e3baf65f5de2c081cd2c4416b3a2bc0f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/f58946e3baf65f5de2c081cd2c4416… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 9 23:28:27 2023 +0100 winewayland.drv: Basic handling of Wayland keyboard events. Handle Wayland keyboard events and translate them to Windows events, currently using a hardcoded US key mapping. --- configure | 91 ++++++++++- configure.ac | 5 +- dlls/winewayland.drv/Makefile.in | 5 +- dlls/winewayland.drv/wayland.c | 6 + dlls/winewayland.drv/wayland_keyboard.c | 274 ++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland_surface.c | 5 + dlls/winewayland.drv/waylanddrv.h | 17 ++ include/config.h.in | 3 + 8 files changed, 402 insertions(+), 4 deletions(-)

1 0

Rémi Bernon : gitlab: Install libxkbcommon and libxkbregistry dependencies.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 677868a0c7e8e15dc037090e22435afb6fa9ecc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/677868a0c7e8e15dc037090e22435a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 15 12:55:22 2023 +0200 gitlab: Install libxkbcommon and libxkbregistry dependencies. --- tools/gitlab/image.docker | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index 50607d13872..8ff9055df2f 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -42,6 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libxext-dev:amd64 libxext-dev:i386 \ libxi-dev:amd64 libxi-dev:i386 \ libxinerama-dev:amd64 libxinerama-dev:i386 \ + libxkbcommon-dev:amd64 libxkbcommon-dev:i386 \ + libxkbregistry-dev:amd64 libxkbregistry-dev:i386 \ libxrandr-dev:amd64 libxrandr-dev:i386 \ libxrender-dev:amd64 libxrender-dev:i386 \ libxxf86vm-dev:amd64 libxxf86vm-dev:i386 \

1 0

Alexandre Julliard : makefiles: Avoid generating the .tab.c file twice with bison.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: aea0d88ae54462689fb03f0a5dc22a2921bdad54 URL: https://gitlab.winehq.org/wine/wine/-/commit/aea0d88ae54462689fb03f0a5dc22a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 13:04:36 2023 +0100 makefiles: Avoid generating the .tab.c file twice with bison. --- tools/makedep.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7b76a3283f0..640b4e63ece 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2680,20 +2680,17 @@ static void output_po_files( struct makefile *make ) */ static void output_source_y( struct makefile *make, struct incl_file *source, const char *obj ) { - /* add source file dependency for parallel makes */ char *header = strmake( "%s.tab.h", obj ); if (find_include_file( make, header )) { output( "%s: %s\n", obj_dir_path( make, header ), source->filename ); - output( "\t%s%s -o %s.tab.c -d %s\n", - cmd_prefix( "BISON" ), bison, obj_dir_path( make, obj ), source->filename ); - output( "%s.tab.c: %s %s\n", obj_dir_path( make, obj ), - source->filename, obj_dir_path( make, header )); + output( "\t%s%s -o %s.tab.$$$$.c --header=$@ %s && rm -f %s.tab.$$$$.c\n", + cmd_prefix( "BISON" ), bison, obj_dir_path( make, obj ), + source->filename, obj_dir_path( make, obj )); strarray_add( &make->clean_files, header ); } - else output( "%s.tab.c: %s\n", obj_dir_path( make, obj ), source->filename ); - + output( "%s.tab.c: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s%s -o $@ %s\n", cmd_prefix( "BISON" ), bison, source->filename ); }

1 0

Alistair Leslie-Hughes : rpcrt4: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 9b26ea16a3fc13118c4c4eaab6ea46d3828ea503 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b26ea16a3fc13118c4c4eaab6ea46… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 9 18:26:22 2023 +1100 rpcrt4: Remove DECLSPEC_HIDDEN usage. --- dlls/rpcrt4/cpsf.h | 30 ++++++++++---------- dlls/rpcrt4/ndr_misc.h | 14 +++++----- dlls/rpcrt4/ndr_stubless.c | 12 ++++---- dlls/rpcrt4/ndr_stubless.h | 12 ++++---- dlls/rpcrt4/rpc_assoc.h | 24 ++++++++-------- dlls/rpcrt4/rpc_binding.h | 70 +++++++++++++++++++++++----------------------- dlls/rpcrt4/rpc_message.h | 56 ++++++++++++++++++------------------- dlls/rpcrt4/rpc_server.h | 8 +++--- 8 files changed, 113 insertions(+), 113 deletions(-)

1 0