July 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Set an array of samplers as a single CS operation.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 34a9d3e40f71ddc2f03c976830bf8b9f6a35ea25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a9d3e40f71ddc2f03c9768… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 21:40:54 2021 -0500 wined3d: Set an array of samplers as a single CS operation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 168 +++++++++++++++-------------------------- dlls/wined3d/cs.c | 38 ++++++---- dlls/wined3d/device.c | 38 +++++----- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 4 +- 6 files changed, 107 insertions(+), 147 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34a9d3e40f71ddc2f03c…

1 0

Zebediah Figura : wined3d: Factor out most of the execute_command_list callback to a common function.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: f2fe987907238ad563750db927f2434b0dacfe82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2fe987907238ad563750db9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:21:59 2021 -0500 wined3d: Factor out most of the execute_command_list callback to a common function. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 54 +++++++++++++++++++----------------------- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ce0417c9f71..d7e1d1383a8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2353,25 +2353,12 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context, query->state = QUERY_SIGNALLED; } -static void wined3d_cs_execute_command_list(struct wined3d_device_context *context, - struct wined3d_command_list *list, bool restore_state) +static void wined3d_cs_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list) { - struct wined3d_cs_execute_command_list *op; SIZE_T i; - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; - op->list = list; - for (i = 0; i < list->resource_count; ++i) wined3d_resource_acquire(list->resources[i]); - - wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); - - if (restore_state) - wined3d_device_context_set_state(context, context->state); - else - wined3d_device_context_reset_state(context); } static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) @@ -2962,6 +2949,25 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo } } +void wined3d_device_context_emit_execute_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list, bool restore_state) +{ + struct wined3d_cs_execute_command_list *op; + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; + op->list = list; + + context->ops->acquire_command_list(context, list); + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); + + if (restore_state) + wined3d_device_context_set_state(context, context->state); + else + wined3d_device_context_reset_state(context); +} + static void *wined3d_cs_st_require_space(struct wined3d_device_context *context, size_t size, enum wined3d_cs_queue_id queue_id) { @@ -3042,7 +3048,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, - wined3d_cs_execute_command_list, + wined3d_cs_acquire_command_list, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3169,7 +3175,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, - wined3d_cs_execute_command_list, + wined3d_cs_acquire_command_list, }; static void poll_queries(struct wined3d_cs *cs) @@ -3562,20 +3568,10 @@ static void wined3d_deferred_context_acquire_resource(struct wined3d_device_cont wined3d_resource_incref(resource); } -static void wined3d_deferred_context_execute_command_list(struct wined3d_device_context *context, - struct wined3d_command_list *list, bool restore_state) +static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - struct wined3d_cs_execute_command_list *op; - - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; - op->list = list; - - if (restore_state) - wined3d_device_context_set_state(context, context->state); - else - wined3d_device_context_reset_state(context); /* Grab a reference to the command list. Note that this implicitly prevents * any dependent command lists or resources from being freed as well. */ @@ -3597,7 +3593,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_issue_query, wined3d_deferred_context_flush, wined3d_deferred_context_acquire_resource, - wined3d_deferred_context_execute_command_list, + wined3d_deferred_context_acquire_command_list, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a2a95ebe96..6e600a59b72 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4908,7 +4908,7 @@ void CDECL wined3d_device_context_execute_command_list(struct wined3d_device_con { TRACE("context %p, list %p, restore_state %d.\n", context, list, restore_state); - context->ops->execute_command_list(context, list, restore_state); + wined3d_device_context_emit_execute_command_list(context, list, restore_state); } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80e03ad9212..935fdb5cb4e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4717,8 +4717,7 @@ struct wined3d_device_context_ops void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); - void (*execute_command_list)(struct wined3d_device_context *context, - struct wined3d_command_list *list, bool restore_state); + void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); }; struct wined3d_device_context @@ -4798,6 +4797,8 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_execute_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list, bool restore_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context,

1 0

