July 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use separate handlers for SIGSEGV/SIGILL/SIGBUS on ARM64.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 82dc024a35a1a522b088df4e9355fa7752f40821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82dc024a35a1a522b088df4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:52:52 2020 +0200 ntdll: Use separate handlers for SIGSEGV/SIGILL/SIGBUS on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 72 +++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 8353a70e52..e66952a29b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -69,7 +69,9 @@ #include "unix_private.h" #include "wine/debug.h" +#ifdef HAVE_LIBUNWIND WINE_DEFAULT_DEBUG_CHANNEL(seh); +#endif /*********************************************************************** * signal context platform-specific definitions @@ -596,49 +598,59 @@ void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *cont /********************************************************************** * segv_handler * - * Handler for SIGSEGV and related errors. + * Handler for SIGSEGV. */ -static void segv_handler( int signal, siginfo_t *info, void *ucontext ) +static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; - ucontext_t *context = ucontext; - - switch(signal) - { - case SIGILL: /* Invalid opcode exception */ - rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; - break; - case SIGSEGV: /* Segmentation fault */ - rec.NumberParameters = 2; - rec.ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; - rec.ExceptionInformation[1] = (ULONG_PTR)info->si_addr; - rec.ExceptionCode = virtual_handle_fault( info->si_addr, rec.ExceptionInformation[0], - (void *)SP_sig(context) ); - if (!rec.ExceptionCode) return; - break; - case SIGBUS: /* Alignment check exception */ - rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; - break; - default: - ERR("Got unexpected signal %i\n", signal); - rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; - break; - } + ucontext_t *context = sigcontext; + + rec.NumberParameters = 2; + rec.ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; + rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; + rec.ExceptionCode = virtual_handle_fault( siginfo->si_addr, rec.ExceptionInformation[0], + (void *)SP_sig(context) ); + if (!rec.ExceptionCode) return; setup_exception( context, &rec ); } +/********************************************************************** + * ill_handler + * + * Handler for SIGILL. + */ +static void ill_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + EXCEPTION_RECORD rec = { EXCEPTION_ILLEGAL_INSTRUCTION }; + + setup_exception( sigcontext, &rec ); +} + + +/********************************************************************** + * bus_handler + * + * Handler for SIGBUS. + */ +static void bus_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + EXCEPTION_RECORD rec = { EXCEPTION_DATATYPE_MISALIGNMENT }; + + setup_exception( sigcontext, &rec ); +} + + /********************************************************************** * trap_handler * * Handler for SIGTRAP. */ -static void trap_handler( int signal, siginfo_t *info, void *ucontext ) +static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; - ucontext_t *context = ucontext; - switch (info->si_code) + switch (siginfo->si_code) { case TRAP_TRACE: rec.ExceptionCode = EXCEPTION_SINGLE_STEP; @@ -648,7 +660,7 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) rec.ExceptionCode = EXCEPTION_BREAKPOINT; break; } - setup_exception( context, &rec ); + setup_exception( sigcontext, &rec ); } @@ -859,7 +871,9 @@ void signal_init_process(void) if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = segv_handler; if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = ill_handler; if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = bus_handler; if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error; return;

1 0

Alexandre Julliard : ntdll: Build the exception record on the signal stack first.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 485c8566f103f05dba3c8c31d3adb18b89eb032a URL: https://source.winehq.org/git/wine.git/?a=commit;h=485c8566f103f05dba3c8c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:31:19 2020 +0200 ntdll: Build the exception record on the signal stack first. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 49 ++++++++++--------------- dlls/ntdll/unix/signal_arm64.c | 81 ++++++++++++++++++----------------------- dlls/ntdll/unix/signal_i386.c | 38 +++++++++---------- dlls/ntdll/unix/signal_x86_64.c | 33 ++++++++--------- 4 files changed, 90 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=485c8566f103f05dba3c…

1 0

