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

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

July 15, 2020

Module: wine Branch: master Commit: adb4e74b479d5406454dffa17fe908742306ac6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb4e74b479d5406454dffa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:34:47 2020 +0200 ntdll: Send debug event before pushing exception data on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 1e8abb494c..34463309de 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -529,12 +529,24 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) CONTEXT context; EXCEPTION_RECORD rec; } *stack; + void *stack_ptr = (void *)(SP_sig(sigcontext) & ~3); + CONTEXT context; + NTSTATUS status; rec->ExceptionAddress = (void *)PC_sig(sigcontext); + save_context( &context, sigcontext ); + + status = send_debug_event( rec, &context, TRUE ); + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) + { + restore_context( &context, sigcontext ); + return; + } + stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; - save_context( &stack->context, sigcontext ); + stack->context = context; /* now modify the sigcontext to return to the raise function */ SP_sig(sigcontext) = (DWORD)stack;

1 0

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

July 15, 2020

Module: wine Branch: master Commit: 3889c374a11d92733f6830473ff589f8846a7396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3889c374a11d92733f683047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:40:04 2020 +0200 ntdll: Send debug event before pushing exception data on x86. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 261 ++++++++++++++++++++---------------------- 1 file changed, 124 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3889c374a11d92733f68…

1 0

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

July 15, 2020

Module: wine Branch: master Commit: ae9c385e13cff233527b55090dc8ae55de6664ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9c385e13cff233527b5509… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:36 2020 +0200 msvcrt: Don't use strstrW in wcsstr. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 59ff24e196..ff066fb5c5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2652,7 +2652,19 @@ int CDECL MSVCRT_wcslen(const MSVCRT_wchar_t *str) */ MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *sub) { - return strstrW(str, sub); + while(*str) + { + const MSVCRT_wchar_t *p1 = str, *p2 = sub; + while(*p1 && *p2 && *p1 == *p2) + { + p1++; + p2++; + } + if(!*p2) + return (MSVCRT_wchar_t*)str; + str++; + } + return NULL; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Use _iswctype_l in _iswspace_l function.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 8d2a2c942331c8d6c87617aeb80acc2984b4e905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d2a2c942331c8d6c87617ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:40 2020 +0200 msvcrt: Use _iswctype_l in _iswspace_l function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ff066fb5c5..0c99d0faab 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1912,6 +1912,22 @@ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate return MSVCRT_wctomb(dst, ch); } +/********************************************************************* + * _iswctype_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) +{ + return (get_char_typeW(wc) & 0xffff) & type; +} + +/********************************************************************* + * iswctype (MSVCRT.@) + */ +INT CDECL MSVCRT_iswctype( MSVCRT_wchar_t wc, MSVCRT_wctype_t type ) +{ + return (get_char_typeW(wc) & 0xfff) & type; +} + /********************************************************************* * iswalnum (MSVCRT.@) */ @@ -2045,7 +2061,7 @@ INT CDECL MSVCRT_iswpunct( MSVCRT_wchar_t wc ) */ INT CDECL MSVCRT__iswspace_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isspaceW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__SPACE, locale ); } /********************************************************************* @@ -2053,7 +2069,7 @@ INT CDECL MSVCRT__iswspace_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) */ INT CDECL MSVCRT_iswspace( MSVCRT_wchar_t wc ) { - return isspaceW( wc ); + return MSVCRT__iswspace_l( wc, NULL ); } /********************************************************************* @@ -2088,22 +2104,6 @@ int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) return isxdigitW( wc ); } -/********************************************************************* - * _iswctype_l (MSVCRT.@) - */ -INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) -{ - return (get_char_typeW(wc) & 0xffff) & type; -} - -/********************************************************************* - * iswctype (MSVCRT.@) - */ -INT CDECL MSVCRT_iswctype( MSVCRT_wchar_t wc, MSVCRT_wctype_t type ) -{ - return (get_char_typeW(wc) & 0xfff) & type; -} - /********************************************************************* * _iswblank_l (MSVCRT.@) */

1 0

