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

Alexandre Julliard : winebuild: Add a specific platform id for Linux.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 5e12256ec41189579cc3d2471d1ddf37ca9181ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e12256ec41189579cc3d247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:50:30 2021 +0200 winebuild: Add a specific platform id for Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 84938aabf4f..1918932ad1f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -152,6 +152,7 @@ enum target_platform { PLATFORM_UNSPECIFIED, PLATFORM_APPLE, + PLATFORM_LINUX, PLATFORM_FREEBSD, PLATFORM_MINGW, PLATFORM_SOLARIS, diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 72e13b7992b..8c0e77030b6 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -67,6 +67,8 @@ enum target_cpu target_cpu = CPU_ARM64; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; +#elif defined(__linux__) +enum target_platform target_platform = PLATFORM_LINUX; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) enum target_platform target_platform = PLATFORM_FREEBSD; #elif defined(__sun) @@ -132,6 +134,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "linux", PLATFORM_LINUX }, { "freebsd", PLATFORM_FREEBSD }, { "solaris", PLATFORM_SOLARIS }, { "mingw32", PLATFORM_MINGW },

1 0

Alexandre Julliard : winebuild: Save/restore the %fs register in the syscall dispatcher on Linux.
by Alexandre Julliard 06 Jul '21

06 Jul '21

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

Zebediah Figura : wined3d: Factor out most of the execute_command_list callback to a common function.
by Alexandre Julliard 06 Jul '21

06 Jul '21

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

Zebediah Figura : wined3d: Pass a wined3d_cs pointer to wined3d_not_from_cs().
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: a68cdf4a41a19fc52311250356c4e8db8cf87d1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a68cdf4a41a19fc523112503… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:32:13 2021 -0500 wined3d: Pass a wined3d_cs pointer to wined3d_not_from_cs(). This partially reverts 6a9752bf5e3cff3ceb4249d5a5e59b4d548008d1. 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 | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d7e1d1383a8..b7c48d2d0a9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2457,7 +2457,7 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, /* Mapping resources from the worker thread isn't an issue by itself, but * increasing the map count would be visible to applications. */ - wined3d_not_from_cs(context->device); + wined3d_not_from_cs(context->device->cs); wined3d_resource_wait_idle(resource); @@ -2502,7 +2502,7 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context return WINED3D_OK; } - wined3d_not_from_cs(context->device); + wined3d_not_from_cs(context->device->cs); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UNMAP; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e600a59b72..b97d565c42d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5536,7 +5536,7 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource { TRACE("device %p, resource %p.\n", device, resource); - wined3d_not_from_cs(device); + wined3d_not_from_cs(device->cs); list_add_head(&device->resources, &resource->resource_list_entry); } @@ -5545,7 +5545,7 @@ static void device_resource_remove(struct wined3d_device *device, struct wined3d { TRACE("device %p, resource %p.\n", device, resource); - wined3d_not_from_cs(device); + wined3d_not_from_cs(device->cs); list_remove(&resource->resource_list_entry); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 935fdb5cb4e..5f0c2bb6732 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6041,9 +6041,9 @@ static inline void wined3d_from_cs(const struct wined3d_cs *cs) assert(cs->thread_id == GetCurrentThreadId()); } -static inline void wined3d_not_from_cs(const struct wined3d_device *device) +static inline void wined3d_not_from_cs(const struct wined3d_cs *cs) { - assert(device->cs->thread_id != GetCurrentThreadId()); + assert(cs->thread_id != GetCurrentThreadId()); } static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map,

1 0

Zebediah Figura : wined3d: Set an array of constant buffers as a single CS operation.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: e6bbf6ee9151c632bfc9e73b785e51dcb001d0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6bbf6ee9151c632bfc9e73b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 21:40:52 2021 -0500 wined3d: Set an array of constant buffers 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 | 38 ++++++++++++++++++++++-------- dlls/wined3d/cs.c | 53 ++++++++++++++++++++++++------------------ dlls/wined3d/device.c | 37 ++++++++++++++++------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 5 ++-- include/wine/wined3d.h | 5 ++-- 6 files changed, 87 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6bbf6ee9151c632bfc9…

1 0

Zebediah Figura : wined3d: Set an array of shader resource views as a single CS operation.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 7698b9e25a1f039a0ad6c70cfe43c16aed51029e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7698b9e25a1f039a0ad6c70c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 21:40:53 2021 -0500 wined3d: Set an array of shader resource views 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 | 169 +++++++++++++++-------------------------- dlls/wined3d/cs.c | 53 +++++++------ dlls/wined3d/device.c | 71 ++++++++++------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.h | 5 +- 6 files changed, 141 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7698b9e25a1f039a0ad6…

1 0

Zebediah Figura : wined3d: Set an array of samplers as a single CS operation.
by Alexandre Julliard 06 Jul '21

06 Jul '21

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

Zhiyi Zhang : user32: Call SCROLL_DrawScrollBar() to draw moving thumb in SCROLL_HandleScrollEvent().
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: c3d8b39e9e531d50ca4fe5a88bba741eb2e98539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d8b39e9e531d50ca4fe5a8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:07:21 2021 +0800 user32: Call SCROLL_DrawScrollBar() to draw moving thumb in SCROLL_HandleScrollEvent(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 01868bd4238..4abb13d5199 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -863,8 +863,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLL_TrackingPos ); if (!SCROLL_MovingThumb) { - SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); SCROLL_MovingThumb = TRUE; + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); } } else if (msg == WM_LBUTTONUP) @@ -893,8 +893,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), (LPARAM)hwndCtl ); - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); SCROLL_MovingThumb = TRUE; + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); } } break;

1 0

Zhiyi Zhang : user32: Call SCROLL_DrawScrollBar() to draw tracks in SCROLL_HandleScrollEvent().
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: e04e857a1f1704f86a80def88a9e62a0dc8f2186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04e857a1f1704f86a80def8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:07:31 2021 +0800 user32: Call SCROLL_DrawScrollBar() to draw tracks in SCROLL_HandleScrollEvent(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 4abb13d5199..fdd657feda6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -614,6 +614,13 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); SCROLL_MovingThumb = FALSE; } + else if (vertical == SCROLL_trackVertical && GetCapture() == hwnd) + { + SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, + infoPtr->flags, vertical, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_TOP_RECT, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_BOTTOM_RECT ); + } else { SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, @@ -836,9 +843,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_TOP_RECT: - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - (hittest == SCROLL_trackHitTest), FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -869,9 +874,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } else if (msg == WM_LBUTTONUP) { - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - FALSE, FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_NOWHERE, FALSE, TRUE ); } else /* WM_MOUSEMOVE */ { @@ -900,9 +903,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_BOTTOM_RECT: - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - FALSE, (hittest == SCROLL_trackHitTest) ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))

1 0

Zhiyi Zhang : user32: Pass a scroll bar tracking info parameter to SCROLL_DrawScrollBar().
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: b2184e7bff9c33f35ab46f7cb8a93968ceefa67f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2184e7bff9c33f35ab46f7c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:07:39 2021 +0800 user32: Pass a scroll bar tracking info parameter to SCROLL_DrawScrollBar(). Pack all scroll bar tracking information in a struct and pass that struct as a parameter to SCROLL_DrawScrollBar() instead of using global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 14 +++++- dlls/user32/scroll.c | 121 +++++++++++++++++++++++-------------------------- 2 files changed, 70 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2184e7bff9c33f35ab4…

1 0