Alexandre Julliard : ntdll: Handle signals on the signal stack also on ARM.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 1e4865ffcfa4933ff27b1e66405e1498dd9d1781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e4865ffcfa4933ff27b1e66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:34:18 2020 +0200 ntdll: Handle signals on the signal stack also on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 117 ++++++++++++------------------------------- 1 file changed, 32 insertions(+), 85 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index eaa58fe00b..1e8abb494c 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -172,8 +172,6 @@ enum arm_trap_code TRAP_ARM_ALIGNFLT = 17, /* Alignment check exception */ }; -typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); - /*********************************************************************** * unwind_builtin_dll @@ -507,29 +505,29 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } -extern void raise_func_trampoline_thumb( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +extern void raise_func_trampoline_thumb( EXCEPTION_RECORD *rec, CONTEXT *context, void *func ); __ASM_GLOBAL_FUNC( raise_func_trampoline_thumb, ".thumb\n\t" - "blx r2\n\t" + "bx r2\n\t" "bkpt") -extern void raise_func_trampoline_arm( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +extern void raise_func_trampoline_arm( EXCEPTION_RECORD *rec, CONTEXT *context, void *func ); __ASM_GLOBAL_FUNC( raise_func_trampoline_arm, ".arm\n\t" - "blx r2\n\t" + "bx r2\n\t" "bkpt") /*********************************************************************** - * setup_exception_record + * setup_exception * - * Setup the exception record and context on the thread stack. + * Modify the signal context to call the exception raise function. */ -static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func func, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) { - struct stack_layout + struct { - CONTEXT context; - EXCEPTION_RECORD rec; + CONTEXT context; + EXCEPTION_RECORD rec; } *stack; void *stack_ptr = (void *)(SP_sig(sigcontext) & ~3); @@ -544,39 +542,29 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun PC_sig(sigcontext) = (DWORD)raise_func_trampoline_thumb; else PC_sig(sigcontext) = (DWORD)raise_func_trampoline_arm; - REGn_sig(0, sigcontext) = (DWORD)&stack->rec; /* first arg for raise_func */ - REGn_sig(1, sigcontext) = (DWORD)&stack->context; /* second arg for raise_func */ - REGn_sig(2, sigcontext) = (DWORD)func; /* the raise_func as third arg for the trampoline */ - return &stack->rec; + REGn_sig(0, sigcontext) = (DWORD)&stack->rec; /* first arg for KiUserExceptionDispatcher */ + REGn_sig(1, sigcontext) = (DWORD)&stack->context; /* second arg for KiUserExceptionDispatcher */ + REGn_sig(2, sigcontext) = (DWORD)pKiUserExceptionDispatcher; } -extern void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, - NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) +void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, + NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) { dispatcher( rec, context ); } -/********************************************************************** - * raise_segv_exception - */ -static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status = NtRaiseException( rec, context, TRUE ); - if (status) RtlRaiseStatus( status ); -} - /********************************************************************** * segv_handler * * Handler for SIGSEGV and related errors. */ -static void segv_handler( int signal, siginfo_t *info, void *ucontext ) +static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; - ucontext_t *context = ucontext; + ucontext_t *context = sigcontext; - switch(get_trap_code(signal, context)) + switch (get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; @@ -584,8 +572,8 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case TRAP_ARM_PAGEFLT: /* Page fault */ rec.NumberParameters = 2; rec.ExceptionInformation[0] = (get_error_code(context) & 0x800) != 0; - rec.ExceptionInformation[1] = (ULONG_PTR)info->si_addr; - rec.ExceptionCode = virtual_handle_fault( info->si_addr, rec.ExceptionInformation[0], + rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; + rec.ExceptionCode = virtual_handle_fault( siginfo->si_addr, rec.ExceptionInformation[0], (void *)SP_sig(context) ); if (!rec.ExceptionCode) return; break; @@ -603,7 +591,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } - setup_exception( context, raise_segv_exception, &rec ); + setup_exception( context, &rec ); } @@ -612,13 +600,11 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) * * Handler for SIGTRAP. */ -static void trap_handler( int signal, siginfo_t *info, void *ucontext ) +static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; + EXCEPTION_RECORD rec = { 0 }; - switch ( info->si_code ) + switch (siginfo->si_code) { case TRAP_TRACE: rec.ExceptionCode = EXCEPTION_SINGLE_STEP; @@ -628,15 +614,7 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) rec.ExceptionCode = EXCEPTION_BREAKPOINT; break; } - - save_context( &context, ucontext ); - rec.ExceptionFlags = EXCEPTION_CONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = NtRaiseException( &rec, &context, TRUE ); - if (status) RtlRaiseStatus( status ); - restore_context( &context, ucontext ); + setup_exception( sigcontext, &rec ); } @@ -647,11 +625,7 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) */ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; - - save_context( &context, sigcontext ); + EXCEPTION_RECORD rec = { 0 }; switch (siginfo->si_code & 0xffff ) { @@ -697,14 +671,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - rec.ExceptionFlags = EXCEPTION_CONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = NtRaiseException( &rec, &context, TRUE ); - if (status) RtlRaiseStatus( status ); - - restore_context( &context, sigcontext ); + setup_exception( sigcontext, &rec ); } @@ -715,19 +682,9 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; + EXCEPTION_RECORD rec = { CONTROL_C_EXIT }; - save_context( &context, sigcontext ); - rec.ExceptionCode = CONTROL_C_EXIT; - rec.ExceptionFlags = EXCEPTION_CONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = NtRaiseException( &rec, &context, TRUE ); - if (status) RtlRaiseStatus( status ); - restore_context( &context, sigcontext ); + setup_exception( sigcontext, &rec ); } @@ -738,19 +695,9 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; + EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - save_context( &context, sigcontext ); - rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; - rec.ExceptionFlags = EH_NONCONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = NtRaiseException( &rec, &context, TRUE ); - if (status) RtlRaiseStatus( status ); - restore_context( &context, sigcontext ); + setup_exception( sigcontext, &rec ); } @@ -846,7 +793,7 @@ void signal_init_process(void) struct sigaction sig_act; sig_act.sa_mask = server_block_set; - sig_act.sa_flags = SA_RESTART | SA_SIGINFO; + sig_act.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK; sig_act.sa_sigaction = int_handler; if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error;