Alexandre Julliard : ntdll: Initialize the thread signal stack in the common code.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 99851ca4c2edd4b921c91327540d69dec77c5df7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99851ca4c2edd4b921c91327… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:23:00 2020 +0200 ntdll: Initialize the thread signal stack in the common code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 9 +++++++-- dlls/ntdll/unix/signal_arm64.c | 9 --------- dlls/ntdll/unix/signal_i386.c | 18 ------------------ dlls/ntdll/unix/signal_x86_64.c | 19 ------------------- dlls/ntdll/unix/unix_private.h | 6 ++++++ dlls/ntdll/unix/virtual.c | 23 +++++++++++------------ 6 files changed, 24 insertions(+), 60 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index faca7da5c9..452094ff5d 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1508,15 +1508,20 @@ size_t server_init_thread( void *entry_point, BOOL *suspend ) int ret; int reply_pipe[2]; struct sigaction sig_act; + stack_t ss; size_t info_size; + /* ignore SIGPIPE so that we get an EPIPE error instead */ sig_act.sa_handler = SIG_IGN; sig_act.sa_flags = 0; sigemptyset( &sig_act.sa_mask ); - - /* ignore SIGPIPE so that we get an EPIPE error instead */ sigaction( SIGPIPE, &sig_act, NULL ); + ss.ss_sp = get_signal_stack(); + ss.ss_size = signal_stack_size; + ss.ss_flags = 0; + sigaltstack( &ss, NULL ); + /* create the server->client communication pipes */ if (server_pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" ); if (server_pipe( ntdll_get_thread_data()->wait_fd ) == -1) server_protocol_perror( "pipe" ); diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3a3afb5ad5..6c86ec265e 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -114,8 +114,6 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) static pthread_key_t teb_key; -static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ - typedef void (*raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); /* stack layout when calling an exception raise function */ @@ -863,13 +861,6 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - stack_t ss; - - ss.ss_sp = (char *)teb + teb_size; - ss.ss_size = signal_stack_size; - ss.ss_flags = 0; - if (sigaltstack( &ss, NULL ) == -1) perror( "sigaltstack" ); - /* Win64/ARM applications expect the TEB pointer to be in the x18 platform register. */ __asm__ __volatile__( "mov x18, %0" : : "r" (teb) ); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 44195fc205..be041f3fb2 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -436,7 +436,6 @@ struct stack_layout DWORD eip; }; -static const size_t teb_size = 4096; /* we reserve one page for the TEB */ static ULONG first_ldt_entry = 32; enum i386_trap_code @@ -542,17 +541,6 @@ static inline int ldt_is_system( WORD sel ) } -/*********************************************************************** - * get_signal_stack - * - * Get the base of the signal stack for the current thread. - */ -static inline void *get_signal_stack(void) -{ - return (char *)NtCurrentTeb() + 4096; -} - - /*********************************************************************** * get_current_teb * @@ -2205,12 +2193,6 @@ void signal_init_thread( TEB *teb ) { const WORD fpu_cw = 0x27f; struct x86_thread_data *thread_data = (struct x86_thread_data *)teb->SystemReserved2; - stack_t ss; - - ss.ss_sp = (char *)teb + teb_size; - ss.ss_size = signal_stack_size; - ss.ss_flags = 0; - if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); ldt_set_fs( thread_data->fs, teb ); thread_data->gs = get_gs(); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a2240900ab..f4d64ed4e5 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -225,8 +225,6 @@ enum i386_trap_code TRAP_x86_CACHEFLT = 19 /* Cache flush exception */ }; -static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ - typedef void (*raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); /* stack layout when calling an exception raise function */ @@ -1379,17 +1377,6 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex } -/*********************************************************************** - * get_signal_stack - * - * Get the base of the signal stack for the current thread. - */ -static inline void *get_signal_stack(void) -{ - return (char *)NtCurrentTeb() + teb_size; -} - - /*********************************************************************** * is_inside_signal_stack * @@ -2451,7 +2438,6 @@ static void *mac_thread_gsbase(void) void signal_init_thread( TEB *teb ) { const WORD fpu_cw = 0x27f; - stack_t ss; #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); @@ -2475,11 +2461,6 @@ void signal_init_thread( TEB *teb ) # error Please define setting %gs for your architecture #endif - ss.ss_sp = (char *)teb + teb_size; - ss.ss_size = signal_stack_size; - ss.ss_flags = 0; - if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); - #ifdef __GNUC__ __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); #else diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3d56ea5d40..1e8f82a8a7 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -145,6 +145,7 @@ extern timeout_t server_start_time DECLSPEC_HIDDEN; extern sigset_t server_block_set DECLSPEC_HIDDEN; extern SIZE_T signal_stack_size DECLSPEC_HIDDEN; extern SIZE_T signal_stack_mask DECLSPEC_HIDDEN; +static const SIZE_T teb_size = 0x1000 * sizeof(void *) / 4; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; #ifdef __i386__ extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; @@ -270,6 +271,11 @@ static inline IMAGE_NT_HEADERS *get_exe_nt_header(void) return (IMAGE_NT_HEADERS *)((char *)module + module->e_lfanew); } +static inline void *get_signal_stack(void) +{ + return (char *)NtCurrentTeb() + teb_size; +} + static inline size_t ntdll_wcslen( const WCHAR *str ) { const WCHAR *s = str; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 63efb74382..9ba1053a0d 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -156,7 +156,6 @@ struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; SIZE_T signal_stack_size = 0; SIZE_T signal_stack_mask = 0; -static SIZE_T signal_stack_align; /* TEB allocation blocks */ static TEB *teb_block; @@ -2355,7 +2354,7 @@ void virtual_init(void) const struct preload_info **preload_info = dlsym( RTLD_DEFAULT, "wine_main_preload_info" ); const char *preload = getenv( "WINEPRELOADRESERVE" ); struct alloc_virtual_heap alloc_views; - size_t size; + size_t size, align; int i; pthread_mutexattr_t attr; @@ -2383,12 +2382,12 @@ void virtual_init(void) } } - size = ROUND_SIZE( 0, sizeof(TEB) ) + max( MINSIGSTKSZ, 8192 ); + size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than size */ - signal_stack_align = page_shift; - while ((1u << signal_stack_align) < size) signal_stack_align++; - signal_stack_mask = (1 << signal_stack_align) - 1; - signal_stack_size = (1 << signal_stack_align) - ROUND_SIZE( 0, sizeof(TEB) ); + align = page_shift; + while ((1u << align) < size) align++; + signal_stack_mask = (1 << align) - 1; + signal_stack_size = (1 << align) - teb_size; /* try to find space in a reserved area for the views and pages protection table */ #ifdef _WIN64 @@ -2584,8 +2583,8 @@ TEB *virtual_alloc_first_teb(void) NTSTATUS status; SIZE_T data_size = page_size; SIZE_T peb_size = page_size; - SIZE_T teb_size = signal_stack_mask + 1; - SIZE_T total = 32 * teb_size; + SIZE_T block_size = signal_stack_size + teb_size; + SIZE_T total = 32 * block_size; /* reserve space for shared user data */ status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&user_shared_data, 0, &data_size, @@ -2599,9 +2598,9 @@ TEB *virtual_alloc_first_teb(void) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&teb_block, 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; - teb = (TEB *)((char *)teb_block + 30 * teb_size); - peb = (PEB *)((char *)teb_block + 32 * teb_size - peb_size); - NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&teb, 0, &teb_size, MEM_COMMIT, PAGE_READWRITE ); + teb = (TEB *)((char *)teb_block + 30 * block_size); + peb = (PEB *)((char *)teb_block + 32 * block_size - peb_size); + NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&teb, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&peb, 0, &peb_size, MEM_COMMIT, PAGE_READWRITE ); init_teb( teb, peb ); *(ULONG_PTR *)peb->Reserved = get_image_address();

1 0

Alexandre Julliard : ntdll: Add a helper function to push the exception data to the thread stack.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: ca45eda758e29261691b27eecf1f4fc78bdfadc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca45eda758e29261691b27ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:30:45 2020 +0200 ntdll: Add a helper function to push the exception data to the thread stack. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 15 +++----- dlls/ntdll/unix/signal_arm64.c | 18 ++++------ dlls/ntdll/unix/signal_i386.c | 70 +++--------------------------------- dlls/ntdll/unix/signal_x86_64.c | 80 +++-------------------------------------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 79 +++++++++++++++++++++++++++------------- 6 files changed, 78 insertions(+), 186 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca45eda758e29261691b…

1 0

Alexandre Julliard : ntdll: Also handle stack guard page faults in virtual_handle_fault().
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 9a9fb47e24d3daa57aa24bc5529e33b6271b92bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9fb47e24d3daa57aa24bc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:29:50 2020 +0200 ntdll: Also handle stack guard page faults in virtual_handle_fault(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 19 ++++++------------- dlls/ntdll/unix/signal_arm64.c | 19 ++++++------------- dlls/ntdll/unix/signal_i386.c | 28 ++++++---------------------- dlls/ntdll/unix/signal_x86_64.c | 26 ++++++-------------------- dlls/ntdll/unix/virtual.c | 11 ++++++++--- 5 files changed, 32 insertions(+), 71 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index b74dbd32de..e7a259f632 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -585,18 +585,14 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) /* check for page fault inside the thread stack */ if (get_trap_code(signal, context) == TRAP_ARM_PAGEFLT) { - switch (virtual_handle_stack_fault( info->si_addr )) - { - case 1: /* handled */ - return; - case -1: /* overflow */ - rec = setup_exception( context, raise_segv_exception ); - rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; - return; - } + DWORD err = (get_error_code(context) & 0x800) != 0; + NTSTATUS status = virtual_handle_fault( info->si_addr, err, (void *)SP_sig(context) ); + if (!status) return; + rec = setup_exception( context, raise_segv_exception ); + rec->ExceptionCode = status; } + else rec = setup_exception( context, raise_segv_exception ); - rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; switch(get_trap_code(signal, context)) @@ -609,9 +605,6 @@ 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], NULL ))) - return; break; case TRAP_ARM_ALIGNFLT: /* Alignment check exception */ rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index b402ecb93d..27185dbb17 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -619,18 +619,14 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) /* check for page fault inside the thread stack */ if (signal == SIGSEGV) { - switch (virtual_handle_stack_fault( info->si_addr )) - { - case 1: /* handled */ - return; - case -1: /* overflow */ - stack = setup_exception( context ); - stack->rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; - goto done; - } + DWORD err = (get_fault_esr( context ) & 0x40) != 0; + NTSTATUS status = virtual_handle_fault( info->si_addr, err, (void *)SP_sig(context) ); + if (!status) return; + stack = setup_exception( context ); + stack->rec.ExceptionCode = status; } + else stack = setup_exception( context ); - stack = setup_exception( context ); if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) goto done; switch(signal) @@ -642,9 +638,6 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) stack->rec.NumberParameters = 2; stack->rec.ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; stack->rec.ExceptionInformation[1] = (ULONG_PTR)info->si_addr; - if (!(stack->rec.ExceptionCode = virtual_handle_fault( (void *)stack->rec.ExceptionInformation[1], - stack->rec.ExceptionInformation[0], NULL ))) - return; break; case SIGBUS: /* Alignment check exception */ stack->rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 3bdf7c38e9..9d7635bcf4 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1665,29 +1665,16 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) void *stack_ptr = init_handler( sigcontext ); /* check for exceptions on the signal stack caused by write watches */ - if (TRAP_sig(context) == TRAP_x86_PAGEFLT && - (char *)stack_ptr >= (char *)get_signal_stack() && - (char *)stack_ptr < (char *)get_signal_stack() + signal_stack_size && - !virtual_handle_fault( siginfo->si_addr, (ERROR_sig(context) >> 1) & 0x09, stack_ptr )) - { - return; - } - - /* check for page fault inside the thread stack */ if (TRAP_sig(context) == TRAP_x86_PAGEFLT) { - switch (virtual_handle_stack_fault( siginfo->si_addr )) - { - case 1: /* handled */ - return; - case -1: /* overflow */ - stack = setup_exception_record( context, stack_ptr ); - stack->rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; - goto done; - } + DWORD err = (ERROR_sig(context) >> 1) & 0x09; + NTSTATUS status = virtual_handle_fault( siginfo->si_addr, err, stack_ptr ); + if (!status) return; + stack = setup_exception_record( context, stack_ptr ); + stack->rec.ExceptionCode = status; } + else stack = setup_exception_record( context, stack_ptr ); - stack = setup_exception_record( context, stack_ptr ); if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) goto done; switch (TRAP_sig(context)) @@ -1727,9 +1714,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.NumberParameters = 2; stack->rec.ExceptionInformation[0] = (ERROR_sig(context) >> 1) & 0x09; stack->rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - stack->rec.ExceptionCode = virtual_handle_fault( (void *)stack->rec.ExceptionInformation[1], - stack->rec.ExceptionInformation[0], NULL ); - if (!stack->rec.ExceptionCode) return; if (stack->rec.ExceptionCode == EXCEPTION_ACCESS_VIOLATION && stack->rec.ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) { diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9b56044c70..1c8648c243 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2125,27 +2125,16 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack = (struct stack_layout *)(RSP_sig(ucontext) & ~15); /* check for exceptions on the signal stack caused by write watches */ - if (TRAP_sig(ucontext) == TRAP_x86_PAGEFLT && is_inside_signal_stack( stack ) && - !virtual_handle_fault( siginfo->si_addr, (ERROR_sig(ucontext) >> 1) & 0x09, stack )) - { - return; - } - - /* check for page fault inside the thread stack */ if (TRAP_sig(ucontext) == TRAP_x86_PAGEFLT) { - switch (virtual_handle_stack_fault( siginfo->si_addr )) - { - case 1: /* handled */ - return; - case -1: /* overflow */ - stack = setup_exception( sigcontext ); - stack->rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; - goto done; - } + DWORD err = (ERROR_sig(ucontext) >> 1) & 0x09; + NTSTATUS status = virtual_handle_fault( siginfo->si_addr, err, stack ); + if (!status) return; + stack = setup_exception( sigcontext ); + stack->rec.ExceptionCode = status; } + else stack = setup_exception( sigcontext ); - stack = setup_exception( sigcontext ); if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) goto done; switch(TRAP_sig(ucontext)) @@ -2178,9 +2167,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.NumberParameters = 2; stack->rec.ExceptionInformation[0] = (ERROR_sig(ucontext) >> 1) & 0x09; stack->rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - if (!(stack->rec.ExceptionCode = virtual_handle_fault((void *)stack->rec.ExceptionInformation[1], - stack->rec.ExceptionInformation[0], NULL ))) - return; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ stack->rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 122f372978..8775f94fba 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2884,9 +2884,14 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) vprot = get_page_vprot( page ); if (!is_inside_signal_stack( stack ) && (vprot & VPROT_GUARD)) { - set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); - mprotect_range( page, page_size, 0, 0 ); - ret = STATUS_GUARD_PAGE_VIOLATION; + if (page < (char *)NtCurrentTeb()->DeallocationStack || + page >= (char *)NtCurrentTeb()->Tib.StackBase) + { + set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); + mprotect_range( page, page_size, 0, 0 ); + ret = STATUS_GUARD_PAGE_VIOLATION; + } + else ret = grow_thread_stack( page ); } else if (err & EXCEPTION_WRITE_FAULT) {

1 0

Alexandre Julliard : ntdll: Add support for FPU registers in signal context on ARM.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: f30ba2cf256054c4aa6b75ff2f282dfe8e2c219a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f30ba2cf256054c4aa6b75ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:23:34 2020 +0200 ntdll: Add support for FPU registers in signal context on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 73 +++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index abe47da929..1fadb0aa07 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -104,6 +104,48 @@ typedef struct ucontext # define ERROR_sig(context) REG_sig(error_code, context) # define TRAP_sig(context) REG_sig(trap_no, context) +struct extended_ctx +{ + unsigned long magic; + unsigned long size; +}; + +struct vfp_sigframe +{ + struct extended_ctx ctx; + unsigned long long fpregs[32]; + unsigned long fpscr; +}; + +static void *get_extended_sigcontext( const ucontext_t *sigcontext, unsigned int magic ) +{ + struct extended_ctx *ctx = (struct extended_ctx *)sigcontext->uc_regspace; + while ((char *)ctx < (char *)(sigcontext + 1) && ctx->magic && ctx->size) + { + if (ctx->magic == magic) return ctx; + ctx = (struct extended_ctx *)((char *)ctx + ctx->size); + } + return NULL; +} + +static void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +{ + struct vfp_sigframe *frame = get_extended_sigcontext( sigcontext, 0x56465001 ); + + if (!frame) return; + memcpy( context->u.D, frame->fpregs, sizeof(context->u.D) ); + context->Fpscr = frame->fpscr; +} + +static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) +{ + struct vfp_sigframe *frame = get_extended_sigcontext( sigcontext, 0x56465001 ); + + if (!frame) return; + memcpy( frame->fpregs, context->u.D, sizeof(context->u.D) ); + frame->fpscr = context->Fpscr; +} + #elif defined(__FreeBSD__) /* All Registers access - only for local access */ @@ -117,6 +159,9 @@ typedef struct ucontext # define IP_sig(context) REGn_sig(_REG_R12, context) /* Intra-Procedure-call scratch register */ # define FP_sig(context) REGn_sig(_REG_FP, context) /* Frame pointer */ +static void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) { } +static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) { } + #endif /* linux */ enum arm_trap_code @@ -200,6 +245,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) context->Cpsr = CPSR_sig(sigcontext); /* Current State Register */ context->R11 = FP_sig(sigcontext); /* Frame pointer */ context->R12 = IP_sig(sigcontext); /* Intra-Procedure-call scratch register */ + save_fpu( context, sigcontext ); } @@ -216,33 +262,12 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) #undef C SP_sig(sigcontext) = context->Sp; /* Stack pointer */ - LR_sig(sigcontext) = context->Lr ; /* Link register */ + LR_sig(sigcontext) = context->Lr; /* Link register */ PC_sig(sigcontext) = context->Pc; /* Program Counter */ CPSR_sig(sigcontext) = context->Cpsr; /* Current State Register */ FP_sig(sigcontext) = context->R11; /* Frame pointer */ IP_sig(sigcontext) = context->R12; /* Intra-Procedure-call scratch register */ -} - - -/*********************************************************************** - * save_fpu - * - * Set the FPU context from a sigcontext. - */ -static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) -{ - FIXME("not implemented\n"); -} - - -/*********************************************************************** - * restore_fpu - * - * Restore the FPU context to a sigcontext. - */ -static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) -{ - FIXME("not implemented\n"); + restore_fpu( context, sigcontext ); } @@ -661,7 +686,6 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) CONTEXT context; NTSTATUS status; - save_fpu( &context, sigcontext ); save_context( &context, sigcontext ); switch (siginfo->si_code & 0xffff ) @@ -716,7 +740,6 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (status) RtlRaiseStatus( status ); restore_context( &context, sigcontext ); - restore_fpu( &context, sigcontext ); }

1 0

Alexandre Julliard : ntdll: Pass the stack address to the virtual_handle_fault() function.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 432d504118f4c00cc33c199946b36448cc6355e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=432d504118f4c00cc33c1999… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:28:26 2020 +0200 ntdll: Pass the stack address to the virtual_handle_fault() function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 18 ++++++++++++------ 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 4ec311de44..b74dbd32de 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -610,7 +610,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) 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 ))) + rec->ExceptionInformation[0], NULL ))) return; break; case TRAP_ARM_ALIGNFLT: /* Alignment check exception */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 6c86ec265e..b402ecb93d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -643,7 +643,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) stack->rec.ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; stack->rec.ExceptionInformation[1] = (ULONG_PTR)info->si_addr; if (!(stack->rec.ExceptionCode = virtual_handle_fault( (void *)stack->rec.ExceptionInformation[1], - stack->rec.ExceptionInformation[0], FALSE ))) + stack->rec.ExceptionInformation[0], NULL ))) return; break; case SIGBUS: /* Alignment check exception */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index be041f3fb2..3bdf7c38e9 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1668,7 +1668,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (TRAP_sig(context) == TRAP_x86_PAGEFLT && (char *)stack_ptr >= (char *)get_signal_stack() && (char *)stack_ptr < (char *)get_signal_stack() + signal_stack_size && - !virtual_handle_fault( siginfo->si_addr, (ERROR_sig(context) >> 1) & 0x09, TRUE )) + !virtual_handle_fault( siginfo->si_addr, (ERROR_sig(context) >> 1) & 0x09, stack_ptr )) { return; } @@ -1728,7 +1728,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionInformation[0] = (ERROR_sig(context) >> 1) & 0x09; stack->rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; stack->rec.ExceptionCode = virtual_handle_fault( (void *)stack->rec.ExceptionInformation[1], - stack->rec.ExceptionInformation[0], FALSE ); + stack->rec.ExceptionInformation[0], NULL ); if (!stack->rec.ExceptionCode) return; if (stack->rec.ExceptionCode == EXCEPTION_ACCESS_VIOLATION && stack->rec.ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index f4d64ed4e5..9b56044c70 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2126,7 +2126,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) /* check for exceptions on the signal stack caused by write watches */ if (TRAP_sig(ucontext) == TRAP_x86_PAGEFLT && is_inside_signal_stack( stack ) && - !virtual_handle_fault( siginfo->si_addr, (ERROR_sig(ucontext) >> 1) & 0x09, TRUE )) + !virtual_handle_fault( siginfo->si_addr, (ERROR_sig(ucontext) >> 1) & 0x09, stack )) { return; } @@ -2179,7 +2179,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionInformation[0] = (ERROR_sig(ucontext) >> 1) & 0x09; stack->rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; if (!(stack->rec.ExceptionCode = virtual_handle_fault((void *)stack->rec.ExceptionInformation[1], - stack->rec.ExceptionInformation[0], FALSE ))) + stack->rec.ExceptionInformation[0], NULL ))) return; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1e8f82a8a7..79b5d1e118 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -196,7 +196,7 @@ extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_clear_tls_index( ULONG index ) DECLSPEC_HIDDEN; extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; extern ssize_t virtual_locked_read( int fd, void *addr, size_t size ) DECLSPEC_HIDDEN; extern ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 9ba1053a0d..a155fc46f8 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -203,6 +203,13 @@ static struct range_entry *free_ranges; static struct range_entry *free_ranges_end; +static inline BOOL is_inside_signal_stack( void *ptr ) +{ + return ((char *)ptr >= (char *)get_signal_stack() && + (char *)ptr < (char *)get_signal_stack() + signal_stack_size); +} + + static void reserve_area( void *addr, void *end ) { #ifdef __APPLE__ @@ -2840,16 +2847,15 @@ void virtual_map_user_shared_data(void) /*********************************************************************** * virtual_handle_fault */ -NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) +NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) { NTSTATUS ret = STATUS_ACCESS_VIOLATION; - void *page = ROUND_ADDR( addr, page_mask ); - sigset_t sigset; + char *page = ROUND_ADDR( addr, page_mask ); BYTE vprot; - server_enter_uninterrupted_section( &virtual_mutex, &sigset ); + pthread_mutex_lock( &virtual_mutex ); /* no need for signal masking inside signal handler */ vprot = get_page_vprot( page ); - if (!on_signal_stack && (vprot & VPROT_GUARD)) + if (!is_inside_signal_stack( stack ) && (vprot & VPROT_GUARD)) { set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); mprotect_range( page, page_size, 0, 0 ); @@ -2869,7 +2875,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) ret = STATUS_SUCCESS; } } - server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + pthread_mutex_unlock( &virtual_mutex ); return ret; }

1 0

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

July 15, 2020

Module: wine Branch: master Commit: 7b795324483504e911350a8c0710d4c2fa2b6dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b795324483504e911350a8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 10:47:47 2020 +0200 ntdll: Send debug event before pushing exception data on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 190 +++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b795324483504e91135…

1 0