June 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Don't update cached registers if NtGetContextThread() fails.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: bcc587887a2003c60f9db6a03a6b6e7ee98782fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc587887a2003c60f9db6a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 12:55:23 2021 +0200 ntdll: Don't update cached registers if NtGetContextThread() fails. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 28 +++++++++++++--------------- dlls/ntdll/unix/signal_x86_64.c | 28 +++++++++++++--------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 446fed25eb8..1ffaa543124 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1047,7 +1047,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (self) { - XSTATE *xstate; if (needed_flags & CONTEXT_INTEGER) { context->Eax = frame->eax; @@ -1127,19 +1126,10 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; } - /* update the cached version of the debug registers */ - if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) - { - x86_thread_data()->dr0 = context->Dr0; - x86_thread_data()->dr1 = context->Dr1; - x86_thread_data()->dr2 = context->Dr2; - x86_thread_data()->dr3 = context->Dr3; - x86_thread_data()->dr6 = context->Dr6; - x86_thread_data()->dr7 = context->Dr7; - } - if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xstate = xstate_from_context( context ))) + if ((needed_flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); unsigned int mask; if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) @@ -1152,12 +1142,20 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); if (xstate->Mask) { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - + if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; xstate->YmmContext = frame->xstate.YmmContext; } } + /* update the cached version of the debug registers */ + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) + { + x86_thread_data()->dr0 = context->Dr0; + x86_thread_data()->dr1 = context->Dr1; + x86_thread_data()->dr2 = context->Dr2; + x86_thread_data()->dr3 = context->Dr3; + x86_thread_data()->dr6 = context->Dr6; + x86_thread_data()->dr7 = context->Dr7; + } } if (context->ContextFlags & (CONTEXT_INTEGER & ~CONTEXT_i386)) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 4845d3dd5f4..404006d22d1 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1677,7 +1677,6 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) DWORD needed_flags; struct syscall_frame *frame = amd64_thread_data()->syscall_frame; BOOL self = (handle == GetCurrentThread()); - XSTATE *xstate; if (!context) return STATUS_INVALID_PARAMETER; @@ -1765,19 +1764,10 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->MxCsr = context->u.FltSave.MxCsr; context->ContextFlags |= CONTEXT_FLOATING_POINT; } - /* update the cached version of the debug registers */ - if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) - { - amd64_thread_data()->dr0 = context->Dr0; - amd64_thread_data()->dr1 = context->Dr1; - amd64_thread_data()->dr2 = context->Dr2; - amd64_thread_data()->dr3 = context->Dr3; - amd64_thread_data()->dr6 = context->Dr6; - amd64_thread_data()->dr7 = context->Dr7; - } - if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xstate = xstate_from_context( context ))) + if ((needed_flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); unsigned int mask; if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) @@ -1790,12 +1780,20 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); if (xstate->Mask) { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - + if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; memcpy( &xstate->YmmContext, &frame->xstate.YmmContext, sizeof(xstate->YmmContext) ); } } + /* update the cached version of the debug registers */ + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } } return STATUS_SUCCESS;

1 0