1 0

Alexandre Julliard : ntdll: Send debug event before pushing exception data on ARM64.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: ae15a4ca5a1c7270dcfe4f7456ea75fc946ab279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae15a4ca5a1c7270dcfe4f74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:34:56 2020 +0200 ntdll: Send debug event before pushing exception data on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 91 ++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index d5df921af7..8353a70e52 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -114,17 +114,6 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) static pthread_key_t teb_key; -typedef void (*raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); - -/* stack layout when calling an exception raise function */ -struct stack_layout -{ - CONTEXT context; - EXCEPTION_RECORD rec; - void *redzone[3]; -}; -C_ASSERT( !(sizeof(struct stack_layout) % 16) ); - struct arm64_thread_data { void *exit_frame; /* exit frame pointer */ @@ -534,26 +523,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } -/*********************************************************************** - * setup_exception - * - * Setup the exception record and context on the thread stack. - */ -static struct stack_layout *setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) -{ - void *stack_ptr = (void *)(SP_sig(sigcontext) & ~15); - struct stack_layout *stack; - - rec->ExceptionAddress = (void *)PC_sig(sigcontext); - stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); - stack->rec = *rec; - save_context( &stack->context, sigcontext ); - save_fpu( &stack->context, sigcontext ); - return stack; -} - - -extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func, void *sp ); +extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher, void *sp ); __ASM_GLOBAL_FUNC( raise_func_trampoline, __ASM_CFI(".cfi_signal_frame\n\t") "stp x29, x30, [sp, #-0x20]!\n\t" @@ -572,26 +542,48 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, "brk #1") /*********************************************************************** - * setup_raise_exception + * setup_exception * * Modify the signal context to call the exception raise function. */ -static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) { - NTSTATUS status = send_debug_event( &stack->rec, &stack->context, TRUE ); + struct + { + CONTEXT context; + EXCEPTION_RECORD rec; + void *redzone[3]; + } *stack; + + void *stack_ptr = (void *)(SP_sig(sigcontext) & ~15); + CONTEXT context; + NTSTATUS status; + rec->ExceptionAddress = (void *)PC_sig(sigcontext); + save_context( &context, sigcontext ); + save_fpu( &context, sigcontext ); + + status = send_debug_event( rec, &context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { - restore_context( &stack->context, sigcontext ); + restore_context( &context, sigcontext ); return; } + + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc += 4; + + stack = virtual_setup_exception( stack_ptr, (sizeof(*stack) + 15) & ~15, rec ); + stack->rec = *rec; + stack->context = context; + REGn_sig(3, sigcontext) = SP_sig(sigcontext); /* original stack pointer, fourth arg for raise_func_trampoline */ SP_sig(sigcontext) = (ULONG_PTR)stack; LR_sig(sigcontext) = PC_sig(sigcontext); - PC_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; /* raise_generic_exception; */ - REGn_sig(0, sigcontext) = (ULONG_PTR)&stack->rec; /* first arg for raise_generic_exception */ - REGn_sig(1, sigcontext) = (ULONG_PTR)&stack->context; /* second arg for raise_generic_exception */ - REGn_sig(2, sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; /* third arg for raise_func_trampoline */ + PC_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; + REGn_sig(0, sigcontext) = (ULONG_PTR)&stack->rec; /* first arg for KiUserExceptionDispatcher */ + REGn_sig(1, sigcontext) = (ULONG_PTR)&stack->context; /* second arg for KiUserExceptionDispatcher */ + REGn_sig(2, sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; /* dispatcher arg for raise_func_trampoline */ REGn_sig(18, sigcontext) = (ULONG_PTR)NtCurrentTeb(); } @@ -609,7 +601,6 @@ void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *cont static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD rec = { 0 }; - struct stack_layout *stack; ucontext_t *context = ucontext; switch(signal) @@ -633,8 +624,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } - stack = setup_exception( context, &rec ); - setup_raise_exception( context, stack ); + setup_exception( context, &rec ); } @@ -647,7 +637,6 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = ucontext; - struct stack_layout *stack; switch (info->si_code) { @@ -657,11 +646,9 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) case TRAP_BRKPT: default: rec.ExceptionCode = EXCEPTION_BREAKPOINT; - PC_sig(context) += 4; break; } - stack = setup_exception( context, &rec ); - setup_raise_exception( context, stack ); + setup_exception( context, &rec ); } @@ -673,7 +660,6 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; - struct stack_layout *stack; switch (siginfo->si_code & 0xffff ) { @@ -719,8 +705,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - stack = setup_exception( sigcontext, &rec ); - setup_raise_exception( sigcontext, stack ); + setup_exception( sigcontext, &rec ); } @@ -732,8 +717,8 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { CONTROL_C_EXIT }; - struct stack_layout *stack = setup_exception( sigcontext, &rec ); - setup_raise_exception( sigcontext, stack ); + + setup_exception( sigcontext, &rec ); } @@ -745,8 +730,8 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - struct stack_layout *stack = setup_exception( sigcontext, &rec ); - setup_raise_exception( sigcontext, stack ); + + setup_exception( sigcontext, &rec ); }