Alexandre Julliard : winebuild: Save/restore the %fs register in the syscall dispatcher on Linux.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 216d2411781f4bf12edf2083a7ac84d2885bd404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216d2411781f4bf12edf2083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:50:56 2021 +0200 winebuild: Save/restore the %fs register in the syscall dispatcher on Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 11 +++++++++-- tools/winebuild/import.c | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index dab22c67021..93183794bf6 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -41,6 +41,9 @@ #ifdef HAVE_MACHINE_SYSARCH_H # include <machine/sysarch.h> #endif +#ifdef HAVE_SYS_AUXV_H +# include <sys/auxv.h> +#endif #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -276,8 +279,10 @@ C_ASSERT( sizeof(XSTATE) == 0x140 ); C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ /* flags to control the behavior of the syscall dispatcher */ -#define SYSCALL_HAVE_XSAVE 1 -#define SYSCALL_HAVE_XSAVEC 2 +#define SYSCALL_HAVE_XSAVE 1 +#define SYSCALL_HAVE_XSAVEC 2 +#define SYSCALL_HAVE_PTHREAD_TEB 4 +#define SYSCALL_HAVE_WRFSGSBASE 8 /* stack layout when calling an user apc function. * FIXME: match Windows ABI. */ @@ -2859,6 +2864,8 @@ void signal_init_process(void) if ((sel = alloc_fs_sel( -1, teb32 )) != -1) { fs32_sel = (sel << 3) | 3; + __wine_syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; + if (getauxval( AT_HWCAP2 ) & 2) __wine_syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; } else ERR( "failed to allocate %%fs selector\n" ); } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6b03ff73f49..064ab1b4768 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1597,6 +1597,21 @@ static void output_syscall_dispatcher(void) output( "\tjmp 3f\n" ); output( "2:\tfxsave64 0xc0(%%rcx)\n" ); output( "3:\tleaq 0x98(%%rcx),%%rbp\n" ); + if (target_platform == PLATFORM_LINUX) + { + output( "\ttestl $12,%%r14d\n" ); /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + output( "\tjz 2f\n" ); + output( "\tmovq %%gs:0x330,%%rsi\n" ); /* amd64_thread_data()->pthread_teb */ + output( "\ttestl $8,%%r14d\n" ); /* SYSCALL_HAVE_WRFSGSBASE */ + output( "\tjz 1f\n" ); + output( "\twrfsbase %%rsi\n" ); + output( "\tjmp 2f\n" ); + output( "1:\tmov $0x1002,%%edi\n" ); /* ARCH_SET_FS */ + output( "\tmov $158,%%eax\n" ); /* SYS_arch_prctl */ + output( "\tsyscall\n" ); + output( "\tleaq -0x98(%%rbp),%%rcx\n" ); + output( "2:\n" ); + } output( "\tleaq 0x28(%%rsp),%%rsi\n" ); /* first argument */ output( "\tmovq %%rcx,%%rsp\n" ); output( "\tmovq 0x00(%%rcx),%%rax\n" ); @@ -1625,6 +1640,13 @@ static void output_syscall_dispatcher(void) output( "\tcallq *(%%r10,%%rax,8)\n" ); output( "\tleaq -0x98(%%rbp),%%rcx\n" ); output( "2:\tmovl 0x94(%%rcx),%%edx\n" ); /* frame->restore_flags */ + if (target_platform == PLATFORM_LINUX) + { + output( "\ttestl $12,%%r14d\n" ); /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + output( "\tjz 1f\n" ); + output( "\tmovw 0x7e(%%rcx),%%fs\n" ); + output( "1:\n" ); + } output( "\ttestl $0x48,%%edx\n" ); /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ output( "\tjz 4f\n" ); output( "\ttestl $3,%%r14d\n" ); /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */

1 0