Alexandre Julliard : ntdll: Move the XSTATE definitions to the platform-specific files.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 2849ca9db42d7c2dad57f987fd595c3cb2050eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2849ca9db42d7c2dad57f987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 12:55:39 2021 +0200 ntdll: Move the XSTATE definitions to the platform-specific files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 35 +++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 34 ++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 46 ----------------------------------------- 3 files changed, 69 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1ffaa543124..cb90eade4c6 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -580,6 +580,41 @@ static BOOL is_inside_syscall( ucontext_t *sigcontext ) (char *)ESP_sig(sigcontext) <= (char *)x86_thread_data()->syscall_frame); } + +struct xcontext +{ + CONTEXT c; + CONTEXT_EX c_ex; + ULONG64 host_compaction_mask; +}; + +extern BOOL xstate_compaction_enabled DECLSPEC_HIDDEN; + +static inline XSTATE *xstate_from_context( const CONTEXT *context ) +{ + CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1); + + if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) return NULL; + return (XSTATE *)((char *)xctx + xctx->XState.Offset); +} + +static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) +{ + CONTEXT_EX *xctx; + + xctx = (CONTEXT_EX *)(context + 1); + xctx->Legacy.Length = sizeof(CONTEXT); + xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); + + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + xctx->All.Offset = -(LONG)sizeof(CONTEXT); + context->ContextFlags |= CONTEXT_XSTATE; +} + + #ifdef __sun /* We have to workaround two Solaris breakages: diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 404006d22d1..46243ea00d4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -329,6 +329,40 @@ static BOOL is_inside_syscall( ucontext_t *sigcontext ) } +struct xcontext +{ + CONTEXT c; + CONTEXT_EX c_ex; + ULONG64 host_compaction_mask; +}; + +extern BOOL xstate_compaction_enabled DECLSPEC_HIDDEN; + +static inline XSTATE *xstate_from_context( const CONTEXT *context ) +{ + CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1); + + if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) return NULL; + return (XSTATE *)((char *)xctx + xctx->XState.Offset); +} + +static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) +{ + CONTEXT_EX *xctx; + + xctx = (CONTEXT_EX *)(context + 1); + xctx->Legacy.Length = sizeof(CONTEXT); + xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); + + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + xctx->All.Offset = -(LONG)sizeof(CONTEXT); + context->ContextFlags |= CONTEXT_XSTATE; +} + + /*********************************************************************** * Definitions for Dwarf unwind tables */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f6934ae9e91..28ba07ceac1 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -335,52 +335,6 @@ static inline TEB64 *NtCurrentTeb64(void) { return NULL; } static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } #endif -struct xcontext -{ - CONTEXT c; - CONTEXT_EX c_ex; - ULONG64 host_compaction_mask; -}; - -#if defined(__i386__) || defined(__x86_64__) -extern BOOL xstate_compaction_enabled DECLSPEC_HIDDEN; - -static inline XSTATE *xstate_from_context( const CONTEXT *context ) -{ - CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1); - - if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) - return NULL; - - return (XSTATE *)((char *)(context + 1) + xctx->XState.Offset); -} - -static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) -{ - CONTEXT_EX *xctx; - - xctx = (CONTEXT_EX *)(context + 1); - xctx->Legacy.Length = sizeof(CONTEXT); - xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); - - xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; - - xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; - xctx->All.Offset = -(LONG)sizeof(CONTEXT); - context->ContextFlags |= 0x40; -} - -#else -static inline XSTATE *xstate_from_context( const CONTEXT *context ) -{ - return NULL; -} -static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) -{ -} -#endif - enum loadorder { LO_INVALID,

1 0

