August 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : widl: Get rid of fix_incomplete().
by Alexandre Julliard Aug. 14, 2019

Aug. 14, 2019

Module: wine Branch: master Commit: c4f5fb383bb7f28052cbbcc3c47ecbcd3aef1998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4f5fb383bb7f28052cbbcc3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 13 21:08:04 2019 -0500 widl: Get rid of fix_incomplete(). This seems to have been broken since 0f7f7922bab; is_incomplete() will only return true for non-aliases. It could be fixed by reverting that hunk of 0f7f7922bab, but we intend rather to change the representation of aliases so that no "fixing" is needed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ff86765..ff6ed1f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -54,7 +54,6 @@ struct _import_t typelist_t incomplete_types = LIST_INIT(incomplete_types); -static void fix_incomplete(void); static void fix_incomplete_types(type_t *complete_type); static str_list_t *append_str(str_list_t *list, char *str); @@ -315,8 +314,7 @@ static typelib_t *current_typelib; %% -input: gbl_statements m_acf { fix_incomplete(); - check_statements($1, FALSE); +input: gbl_statements m_acf { check_statements($1, FALSE); check_all_user_types($1); write_header($1); write_id_data($1); @@ -1914,30 +1912,6 @@ void add_incomplete(type_t *t) list_add_tail(&incomplete_types, &tn->entry); } -static void fix_type(type_t *t) -{ - if (type_is_alias(t) && is_incomplete(t)) { - type_t *ot = type_alias_get_aliasee(t); - fix_type(ot); - if (type_get_type_detect_alias(ot) == TYPE_STRUCT || - type_get_type_detect_alias(ot) == TYPE_UNION || - type_get_type_detect_alias(ot) == TYPE_ENCAPSULATED_UNION) - t->details.structure = ot->details.structure; - t->defined = ot->defined; - } -} - -static void fix_incomplete(void) -{ - struct typenode *tn, *next; - - LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) { - fix_type(tn->type); - list_remove(&tn->entry); - free(tn); - } -} - static void fix_incomplete_types(type_t *complete_type) { struct typenode *tn, *next;

1 0

Naveen Narayanan : ntdll: Set pthread stack guard size to 0 for NetBSD.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: de5392bfe7919c180d6650eec7b57b5386a4796f URL: https://source.winehq.org/git/wine.git/?a=commit;h=de5392bfe7919c180d6650ee… Author: Naveen Narayanan <zerous(a)nocebo.space> Date: Mon Aug 12 19:29:22 2019 +0200 ntdll: Set pthread stack guard size to 0 for NetBSD. pthread_attr_setstack(3) in NetBSD 8.0 and newer sets the guard size to 65536 and extends the stack beyond the specified range. Signed-off-by: Naveen Narayanan <zerous(a)nocebo.space> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 126bf76..97bd4bf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -525,6 +525,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, pthread_attr_init( &attr ); pthread_attr_setstack( &attr, teb->DeallocationStack, (char *)teb->Tib.StackBase + extra_stack - (char *)teb->DeallocationStack ); + pthread_attr_setguardsize( &attr, 0 ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ interlocked_xchg_add( &nb_threads, 1 ); if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info ))

1 0

Chip Davis : configure: Add a missing comma.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 594c64543f616ba805b782608798d27da2111622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594c64543f616ba805b78260… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Aug 13 11:52:41 2019 -0500 configure: Add a missing comma. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 ++--- configure.ac | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 2103658..702023b 100755 --- a/configure +++ b/configure @@ -14252,10 +14252,9 @@ $as_echo "#define HAVE_PPDEV 1" >>confdefs.h fi ac_wine_check_funcs_save_LIBS="$LIBS" -LIBS="$LIBS " +LIBS="$LIBS $PTHREAD_LIBS" for ac_func in \ - pthread_getthreadid_np \ - $PTHREAD_LIBS + pthread_getthreadid_np do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 59d5fa6..499c4f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1564,7 +1564,7 @@ fi dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ - pthread_getthreadid_np \ + pthread_getthreadid_np, [$PTHREAD_LIBS]) dnl **** Check for zlib ****

1 0

