February 2021 - Wine-Commits

Zebediah Figura : vkd3d-shader: Replace hlsl_message() with hlsl_error().
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: vkd3d Branch: master Commit: 7069fa1c40f8762581336b57b06f0f41c5ca6161 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7069fa1c40f8762581336b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 21 22:04:37 2021 -0600 vkd3d-shader: Replace hlsl_message() with hlsl_error(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 5 ----- libs/vkd3d-shader/hlsl.h | 2 -- libs/vkd3d-shader/hlsl.y | 4 +++- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1f9a392..dbc6954 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -20,11 +20,6 @@ #include "hlsl.h" #include <stdio.h> -void hlsl_message(const char *fmt, ...) -{ - /* FIXME */ -} - void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_log_level level, const char *fmt, ...) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9122b09..a374f54 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -544,8 +544,6 @@ struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const const struct hlsl_reg_reservation *reg_reservation) DECLSPEC_HIDDEN; struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -void hlsl_message(const char *fmt, ...) VKD3D_PRINTF_FUNC(1,2) DECLSPEC_HIDDEN; - void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b6d0324..ea640b9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3110,7 +3110,9 @@ int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) if (!(entry_func = get_func_entry(ctx, entrypoint))) { - hlsl_message("error: entry point \"%s\" is not defined\n", entrypoint); + const struct vkd3d_shader_location loc = {.source_name = ctx->location.source_name}; + + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entrypoint); return VKD3D_ERROR_INVALID_SHADER; }

1 0

Zebediah Figura : vkd3d-shader: Implement hlsl_note().
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: vkd3d Branch: master Commit: 87a371292d7cdb5b7eb2159b49c24d3fdfb4c2e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=87a371292d7cdb5b7eb2159… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 21 22:04:38 2021 -0600 vkd3d-shader: Implement hlsl_note(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 6 +++++- libs/vkd3d-shader/vkd3d_shader_main.c | 20 ++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index dbc6954..52b3dd1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -23,7 +23,11 @@ void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_log_level level, const char *fmt, ...) { - /* FIXME */ + va_list args; + + va_start(args, fmt); + vkd3d_shader_vnote(ctx->message_context, &loc, level, fmt, args); + va_end(args); } void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6f1482a..bae2852 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -144,6 +144,26 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont return true; } +void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_log_level level, const char *format, va_list args) +{ + if (context->log_level < level) + return; + + if (location) + { + const char *source_name = location->source_name ? location->source_name : "<anonymous>"; + + if (location->line) + vkd3d_string_buffer_printf(&context->messages, "%s:%u:%u: ", + source_name, location->line, location->column); + else + vkd3d_string_buffer_printf(&context->messages, "%s: ", source_name); + } + vkd3d_string_buffer_vprintf(&context->messages, format, args); + vkd3d_string_buffer_printf(&context->messages, "\n"); +} + void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2d7eb05..e837dbc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -906,6 +906,8 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const stru enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, + enum vkd3d_shader_log_level level, const char *format, va_list args) DECLSPEC_HIDDEN; void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : vkd3d-shader: Implement hlsl_error() and hlsl_warning().
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: vkd3d Branch: master Commit: 6124aa664fc3aa45f4f39732b1ea66b25ef88d00 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6124aa664fc3aa45f4f3973… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 21 22:04:36 2021 -0600 vkd3d-shader: Implement hlsl_error() and hlsl_warning(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.c | 18 ++- libs/vkd3d-shader/hlsl.h | 8 +- libs/vkd3d-shader/hlsl.l | 3 +- libs/vkd3d-shader/hlsl.y | 204 +++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 18 +++ 6 files changed, 147 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6124aa664fc3aa45f4f…

1 0

Gijs Vermeulen : msvcirt: Implement remainder of fstream class.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 4981785f0fbcafbdc6a9dc4f71d06b137d558597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4981785f0fbcafbdc6a9dc4f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Feb 21 18:05:02 2021 +0100 msvcirt: Implement remainder of fstream class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 157 +++++++++++++++++ dlls/msvcirt/msvcirt.spec | 52 +++--- dlls/msvcirt/tests/msvcirt.c | 397 ++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 52 +++--- dlls/msvcrt40/msvcrt40.spec | 52 +++--- 5 files changed, 625 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4981785f0fbcafbdc6a9…

1 0

Zhiyi Zhang : comctl32/button: Turn off themed painting if parts are unavailable for Command Links.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: b08c622e22428effc4c0e47446a06e12d3532f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b08c622e22428effc4c0e474… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:32:28 2021 +0800 comctl32/button: Turn off themed painting if parts are unavailable for Command Links. Themed painting for Command Links requires BP_COMMANDLINK and BP_COMMANDLINKGLYPH to be defined in the theme. However, Wine currently only supports the v3 theme file format used by XP, which doesn't support Command Links. So turn off themed painting for Command Links if user uses a third party theme that doesn't have the required parts. Otherwise, only plain text is drawn. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 67bf5ceae48..0dcbb38d202 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -276,6 +276,20 @@ static LONG get_default_glyph_size(const BUTTON_INFO *infoPtr) return GetSystemMetrics(SM_CYMENUCHECK); } +static BOOL is_themed_paint_supported(HTHEME theme, UINT btn_type) +{ + if (!theme || !btnThemedPaintFunc[btn_type]) + return FALSE; + + if (btn_type == BS_COMMANDLINK || btn_type == BS_DEFCOMMANDLINK) + { + if (!IsThemePartDefined(theme, BP_COMMANDLINK, 0)) + return FALSE; + } + + return TRUE; +} + static void init_custom_draw(NMCUSTOMDRAW *nmcd, const BUTTON_INFO *infoPtr, HDC hdc, const RECT *rc) { nmcd->hdr.hwndFrom = infoPtr->hwnd; @@ -548,7 +562,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L theme = GetWindowTheme( hWnd ); hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); - if (theme && btnThemedPaintFunc[btn_type]) + if (is_themed_paint_supported(theme, btn_type)) { int drawState = get_draw_state(infoPtr); UINT dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE));