Alexandre Julliard : ntdll: Also pass the TEB to signal_exit_thread().
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 9a430dc6db30b2530e355204fd5907c50791d3df URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a430dc6db30b2530e355204… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 12:56:38 2021 +0200 ntdll: Also pass the TEB to signal_exit_thread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 14 ++++---------- dlls/ntdll/unix/signal_arm64.c | 16 ++++------------ dlls/ntdll/unix/signal_i386.c | 5 +++-- dlls/ntdll/unix/signal_x86_64.c | 9 ++++----- dlls/ntdll/unix/thread.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 2 +- 6 files changed, 19 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 8a45d0ba086..a0d826ea178 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -973,8 +973,10 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "bx r5" ) -extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); -__ASM_GLOBAL_FUNC( call_thread_exit_func, +/*********************************************************************** + * signal_exit_thread + */ +__ASM_GLOBAL_FUNC( signal_exit_thread, "ldr r3, [r2, #0x1d4]\n\t" /* arm_thread_data()->exit_frame */ "mov ip, #0\n\t" "str ip, [r2, #0x1d4]\n\t" @@ -983,12 +985,4 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, "movne sp, r3\n\t" "blx r1" ) -/*********************************************************************** - * signal_exit_thread - */ -void signal_exit_thread( int status, void (*func)(int) ) -{ - call_thread_exit_func( status, func, NtCurrentTeb() ); -} - #endif /* __arm__ */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 0cb1bde1d55..669e44aaa2b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1146,9 +1146,10 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "mov lr, #0\n\t" "br x19" ) - -extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); -__ASM_GLOBAL_FUNC( call_thread_exit_func, +/*********************************************************************** + * signal_exit_thread + */ +__ASM_GLOBAL_FUNC( signal_exit_thread, "stp x29, x30, [sp,#-16]!\n\t" "ldr x3, [x2, #0x2f0]\n\t" /* arm64_thread_data()->exit_frame */ "str xzr, [x2, #0x2f0]\n\t" @@ -1157,15 +1158,6 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, "1:\tldp x29, x30, [sp], #16\n\t" "br x1" ) -/*********************************************************************** - * signal_exit_thread - */ -void signal_exit_thread( int status, void (*func)(int) ) -{ - call_thread_exit_func( status, func, NtCurrentTeb() ); -} - - /********************************************************************** * NtCurrentTeb (NTDLL.@) */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index cb90eade4c6..4ce1b519da3 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2436,14 +2436,15 @@ __ASM_GLOBAL_FUNC( signal_start_thread, */ __ASM_GLOBAL_FUNC( signal_exit_thread, "movl 8(%esp),%ecx\n\t" + "movl 12(%esp),%esi\n\t" + "xorl %edx,%edx\n\t" /* fetch exit frame */ - "movl %fs:0x1f4,%edx\n\t" /* x86_thread_data()->exit_frame */ + "xchgl %edx,0x1f4(%esi)\n\t" /* x86_thread_data()->exit_frame */ "testl %edx,%edx\n\t" "jnz 1f\n\t" "jmp *%ecx\n\t" /* switch to exit frame stack */ "1:\tmovl 4(%esp),%eax\n\t" - "movl $0,%fs:0x1f4\n\t" "movl %edx,%ebp\n\t" __ASM_CFI(".cfi_def_cfa %ebp,4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 46243ea00d4..04442a012a2 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2691,14 +2691,13 @@ __ASM_GLOBAL_FUNC( signal_start_thread, */ __ASM_GLOBAL_FUNC( signal_exit_thread, /* fetch exit frame */ - "movq %gs:0x30,%rax\n\t" - "movq 0x320(%rax),%rdx\n\t" /* amd64_thread_data()->exit_frame */ - "testq %rdx,%rdx\n\t" + "xorl %ecx,%ecx\n\t" + "xchgq %rcx,0x320(%rdx)\n\t" /* amd64_thread_data()->exit_frame */ + "testq %rcx,%rcx\n\t" "jnz 1f\n\t" "jmp *%rsi\n" /* switch to exit frame stack */ - "1:\tmovq $0,0x320(%rax)\n\t" - "movq %rdx,%rsp\n\t" + "1:\tmovq %rcx,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") __ASM_CFI(".cfi_rel_offset %rbp,48\n\t") __ASM_CFI(".cfi_rel_offset %rbx,40\n\t") diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index ce72cc8b6cb..1c3c77cf24d 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1017,7 +1017,7 @@ void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); if (InterlockedDecrement( &nb_threads ) <= 0) abort_process( status ); - signal_exit_thread( status, pthread_exit_wrapper ); + signal_exit_thread( status, pthread_exit_wrapper, NtCurrentTeb() ); } @@ -1050,7 +1050,7 @@ static DECLSPEC_NORETURN void exit_thread( int status ) virtual_free_teb( teb ); } } - signal_exit_thread( status, pthread_exit_wrapper ); + signal_exit_thread( status, pthread_exit_wrapper, NtCurrentTeb() ); } @@ -1060,7 +1060,7 @@ static DECLSPEC_NORETURN void exit_thread( int status ) void exit_process( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper ); + signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper, NtCurrentTeb() ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 28ba07ceac1..2392b2ea274 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -246,7 +246,7 @@ extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(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; +extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern unsigned int __wine_syscall_flags DECLSPEC_HIDDEN; extern NTSTATUS signal_set_full_context( CONTEXT *context ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Always use the TEB that was passed to signal_start_thread().
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: a5cec4f5fbef0c586b530ea51acd6e3da2ff3f83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5cec4f5fbef0c586b530ea5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 12:59:05 2021 +0200 ntdll: Always use the TEB that was passed to signal_start_thread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 24 +++++++++++++----------- dlls/ntdll/unix/signal_x86_64.c | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 4ce1b519da3..89f4fb4151c 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2342,7 +2342,7 @@ void signal_init_process(void) /*********************************************************************** * init_thread_context */ -static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg ) +static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg, TEB *teb ) { context->SegCs = get_cs(); context->SegDs = get_ds(); @@ -2353,7 +2353,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, context->EFlags = 0x202; context->Eax = (DWORD)entry; context->Ebx = (DWORD)arg; - context->Esp = (DWORD)NtCurrentTeb()->Tib.StackBase - 16; + context->Esp = (DWORD)teb->Tib.StackBase - 16; context->Eip = (DWORD)pRtlUserThreadStart; context->FloatSave.ControlWord = 0x27f; ((XSAVE_FORMAT *)context->ExtendedRegisters)->ControlWord = 0x27f; @@ -2369,7 +2369,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, /*********************************************************************** * get_initial_context */ -PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) +PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ) { CONTEXT *ctx; @@ -2377,15 +2377,15 @@ PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void { CONTEXT context = { CONTEXT_ALL }; - init_thread_context( &context, entry, arg ); + init_thread_context( &context, entry, arg, teb ); wait_suspend( &context ); ctx = (CONTEXT *)((ULONG_PTR)context.Esp & ~15) - 1; *ctx = context; } else { - ctx = (CONTEXT *)((char *)NtCurrentTeb()->Tib.StackBase - 16) - 1; - init_thread_context( ctx, entry, arg ); + ctx = (CONTEXT *)((char *)teb->Tib.StackBase - 16) - 1; + init_thread_context( ctx, entry, arg, teb ); } pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); ctx->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; @@ -2409,17 +2409,19 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") /* store exit frame */ - "movl %ebp,%fs:0x1f4\n\t" /* x86_thread_data()->exit_frame */ + "movl 24(%ebp),%ecx\n\t" /* teb */ + "movl %ebp,0x1f4(%ecx)\n\t" /* x86_thread_data()->exit_frame */ /* set syscall frame */ - "cmpl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame */ + "cmpl $0,0x1f8(%ecx)\n\t" /* x86_thread_data()->syscall_frame */ "jnz 1f\n\t" "leal -0x380(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ "andl $~63,%eax\n\t" - "movl %eax,%fs:0x1f8\n" /* x86_thread_data()->syscall_frame */ + "movl %eax,0x1f8(%ecx)\n" /* x86_thread_data()->syscall_frame */ /* switch to thread stack */ - "1:\tmovl %fs:4,%eax\n\t" /* NtCurrentTeb()->StackBase */ - "leal -0x1004(%eax),%esp\n\t" + "1:\tmovl 4(%ecx),%eax\n\t" /* teb->StackBase */ + "leal -0x1000(%eax),%esp\n\t" /* attach dlls */ + "pushl %ecx\n\t" /* teb */ "pushl 16(%ebp)\n\t" /* suspend */ "pushl 12(%ebp)\n\t" /* arg */ "pushl 8(%ebp)\n\t" /* entry */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 04442a012a2..10aa2a516b0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2603,13 +2603,13 @@ void signal_init_process(void) /*********************************************************************** * init_thread_context */ -static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg ) +static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg, TEB *teb ) { __asm__( "movw %%cs,%0" : "=m" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=m" (context->SegSs) ); context->Rcx = (ULONG_PTR)entry; context->Rdx = (ULONG_PTR)arg; - context->Rsp = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase - 0x28; + context->Rsp = (ULONG_PTR)teb->Tib.StackBase - 0x28; context->Rip = (ULONG_PTR)pRtlUserThreadStart; context->EFlags = 0x200; context->u.FltSave.ControlWord = 0x27f; @@ -2620,7 +2620,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, /*********************************************************************** * get_initial_context */ -PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) +PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ) { CONTEXT *ctx; @@ -2629,15 +2629,15 @@ PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void CONTEXT context = { 0 }; context.ContextFlags = CONTEXT_ALL; - init_thread_context( &context, entry, arg ); + init_thread_context( &context, entry, arg, teb ); wait_suspend( &context ); ctx = (CONTEXT *)((ULONG_PTR)context.Rsp & ~15) - 1; *ctx = context; } else { - ctx = (CONTEXT *)((char *)NtCurrentTeb()->Tib.StackBase - 0x30) - 1; - init_thread_context( ctx, entry, arg ); + ctx = (CONTEXT *)((char *)teb->Tib.StackBase - 0x30) - 1; + init_thread_context( ctx, entry, arg, teb ); } pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); ctx->ContextFlags = CONTEXT_FULL; @@ -2666,17 +2666,17 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "movq %r15,8(%rsp)\n\t" __ASM_CFI(".cfi_rel_offset %r15,8\n\t") /* store exit frame */ - "movq %gs:0x30,%rax\n\t" - "movq %rsp,0x320(%rax)\n\t" /* amd64_thread_data()->exit_frame */ + "movq %rsp,0x320(%r8)\n\t" /* amd64_thread_data()->exit_frame */ /* set syscall frame */ - "cmpq $0,0x328(%rax)\n\t" /* amd64_thread_data()->syscall_frame */ + "cmpq $0,0x328(%r8)\n\t" /* amd64_thread_data()->syscall_frame */ "jnz 1f\n\t" "leaq -0x400(%rsp),%r10\n\t" /* sizeof(struct syscall_frame) */ "andq $~63,%r10\n\t" - "movq %r10,0x328(%rax)\n" /* amd64_thread_data()->syscall_frame */ + "movq %r10,0x328(%r8)\n" /* amd64_thread_data()->syscall_frame */ /* switch to thread stack */ - "1:\tmovq 8(%rax),%rax\n\t" /* NtCurrentTeb()->Tib.StackBase */ + "1:\tmovq 8(%r8),%rax\n\t" /* teb->Tib.StackBase */ "movq %rcx,%rbx\n\t" /* thunk */ + "movq %r8,%rcx\n\t" /* teb */ "leaq -0x1000(%rax),%rsp\n\t" /* attach dlls */ "call " __ASM_NAME("get_initial_context") "\n\t"