Alexandre Julliard : ntdll: Fix support for breakpoint exceptions on ARM64.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: fc97373f6202c8fef8d070f8b3cc5671baa6b6c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc97373f6202c8fef8d070f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 15:41:55 2019 +0200 ntdll: Fix support for breakpoint exceptions on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4ebccd2..e405c90 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -506,6 +506,17 @@ done: } /********************************************************************** + * 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 */ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) @@ -704,7 +715,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; - EXCEPTION_RECORD *rec = setup_exception( context, raise_generic_exception ); + EXCEPTION_RECORD *rec = setup_exception( context, raise_trap_exception ); switch (info->si_code) { @@ -1208,18 +1219,12 @@ void signal_exit_process( int status ) /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -void WINAPI DbgBreakPoint(void) -{ - kill(getpid(), SIGTRAP); -} +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0; ret") /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -void WINAPI DbgUserBreakPoint(void) -{ - kill(getpid(), SIGTRAP); -} +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0; ret") /********************************************************************** * NtCurrentTeb (NTDLL.@)

1 0

Alexandre Julliard : ntdll: Implement setting the thread context on ARM64.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 94a98cf5a23e38824384a3412687b840c9d6b5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94a98cf5a23e38824384a341… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 14:53:07 2019 +0200 ntdll: Implement setting the thread context on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 648a140..1531a0e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -252,7 +252,8 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, */ static void set_cpu_context( const CONTEXT *context ) { - FIXME( "Not implemented on ARM64\n" ); + interlocked_xchg_ptr( (void **)&arm64_thread_data()->context, (void *)context ); + raise( SIGUSR2 ); } /*********************************************************************** @@ -861,6 +862,21 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } +/********************************************************************** + * usr2_handler + * + * Handler for SIGUSR2, used to set a thread context. + */ +static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +{ + CONTEXT *context = interlocked_xchg_ptr( (void **)&arm64_thread_data()->context, NULL ); + if (!context) return; + if ((context->ContextFlags & ~CONTEXT_ARM64) & CONTEXT_FLOATING_POINT) + restore_fpu( context, sigcontext ); + restore_context( context, sigcontext ); +} + + /*********************************************************************** * __wine_set_signal_handler (NTDLL.@) */ @@ -955,6 +971,8 @@ void signal_init_process(void) if (sigaction( SIGQUIT, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = usr1_handler; if (sigaction( SIGUSR1, &sig_act, NULL ) == -1) goto error; + sig_act.sa_sigaction = usr2_handler; + if (sigaction( SIGUSR2, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = segv_handler; if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error;

1 0

Rémi Bernon : winex11.drv: Print the FocusIn/ FocusOut mode in trace message.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: de6450135de419ac7e64aee0c0efa27b60bea3e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de6450135de419ac7e64aee0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 27 16:30:12 2019 +0200 winex11.drv: Print the FocusIn/FocusOut mode in trace message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5c465aa..edeae7c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -749,6 +749,14 @@ static const char * const focus_details[] = "NotifyDetailNone" }; +static const char * const focus_modes[] = +{ + "NotifyNormal", + "NotifyGrab", + "NotifyUngrab", + "NotifyWhileGrabbed" +}; + /********************************************************************** * X11DRV_FocusIn */ @@ -759,7 +767,7 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (!hwnd) return FALSE; - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] ); if (event->detail == NotifyPointer) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; @@ -839,7 +847,7 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) { XFocusChangeEvent *event = &xev->xfocus; - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] ); if (event->detail == NotifyPointer) {

1 0

Huw Davies : user32: Don' t query the nonclient metrics unless the font info is required.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: ef26257f6f81557199d969ba681bbcbba6edc601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef26257f6f81557199d969ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 13 13:52:13 2019 +0100 user32: Don't query the nonclient metrics unless the font info is required. This is an optimization that is particularly helpful for scrollbar code. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 74 +++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3f93f9c..cdeea65 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2646,9 +2646,8 @@ INT WINAPI GetSystemMetrics( INT index ) { case SM_CXVSCROLL: case SM_CYHSCROLL: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - return ncm.iScrollWidth; + get_entry( &entry_SCROLLWIDTH, 0, &ret ); + return max( ret, 8 ); case SM_CYCAPTION: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); @@ -2664,9 +2663,8 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_CXHTHUMB: case SM_CYVSCROLL: case SM_CXHSCROLL: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - return ncm.iScrollHeight; + get_entry( &entry_SCROLLHEIGHT, 0, &ret ); + return max( ret, 8 ); case SM_CXICON: case SM_CYICON: return map_to_dpi( 32, GetDpiForSystem() ); @@ -2712,21 +2710,20 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_CYMIN: return GetSystemMetrics( SM_CYCAPTION) + 2 * GetSystemMetrics( SM_CYFRAME); case SM_CXSIZE: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - return ncm.iCaptionWidth; + get_entry( &entry_CAPTIONWIDTH, 0, &ret ); + return max( ret, 8 ); case SM_CYSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iCaptionHeight; case SM_CXFRAME: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - return GetSystemMetrics(SM_CXDLGFRAME) + ncm.iBorderWidth; + get_entry( &entry_BORDER, 0, &ret ); + ret = max( ret, 1 ); + return GetSystemMetrics(SM_CXDLGFRAME) + ret; case SM_CYFRAME: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - return GetSystemMetrics(SM_CYDLGFRAME) + ncm.iBorderWidth; + get_entry( &entry_BORDER, 0, &ret ); + ret = max( ret, 1 ); + return GetSystemMetrics(SM_CYDLGFRAME) + ret; case SM_CXMINTRACK: return GetSystemMetrics(SM_CXMIN); case SM_CYMINTRACK: @@ -2780,17 +2777,15 @@ INT WINAPI GetSystemMetrics( INT index ) SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iSmCaptionHeight + 1; case SM_CXSMSIZE: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - return ncm.iSmCaptionWidth; + get_entry( &entry_SMCAPTIONWIDTH, 0, &ret ); + return ret; case SM_CYSMSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iSmCaptionHeight; case SM_CXMENUSIZE: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - return ncm.iMenuWidth; + get_entry( &entry_MENUWIDTH, 0, &ret ); + return ret; case SM_CYMENUSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); @@ -2901,9 +2896,8 @@ INT WINAPI GetSystemMetricsForDpi( INT index, UINT dpi ) { case SM_CXVSCROLL: case SM_CYHSCROLL: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); - return ncm.iScrollWidth; + get_entry_dpi( &entry_SCROLLWIDTH, 0, &ret, dpi ); + return max( ret, 8 ); case SM_CYCAPTION: ncm.cbSize = sizeof(ncm); SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); @@ -2912,9 +2906,8 @@ INT WINAPI GetSystemMetricsForDpi( INT index, UINT dpi ) case SM_CXHTHUMB: case SM_CYVSCROLL: case SM_CXHSCROLL: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); - return ncm.iScrollHeight; + get_entry_dpi( &entry_SCROLLHEIGHT, 0, &ret, dpi ); + return max( ret, 8 ); case SM_CXICON: case SM_CYICON: return map_to_dpi( 32, dpi ); @@ -2929,21 +2922,20 @@ INT WINAPI GetSystemMetricsForDpi( INT index, UINT dpi ) SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); return ncm.iMenuHeight + 1; case SM_CXSIZE: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); - return ncm.iCaptionWidth; + get_entry_dpi( &entry_CAPTIONWIDTH, 0, &ret, dpi ); + return max( ret, 8 ); case SM_CYSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); return ncm.iCaptionHeight; case SM_CXFRAME: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); - return GetSystemMetricsForDpi( SM_CXDLGFRAME, dpi ) + ncm.iBorderWidth; + get_entry_dpi( &entry_BORDER, 0, &ret, dpi ); + ret = max( ret, 1 ); + return GetSystemMetricsForDpi( SM_CXDLGFRAME, dpi ) + ret; case SM_CYFRAME: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); - return GetSystemMetricsForDpi( SM_CYDLGFRAME, dpi ) + ncm.iBorderWidth; + get_entry_dpi( &entry_BORDER, 0, &ret, dpi ); + ret = max( ret, 1 ); + return GetSystemMetricsForDpi( SM_CYDLGFRAME, dpi ) + ret; case SM_CXICONSPACING: im.cbSize = sizeof(im); SystemParametersInfoForDpi( SPI_GETICONMETRICS, sizeof(im), &im, 0, dpi ); @@ -2960,17 +2952,15 @@ INT WINAPI GetSystemMetricsForDpi( INT index, UINT dpi ) SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); return ncm.iSmCaptionHeight + 1; case SM_CXSMSIZE: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); - return ncm.iSmCaptionWidth; + get_entry_dpi( &entry_SMCAPTIONWIDTH, 0, &ret, dpi ); + return ret; case SM_CYSMSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); return ncm.iSmCaptionHeight; case SM_CXMENUSIZE: - ncm.cbSize = sizeof(ncm); - SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); - return ncm.iMenuWidth; + get_entry_dpi( &entry_MENUWIDTH, 0, &ret, dpi ); + return ret; case SM_CYMENUSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi );

1 0

Alexandre Julliard : wineboot: Only use cpuid on platforms where it makes sense.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 44ee1c47ff8c76a64ac8760d53a483749f9bb1fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=44ee1c47ff8c76a64ac8760d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 20:24:48 2019 +0200 wineboot: Only use cpuid on platforms where it makes sense. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 55f2c6c..add8c47 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -185,6 +185,8 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value ) return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, (lstrlenW(value) + 1) * sizeof(WCHAR) ); } +#if defined(__i386__) || defined(__x86_64__) + #if defined(_MSC_VER) static void do_cpuid( unsigned int ax, unsigned int *p ) { @@ -205,7 +207,7 @@ __ASM_GLOBAL_FUNC( do_cpuid, "popl %ebx\n\t" "popl %esi\n\t" "ret" ) -#elif defined(__x86_64__) +#else extern void __cdecl do_cpuid( unsigned int ax, unsigned int *p ); __ASM_GLOBAL_FUNC( do_cpuid, "pushq %rsi\n\t" @@ -220,11 +222,6 @@ __ASM_GLOBAL_FUNC( do_cpuid, "popq %rbx\n\t" "popq %rsi\n\t" "ret" ) -#else -static void do_cpuid( unsigned int ax, unsigned int *p ) -{ - FIXME("\n"); -} #endif static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) @@ -291,6 +288,14 @@ static void get_namestring( WCHAR *buf ) for (i = lstrlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0; } +#else /* __i386__ || __x86_64__ */ + +static void get_identifier( WCHAR *buf, size_t size, const WCHAR *arch ) { } +static void get_vendorid( WCHAR *buf ) { } +static void get_namestring( WCHAR *buf ) { } + +#endif /* __i386__ || __x86_64__ */ + /* create the volatile hardware registry keys */ static void create_hardware_registry_keys(void) {