Alexandre Julliard : ntdll: Switch back to the pthread %fs register in signal handlers.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: c42384b5a117ef818313cb023333c89f9810e124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c42384b5a117ef818313cb02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:41:27 2021 +0200 ntdll: Switch back to the pthread %fs register in signal handlers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index b94ad9c4d91..dab22c67021 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1520,6 +1520,28 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex } +/*********************************************************************** + * init_handler + */ +static inline void init_handler( const ucontext_t *sigcontext ) +{ +#ifdef __linux__ + if (fs32_sel) arch_prctl( ARCH_SET_FS, amd64_thread_data()->pthread_teb ); +#endif +} + + +/*********************************************************************** + * leave_handler + */ +static inline void leave_handler( const ucontext_t *sigcontext ) +{ +#ifdef __linux__ + if (fs32_sel) __asm__ volatile( "movw %0,%%fs" :: "r" (fs32_sel) ); +#endif +} + + /*********************************************************************** * save_context * @@ -1529,6 +1551,8 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex { CONTEXT *context = &xcontext->c; + init_handler( sigcontext ); + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_DEBUG_REGISTERS; context->Rax = RAX_sig(sigcontext); context->Rcx = RCX_sig(sigcontext); @@ -1611,6 +1635,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xs = XState_sig(FPU_sig(sigcontext)))) xs->CompactionMask = xcontext->host_compaction_mask; + leave_handler( sigcontext ); } @@ -2139,6 +2164,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); + leave_handler( sigcontext ); } @@ -2343,6 +2369,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ RIP_sig(sigcontext) += 3; + leave_handler( sigcontext ); return TRUE; } context->Rip += 3; @@ -2479,12 +2506,17 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; rec.ExceptionCode = virtual_handle_fault( siginfo->si_addr, rec.ExceptionInformation[0], (void *)RSP_sig(ucontext) ); - if (!rec.ExceptionCode) return; + if (!rec.ExceptionCode) + { + leave_handler( sigcontext ); + return; + } break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ if (EFL_sig(ucontext) & 0x00040000) { EFL_sig(ucontext) &= ~0x00040000; /* reset AC flag */ + leave_handler( sigcontext ); return; } rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; @@ -2627,6 +2659,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void quit_handler( int signal, siginfo_t *siginfo, void *ucontext ) { + init_handler( ucontext ); abort_thread(0); }

1 0

Alexandre Julliard : ntdll: Allocate a 32-bit %fs selector on Linux in Wow64 mode.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: a7b6b4f0d06127526addc4dba7c0b6b09821542b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b6b4f0d06127526addc4db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:38:07 2021 +0200 ntdll: Allocate a 32-bit %fs selector on Linux in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6175bb9b230..b94ad9c4d91 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -88,6 +88,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } +extern int CDECL alloc_fs_sel( int sel, void *base ); +__ASM_GLOBAL_FUNC( alloc_fs_sel, + /* switch to 32-bit stack */ + "pushq %rbx\n\t" + "pushq %rdi\n\t" + "movq %rsp,%rdi\n\t" + "movq %gs:0x8,%rsp\n\t" /* NtCurrentTeb()->Tib.StackBase */ + "subl $0x10,%esp\n\t" + /* setup modify_ldt struct on 32-bit stack */ + "movl %ecx,(%rsp)\n\t" /* entry_number */ + "movl %edx,4(%rsp)\n\t" /* base */ + "movl $~0,8(%rsp)\n\t" /* limit */ + "movl $0x41,12(%rsp)\n\t" /* seg_32bit | usable */ + /* invoke 32-bit syscall */ + "movl %esp,%ebx\n\t" + "movl $0xf3,%eax\n\t" /* SYS_set_thread_area */ + "int $0x80\n\t" + /* restore stack */ + "movl (%rsp),%eax\n\t" /* entry_number */ + "movq %rdi,%rsp\n\t" + "popq %rdi\n\t" + "popq %rbx\n\t" + "ret" ); + #ifndef FP_XSTATE_MAGIC1 #define FP_XSTATE_MAGIC1 0x46505853 #endif @@ -367,6 +391,7 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ static USHORT cs64_sel; /* selector for %cs in 64-bit mode */ static USHORT ds64_sel; /* selector for %ds/%es/%ss in 64-bit mode */ +static USHORT fs32_sel; /* selector for %fs in 32-bit mode */ /*********************************************************************** * Definitions for Dwarf unwind tables @@ -1911,7 +1936,7 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { wow_frame->SegDs = ds64_sel; wow_frame->SegEs = ds64_sel; - wow_frame->SegFs = 0; /* FIXME */ + wow_frame->SegFs = fs32_sel; wow_frame->SegGs = ds64_sel; } if (flags & CONTEXT_I386_DEBUG_REGISTERS) @@ -2743,6 +2768,7 @@ void signal_init_thread( TEB *teb ) #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); + if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, (char *)teb + teb->WowTebOffset ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #elif defined(__NetBSD__) @@ -2793,7 +2819,15 @@ void signal_init_process(void) #ifdef __linux__ if (NtCurrentTeb()->WowTebOffset) { + void *teb32 = (char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset; + int sel; + cs32_sel = 0x23; + if ((sel = alloc_fs_sel( -1, teb32 )) != -1) + { + fs32_sel = (sel << 3) | 3; + } + else ERR( "failed to allocate %%fs selector\n" ); } #endif @@ -2842,6 +2876,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.SegCs = cs64_sel; context.SegDs = ds64_sel; context.SegEs = ds64_sel; + context.SegFs = fs32_sel; context.SegGs = ds64_sel; context.SegSs = ds64_sel; context.EFlags = 0x200;