1 0

Piotr Caban : msvcrt: Fix math error arguments in powf.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 9d2de96d075937ba0d3767fe147c4dc6baae6433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d2de96d075937ba0d3767fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 14 17:40:28 2021 +0200 msvcrt: Fix math error arguments in powf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3d4ce3b3108..f09330d57a1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1567,7 +1567,7 @@ float CDECL powf( float x, float y ) if (ix & 0x80000000 && powf_checkint(iy) == 1) x2 = -x2; if (iy & 0x80000000 && x2 == 0.0) - return math_error(_SING, "powf", x, 0, 1 / x2); + return math_error(_SING, "powf", x, y, 1 / x2); /* Without the barrier some versions of clang hoist the 1/x2 and thus division by zero exception can be signaled spuriously. */ return iy & 0x80000000 ? fp_barrierf(1 / x2) : x2; @@ -1577,7 +1577,7 @@ float CDECL powf( float x, float y ) /* Finite x < 0. */ int yint = powf_checkint(iy); if (yint == 0) - return math_error(_DOMAIN, "powf", x, 0, 0 / (x - x)); + return math_error(_DOMAIN, "powf", x, y, 0 / (x - x)); if (yint == 1) sign_bias = 1 << (5 + 11); ix &= 0x7fffffff; @@ -1595,9 +1595,9 @@ float CDECL powf( float x, float y ) if ((*(UINT64*)&ylogx >> 47 & 0xffff) >= 0x40af800000000000llu >> 47) { /* |y*log(x)| >= 126. */ if (ylogx > 0x1.fffffffd1d571p+6 * (1 << 5)) - return math_error(_OVERFLOW, "powf", x, 0, (sign_bias ? -1.0 : 1.0) * 0x1p1023); + return math_error(_OVERFLOW, "powf", x, y, (sign_bias ? -1.0 : 1.0) * 0x1p1023); if (ylogx <= -150.0 * (1 << 5)) - return math_error(_UNDERFLOW, "powf", x, 0, (sign_bias ? -1.0 : 1.0) / 0x1p1023); + return math_error(_UNDERFLOW, "powf", x, y, (sign_bias ? -1.0 : 1.0) / 0x1p1023); } return powf_exp2(ylogx, sign_bias); }

