February 2021 - Wine-commits

Rémi Bernon : secur32: Return STREAM_HEADER/TRAILER buffers on SEC_I_RENEGOTIATE.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 86ab322377e11f9670c1dc1af1935d1b8f501096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86ab322377e11f9670c1dc1a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 19 16:58:57 2021 +0100 secur32: Return STREAM_HEADER/TRAILER buffers on SEC_I_RENEGOTIATE. And don't print an error anymore. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 2d135a85227..d47c4d79258 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1336,6 +1336,7 @@ static void schan_decrypt_fill_buffer(PSecBufferDesc message, ULONG buffer_type, static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle, PSecBufferDesc message, ULONG message_seq_no, PULONG quality) { + SECURITY_STATUS status = SEC_E_OK; struct schan_context *ctx; SecBuffer *buffer; SIZE_T data_size; @@ -1385,10 +1386,16 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle while (received < data_size) { SIZE_T length = data_size - received; - SECURITY_STATUS status = schan_imp_recv(ctx->session, data + received, &length); + status = schan_imp_recv(ctx->session, data + received, &length); + + if (status == SEC_I_RENEGOTIATE) + break; if (status == SEC_I_CONTINUE_NEEDED) + { + status = SEC_E_OK; break; + } if (status != SEC_E_OK) { @@ -1421,7 +1428,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle buffer->BufferType = SECBUFFER_STREAM_HEADER; buffer->cbBuffer = 5; - return SEC_E_OK; + return status; } static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context_handle)

1 0

Hans Leidekker : secur32/tests: Add tests for renegotiating an SSL connection.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 3d1a98f48666e581b4ce0c10a4752f715fa06329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d1a98f48666e581b4ce0c10… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 19 16:58:58 2021 +0100 secur32/tests: Add tests for renegotiating an SSL connection. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 338 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 333 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d1a98f48666e581b4ce…

1 0

Jacek Caban : ntdll: Introduce signal_init_syscalls.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: a0a62463e3d1d053459a194e2e1bcc91bfbec0f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a62463e3d1d053459a194e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 19 19:08:48 2021 +0100 ntdll: Introduce signal_init_syscalls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 4 +++- dlls/ntdll/unix/signal_arm.c | 9 +++++++++ dlls/ntdll/unix/signal_arm64.c | 10 ++++++++++ dlls/ntdll/unix/signal_i386.c | 9 +++++++++ dlls/ntdll/unix/signal_x86_64.c | 17 +++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 6 ------ 7 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 8b1fd6edb7a..c4f897f3d0d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -104,6 +104,7 @@ void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NU void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); +static void *syscall_dispatcher; #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); @@ -883,7 +884,7 @@ static void load_ntdll_functions( HMODULE module ) if ((ptr = (void *)find_named_export( module, ntdll_exports, #name ))) *ptr = val; \ else ERR( "%s not found\n", #name ) - SET_PTR( __wine_syscall_dispatcher, __wine_syscall_dispatcher ); + SET_PTR( __wine_syscall_dispatcher, syscall_dispatcher ); #ifdef __i386__ SET_PTR( __wine_ldt_copy, &__wine_ldt_copy ); #endif @@ -1650,6 +1651,7 @@ static void start_main_thread(void) startup_info_size = server_init_process(); virtual_map_user_shared_data(); init_cpu_info(); + syscall_dispatcher = signal_init_syscalls(); init_files(); init_startup_info(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 385e4807990..2de58925c84 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -963,6 +963,15 @@ void signal_init_process(void) } +/********************************************************************** + * signal_init_syscalls + */ +void *signal_init_syscalls(void) +{ + return __wine_syscall_dispatcher; +} + + /*********************************************************************** * init_thread_context */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 95042de45e1..9a36746f5bc 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1120,6 +1120,16 @@ void signal_init_process(void) exit(1); } + +/********************************************************************** + * signal_init_syscalls + */ +void *signal_init_syscalls(void) +{ + return __wine_syscall_dispatcher; +} + + /*********************************************************************** * init_thread_context */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index f2d58dc654d..09529a1ea96 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2467,6 +2467,15 @@ void signal_init_process(void) } +/********************************************************************** + * signal_init_syscalls + */ +void *signal_init_syscalls(void) +{ + return __wine_syscall_dispatcher; +} + + /*********************************************************************** * init_thread_context */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 892d208e43a..bed4958f251 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -34,6 +34,7 @@ #include <stdarg.h> #include <stdio.h> #include <sys/types.h> +#include <sys/mman.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -2787,6 +2788,22 @@ void signal_init_process(void) } +/********************************************************************** + * signal_init_syscalls + */ +void *signal_init_syscalls(void) +{ + void *ptr; + + /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */ + ptr = (char *)user_shared_data + page_size; + anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); + *(void **)ptr = __wine_syscall_dispatcher; + + return __wine_syscall_dispatcher; +} + + /*********************************************************************** * init_thread_context */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1a864b6fb5d..65f526d0f7d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -208,6 +208,7 @@ extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(void) DECLSPEC_HIDDEN; +extern void *signal_init_syscalls(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, void *thunk, TEB *teb ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index c35f9c2fc07..3350dc665c1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2597,12 +2597,6 @@ TEB *virtual_alloc_first_teb(void) exit(1); } -#ifdef __x86_64__ /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */ - ptr = (char *)user_shared_data + page_size; - anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); - *(void **)ptr = __wine_syscall_dispatcher; -#endif - NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30;