1 0

Piotr Caban : msvcrt: Don't use isalnumW.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 4e8c90600c4e86ad60cf06b00f83d7952c834e60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e8c90600c4e86ad60cf06b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:46 2020 +0200 msvcrt: Don't use isalnumW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 076336f43b..6998c16f59 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1929,19 +1929,19 @@ INT CDECL MSVCRT_iswctype( MSVCRT_wchar_t wc, MSVCRT_wctype_t type ) } /********************************************************************* - * iswalnum (MSVCRT.@) + * _iswalnum_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswalnum( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswalnum_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isalnumW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA | MSVCRT__DIGIT, locale ); } /********************************************************************* - * _iswalnum_l (MSVCRT.@) + * iswalnum (MSVCRT.@) */ -int CDECL MSVCRT__iswalnum_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswalnum( MSVCRT_wchar_t wc ) { - return isalnumW( wc ); + return MSVCRT__iswalnum_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Remove unused parameter in pf_integer_conv.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 071a71a8668078d48faa8763059533b0447b8dab URL: https://source.winehq.org/git/wine.git/?a=commit;h=071a71a8668078d48faa8763… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:32 2020 +0200 msvcrt: Remove unused parameter in pf_integer_conv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 25d817eefd..46df340839 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -514,8 +514,7 @@ static inline int FUNC_NAME(pf_output_hex_fp)(FUNC_NAME(puts_clbk) pf_puts, void /* pf_integer_conv: prints x to buf, including alternate formats and additional precision digits, but not field characters or the sign */ -static inline void FUNC_NAME(pf_integer_conv)(APICHAR *buf, int buf_len, - pf_flags *flags, LONGLONG x) +static inline void FUNC_NAME(pf_integer_conv)(APICHAR *buf, pf_flags *flags, LONGLONG x) { unsigned int base; const char *digits; @@ -783,7 +782,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu limb_len = LIMB_DIGITS; } radix_pos -= f.Precision; - FUNC_NAME(pf_integer_conv)(buf, ARRAY_SIZE(buf), &f, l); + FUNC_NAME(pf_integer_conv)(buf, &f, l); r = pf_puts(puts_ctx, f.Precision, buf); if(r < 0) return r; @@ -824,7 +823,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu limb_len = LIMB_DIGITS; } prec -= f.Precision; - FUNC_NAME(pf_integer_conv)(buf, ARRAY_SIZE(buf), &f, l); + FUNC_NAME(pf_integer_conv)(buf, &f, l); r = pf_puts(puts_ctx, f.Precision, buf); if(r < 0) return r; @@ -870,7 +869,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu limb_len = LIMB_DIGITS; } prec -= f.Precision; - FUNC_NAME(pf_integer_conv)(buf, ARRAY_SIZE(buf), &f, l); + FUNC_NAME(pf_integer_conv)(buf, &f, l); r = pf_puts(puts_ctx, f.Precision, buf); if(r < 0) return r; @@ -892,7 +891,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu ret += r; f.Precision = three_digit_exp ? 3 : 2; - FUNC_NAME(pf_integer_conv)(buf, ARRAY_SIZE(buf), &f, radix_pos); + FUNC_NAME(pf_integer_conv)(buf, &f, radix_pos); r = pf_puts(puts_ctx, f.Precision, buf); if(r < 0) return r; ret += r; @@ -1068,8 +1067,8 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.PadZero = TRUE; i = flags.Precision; flags.Precision = 2*sizeof(void*); - FUNC_NAME(pf_integer_conv)(buf, ARRAY_SIZE(buf), &flags, - (ULONG_PTR)pf_args(args_ctx, pos, VT_PTR, valist).get_ptr); + FUNC_NAME(pf_integer_conv)(buf, &flags, + (ULONG_PTR)pf_args(args_ctx, pos, VT_PTR, valist).get_ptr); flags.PadZero = FALSE; flags.Precision = i; @@ -1105,15 +1104,15 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API return -1; if(flags.IntegerDouble || (flags.IntegerNative && sizeof(void*) == 8)) - FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, + FUNC_NAME(pf_integer_conv)(tmp, &flags, pf_args(args_ctx, pos, VT_I8, valist).get_longlong); else if(flags.Format=='d' || flags.Format=='i') - FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, + FUNC_NAME(pf_integer_conv)(tmp, &flags, flags.IntegerLength != LEN_SHORT ? pf_args(args_ctx, pos, VT_INT, valist).get_int : (short)pf_args(args_ctx, pos, VT_INT, valist).get_int); else - FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, + FUNC_NAME(pf_integer_conv)(tmp, &flags, flags.IntegerLength != LEN_SHORT ? (unsigned)pf_args(args_ctx, pos, VT_INT, valist).get_int : (unsigned short)pf_args(args_ctx, pos, VT_INT, valist).get_int);

1 0

Alexandre Julliard : ntdll: Handle faults inside the signal handler also on ARM.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 5a68254c131290adbf51843aa82f543afe99fe87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a68254c131290adbf51843a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:23:52 2020 +0200 ntdll: Handle faults inside the signal handler also on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 1fadb0aa07..4ec311de44 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -567,23 +567,8 @@ extern void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEX */ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { - NTSTATUS status; - - switch(rec->ExceptionCode) - { - case EXCEPTION_ACCESS_VIOLATION: - if (rec->NumberParameters == 2) - { - if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0], FALSE ))) - goto done; - } - break; - } - status = NtRaiseException( rec, context, TRUE ); + NTSTATUS status = NtRaiseException( rec, context, TRUE ); if (status) RtlRaiseStatus( status ); -done: - set_cpu_context( context ); } @@ -624,6 +609,9 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec->NumberParameters = 2; rec->ExceptionInformation[0] = (get_error_code(context) & 0x800) != 0; rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; + if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], + rec->ExceptionInformation[0], FALSE ))) + return; break; case TRAP_ARM_ALIGNFLT: /* Alignment check exception */ rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT;