1 0

Piotr Caban : msvcrt: Import pow implementation from musl.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: ff4d7edc338b35dce3274dd6887dbaf55cf86513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff4d7edc338b35dce3274dd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 14 17:40:33 2021 +0200 msvcrt: Import pow implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 1 - dlls/msvcr100/Makefile.in | 1 - dlls/msvcr110/Makefile.in | 1 - dlls/msvcr120/Makefile.in | 1 - dlls/msvcr70/Makefile.in | 1 - dlls/msvcr71/Makefile.in | 1 - dlls/msvcr80/Makefile.in | 1 - dlls/msvcr90/Makefile.in | 1 - dlls/msvcrt/Makefile.in | 1 - dlls/msvcrt/math.c | 423 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 64 ------- dlls/msvcrt/unixlib.h | 29 ---- dlls/msvcrtd/Makefile.in | 1 - dlls/ucrtbase/Makefile.in | 1 - 14 files changed, 412 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff4d7edc338b35dce327…

1 0

Jactry Zeng : riched20: Allow to insert OLE object at specified offset.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 8c894382dde5b9da88b0e9f23a753d5e851a43d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c894382dde5b9da88b0e9f2… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 8 13:45:49 2021 +0800 riched20: Allow to insert OLE object at specified offset. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 16 ++++++++++++---- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/tests/richole.c | 18 +++++++++--------- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1f4c3903a38..beac8af50a1 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -455,15 +455,23 @@ static struct re_object* create_re_object(const REOBJECT *reo) return reobj; } -void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) +void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) { ME_Run *run, *prev; const WCHAR space = ' '; struct re_object *reobj_prev = NULL; - ME_Cursor *cursor = editor->pCursors + nCursor; - ME_Style *style = style_get_insert_style( editor, cursor ); + ME_Cursor *cursor, cursor_from_ofs; + ME_Style *style; + + if (reo->cp == REO_CP_SELECTION) + cursor = editor->pCursors; + else + { + cursor_from_char_ofs( editor, reo->cp, &cursor_from_ofs ); + cursor = &cursor_from_ofs; + } + style = style_get_insert_style( editor, cursor ); - /* FIXME no no no */ if (ME_IsSelection(editor)) ME_DeleteSelection(editor); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d4aadc325f9..cc02604767e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1172,7 +1172,7 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB reobject.dwFlags = 0; /* FIXME */ reobject.dwUser = 0; - ME_InsertOLEFromCursor(editor, &reobject, 0); + editor_insert_oleobj(editor, &reobject); hr = S_OK; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 141e9034a6a..fdf3e068fe9 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -188,7 +188,7 @@ int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) DEC BOOL ME_IsSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DeleteSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SendSelChange(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) DECLSPEC_HIDDEN; +void editor_insert_oleobj( ME_TextEditor *editor, const REOBJECT *reo ) DECLSPEC_HIDDEN; BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) DECLSPEC_HIDDEN; int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 72840a4cafa..03572511ff7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1367,7 +1367,7 @@ IRichEditOle_fnInsertObject(IRichEditOle *iface, REOBJECT *reo) if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; - ME_InsertOLEFromCursor(services->editor, reo, 0); + editor_insert_oleobj(services->editor, reo); ME_CommitUndo(services->editor); ME_UpdateRepaint(services->editor, FALSE); return S_OK; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index a76f9fdaf2e..a8c48994613 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3377,15 +3377,15 @@ static void test_InsertObject(void) SendMessageW(hwnd, EM_SETSEL, 3, 4); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); - todo_wine ok(result == SEL_OBJECT, "Got selection type: %x.\n", result); - todo_wine CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo1.polesite, 1); + ok(result == SEL_OBJECT, "Got selection type: %x.\n", result); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo1.polesite, 1); SendMessageW(hwnd, EM_SETSEL, 2, 4); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); - todo_wine ok(result == (SEL_TEXT | SEL_OBJECT), "Got selection type: %x.\n", result); + ok(result == (SEL_TEXT | SEL_OBJECT), "Got selection type: %x.\n", result); SendMessageW(hwnd, EM_SETSEL, 5, 6); - todo_wine CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo2.polesite, 2); expected_string = L"abc\xfffc""d\xfffc""efg"; gettextex.cb = sizeof(buffer); @@ -3408,7 +3408,7 @@ static void test_InsertObject(void) SendMessageA(hwnd, EM_SETSEL, 0, -1); result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); - todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); memset(bufferA, 0, sizeof(bufferA)); textrange.lpstrText = bufferA; @@ -3416,7 +3416,7 @@ static void test_InsertObject(void) textrange.chrg.cpMax = 11; result = SendMessageA(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)&textrange); ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); - todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); expected_string = L"abc\xfffc""d\xfffc""efg\r"; hr = ITextDocument_Range(doc, 0, 11, &range); @@ -3467,7 +3467,7 @@ static void test_InsertObject(void) ok(hr == S_OK, "Got hr %#x.\n", hr); string = GlobalLock(stgmedium.hGlobal); ok(lstrlenW(string) == lstrlenW(expected_string), "Got wrong length: %d.\n", lstrlenW(string)); - todo_wine ok(!lstrcmpW(string, expected_string), "Got wrong content: %s.\n", debugstr_w(string)); + ok(!lstrcmpW(string, expected_string), "Got wrong content: %s.\n", debugstr_w(string)); GlobalUnlock(stgmedium.hGlobal); expected_string = L"abc\xfffc""d\xfffc""efg"; @@ -3491,7 +3491,7 @@ static void test_InsertObject(void) SendMessageA(hwnd, EM_SETSEL, 0, -1); result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); - todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); memset(bufferA, 0, sizeof(bufferA)); textrange.lpstrText = bufferA; @@ -3499,7 +3499,7 @@ static void test_InsertObject(void) textrange.chrg.cpMax = 11; result = SendMessageA(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)&textrange); ok(result == strlen(expected_stringA), "Got wrong length: %d.\n", result); - todo_wine ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); expected_string = L"abc\xfffc""d\xfffc""efg"; hr = ITextDocument_Range(doc, 0, 11, &range);