1 0

Nikolay Sivov : winegstreamer: Fully initialize MF object creation context.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: e162e7ea7f90e4f2b87817683a5e5bdb528d66ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e162e7ea7f90e4f2b8781768… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 22 21:32:47 2021 +0300 winegstreamer: Fully initialize MF object creation context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e69370d2513..74af8e41f48 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1379,7 +1379,7 @@ static HRESULT WINAPI winegstreamer_stream_handler_BeginCreateObject(IMFByteStre if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) return hr; - context = heap_alloc(sizeof(*context)); + context = heap_alloc_zero(sizeof(*context)); if (!context) { IMFAsyncResult_Release(caller);

1 0

Jacek Caban : ntdll: Use syscall dispatcher for restoring context in x86_64 NtSetContextThread implementation.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 437bef6ac15dea892904769b46a4cafb80ed9eb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=437bef6ac15dea892904769b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 22 18:04:16 2021 +0100 ntdll: Use syscall dispatcher for restoring context in x86_64 NtSetContextThread implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 5 ++++- dlls/ntdll/unix/signal_arm.c | 10 ++++++++++ dlls/ntdll/unix/signal_arm64.c | 10 ++++++++++ dlls/ntdll/unix/signal_i386.c | 11 +++++++++++ dlls/ntdll/unix/signal_x86_64.c | 29 ++++++++++++++++++++++------- dlls/ntdll/unix/unix_private.h | 1 + tools/winebuild/import.c | 13 ++++++++++++- 7 files changed, 70 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 6af8effe9e1..4f149c0f644 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -726,7 +726,10 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); if (status == STATUS_USER_APC) invoke_apc( context, &apc ); } - return NtSetContextThread( GetCurrentThread(), context ); + status = NtSetContextThread( GetCurrentThread(), context ); + if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + signal_restore_full_cpu_context(); + return status; } diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 2de58925c84..cb4695939f5 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -332,6 +332,16 @@ __ASM_GLOBAL_FUNC( set_cpu_context, "pop {pc}" ) +/*********************************************************************** + * signal_restore_full_cpu_context + * + * Restore full context from syscall frame + */ +void signal_restore_full_cpu_context(void) +{ +} + + /*********************************************************************** * get_server_context_flags * diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 9a36746f5bc..80cc59d0743 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -406,6 +406,16 @@ static void restore_fpu( CONTEXT *context, ucontext_t *sigcontext ) } +/*********************************************************************** + * signal_restore_full_cpu_context + * + * Restore full context from syscall frame + */ +void signal_restore_full_cpu_context(void) +{ +} + + /*********************************************************************** * get_server_context_flags * diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 09529a1ea96..4d03153bd1f 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -807,6 +807,17 @@ static inline void restore_xstate( const CONTEXT *context ) __asm__ volatile( "xrstor %0" : : "m"(*xrstor_base), "a" (4), "d" (0) ); } + +/*********************************************************************** + * signal_restore_full_cpu_context + * + * Restore full context from syscall frame + */ +void signal_restore_full_cpu_context(void) +{ +} + + /*********************************************************************** * fpux_to_fpu * diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index b5040852cbe..88e5eace003 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1591,7 +1591,12 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, "leaq 0x70(%rsp),%rsp\n\t" "iretq" ) -static void signal_restore_full_cpu_context(void) +/*********************************************************************** + * signal_restore_full_cpu_context + * + * Restore full context from syscall frame + */ +void signal_restore_full_cpu_context(void) { struct syscall_xsave *xsave = get_syscall_xsave( get_syscall_frame() ); SYSTEM_CPU_INFORMATION cpu_info; @@ -1863,9 +1868,6 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) else if (xs->CompactionMask & XSTATE_MASK_GSSE) xsave->xstate.Mask &= ~XSTATE_MASK_GSSE; } - - if (!(flags & CONTEXT_INTEGER)) frame->rax = STATUS_SUCCESS; - signal_restore_full_cpu_context(); return STATUS_SUCCESS; } @@ -2614,11 +2616,24 @@ static void quit_handler( int signal, siginfo_t *siginfo, void *ucontext ) */ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) { + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; struct xcontext context; + if (frame) + { + DECLSPEC_ALIGN(64) XSTATE xs; + context.c.ContextFlags = CONTEXT_FULL; + context_init_xstate( &context.c, &xs ); - save_context( &context, ucontext ); - wait_suspend( &context.c ); - restore_context( &context, ucontext ); + NtGetContextThread( GetCurrentThread(), &context.c ); + wait_suspend( &context.c ); + NtSetContextThread( GetCurrentThread(), &context.c ); + } + else + { + save_context( &context, ucontext ); + wait_suspend( &context.c ); + restore_context( &context, ucontext ); + } } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 65f526d0f7d..c98b11701e4 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -214,6 +214,7 @@ extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE ent extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN exec_process( NTSTATUS status ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; +extern void signal_restore_full_cpu_context(void) DECLSPEC_HIDDEN; extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDDEN; extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 0fddbaf6134..a01694ffb9c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1559,7 +1559,18 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tcallq *(%%r10,%%r11,8)\n" ); output( "2:\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq $0,0x328(%%rcx)\n" ); - output( "\tfxrstor64 (%%r12)\n" ); + if (!*variant) + { + output( "\tfxrstor64 (%%r12)\n" ); + } + else + { + output( "\tmovq %%rax,%%r11\n" ); + output( "\tmovl $7,%%eax\n" ); + output( "\txorq %%rdx,%%rdx\n" ); + output( "\txrstor64 (%%r12)\n" ); + output( "\tmovq %%r11,%%rax\n" ); + } output( "\tmovq -0x30(%%rbp),%%r15\n" ); output( "\tmovq -0x38(%%rbp),%%r14\n" ); output( "\tmovq -0x40(%%rbp),%%r13\n" );

1 0

Jacek Caban : ntdll: Use xsavec in x86_64 syscall dispatcher.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: a8856381ed9a7187a6564960893617f31ec3e8ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8856381ed9a7187a6564960… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 22 18:04:31 2021 +0100 ntdll: Use xsavec in x86_64 syscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 5 ++++- dlls/ntdll/unix/system.c | 6 ++++++ include/winternl.h | 1 + tools/winebuild/import.c | 13 ++++++++++++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 88e5eace003..df83094750e 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2814,9 +2814,12 @@ void *signal_init_syscalls(void) void *ptr, *syscall_dispatcher; extern void __wine_syscall_dispatcher_xsave(void) DECLSPEC_HIDDEN; + extern void __wine_syscall_dispatcher_xsavec(void) DECLSPEC_HIDDEN; NtQuerySystemInformation( SystemCpuInformation, &cpu_info, sizeof(cpu_info), NULL ); - if (cpu_info.FeatureSet & CPU_FEATURE_XSAVE) + if (cpu_info.FeatureSet & CPU_FEATURE_XSAVEC) + syscall_dispatcher = __wine_syscall_dispatcher_xsavec; + else if (cpu_info.FeatureSet & CPU_FEATURE_XSAVE) syscall_dispatcher = __wine_syscall_dispatcher_xsave; else syscall_dispatcher = __wine_syscall_dispatcher; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6cf044d496f..27ecfae365f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -305,6 +305,12 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if (regs3[1] & (1 << 5)) info->FeatureSet |= CPU_FEATURE_AVX2; } + if (info->FeatureSet & CPU_FEATURE_XSAVE) + { + do_cpuid( 0x0000000d, regs3 ); /* get XSAVE details */ + if (regs3[0] & 2) info->FeatureSet |= CPU_FEATURE_XSAVEC; + } + if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) { info->Level = (regs2[0] >> 8) & 0xf; /* family */ diff --git a/include/winternl.h b/include/winternl.h index 76feca83596..3beecf10ff6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1754,6 +1754,7 @@ typedef struct _SYSTEM_CPU_INFORMATION { /* FIXME: following values are made up, actual flags are unknown */ #define CPU_FEATURE_SSSE3 0x00008000 /* SSSE3 instructions */ +#define CPU_FEATURE_XSAVEC 0x00400000 /* XSAVEC instructions */ #define CPU_FEATURE_SSE41 0x01000000 /* SSE41 instructions */ #define CPU_FEATURE_SSE42 0x02000000 /* SSE42 instructions */ #define CPU_FEATURE_AVX 0x40000000 /* AVX instructions */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a01694ffb9c..2fa9d3d430b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1534,7 +1534,17 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tmovq %%rdx,0x200(%%r12)\n" ); output( "\tmovq %%rdx,0x208(%%r12)\n" ); output( "\tmovq %%rdx,0x210(%%r12)\n" ); - output( "\txsave64 (%%r12)\n" ); + if (!strcmp( variant, "_xsavec" )) + { + output( "\tmovq %%rdx,0x218(%%r12)\n" ); + output( "\tmovq %%rdx,0x220(%%r12)\n" ); + output( "\tmovq %%rdx,0x228(%%r12)\n" ); + output( "\tmovq %%rdx,0x230(%%r12)\n" ); + output( "\tmovq %%rdx,0x238(%%r12)\n" ); + output( "\txsavec64 (%%r12)\n" ); + } + else + output( "\txsave64 (%%r12)\n" ); output( "\tmovq %%rsi,%%rdx\n" ); } output( "\tmovq %%gs:0x30,%%rcx\n" ); @@ -1740,6 +1750,7 @@ void output_syscalls( DLLSPEC *spec ) { case CPU_x86_64: output_syscall_dispatcher( count, "_xsave" ); + output_syscall_dispatcher( count, "_xsavec" ); break; default: break;

1 0

Zhiyi Zhang : user32/tests: Fix a test failure on w7u_2qxl TestBot VM.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 068cf6f02c147bd646ffd0f319493fe3783b4dc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=068cf6f02c147bd646ffd0f3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 21:38:01 2021 +0800 user32/tests: Fix a test failure on w7u_2qxl TestBot VM. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..6b233970ace 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -743,17 +743,18 @@ static void test_ChangeDisplaySettingsEx(void) { dm.dmPosition = position; dm.dmFields |= DM_POSITION; - res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */ if (mode == 0 && device) { - todo_wine ok(res == DISP_CHANGE_FAILED, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", - devices[device].name, mode, res); res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", devices[device].name, mode, res); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); } + else + { + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + } ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* TestBots using VGA driver can't change to some modes */

1 0

Zhiyi Zhang : comctl32/theme_scrollbar: Remove an unused variable.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: d9b47aa303705c61c0b469363c5dfd05d2e34b11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9b47aa303705c61c0b46936… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:32:21 2021 +0800 comctl32/theme_scrollbar: Remove an unused variable. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/theme_scrollbar.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index bb42267bf21..27d31bd4ac5 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -334,16 +334,12 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); } else { - SCROLLBARINFO sbi; SCROLLINFO si; unsigned int thumbpos, thumbsize; int uppertrackstate, lowertrackstate, thumbstate; RECT partrect, trackrect; SIZE grippersize; - sbi.cbSize = sizeof(sbi); - GetScrollBarInfo(hwnd, OBJID_CLIENT, &sbi); - si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwnd, SB_CTL, &si);

1 0