1 0

Alexandre Julliard : ntdll: Fix RtlSizeHeap() error value for 64-bit.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 704d0662bef08a980c87c408fa33f50fc60b5cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=704d0662bef08a980c87c408… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 12:06:32 2020 +0200 ntdll: Fix RtlSizeHeap() error value for 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 8 ++++---- dlls/ntdll/heap.c | 6 +++--- dlls/ntdll/tests/env.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 6c5219b624..dc1a3cd72c 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -333,10 +333,10 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { retval=HeapSize(GetProcessHeap(), 0, hmem); - if (retval == ~0ul) /* It might be a GMEM_MOVEABLE data pointer */ + if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ { retval = HeapSize(GetProcessHeap(), 0, (char*)hmem - HGLOBAL_STORAGE); - if (retval != ~0ul) retval -= HGLOBAL_STORAGE; + if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; } } else @@ -351,7 +351,7 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) else { retval = HeapSize(GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); - if (retval != ~0ul) retval -= HGLOBAL_STORAGE; + if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; } } else @@ -362,7 +362,7 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) } RtlUnlockHeap(GetProcessHeap()); } - if (retval == ~0ul) retval = 0; + if (retval == ~(SIZE_T)0) retval = 0; return retval; } diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index cb66d1a258..f3c76cc82b 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -116,7 +116,7 @@ C_ASSERT( HEAP_MAX_SMALL_FREE_LIST % ALIGNMENT == 0 ); /* Max size of the blocks on the free lists above HEAP_MAX_SMALL_FREE_LIST */ static const SIZE_T HEAP_freeListSizes[] = { - 0x200, 0x400, 0x1000, ~0UL + 0x200, 0x400, 0x1000, ~(SIZE_T)0 }; #define HEAP_NB_FREE_LISTS (ARRAY_SIZE( HEAP_freeListSizes ) + HEAP_NB_SMALL_FREE_LISTS) @@ -2007,7 +2007,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) if (!heapPtr) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_HANDLE ); - return ~0UL; + return ~(SIZE_T)0; } flags &= HEAP_NO_SERIALIZE; flags |= heapPtr->flags; @@ -2017,7 +2017,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr ) if (!validate_block_pointer( heapPtr, &subheap, pArena )) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); - ret = ~0UL; + ret = ~(SIZE_T)0; } else if (!subheap) { diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 9883739eba..4865a0a8e5 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -386,7 +386,7 @@ static void test_process_params(void) else { size = HeapSize( GetProcessHeap(), 0, params ); - ok( size != ~0UL, "not a heap block %p\n", params ); + ok( size != ~(SIZE_T)0, "not a heap block %p\n", params ); ok( params->AllocationSize == params->Size, "wrong AllocationSize %x/%x\n", params->AllocationSize, params->Size ); } @@ -456,7 +456,7 @@ static void test_process_params(void) else { size = HeapSize( GetProcessHeap(), 0, params ); - ok( size != ~0UL, "not a heap block %p\n", params ); + ok( size != ~(SIZE_T)0, "not a heap block %p\n", params ); ok( params->AllocationSize == params->Size, "wrong AllocationSize %x/%x\n", params->AllocationSize, params->Size ); } @@ -509,7 +509,7 @@ static void test_process_params(void) else { size = HeapSize( GetProcessHeap(), 0, cur_params ); - ok( size != ~0UL, "not a heap block %p\n", cur_params ); + ok( size != ~(SIZE_T)0, "not a heap block %p\n", cur_params ); ok( cur_params->AllocationSize == cur_params->Size, "wrong AllocationSize %x/%x\n", cur_params->AllocationSize, cur_params->Size ); ok( cur_params->Size == size, "wrong Size %x/%lx\n", cur_params->Size, size ); @@ -548,7 +548,7 @@ static void test_process_params(void) else { size = HeapSize( GetProcessHeap(), 0, initial_env ); - ok( size != ~0UL, "env is not a heap block %p / %p\n", cur_params, initial_env ); + ok( size != ~(SIZE_T)0, "env is not a heap block %p / %p\n", cur_params, initial_env ); } }