1 0

Jactry Zeng : riched20/tests: Add more tests for testing EM_GETTEXTEX with OLE objects.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 40988d6c3886d0f7a914c45ea68264bfc8540859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40988d6c3886d0f7a914c45e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 8 13:45:50 2021 +0800 riched20/tests: Add more tests for testing EM_GETTEXTEX with OLE objects. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index a8c48994613..d5a9844b1fc 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3403,6 +3403,26 @@ static void test_InsertObject(void) ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + gettextex.flags = GT_NOHIDDENTEXT; + memset(buffer, 0, sizeof(buffer)); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + gettextex.flags = GT_SELECTION; + memset(buffer, 0, sizeof(buffer)); + SendMessageW(hwnd, EM_SETSEL, 0, -1); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + expected_string = L"abc d efg"; + gettextex.flags = GT_USECRLF; + memset(buffer, 0, sizeof(buffer)); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + expected_stringA = "abc d efg"; memset(bufferA, 0, sizeof(bufferA)); SendMessageA(hwnd, EM_SETSEL, 0, -1);

1 0

Jan Sikorski : wined3d: Don't pass a 3D texture view's depth range as layer range to Vulkan.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: 25271032dfb3f126a8b0dff2adb9b96a7d09241d URL: https://source.winehq.org/git/wine.git/?a=commit;h=25271032dfb3f126a8b0dff2… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jun 14 15:10:22 2021 +0200 wined3d: Don't pass a 3D texture view's depth range as layer range to Vulkan. Layer index and count fields in struct wined3d_view_desc double as the depth range of a 3D texture view. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 91d26c05fae..7900df3c246 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -773,8 +773,19 @@ static VkImageView wined3d_view_vk_create_vk_image_view(struct wined3d_context_v } create_info.subresourceRange.baseMipLevel = desc->u.texture.level_idx; create_info.subresourceRange.levelCount = desc->u.texture.level_count; - create_info.subresourceRange.baseArrayLayer = desc->u.texture.layer_idx; - create_info.subresourceRange.layerCount = desc->u.texture.layer_count; + if (create_info.viewType == VK_IMAGE_VIEW_TYPE_3D) + { + if (desc->u.texture.layer_idx || (desc->u.texture.layer_count != texture_vk->t.resource.depth + && desc->u.texture.layer_count != ~0u)) + WARN("Partial 3D texture views are not supported.\n"); + create_info.subresourceRange.baseArrayLayer = 0; + create_info.subresourceRange.layerCount = 1; + } + else + { + create_info.subresourceRange.baseArrayLayer = desc->u.texture.layer_idx; + create_info.subresourceRange.layerCount = desc->u.texture.layer_count; + } if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &create_info, NULL, &vk_image_view))) < 0) { ERR("Failed to create Vulkan image view, vr %s.\n", wined3d_debug_vkresult(vr));