1 0

Jacek Caban : winebuild: Factor out output_syscall_dispatcher.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: a06d60bd5f614d0014f013e5a2cc38b7bd8754ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a06d60bd5f614d0014f013e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 19 19:08:51 2021 +0100 winebuild: Factor out output_syscall_dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 516 ++++++++++++++++++++++++----------------------- 1 file changed, 262 insertions(+), 254 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a06d60bd5f614d0014f0…

1 0

Jacek Caban : ntdll: Store x86_64 YMM context in syscall frame.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 11e3d43c264bf24657b20c1435cbabfa78e0b1f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11e3d43c264bf24657b20c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 19 19:08:59 2021 +0100 ntdll: Store x86_64 YMM context in syscall frame. 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 | 20 +++++++++++++----- tools/winebuild/import.c | 45 ++++++++++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index bed4958f251..ca0f9117cd5 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -270,9 +270,10 @@ C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); struct syscall_xsave { XMM_SAVE_AREA32 xsave; + XSTATE xstate; }; -C_ASSERT( sizeof(struct syscall_xsave) == 0x200 ); +C_ASSERT( sizeof(struct syscall_xsave) == 0x340 ); struct syscall_frame { @@ -2147,7 +2148,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, "movq %gs:0x30,%rdx\n\t" "movq 0x328(%rdx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq -0x200(%rax),%r8\n\t" + "leaq -0x340(%rax),%r8\n\t" "andq $~63,%r8\n\t" "fxrstor64 (%r8)\n\t" "movq 0x8(%rax),%rbx\n\t" /* frame->rbx */ @@ -2793,14 +2794,23 @@ void signal_init_process(void) */ void *signal_init_syscalls(void) { - void *ptr; + SYSTEM_CPU_INFORMATION cpu_info; + void *ptr, *syscall_dispatcher; + + extern void __wine_syscall_dispatcher_xsave(void) DECLSPEC_HIDDEN; + + NtQuerySystemInformation( SystemCpuInformation, &cpu_info, sizeof(cpu_info), NULL ); + if (cpu_info.FeatureSet & CPU_FEATURE_XSAVE) + syscall_dispatcher = __wine_syscall_dispatcher_xsave; + else + syscall_dispatcher = __wine_syscall_dispatcher; /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */ ptr = (char *)user_shared_data + page_size; anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); - *(void **)ptr = __wine_syscall_dispatcher; + *(void **)ptr = syscall_dispatcher; - return __wine_syscall_dispatcher; + return syscall_dispatcher; } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 85bd31b8e08..0fddbaf6134 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1426,13 +1426,14 @@ static int cmp_link_name( const void *e1, const void *e2 ) /* output dispatcher for system calls */ -static void output_syscall_dispatcher( int count ) +static void output_syscall_dispatcher( int count, const char *variant ) { const unsigned int invalid_param = 0xc000000d; /* STATUS_INVALID_PARAMETER */ + const char *symbol = strmake( "__wine_syscall_dispatcher%s", variant ); output( "\t.align %d\n", get_alignment(4) ); - output( "\t%s\n", func_declaration("__wine_syscall_dispatcher") ); - output( "%s\n", asm_globl("__wine_syscall_dispatcher") ); + output( "\t%s\n", func_declaration(symbol) ); + output( "%s\n", asm_globl(symbol) ); output_cfi( ".cfi_startproc" ); switch (target_cpu) { @@ -1493,7 +1494,7 @@ static void output_syscall_dispatcher( int count ) output_cfi( ".cfi_def_cfa_register %%rbp" ); output( "\tleaq -0x10(%%rbp),%%rsp\n" ); output( "\tpushfq\n" ); - output( "\tsubq $0x280,%%rsp\n" ); + output( "\tsubq $0x3c0,%%rsp\n" ); output( "\tandq $~63,%%rsp\n" ); output( "\tmovq %%rbx,-0x90(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rbx,-144" ); @@ -1520,14 +1521,29 @@ static void output_syscall_dispatcher( int count ) output( "\tmovw %%ss,-0x8(%%rbp)\n" ); output( "\tmovw %%gs,-0x6(%%rbp)\n" ); output( "\tmovq %%rsp,%%r12\n" ); - output( "\tfxsave64 (%%r12)\n" ); + output( "\tmovq %%rax,%%r11\n" ); + if (!*variant) + { + output( "\tfxsave64 (%%r12)\n" ); + } + else + { + output( "\tmovl $7,%%eax\n" ); + output( "\tmovq %%rdx,%%rsi\n" ); + output( "\txorq %%rdx,%%rdx\n" ); + output( "\tmovq %%rdx,0x200(%%r12)\n" ); + output( "\tmovq %%rdx,0x208(%%r12)\n" ); + output( "\tmovq %%rdx,0x210(%%r12)\n" ); + output( "\txsave64 (%%r12)\n" ); + output( "\tmovq %%rsi,%%rdx\n" ); + } output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ - output( "\tcmpq $%u,%%rax\n", count ); + output( "\tcmpq $%u,%%r11\n", count ); output( "\tjae 3f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); - output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); + output( "\tmovzbl (%%rcx,%%r11),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); output( "\tjbe 1f\n" ); output( "\tsubq %%rcx,%%rsp\n" ); @@ -1540,7 +1556,7 @@ static void output_syscall_dispatcher( int count ) output( "1:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); - output( "\tcallq *(%%r10,%%rax,8)\n" ); + output( "\tcallq *(%%r10,%%r11,8)\n" ); output( "2:\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq $0,0x328(%%rcx)\n" ); output( "\tfxrstor64 (%%r12)\n" ); @@ -1682,7 +1698,7 @@ static void output_syscall_dispatcher( int count ) assert(0); } output_cfi( ".cfi_endproc" ); - output_function_size( "__wine_syscall_dispatcher" ); + output_function_size( symbol ); } @@ -1707,7 +1723,16 @@ void output_syscalls( DLLSPEC *spec ) if (unix_lib) { - output_syscall_dispatcher( count ); + output_syscall_dispatcher( count, "" ); + + switch( target_cpu ) + { + case CPU_x86_64: + output_syscall_dispatcher( count, "_xsave" ); + break; + default: + break; + } output( "\t.data\n" ); output( "\t.align %d\n", get_alignment( get_ptr_size() ) );

1 0

Jacek Caban : ntdll: Use syscall frame for x86_64 YMM context in NtGetContextThread.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 4de079bb7247c8b849558c0f27a280a9546c5570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4de079bb7247c8b849558c0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 19 19:09:03 2021 +0100 ntdll: Use syscall frame for x86_64 YMM context in NtGetContextThread. 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 | 82 +++++++++++++---------------------------- 1 file changed, 26 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ca0f9117cd5..8d3353e959d 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1540,56 +1540,6 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex } -/*********************************************************************** - * save_xstate - * - * Save the XState context - */ -static inline NTSTATUS save_xstate( CONTEXT *context ) -{ - CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); - DECLSPEC_ALIGN(64) struct - { - XSAVE_FORMAT xsave; - XSTATE xstate; - } - xsave_area; - XSTATE *xs; - - if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) - return STATUS_SUCCESS; - - if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) - || context_ex->XState.Length > sizeof(XSTATE)) - return STATUS_INVALID_PARAMETER; - - if (user_shared_data->XState.CompactionEnabled) - { - /* xsavec doesn't use anything from the save area. */ - __asm__ volatile( "xsavec %0" : "=m"(xsave_area) - : "a" ((unsigned int)(xs->CompactionMask & (1 << XSTATE_AVX))), "d" (0) ); - } - else - { - /* xsave preserves those bits in the mask which are not in EDX:EAX, so zero it. */ - xsave_area.xstate.Mask = xsave_area.xstate.CompactionMask = 0; - __asm__ volatile( "xsave %0" : "=m"(xsave_area) - : "a" ((unsigned int)(xs->Mask & (1 << XSTATE_AVX))), "d" (0) ); - } - - memcpy(xs, &xsave_area.xstate, offsetof(XSTATE, YmmContext)); - if (xs->Mask & (1 << XSTATE_AVX)) - { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - - memcpy(&xs->YmmContext, &xsave_area.xstate.YmmContext, sizeof(xs->YmmContext)); - } - - return STATUS_SUCCESS; -} - - /*********************************************************************** * restore_context * @@ -1895,17 +1845,14 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) */ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { - NTSTATUS ret, xsave_status; + NTSTATUS ret; DWORD needed_flags; struct syscall_frame *frame = amd64_thread_data()->syscall_frame; BOOL self = (handle == GetCurrentThread()); + XSTATE *xstate; if (!context) return STATUS_INVALID_PARAMETER; - /* Save xstate before any calls which can potentially change volatile ymm registers. - * E. g., debug output will clobber ymm registers. */ - xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; - needed_flags = context->ContextFlags & ~CONTEXT_AMD64; /* debug registers require a server call */ @@ -1975,9 +1922,32 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) amd64_thread_data()->dr6 = context->Dr6; amd64_thread_data()->dr7 = context->Dr7; } + if (user_shared_data->XState.EnabledFeatures && (xstate = xstate_from_context( context ))) + { + struct syscall_xsave *xsave = get_syscall_xsave( frame ); + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + const BOOL compaction_enabled = user_shared_data->XState.CompactionEnabled; + unsigned int mask; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) + || context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + mask = (compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; + xstate->Mask = xsave->xstate.Mask & mask; + xstate->CompactionMask = compaction_enabled ? (0x8000000000000000 | mask) : 0; + memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); + if (xstate->Mask) + { + if (context_ex->XState.Length < sizeof(XSTATE)) + return STATUS_BUFFER_OVERFLOW; + + memcpy( &xstate->YmmContext, &xsave->xstate.YmmContext, sizeof(xstate->YmmContext) ); + } + } } - return xsave_status; + return STATUS_SUCCESS; } extern void CDECL raise_func_trampoline( void *dispatcher );

