September 2019 - Wine-commits

Alexandre Julliard : ntdll: Remove no longer needed function argument from setup_raise_exception() on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: d9ec920fd9234a1cc257264bae5a5a41d3a760b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9ec920fd9234a1cc257264b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 21:02:29 2019 +0200 ntdll: Remove no longer needed function argument from setup_raise_exception() on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 56 +++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 11ef7c393a..8876790195 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -422,9 +422,9 @@ typedef struct trapframe ucontext_t; /* stack layout when calling an exception raise function */ struct stack_layout { - void *ret_addr; /* return address from raise_func */ - EXCEPTION_RECORD *rec_ptr; /* first arg for raise_func */ - CONTEXT *context_ptr; /* second arg for raise_func */ + void *ret_addr; /* return address from raise_generic_exception */ + EXCEPTION_RECORD *rec_ptr; /* first arg for raise_generic_exception */ + CONTEXT *context_ptr; /* second arg for raise_generic_exception */ CONTEXT context; EXCEPTION_RECORD rec; DWORD ebp; @@ -804,8 +804,6 @@ static int solaris_sigaction( int sig, const struct sigaction *new, struct sigac #endif -typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); - extern void clear_alignment_flag(void); __ASM_GLOBAL_FUNC( clear_alignment_flag, "pushfl\n\t" @@ -1852,15 +1850,29 @@ static struct stack_layout *setup_exception( ucontext_t *sigcontext ) } +/********************************************************************** + * raise_generic_exception + * + * Generic raise function for exceptions that don't need special treatment. + */ +static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status; + + status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); +} + + /*********************************************************************** * setup_raise_exception * * Change context to setup a call to a raise exception function. */ -static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack, raise_func func ) +static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack ) { ESP_sig(sigcontext) = (DWORD)stack; - EIP_sig(sigcontext) = (DWORD)func; + EIP_sig(sigcontext) = (DWORD)raise_generic_exception; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); CS_sig(sigcontext) = wine_get_cs(); @@ -1869,8 +1881,8 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * FS_sig(sigcontext) = wine_get_fs(); GS_sig(sigcontext) = wine_get_gs(); SS_sig(sigcontext) = wine_get_ss(); - stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ - stack->rec_ptr = &stack->rec; /* arguments for raise_func */ + stack->ret_addr = (void *)0xdeadbabe; /* raise_generic_exception must not return */ + stack->rec_ptr = &stack->rec; /* arguments for raise_generic_exception */ stack->context_ptr = &stack->context; } @@ -1900,20 +1912,6 @@ static inline DWORD get_fpu_code( const CONTEXT *context ) } -/********************************************************************** - * raise_generic_exception - * - * Generic raise function for exceptions that don't need special treatment. - */ -static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status; - - status = NtRaiseException( rec, context, TRUE ); - raise_status( status, rec ); -} - - /*********************************************************************** * handle_interrupt * @@ -1945,7 +1943,7 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, st stack->rec.ExceptionInformation[0] = stack->context.Eax; stack->rec.ExceptionInformation[1] = stack->context.Ecx; stack->rec.ExceptionInformation[2] = stack->context.Edx; - setup_raise_exception( sigcontext, stack, raise_generic_exception ); + setup_raise_exception( sigcontext, stack ); return TRUE; default: return FALSE; @@ -2068,7 +2066,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } done: - setup_raise_exception( context, stack, raise_generic_exception ); + setup_raise_exception( context, stack ); } @@ -2110,7 +2108,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionInformation[2] = 0; /* FIXME */ break; } - setup_raise_exception( context, stack, raise_generic_exception ); + setup_raise_exception( context, stack ); } @@ -2156,7 +2154,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } - setup_raise_exception( context, stack, raise_generic_exception ); + setup_raise_exception( context, stack ); } @@ -2175,7 +2173,7 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = CONTROL_C_EXIT; - setup_raise_exception( sigcontext, stack, raise_generic_exception ); + setup_raise_exception( sigcontext, stack ); } } @@ -2189,7 +2187,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; stack->rec.ExceptionFlags = EH_NONCONTINUABLE; - setup_raise_exception( sigcontext, stack, raise_generic_exception ); + setup_raise_exception( sigcontext, stack ); }

1 0

Alexandre Julliard : ntdll: Use a stack_layout structure to build exception data on ARM64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 7736f3837e4b22606ffff590cfa99c2f58dc8a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7736f3837e4b22606ffff590… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 21:07:14 2019 +0200 ntdll: Use a stack_layout structure to build exception data on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 80 +++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index ebba8e9cae..3194cc82b6 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -114,6 +114,15 @@ static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ static const size_t signal_stack_size = max( MINSIGSTKSZ, 8192 ); typedef void (WINAPI *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[2]; +}; + typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; @@ -471,18 +480,13 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) /*********************************************************************** - * setup_exception_record + * setup_exception * * Setup the exception record and context on the thread stack. */ -static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func func ) +static struct stack_layout *setup_exception( ucontext_t *sigcontext, raise_func func ) { - struct stack_layout - { - CONTEXT context; - EXCEPTION_RECORD rec; - void *redzone[2]; - } *stack; + struct stack_layout *stack; DWORD exception_code = 0; /* push the stack_layout structure */ @@ -503,7 +507,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun REGn_sig(0, sigcontext) = (ULONG_PTR)&stack->rec; /* first arg for raise_func */ REGn_sig(1, sigcontext) = (ULONG_PTR)&stack->context; /* second arg for raise_func */ - return &stack->rec; + return stack; } /********************************************************************** @@ -1039,7 +1043,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f */ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { - EXCEPTION_RECORD *rec; + struct stack_layout *stack; ucontext_t *context = ucontext; /* check for page fault inside the thread stack */ @@ -1050,32 +1054,32 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case 1: /* handled */ return; case -1: /* overflow */ - rec = setup_exception( context, raise_segv_exception ); - rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; + stack = setup_exception( context, raise_segv_exception ); + stack->rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; return; } } - rec = setup_exception( context, raise_segv_exception ); - if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; + stack = setup_exception( context, raise_segv_exception ); + if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; switch(signal) { case SIGILL: /* Invalid opcode exception */ - rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + stack->rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; case SIGSEGV: /* Segmentation fault */ - rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; - rec->NumberParameters = 2; - rec->ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; - rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; + stack->rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + stack->rec.NumberParameters = 2; + stack->rec.ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; + stack->rec.ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */ - rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; + stack->rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default: ERR("Got unexpected signal %i\n", signal); - rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + stack->rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } } @@ -1088,16 +1092,16 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) static void trap_handler( int signal, siginfo_t *info, void *ucontext ) { ucontext_t *context = ucontext; - EXCEPTION_RECORD *rec = setup_exception( context, raise_trap_exception ); + struct stack_layout *stack = setup_exception( context, raise_trap_exception ); switch (info->si_code) { case TRAP_TRACE: - rec->ExceptionCode = EXCEPTION_SINGLE_STEP; + stack->rec.ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: default: - rec->ExceptionCode = EXCEPTION_BREAKPOINT; + stack->rec.ExceptionCode = EXCEPTION_BREAKPOINT; break; } } @@ -1109,50 +1113,50 @@ 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 = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); switch (siginfo->si_code & 0xffff ) { #ifdef FPE_FLTSUB case FPE_FLTSUB: - rec->ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; + stack->rec.ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; break; #endif #ifdef FPE_INTDIV case FPE_INTDIV: - rec->ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; + stack->rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; break; #endif #ifdef FPE_INTOVF case FPE_INTOVF: - rec->ExceptionCode = EXCEPTION_INT_OVERFLOW; + stack->rec.ExceptionCode = EXCEPTION_INT_OVERFLOW; break; #endif #ifdef FPE_FLTDIV case FPE_FLTDIV: - rec->ExceptionCode = EXCEPTION_FLT_DIVIDE_BY_ZERO; + stack->rec.ExceptionCode = EXCEPTION_FLT_DIVIDE_BY_ZERO; break; #endif #ifdef FPE_FLTOVF case FPE_FLTOVF: - rec->ExceptionCode = EXCEPTION_FLT_OVERFLOW; + stack->rec.ExceptionCode = EXCEPTION_FLT_OVERFLOW; break; #endif #ifdef FPE_FLTUND case FPE_FLTUND: - rec->ExceptionCode = EXCEPTION_FLT_UNDERFLOW; + stack->rec.ExceptionCode = EXCEPTION_FLT_UNDERFLOW; break; #endif #ifdef FPE_FLTRES case FPE_FLTRES: - rec->ExceptionCode = EXCEPTION_FLT_INEXACT_RESULT; + stack->rec.ExceptionCode = EXCEPTION_FLT_INEXACT_RESULT; break; #endif #ifdef FPE_FLTINV case FPE_FLTINV: #endif default: - rec->ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + stack->rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } } @@ -1166,9 +1170,9 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { if (!dispatch_signal(SIGINT)) { - EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); - rec->ExceptionCode = CONTROL_C_EXIT; + stack->rec.ExceptionCode = CONTROL_C_EXIT; } } @@ -1180,10 +1184,10 @@ 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 = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); - rec->ExceptionCode = EXCEPTION_WINE_ASSERTION; - rec->ExceptionFlags = EH_NONCONTINUABLE; + stack->rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; + stack->rec.ExceptionFlags = EH_NONCONTINUABLE; }

1 0

Alexandre Julliard : ntdll: Factor out setup_raise_exception() on ARM64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 769c333c6c67721d9f78edc7c7efd70d8700de22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=769c333c6c67721d9f78edc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 21:15:49 2019 +0200 ntdll: Factor out setup_raise_exception() on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 3194cc82b6..a029960ba4 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -484,7 +484,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) * * Setup the exception record and context on the thread stack. */ -static struct stack_layout *setup_exception( ucontext_t *sigcontext, raise_func func ) +static struct stack_layout *setup_exception( ucontext_t *sigcontext ) { struct stack_layout *stack; DWORD exception_code = 0; @@ -500,14 +500,20 @@ static struct stack_layout *setup_exception( ucontext_t *sigcontext, raise_func save_context( &stack->context, sigcontext ); save_fpu( &stack->context, sigcontext ); + return stack; +} - /* now modify the sigcontext to return to the raise function */ +/*********************************************************************** + * setup_raise_exception + * + * Modify the signal context to call the exception raise function. + */ +static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack, raise_func func ) +{ SP_sig(sigcontext) = (ULONG_PTR)stack; PC_sig(sigcontext) = (ULONG_PTR)func; REGn_sig(0, sigcontext) = (ULONG_PTR)&stack->rec; /* first arg for raise_func */ REGn_sig(1, sigcontext) = (ULONG_PTR)&stack->context; /* second arg for raise_func */ - - return stack; } /********************************************************************** @@ -1054,14 +1060,14 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case 1: /* handled */ return; case -1: /* overflow */ - stack = setup_exception( context, raise_segv_exception ); + stack = setup_exception( context ); stack->rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; - return; + goto done; } } - stack = setup_exception( context, raise_segv_exception ); - if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; + stack = setup_exception( context ); + if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) goto done; switch(signal) { @@ -1082,6 +1088,8 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) stack->rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } +done: + setup_raise_exception( context, stack, raise_segv_exception ); } /********************************************************************** @@ -1092,7 +1100,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) static void trap_handler( int signal, siginfo_t *info, void *ucontext ) { ucontext_t *context = ucontext; - struct stack_layout *stack = setup_exception( context, raise_trap_exception ); + struct stack_layout *stack = setup_exception( context ); switch (info->si_code) { @@ -1104,6 +1112,7 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) stack->rec.ExceptionCode = EXCEPTION_BREAKPOINT; break; } + setup_raise_exception( context, stack, raise_trap_exception ); } /********************************************************************** @@ -1113,7 +1122,7 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) */ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext ); switch (siginfo->si_code & 0xffff ) { @@ -1159,6 +1168,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } + setup_raise_exception( sigcontext, stack, raise_generic_exception ); } /********************************************************************** @@ -1170,9 +1180,10 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { if (!dispatch_signal(SIGINT)) { - struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = CONTROL_C_EXIT; + setup_raise_exception( sigcontext, stack, raise_generic_exception ); } } @@ -1184,10 +1195,11 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; stack->rec.ExceptionFlags = EH_NONCONTINUABLE; + setup_raise_exception( sigcontext, stack, raise_generic_exception ); }

1 0

Alexandre Julliard : ntdll: Handle trap exception in signal handler on ARM64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: a7459d0c99677be0df238236e0c5d555fe8d9dc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7459d0c99677be0df238236… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 21:23:15 2019 +0200 ntdll: Handle trap exception in signal handler on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a029960ba4..40ef517d22 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -540,17 +540,6 @@ done: set_cpu_context( context ); } -/********************************************************************** - * raise_trap_exception - */ -static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status; - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Pc += 4; - status = NtRaiseException( rec, context, TRUE ); - raise_status( status, rec ); -} - /********************************************************************** * raise_generic_exception */ @@ -1110,9 +1099,10 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) case TRAP_BRKPT: default: stack->rec.ExceptionCode = EXCEPTION_BREAKPOINT; + stack->context.Pc += 4; break; } - setup_raise_exception( context, stack, raise_trap_exception ); + setup_raise_exception( context, stack, raise_generic_exception ); } /**********************************************************************

1 0

Alexandre Julliard : ntdll: Handle page fault in signal handler on ARM64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 60eb37c6bedaad6fe6ca028c217595dba98714e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60eb37c6bedaad6fe6ca028c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 21:25:42 2019 +0200 ntdll: Handle page fault in signal handler on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 40ef517d22..4b47b2aa94 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -516,30 +516,6 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * REGn_sig(1, sigcontext) = (ULONG_PTR)&stack->context; /* second arg for raise_func */ } -/********************************************************************** - * raise_segv_exception - */ -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 ); - raise_status( status, rec ); -done: - set_cpu_context( context ); -} - /********************************************************************** * raise_generic_exception */ @@ -1064,10 +1040,12 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) stack->rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; case SIGSEGV: /* Segmentation fault */ - stack->rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; 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], FALSE ))) + return; break; case SIGBUS: /* Alignment check exception */ stack->rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; @@ -1078,7 +1056,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) break; } done: - setup_raise_exception( context, stack, raise_segv_exception ); + setup_raise_exception( context, stack, raise_generic_exception ); } /**********************************************************************

1 0

Alexandre Julliard : ntdll: Remove no longer needed function argument from setup_raise_exception() on ARM64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 2201229086da312c8b21ab0ff9f757fc4940b96e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2201229086da312c8b21ab0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 21:26:42 2019 +0200 ntdll: Remove no longer needed function argument from setup_raise_exception() on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4b47b2aa94..25ac7dac02 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -113,8 +113,6 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ static const size_t signal_stack_size = max( MINSIGSTKSZ, 8192 ); -typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); - /* stack layout when calling an exception raise function */ struct stack_layout { @@ -503,19 +501,6 @@ static struct stack_layout *setup_exception( ucontext_t *sigcontext ) return stack; } -/*********************************************************************** - * setup_raise_exception - * - * Modify the signal context to call the exception raise function. - */ -static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack, raise_func func ) -{ - SP_sig(sigcontext) = (ULONG_PTR)stack; - PC_sig(sigcontext) = (ULONG_PTR)func; - REGn_sig(0, sigcontext) = (ULONG_PTR)&stack->rec; /* first arg for raise_func */ - REGn_sig(1, sigcontext) = (ULONG_PTR)&stack->context; /* second arg for raise_func */ -} - /********************************************************************** * raise_generic_exception */ @@ -525,6 +510,19 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont raise_status( status, rec ); } +/*********************************************************************** + * setup_raise_exception + * + * Modify the signal context to call the exception raise function. + */ +static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack ) +{ + SP_sig(sigcontext) = (ULONG_PTR)stack; + PC_sig(sigcontext) = (ULONG_PTR)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 */ +} + /*********************************************************************** * libunwind_virtual_unwind * @@ -1056,7 +1054,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) break; } done: - setup_raise_exception( context, stack, raise_generic_exception ); + setup_raise_exception( context, stack ); } /********************************************************************** @@ -1080,7 +1078,7 @@ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) stack->context.Pc += 4; break; } - setup_raise_exception( context, stack, raise_generic_exception ); + setup_raise_exception( context, stack ); } /********************************************************************** @@ -1136,7 +1134,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_raise_exception( sigcontext, stack, raise_generic_exception ); + setup_raise_exception( sigcontext, stack ); } /********************************************************************** @@ -1151,7 +1149,7 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = CONTROL_C_EXIT; - setup_raise_exception( sigcontext, stack, raise_generic_exception ); + setup_raise_exception( sigcontext, stack ); } } @@ -1167,7 +1165,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; stack->rec.ExceptionFlags = EH_NONCONTINUABLE; - setup_raise_exception( sigcontext, stack, raise_generic_exception ); + setup_raise_exception( sigcontext, stack ); }

1 0

Dmitry Timoshkov : ntdll/tests: Fix compilation with PSDK compiler.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 65e1ed3480929702f60ed8d1541e2cb0edc6d5eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e1ed3480929702f60ed8d1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 12 18:09:55 2019 +0800 ntdll/tests: Fix compilation with PSDK compiler. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtlstr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 8b948fa82a..c2c82516cc 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1970,7 +1970,7 @@ static void test_RtlHashUnicodeString(void) status = pRtlHashUnicodeString(NULL, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); - RtlInitUnicodeString(&str, strW); + pRtlInitUnicodeString(&str, strW); status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, NULL); ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); @@ -1988,7 +1988,7 @@ static void test_RtlHashUnicodeString(void) ptr = hash_test; while (*ptr->str) { - RtlInitUnicodeString(&str, ptr->str); + pRtlInitUnicodeString(&str, ptr->str); hash = 0; status = pRtlHashUnicodeString(&str, ptr->case_insensitive, HASH_STRING_ALGORITHM_X65599, &hash); ok(status == STATUS_SUCCESS, "got status 0x%08x for %s\n", status, wine_dbgstr_w(ptr->str));

1 0

Dmitry Timoshkov : ntdll: Implement RtlUnicodeToUTF8N.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 3b2937f7c7fb1d4081363ebfa213c0a8eefa81db URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2937f7c7fb1d4081363ebf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 12 18:09:59 2019 +0800 ntdll: Implement RtlUnicodeToUTF8N. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtlstr.c | 33 ++++++++++++++++++++++++++++++++ dlls/ntdll/tests/rtlstr.c | 48 +++++++++++++++++++++++++++++++---------------- include/winternl.h | 1 + 4 files changed, 67 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 98a423adfb..5a6f4e4ed4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -980,6 +980,7 @@ @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) +@ stdcall RtlUnicodeToUTF8N(ptr long ptr ptr long) @ stdcall RtlUniform(ptr) # @ stub RtlUnlockBootStatusData @ stdcall RtlUnlockHeap(long) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 6b60d36a1c..977f57a907 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -908,6 +908,39 @@ NTSTATUS WINAPI RtlUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen, } +/************************************************************************** + * RtlUnicodeToUTF8N (NTDLL.@) + * + * Converts a Unicode string to a UTF-8 string. + * + * RETURNS + * NTSTATUS code + */ +NTSTATUS WINAPI RtlUnicodeToUTF8N( LPSTR dst, DWORD dstlen, LPDWORD reslen, + LPCWSTR src, DWORD srclen) +{ + int ret; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + if (dst && (srclen & 1)) return STATUS_INVALID_PARAMETER_5; + + if (!dstlen && dst) + { + char c; + dst = &c; + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, 1 ); + if (ret > 0) ret--; + } + else + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, dstlen ); + if (reslen) + *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ + if (ret < 0) return STATUS_BUFFER_TOO_SMALL; + return STATUS_SUCCESS; +} + + /* CASE CONVERSIONS */ diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index c2c82516cc..4583ddeb4b 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2055,8 +2055,8 @@ static void utf8_expect_(const unsigned char *out_string, ULONG buflen, ULONG ou status = pRtlUnicodeToUTF8N( out_string ? buffer : NULL, buflen, &bytes_out, in_string, in_bytes); - ok_(__FILE__, line)(status == expect_status, "status = 0x%x\n", status); - ok_(__FILE__, line)(bytes_out == out_bytes, "bytes_out = %u\n", bytes_out); + ok_(__FILE__, line)(status == expect_status, "status 0x%x, expected 0x%x\n", status, expect_status); + ok_(__FILE__, line)(bytes_out == out_bytes, "bytes_out = %u, expected %u\n", bytes_out, out_bytes); if (out_string) { for (i = 0; i < bytes_out; i++) @@ -2082,6 +2082,7 @@ static void test_RtlUnicodeToUTF8N(void) const WCHAR empty_string[] = { 0 }; const WCHAR test_string[] = { 'A',0,'a','b','c','d','e','f','g',0 }; const WCHAR special_string[] = { 'X',0x80,0xd800,0 }; + const ULONG special_string_len[] = { 0, 1, 1, 3, 3, 3, 6, 7 }; const unsigned char special_expected[] = { 'X',0xc2,0x80,0xef,0xbf,0xbd,0 }; unsigned int input_len; const unsigned int test_count = ARRAY_SIZE(unicode_to_utf8); @@ -2151,25 +2152,33 @@ static void test_RtlUnicodeToUTF8N(void) length_expect(0, 0, STATUS_SUCCESS); length_expect(1, 1, STATUS_SUCCESS); length_expect(2, 3, STATUS_SUCCESS); +todo_wine +{ length_expect(3, 6, STATUS_SOME_NOT_MAPPED); length_expect(4, 7, STATUS_SOME_NOT_MAPPED); +} #undef length_expect - /* output truncation */ -#define truncate_expect(buflen, out_bytes, expect_status) \ - utf8_expect_(special_expected, buflen, out_bytes, \ - special_string, sizeof(special_string), \ - expect_status, __LINE__) + for (i = 0; i <= 6; i++) + { + memset(buffer, 0x55, sizeof(buffer)); + bytes_out = 0xdeadbeef; + status = pRtlUnicodeToUTF8N(buffer, i, &bytes_out, special_string, sizeof(special_string)); +todo_wine_if (i == 4 || i == 5 || i == 6) + ok(status == STATUS_BUFFER_TOO_SMALL, "%d: status = 0x%x\n", i, status); +todo_wine_if (bytes_out != special_string_len[i]) + ok(bytes_out == special_string_len[i], "%d: expected %u, got %u\n", i, special_string_len[i], bytes_out); +todo_wine_if (i == 6) + ok(memcmp(buffer, special_expected, special_string_len[i]) == 0, "%d: bad conversion\n", i); + } - truncate_expect(0, 0, STATUS_BUFFER_TOO_SMALL); - truncate_expect(1, 1, STATUS_BUFFER_TOO_SMALL); - truncate_expect(2, 1, STATUS_BUFFER_TOO_SMALL); - truncate_expect(3, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(4, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(5, 3, STATUS_BUFFER_TOO_SMALL); - truncate_expect(6, 6, STATUS_BUFFER_TOO_SMALL); - truncate_expect(7, 7, STATUS_SOME_NOT_MAPPED); -#undef truncate_expect + status = pRtlUnicodeToUTF8N(buffer, 7, &bytes_out, special_string, sizeof(special_string)); +todo_wine + ok(status == STATUS_SOME_NOT_MAPPED, "status = 0x%x\n", status); +todo_wine + ok(bytes_out == special_string_len[7], "expected %u, got %u\n", special_string_len[7], bytes_out); +todo_wine + ok(memcmp(buffer, special_expected, 7) == 0, "bad conversion\n"); /* conversion behavior with varying input length */ for (input_len = 0; input_len <= sizeof(test_string); input_len++) { @@ -2216,15 +2225,19 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, lstrlenW(unicode_to_utf8[i].unicode) * sizeof(WCHAR)); +todo_wine_if(unicode_to_utf8[i].status == STATUS_SOME_NOT_MAPPED) ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(bytes_out == strlen(unicode_to_utf8[i].expected), "(test %d): bytes_out is %u, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected)); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); @@ -2234,6 +2247,8 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, (lstrlenW(unicode_to_utf8[i].unicode) + 1) * sizeof(WCHAR)); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); @@ -2243,6 +2258,7 @@ static void test_RtlUnicodeToUTF8N(void) ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); } diff --git a/include/winternl.h b/include/winternl.h index 3f2e07b7e2..4d58aebe21 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2863,6 +2863,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToOemString(POEM_STRING,PCUNICODE_STRI NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteSize(PULONG,PCWSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); +NTSYSAPI NTSTATUS WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI ULONG WINAPI RtlUniform(PULONG); NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE); NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID);

1 0

Alex Henrie : server: Fix use after free in add_committed_range (scan-build).
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: f3c9fdf8522040861a7a9bf96ba385fc166965fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3c9fdf8522040861a7a9bf9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 11 21:05:06 2019 -0600 server: Fix use after free in add_committed_range (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index 0728fdc14f..6990a1913d 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -404,7 +404,7 @@ static void add_committed_range( struct memory_view *view, file_pos_t start, fil struct range *new_ptr = realloc( committed->ranges, new_size * sizeof(*new_ptr) ); if (!new_ptr) return; committed->max = new_size; - committed->ranges = new_ptr; + ranges = committed->ranges = new_ptr; } memmove( &ranges[i + 1], &ranges[i], (committed->count - i) * sizeof(*ranges) ); ranges[i].start = start;

1 0

Alex Henrie : winedbg: Fix dependence on undefined left-shift behavior (scan-build).
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 0566ba9a5881dc4f29e7b87bf5b5cd74fa304526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0566ba9a5881dc4f29e7b87b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 11 21:05:15 2019 -0600 winedbg: Fix dependence on undefined left-shift behavior (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 136229fbd6..2346bc4d1f 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -640,7 +640,7 @@ static BOOL be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned si if (!memory_read_value(lvalue, size, ret)) return FALSE; /* propagate sign information */ - if (is_signed && size < 16 && (*ret >> (size * 8 - 1)) != 0) + if (is_signed && size < sizeof(*ret) && (*ret >> (size * 8 - 1)) != 0) { ULONGLONG neg = -1; *ret |= neg << (size * 8);

1 0