1 0

Zebediah Figura : server: Report AFD_POLL_CONNECT_ERR if a previous connection attempt failed.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 53e69130cce85bf59830c1f6f3c9f21084216ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e69130cce85bf59830c1f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:19 2021 -0500 server: Report AFD_POLL_CONNECT_ERR if a previous connection attempt failed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51331 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51366 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 51 ++++++++++++++++++++---------------------------- dlls/ws2_32/tests/sock.c | 16 +++++++-------- server/sock.c | 8 ++++++++ 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9afb8e86dc9..4b8796157aa 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -464,30 +464,24 @@ static void test_poll(void) memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); ok(ret == -1, "got %d\n", ret); @@ -514,16 +508,13 @@ static void test_poll(void) memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); closesocket(client); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index df5a69b4564..9e7cd3a1d39 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3263,8 +3263,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "expected 1, got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); len = sizeof(id); @@ -3285,8 +3285,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); /* Calling connect() doesn't reset the socket error, but a successful * connection does. This is kind of tricky to test, because while @@ -3315,8 +3315,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); len = sizeof(address); ret = getsockname(fdListen, (struct sockaddr *)&address, &len); @@ -3362,8 +3362,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 0; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "expected 1, got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); len = sizeof(id); id = 0xdeadbeef; diff --git a/server/sock.c b/server/sock.c index b1cf628abae..58e9cf4302a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2820,6 +2820,14 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t output[i].flags = flags; output[i].status = sock_get_ntstatus( sock_error( sock->fd ) ); } + + /* FIXME: do other error conditions deserve a similar treatment? */ + if (sock->state != SOCK_CONNECTING && sock->errors[AFD_POLL_BIT_CONNECT_ERR] && (mask & AFD_POLL_CONNECT_ERR)) + { + req->iosb->status = STATUS_SUCCESS; + output[i].flags |= AFD_POLL_CONNECT_ERR; + output[i].status = sock_get_ntstatus( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); + } } if (req->iosb->status != STATUS_PENDING)

1 0

Francois Gouget : kernel32: Fix the formatting of an NLS_IsUnicodeOnlyLcid() trace.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: ea236aa9817f89f4aea7393b366248584027cae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea236aa9817f89f4aea7393b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 5 23:40:05 2021 +0200 kernel32: Fix the formatting of an NLS_IsUnicodeOnlyLcid() trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 47f55b4b27d..a9dfbf09be2 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -333,7 +333,7 @@ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) case LANG_MARATHI: case LANG_PUNJABI: case LANG_SANSKRIT: - TRACE("lcid 0x%08x: langid 0x%4x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); + TRACE("lcid 0x%08x: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); return TRUE; default: return FALSE;

1 0