1 0

Alexandre Julliard : srvcli: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 63b2ee515d30829e0353545a4fa11c83d838dfbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b2ee515d30829e0353545a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:53:37 2021 +0100 srvcli: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/srvcli/Makefile.in | 4 +--- dlls/srvcli/main.c | 41 ----------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/srvcli/Makefile.in b/dlls/srvcli/Makefile.in index 716cc1b3867..22c1230b769 100644 --- a/dlls/srvcli/Makefile.in +++ b/dlls/srvcli/Makefile.in @@ -1,5 +1,3 @@ MODULE = srvcli.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/srvcli/main.c b/dlls/srvcli/main.c deleted file mode 100644 index 0df8e00d0fa..00000000000 --- a/dlls/srvcli/main.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * - * Copyright (C) 2020 Alistair Leslie-Hughes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(srvcli); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : strmdll: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 3d7261eb9c0a8bd66d8a0385d5dd0b928347f73c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d7261eb9c0a8bd66d8a0385… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:02 2021 +0100 strmdll: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmdll/Makefile.in | 5 +---- dlls/strmdll/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/strmdll/Makefile.in b/dlls/strmdll/Makefile.in index f710169b6ab..e224b6f4a51 100644 --- a/dlls/strmdll/Makefile.in +++ b/dlls/strmdll/Makefile.in @@ -1,8 +1,5 @@ MODULE = strmdll.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/strmdll/main.c b/dlls/strmdll/main.c deleted file mode 100644 index 1278fc2b781..00000000000 --- a/dlls/strmdll/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2018 Stefan Leichter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmdll); - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : svrapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 547d34d0cd44f9b74dbb485642561abe0c455ea3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547d34d0cd44f9b74dbb4856… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:18 2021 +0100 svrapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/svrapi/Makefile.in | 5 +---- dlls/svrapi/svrapi_main.c | 46 ---------------------------------------------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/dlls/svrapi/Makefile.in b/dlls/svrapi/Makefile.in index c9467f28d97..4ebcc804cda 100644 --- a/dlls/svrapi/Makefile.in +++ b/dlls/svrapi/Makefile.in @@ -1,6 +1,3 @@ MODULE = svrapi.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - svrapi_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/svrapi/svrapi_main.c b/dlls/svrapi/svrapi_main.c deleted file mode 100644 index 8c7b007fc5a..00000000000 --- a/dlls/svrapi/svrapi_main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* -* Part of NETAPI on Windows 9x -* -* Copyright 2006 Konstantin Petrov -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -*/ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "svrapi.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(svrapi); - -/*********************************************************************** - * DllMain (SVRAPI.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) -{ - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); - - switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /*prefer native version*/ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : utildll: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 210298e4d09c29695cfab336a8b7ffb88baa44a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=210298e4d09c29695cfab336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:35 2021 +0100 utildll: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/utildll/Makefile.in | 5 +---- dlls/utildll/main.c | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/utildll/Makefile.in b/dlls/utildll/Makefile.in index 5bd9a6fa0e0..6a04261eeae 100644 --- a/dlls/utildll/Makefile.in +++ b/dlls/utildll/Makefile.in @@ -1,6 +1,3 @@ MODULE = utildll.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/utildll/main.c b/dlls/utildll/main.c deleted file mode 100644 index e0487944340..00000000000 --- a/dlls/utildll/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Utility Functions - * - * Copyright 2019 Alex Henrie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(utildll); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0