1 0

Piotr Caban : msvcrt: Don't use isspaceW.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: bbf20dbb88dd292397cacc0ce12f193cb4d038bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf20dbb88dd292397cacc0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:43 2020 +0200 msvcrt: Don't use isspaceW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0c99d0faab..076336f43b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2333,7 +2333,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, if(endptr) *endptr = (MSVCRT_wchar_t*)nptr; - while(isspaceW(*nptr)) nptr++; + while(MSVCRT__iswspace_l(*nptr, locale)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -2506,7 +2506,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, if(endptr) *endptr = (MSVCRT_wchar_t*)nptr; - while(isspaceW(*nptr)) nptr++; + while(MSVCRT__iswspace_l(*nptr, locale)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -2675,7 +2675,7 @@ __int64 CDECL MSVCRT__wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t local ULONGLONG RunningTotal = 0; BOOL bMinus = FALSE; - while (isspaceW(*str)) { + while (MSVCRT__iswspace_l(*str, locale)) { str++; } /* while */

1 0

Alexandre Julliard : ntdll: Add a helper function to grow the stack on guard page faults.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: f1e4c54104d92f57d0b3699a800c0f09ce4e8320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e4c54104d92f57d0b3699a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:28:57 2020 +0200 ntdll: Add a helper function to grow the stack on guard page faults. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index a155fc46f8..122f372978 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2844,6 +2844,33 @@ void virtual_map_user_shared_data(void) } +/*********************************************************************** + * grow_thread_stack + */ +static NTSTATUS grow_thread_stack( char *page ) +{ + NTSTATUS ret = 0; + size_t guaranteed = max( NtCurrentTeb()->GuaranteedStackBytes, page_size * (is_win64 ? 2 : 1) ); + + set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); + mprotect_range( page, page_size, 0, 0 ); + if (page >= (char *)NtCurrentTeb()->DeallocationStack + page_size + guaranteed) + { + set_page_vprot_bits( page - page_size, page_size, VPROT_COMMITTED | VPROT_GUARD, 0 ); + mprotect_range( page - page_size, page_size, 0, 0 ); + } + else /* inside guaranteed space -> overflow exception */ + { + page = (char *)NtCurrentTeb()->DeallocationStack + page_size; + set_page_vprot_bits( page, guaranteed, VPROT_COMMITTED, VPROT_GUARD ); + mprotect_range( page, guaranteed, 0, 0 ); + ret = STATUS_STACK_OVERFLOW; + } + NtCurrentTeb()->Tib.StackLimit = page; + return ret; +} + + /*********************************************************************** * virtual_handle_fault */ @@ -3045,24 +3072,7 @@ int virtual_handle_stack_fault( void *addr ) pthread_mutex_lock( &virtual_mutex ); /* no need for signal masking inside signal handler */ if (get_page_vprot( addr ) & VPROT_GUARD) { - size_t guaranteed = max( NtCurrentTeb()->GuaranteedStackBytes, page_size * (is_win64 ? 2 : 1) ); - char *page = ROUND_ADDR( addr, page_mask ); - set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); - mprotect_range( page, page_size, 0, 0 ); - if (page >= (char *)NtCurrentTeb()->DeallocationStack + page_size + guaranteed) - { - set_page_vprot_bits( page - page_size, page_size, VPROT_COMMITTED | VPROT_GUARD, 0 ); - mprotect_range( page - page_size, page_size, 0, 0 ); - ret = 1; - } - else /* inside guaranteed space -> overflow exception */ - { - page = (char *)NtCurrentTeb()->DeallocationStack + page_size; - set_page_vprot_bits( page, guaranteed, VPROT_COMMITTED, VPROT_GUARD ); - mprotect_range( page, guaranteed, 0, 0 ); - ret = -1; - } - NtCurrentTeb()->Tib.StackLimit = page; + ret = grow_thread_stack( ROUND_ADDR( addr, page_mask )) ? -1 : 1; } pthread_mutex_unlock( &virtual_mutex ); return ret;

1 0