Zhiyi Zhang : user32: Separate scroll bar drawing calculation from actual drawing.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: cead75ad5630ed14fbb96cbdee6bdc7526f48208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cead75ad5630ed14fbb96cbd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:07:47 2021 +0800 user32: Separate scroll bar drawing calculation from actual drawing. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 123 +++++++++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 58 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index e941c00a562..6e9f899496f 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -91,10 +91,6 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV ); static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, const SCROLLINFO *info, BOOL bRedraw ); -static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, UINT flags, BOOL vertical, - BOOL top_selected, BOOL bottom_selected ); - /********************************************************************* * scrollbar class descriptor @@ -256,7 +252,7 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, } else { - SCROLLBAR_INFO *info = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ); + SCROLLBAR_INFO *info = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ); if (!info) { WARN("called for missing scroll bar\n"); @@ -293,6 +289,29 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, return vertical; } +static void SCROLL_GetScrollBarDrawInfo( HWND hwnd, INT bar, + const struct SCROLL_TRACKING_INFO *tracking_info, + RECT *rect, INT *arrow_size, INT *thumb_size, + INT *thumb_pos, BOOL *vertical ) +{ + INT pos, max_size; + + *vertical = SCROLL_GetScrollBarRect( hwnd, bar, rect, arrow_size, thumb_size, thumb_pos ); + + if (SCROLL_MovingThumb && tracking_info->win == hwnd && tracking_info->bar == bar) + { + max_size = *vertical ? rect->bottom - rect->top : rect->right - rect->left; + max_size -= *arrow_size - SCROLL_ARROW_THUMB_OVERLAP + *thumb_size; + + pos = tracking_info->thumb_pos; + if (pos < *arrow_size - SCROLL_ARROW_THUMB_OVERLAP) + pos = *arrow_size - SCROLL_ARROW_THUMB_OVERLAP; + else if (pos > max_size) + pos = max_size; + + *thumb_pos = pos; + } +} /*********************************************************************** * SCROLL_GetThumbVal @@ -447,28 +466,6 @@ static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, | (infoPtr->flags&ESB_DISABLE_RTDN ? DFCS_INACTIVE : 0) ); } -static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, - INT arrowSize, INT thumbSize ) -{ - INT pos = g_tracking_info.thumb_pos; - INT max_size; - - if( vertical ) - max_size = rect->bottom - rect->top; - else - max_size = rect->right - rect->left; - - max_size -= (arrowSize-SCROLL_ARROW_THUMB_OVERLAP) + thumbSize; - - if( pos < (arrowSize-SCROLL_ARROW_THUMB_OVERLAP) ) - pos = (arrowSize-SCROLL_ARROW_THUMB_OVERLAP); - else if( pos > max_size ) - pos = max_size; - - SCROLL_DrawInterior( g_tracking_info.win, hdc, g_tracking_info.bar, rect, arrowSize, thumbSize, pos, - 0, vertical, FALSE, FALSE ); -} - /*********************************************************************** * SCROLL_DrawInterior * @@ -560,19 +557,11 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, SelectObject( hdc, hSaveBrush ); } - -/*********************************************************************** - * SCROLL_DrawScrollBar - * - * Redraw the whole scrollbar. - */ -void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, - const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, - BOOL interior ) +static void SCROLL_DoDrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, + const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, + BOOL interior, RECT *rect, INT arrowSize, INT thumbPos, + INT thumbSize, BOOL vertical ) { - INT arrowSize, thumbSize, thumbPos; - RECT rect; - BOOL vertical; SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ); DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); @@ -583,42 +572,30 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit ((nBar == SB_HORZ) && !(style & WS_HSCROLL))) return; if (!WIN_IsWindowDrawable( hwnd, FALSE )) return; - vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect, - &arrowSize, &thumbSize, &thumbPos ); - - /* do not draw if the scrollbar rectangle is empty */ - if(IsRectEmpty(&rect)) return; - /* Draw the arrows */ if (arrows && arrowSize) { if (vertical == tracking_info->vertical && GetCapture() == hwnd) - SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, + SCROLL_DrawArrows( hdc, infoPtr, rect, arrowSize, vertical, hit_test == tracking_info->hit_test && hit_test == SCROLL_TOP_ARROW, hit_test == tracking_info->hit_test && hit_test == SCROLL_BOTTOM_ARROW ); else - SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - FALSE, FALSE ); + SCROLL_DrawArrows( hdc, infoPtr, rect, arrowSize, vertical, FALSE, FALSE ); } if (interior) { - if (SCROLL_MovingThumb && tracking_info->win == hwnd && tracking_info->bar == nBar) - { - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); - SCROLL_MovingThumb = FALSE; - } - else if (vertical == tracking_info->vertical && GetCapture() == hwnd) + if (vertical == tracking_info->vertical && GetCapture() == hwnd) { - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, + SCROLL_DrawInterior( hwnd, hdc, nBar, rect, arrowSize, thumbSize, thumbPos, infoPtr->flags, vertical, hit_test == tracking_info->hit_test && hit_test == SCROLL_TOP_RECT, hit_test == tracking_info->hit_test && hit_test == SCROLL_BOTTOM_RECT ); } else { - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, + SCROLL_DrawInterior( hwnd, hdc, nBar, rect, arrowSize, thumbSize, thumbPos, infoPtr->flags, vertical, FALSE, FALSE ); } } @@ -628,15 +605,45 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit { if (!vertical) { - SetCaretPos(thumbPos+1, rect.top+1); + SetCaretPos(thumbPos + 1, rect->top + 1); } else { - SetCaretPos(rect.top+1, thumbPos+1); + SetCaretPos(rect->top + 1, thumbPos + 1); } } } +/*********************************************************************** + * SCROLL_DrawScrollBar + * + * Redraw the whole scrollbar. + */ +void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_test, + const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, + BOOL draw_interior ) +{ + INT arrow_size, thumb_size, thumb_pos; + BOOL vertical; + RECT rect; + + SCROLL_GetScrollBarDrawInfo( hwnd, bar, tracking_info, &rect, &arrow_size, &thumb_size, + &thumb_pos, &vertical ); + /* do not draw if the scrollbar rectangle is empty */ + if (IsRectEmpty( &rect )) + return; + + TRACE("hwnd %p, hdc %p, bar %d, hit_test %d, tracking_info(win %p, bar %d, thumb_pos %d, " + "track_pos %d, vertical %d, hit_test %d), draw_arrows %d, draw_interior %d, rect %s, " + "arrow_size %d, thumb_pos %d, thumb_val %d, vertical %d, captured window %p\n", hwnd, hdc, + bar, hit_test, tracking_info->win, tracking_info->bar, tracking_info->thumb_pos, + tracking_info->thumb_val, tracking_info->vertical, tracking_info->hit_test, draw_arrows, + draw_interior, wine_dbgstr_rect(&rect), arrow_size, thumb_pos, thumb_size, vertical, + GetCapture()); + SCROLL_DoDrawScrollBar( hwnd, hdc, bar, hit_test, tracking_info, draw_arrows, draw_interior, + &rect, arrow_size, thumb_pos, thumb_size, vertical ); +} + void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) { if (draw_horizontal)

1 0

Zebediah Figura : ws2_32/tests: Add more tests for connection failure.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 91e4596b9e64369c93d0ae5c552a05bc356f7be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91e4596b9e64369c93d0ae5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:16 2021 -0500 ws2_32/tests: Add more tests for connection failure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 86 ++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 153 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 233 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91e4596b9e64369c93d0…

1 0

Zhiyi Zhang : user32: Draw scroll bar size box and size grip in a single function.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 780e5c83dc802d963d837af8bf0e85096355c980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780e5c83dc802d963d837af8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:08:10 2021 +0800 user32: Draw scroll bar size box and size grip in a single function. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 62 ++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d7a4f412785..5561509c50c 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -296,6 +296,16 @@ static void SCROLL_GetScrollBarDrawInfo( HWND hwnd, INT bar, { INT pos, max_size; + if (bar == SB_CTL && GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX)) + { + GetClientRect( hwnd, rect ); + *arrow_size = 0; + *thumb_pos = 0; + *thumb_size = 0; + *vertical = FALSE; + return; + } + *vertical = SCROLL_GetScrollBarRect( hwnd, bar, rect, arrow_size, thumb_size, thumb_pos ); if (SCROLL_MovingThumb && tracking_info->win == hwnd && tracking_info->bar == bar) @@ -564,6 +574,28 @@ static void SCROLL_DoDrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HI { SCROLLBAR_INFO *infoPtr; + if (nBar == SB_CTL) + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + + if (style & SBS_SIZEGRIP) + { + RECT rc = *rect; + + FillRect( hdc, &rc, GetSysColorBrush( COLOR_SCROLLBAR ) ); + rc.left = max( rc.left, rc.right - GetSystemMetrics( SM_CXVSCROLL ) - 1 ); + rc.top = max( rc.top, rc.bottom - GetSystemMetrics( SM_CYHSCROLL ) - 1 ); + DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); + return; + } + + if (style & SBS_SIZEBOX) + { + FillRect( hdc, rect, GetSysColorBrush( COLOR_SCROLLBAR ) ); + return; + } + } + if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) return; @@ -658,23 +690,6 @@ void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); } -/*********************************************************************** - * SCROLL_DrawSizeGrip - * - * Draw the size grip. - */ -static void SCROLL_DrawSizeGrip( HWND hwnd, HDC hdc) -{ - RECT rc; - - GetClientRect( hwnd, &rc ); - FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); - rc.left = max( rc.left, rc.right - GetSystemMetrics(SM_CXVSCROLL) - 1 ); - rc.top = max( rc.top, rc.bottom - GetSystemMetrics(SM_CYHSCROLL) - 1 ); - DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); -} - - /*********************************************************************** * SCROLL_RefreshScrollBar * @@ -1413,18 +1428,7 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM { PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); - if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) - { - SCROLL_DrawSizeGrip( hwnd, hdc); - } - else if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEBOX) - { - RECT rc; - GetClientRect( hwnd, &rc ); - FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); - } - else - SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); if (!wParam) EndPaint(hwnd, &ps); } break;

1 0