1 0

Alexandre Julliard : ntdll: Don' t run exception handlers on the signal stack on ARM64.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 3027c266fc02b650378cb083a18e82fb9c7cba19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3027c266fc02b650378cb083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 15:41:25 2019 +0200 ntdll: Don't run exception handlers on the signal stack on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 95 ++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 64 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 1531a0e..4ebccd2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -470,6 +470,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun stack->rec.NumberParameters = 0; save_context( &stack->context, sigcontext ); + save_fpu( &stack->context, sigcontext ); /* now modify the sigcontext to return to the raise function */ SP_sig(sigcontext) = (ULONG_PTR)stack; @@ -499,12 +500,21 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context break; } status = NtRaiseException( rec, context, TRUE ); - if (status) raise_status( status, rec ); + raise_status( status, rec ); done: set_cpu_context( context ); } /********************************************************************** + * raise_generic_exception + */ +static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); +} + +/********************************************************************** * call_stack_handlers * * Call the stack handlers chain. @@ -693,29 +703,19 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) */ static void trap_handler( int signal, siginfo_t *info, void *ucontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; + ucontext_t *context = ucontext; + EXCEPTION_RECORD *rec = setup_exception( context, raise_generic_exception ); - switch ( info->si_code ) + switch (info->si_code) { case TRAP_TRACE: - rec.ExceptionCode = EXCEPTION_SINGLE_STEP; + rec->ExceptionCode = EXCEPTION_SINGLE_STEP; break; case TRAP_BRKPT: default: - rec.ExceptionCode = EXCEPTION_BREAKPOINT; + 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 = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - restore_context( &context, ucontext ); } /********************************************************************** @@ -725,66 +725,52 @@ 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_fpu( &context, sigcontext ); - save_context( &context, sigcontext ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); switch (siginfo->si_code & 0xffff ) { #ifdef FPE_FLTSUB case FPE_FLTSUB: - rec.ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; + rec->ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; break; #endif #ifdef FPE_INTDIV case FPE_INTDIV: - rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; + rec->ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; break; #endif #ifdef FPE_INTOVF case FPE_INTOVF: - rec.ExceptionCode = EXCEPTION_INT_OVERFLOW; + rec->ExceptionCode = EXCEPTION_INT_OVERFLOW; break; #endif #ifdef FPE_FLTDIV case FPE_FLTDIV: - rec.ExceptionCode = EXCEPTION_FLT_DIVIDE_BY_ZERO; + rec->ExceptionCode = EXCEPTION_FLT_DIVIDE_BY_ZERO; break; #endif #ifdef FPE_FLTOVF case FPE_FLTOVF: - rec.ExceptionCode = EXCEPTION_FLT_OVERFLOW; + rec->ExceptionCode = EXCEPTION_FLT_OVERFLOW; break; #endif #ifdef FPE_FLTUND case FPE_FLTUND: - rec.ExceptionCode = EXCEPTION_FLT_UNDERFLOW; + rec->ExceptionCode = EXCEPTION_FLT_UNDERFLOW; break; #endif #ifdef FPE_FLTRES case FPE_FLTRES: - rec.ExceptionCode = EXCEPTION_FLT_INEXACT_RESULT; + rec->ExceptionCode = EXCEPTION_FLT_INEXACT_RESULT; break; #endif #ifdef FPE_FLTINV case FPE_FLTINV: #endif default: - rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + rec->ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - rec.ExceptionFlags = EXCEPTION_CONTINUABLE; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 0; - status = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - - restore_context( &context, sigcontext ); - restore_fpu( &context, sigcontext ); } /********************************************************************** @@ -796,19 +782,9 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { if (!dispatch_signal(SIGINT)) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; - - 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 = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - restore_context( &context, sigcontext ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); + + rec->ExceptionCode = CONTROL_C_EXIT; } } @@ -820,19 +796,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; - CONTEXT context; - NTSTATUS status; + EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); - 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 = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - restore_context( &context, sigcontext ); + rec->ExceptionCode = EXCEPTION_WINE_ASSERTION; + rec->ExceptionFlags = EH_NONCONTINUABLE; }

1 0

Alexandre Julliard : ntdll: Preserve the stack red zone on ARM64.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 84783ed74f7e62274e6a6277fd5ff85f811c84f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84783ed74f7e62274e6a6277… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 14:50:13 2019 +0200 ntdll: Preserve the stack red zone on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 9643beb..b8591a3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -476,6 +476,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun { CONTEXT context; EXCEPTION_RECORD rec; + void *redzone[2]; } *stack; DWORD exception_code = 0; @@ -608,11 +609,11 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f } else { - TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", + TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); - TRACE(" x4=%016lx x5=%016lx x6=%016lx x7=%016lx\n", + TRACE(" x4=%016lx x5=%016lx x6=%016lx x7=%016lx\n", context->u.s.X4, context->u.s.X5, context->u.s.X6, context->u.s.X7 ); - TRACE(" x8=%016lx x9=%016lx x10=%016lx x11=%016lx\n", + TRACE(" x8=%016lx x9=%016lx x10=%016lx x11=%016lx\n", context->u.s.X8, context->u.s.X9, context->u.s.X10, context->u.s.X11 ); TRACE(" x12=%016lx x13=%016lx x14=%016lx x15=%016lx\n", context->u.s.X12, context->u.s.X13, context->u.s.X14, context->u.s.X15 ); @@ -622,9 +623,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f context->u.s.X20, context->u.s.X21, context->u.s.X22, context->u.s.X23 ); TRACE(" x24=%016lx x25=%016lx x26=%016lx x27=%016lx\n", context->u.s.X24, context->u.s.X25, context->u.s.X26, context->u.s.X27 ); - TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", + TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", context->u.s.X28, context->u.s.Fp, context->u.s.Lr, context->Sp ); - TRACE(" pc=%016lx\n", + TRACE(" pc=%016lx\n", context->Pc ); }

1 0