1 0

Jacek Caban : gdi32: Fix SetPixel error return value.
by Alexandre Julliard 14 Jun '21

14 Jun '21

Module: wine Branch: master Commit: ce94c78b2e42a3335e2ed897628dfabac6be88f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce94c78b2e42a3335e2ed897… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 11 19:55:29 2021 +0200 gdi32: Fix SetPixel error return value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/painting.c | 2 +- dlls/gdi32/tests/dc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 96f4a1ede64..877c8400445 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -453,7 +453,7 @@ COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color ) COLORREF ret; DC * dc = get_dc_ptr( hdc ); - if (!dc) return 0; + if (!dc) return ~0; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pSetPixel ); ret = physdev->funcs->pSetPixel( physdev, x, y, color ); diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 04703288302..8aa3b201b8b 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1672,6 +1672,15 @@ static void test_clip_box(void) DeleteObject(bitmap); } +static void test_SetPixel(void) +{ + COLORREF c; + + c = SetPixel((HDC)0xdeadbeef, 0, 0, 0); + ok(c == ~0, "SetPixel returned: %x\n", c); +} + + START_TEST(dc) { test_dc_values(); @@ -1688,4 +1697,5 @@ START_TEST(dc) test_printer_dc(); test_pscript_printer_dc(); test_clip_box(); + test_SetPixel(); }

1 0