December 2023 - Wine-Commits

Alexandre Julliard : configure: Disable building programs for ARM64EC.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 72409c32be53d7d4ffce0725ad0fa4754495a2c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/72409c32be53d7d4ffce0725ad0fa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 14:20:50 2023 +0100 configure: Disable building programs for ARM64EC. Explicitly enable the few programs that need it. --- aclocal.m4 | 7 ++++++- configure | 16 +++++++++++++++- configure.ac | 10 ++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 5f1e7bbdbf3..f9049a44550 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -301,6 +301,7 @@ wine_fn_config_makefile () AS_VAR_COPY([enable],[$[2]]) case "$enable" in no) AS_VAR_APPEND([DISABLED_SUBDIRS],[" $[1]"]) ;; + yes) ;; *aarch64*|*arm*|*i386*|*x86_64*) if test -n "$PE_ARCHS" then @@ -310,7 +311,11 @@ wine_fn_config_makefile () done else test $(expr ",$enable," : ".*,$HOST_ARCH,") -gt 0 || AS_VAR_APPEND([DISABLED_SUBDIRS],[" $[1]"]) - fi;; + fi ;; + "") + case "$[1], $PE_ARCHS " in + programs/*,*\ arm64ec\ *) AS_VAR_APPEND([arm64ec_DISABLED_SUBDIRS],[" $[1]"]) ;; + esac ;; esac } diff --git a/configure b/configure index 644d38e7288..d225fa226a6 100755 --- a/configure +++ b/configure @@ -6431,6 +6431,15 @@ enable_wow64win=${enable_wow64win:-aarch64,x86_64} enable_wow64cpu=${enable_wow64cpu:-x86_64} enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec} +enable_cmd=${enable_cmd:-yes} +enable_dllhost=${enable_dllhost:-yes} +enable_dpnsvr=${enable_dpnsvr:-i386,x86_64,arm64ec} +enable_dxdiag=${enable_dxdiag:-yes} +enable_msiexec=${enable_msiexec:-yes} +enable_netsh=${enable_netsh:-yes} +enable_regsvr32=${enable_regsvr32:-yes} +enable_rundll32=${enable_rundll32:-yes} + enable_winetest=${enable_winetest:-$enable_tests} if test "x$enable_win64" = "xyes" @@ -9438,6 +9447,7 @@ wine_fn_config_makefile () eval enable=\$$2 case "$enable" in no) as_fn_append DISABLED_SUBDIRS " $1" ;; + yes) ;; *aarch64*|*arm*|*i386*|*x86_64*) if test -n "$PE_ARCHS" then @@ -9447,7 +9457,11 @@ wine_fn_config_makefile () done else test $(expr ",$enable," : ".*,$HOST_ARCH,") -gt 0 || as_fn_append DISABLED_SUBDIRS " $1" - fi;; + fi ;; + "") + case "$1, $PE_ARCHS " in + programs/*,*\ arm64ec\ *) as_fn_append arm64ec_DISABLED_SUBDIRS " $1" ;; + esac ;; esac } diff --git a/configure.ac b/configure.ac index 078856efe6f..a8bb26a5092 100644 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,16 @@ enable_wow64win=${enable_wow64win:-aarch64,x86_64} enable_wow64cpu=${enable_wow64cpu:-x86_64} enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec} +dnl Explicitly enable some programs for arm64ec +enable_cmd=${enable_cmd:-yes} +enable_dllhost=${enable_dllhost:-yes} +enable_dpnsvr=${enable_dpnsvr:-i386,x86_64,arm64ec} +enable_dxdiag=${enable_dxdiag:-yes} +enable_msiexec=${enable_msiexec:-yes} +enable_netsh=${enable_netsh:-yes} +enable_regsvr32=${enable_regsvr32:-yes} +enable_rundll32=${enable_rundll32:-yes} + dnl Disable winetest too if tests are disabled enable_winetest=${enable_winetest:-$enable_tests}

1 0

Brendan McGrath : comctl32: Use selected font to determine default min tab width.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 39ae8778ca415780e23d0185cb4d5040aca4c789 URL: https://gitlab.winehq.org/wine/wine/-/commit/39ae8778ca415780e23d0185cb4d50… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon Dec 4 10:00:08 2023 +1100 comctl32: Use selected font to determine default min tab width. This fixes the layout of the tabcontrol when a font other than the system font is used. --- dlls/comctl32/tab.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 73b3f313086..b0d645bddd4 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -138,14 +138,12 @@ typedef struct #define BUTTON_SPACINGX 3 #define BUTTON_SPACINGY 3 #define FLAT_BTN_SPACINGX 8 -#define DEFAULT_MIN_TAB_WIDTH 54 #define DEFAULT_PADDING_X 6 #define EXTRA_ICON_PADDING 3 +#define MIN_CHAR_LENGTH 6 #define TAB_GetInfoPtr(hwnd) ((TAB_INFO *)GetWindowLongPtrW(hwnd,0)) -#define GET_DEFAULT_MIN_TAB_WIDTH(infoPtr) (DEFAULT_MIN_TAB_WIDTH - (DEFAULT_PADDING_X - (infoPtr)->uHItemPadding) * 2) - /****************************************************************************** * Hot-tracking timer constants */ @@ -1101,8 +1099,10 @@ static void TAB_SetupScrolling( * It also uses the current font to determine the height of the tab row and * it checks if all the tabs fit in the client area of the window. If they * don't, a scrolling control is added. + * + * Returns the default minimum tab width */ -static void TAB_SetItemBounds (TAB_INFO *infoPtr) +static INT TAB_SetItemBounds (TAB_INFO *infoPtr) { TEXTMETRICW fontMetrics; UINT curItem; @@ -1115,6 +1115,8 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) RECT* rcItem; INT iIndex; INT icon_width = 0; + INT default_min_tab_width; + TEXTMETRICW text_metrics; /* * We need to get text information so we need a DC and we need to select @@ -1144,6 +1146,9 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) /* Now use hPadding and vPadding */ infoPtr->uHItemPadding = infoPtr->uHItemPadding_s; infoPtr->uVItemPadding = infoPtr->uVItemPadding_s; + + GetTextMetricsW(hdc, &text_metrics); + default_min_tab_width = text_metrics.tmAveCharWidth * MIN_CHAR_LENGTH + infoPtr->uHItemPadding * 2; /* The leftmost item will be "0" aligned */ curItemLeftPos = 0; @@ -1210,13 +1215,13 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) { /* If no text use minimum tab width including padding. */ if (infoPtr->tabMinWidth < 0) - curr->rect.right = curr->rect.left + GET_DEFAULT_MIN_TAB_WIDTH(infoPtr); + curr->rect.right = curr->rect.left + default_min_tab_width; else { curr->rect.right = curr->rect.left + infoPtr->tabMinWidth; /* Add extra padding if icon is present */ - if (infoPtr->himl && infoPtr->tabMinWidth > 0 && infoPtr->tabMinWidth < DEFAULT_MIN_TAB_WIDTH + if (infoPtr->himl && infoPtr->tabMinWidth > 0 && infoPtr->tabMinWidth < MIN_CHAR_LENGTH * text_metrics.tmAveCharWidth + DEFAULT_PADDING_X * 2 && infoPtr->uHItemPadding > 1) curr->rect.right += EXTRA_ICON_PADDING * (infoPtr->uHItemPadding-1); } @@ -1232,7 +1237,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) tabwidth = size.cx + icon_width + 2 * infoPtr->uHItemPadding; if (infoPtr->tabMinWidth < 0) - tabwidth = max(tabwidth, GET_DEFAULT_MIN_TAB_WIDTH(infoPtr)); + tabwidth = max(tabwidth, default_min_tab_width); else tabwidth = max(tabwidth, infoPtr->tabMinWidth); @@ -1461,6 +1466,8 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) /* Cleanup */ SelectObject (hdc, hOldFont); ReleaseDC (infoPtr->hwnd, hdc); + + return default_min_tab_width; } @@ -2691,17 +2698,14 @@ TAB_SetItemSize (TAB_INFO *infoPtr, INT cx, INT cy) static inline LRESULT TAB_SetMinTabWidth (TAB_INFO *infoPtr, INT cx) { - INT oldcx = 0; + INT default_min_tab_width; + INT prevMinWidth = infoPtr->tabMinWidth; + infoPtr->tabMinWidth = cx; TRACE("(%p,%d)\n", infoPtr, cx); - if (infoPtr->tabMinWidth < 0) - oldcx = DEFAULT_MIN_TAB_WIDTH; - else - oldcx = infoPtr->tabMinWidth; - infoPtr->tabMinWidth = cx; - TAB_SetItemBounds(infoPtr); - return oldcx; + default_min_tab_width = TAB_SetItemBounds(infoPtr); + return (prevMinWidth < 0) ? default_min_tab_width : prevMinWidth; } static inline LRESULT

1 0

Brendan McGrath : user32: Wrap at whitespace rather than soft break.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 8e1197c92e8c08fb197c8656a07215296d656890 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e1197c92e8c08fb197c8656a07215… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Fri Dec 8 09:52:32 2023 +1100 user32: Wrap at whitespace rather than soft break. --- dlls/user32/tests/text.c | 4 ++-- dlls/user32/text.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 6290281ceb4..d3228eae1e0 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -604,7 +604,7 @@ static void test_DrawTextCalcRect(void) textheight = DrawTextW(hdc, wordbreak_text_colonW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", textheight, heightcheck * 2); - todo_wine ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n", + ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n", rect.right, rect2.right - 10); SetRect(&rect, 0, 0, 200, 1); @@ -618,7 +618,7 @@ static void test_DrawTextCalcRect(void) textheight = DrawTextW(hdc, wordbreak_text_csbW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", textheight, heightcheck * 2); - todo_wine ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n", + ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n", rect.right, rect2.right - 10); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 788ed10269c..1896627c893 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -384,9 +384,9 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, } else { - while (i > 0 && !sla[(--i)+1].fSoftBreak) p--; + while (i > 0 && !sla[(--i)+1].fWhiteSpace) p--; p--; - word_fits = (i != 0 || sla[i+1].fSoftBreak ); + word_fits = (i != 0 || sla[i+1].fWhiteSpace ); } /* If there was one. */

1 0

Matteo Bruni : wined3d: Add a bunch of d3d_perf traces.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 12066a2140698bb05482c9900c92ef8c05dd36f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/12066a2140698bb05482c9900c92ef… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 21 10:24:18 2022 +0200 wined3d: Add a bunch of d3d_perf traces. --- dlls/wined3d/cs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4d34a939ac7..0f5d77d93c9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1128,6 +1128,7 @@ static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) { struct wined3d_context *context; + TRACE_(d3d_perf)("Flushing adapter.\n"); context = context_acquire(cs->c.device, NULL, 0); cs->c.device->adapter->adapter_ops->adapter_flush_context(context); context_release(context); @@ -2475,6 +2476,8 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, return WINED3D_OK; } + TRACE_(d3d_perf)("Mapping resource %p (type %u), flags %#x through the CS.\n", resource, resource->type, flags); + wined3d_resource_wait_idle(resource); /* We might end up invalidating the resource on the CS thread. */ @@ -2527,6 +2530,8 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context wined3d_not_from_cs(context->device->cs); + TRACE_(d3d_perf)("Unmapping resource %p (type %u) through the CS.\n", resource, resource->type); + if (!(op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP))) return E_OUTOFMEMORY; op->opcode = WINED3D_CS_OP_UNMAP; @@ -3279,7 +3284,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size if (new_pos < tail && new_pos) break; - TRACE("Waiting for free space. Head %lu, tail %lu, packet size %Iu.\n", + TRACE_(d3d_perf)("Waiting for free space. Head %lu, tail %lu, packet size %Iu.\n", head, tail, packet_size); } @@ -3307,8 +3312,10 @@ static void wined3d_cs_mt_finish(struct wined3d_device_context *context, enum wi if (cs->thread_id == GetCurrentThreadId()) return wined3d_cs_st_finish(context, queue_id); + TRACE_(d3d_perf)("Waiting for queue %u to be empty.\n", queue_id); while (cs->queue[queue_id].head != *(volatile ULONG *)&cs->queue[queue_id].tail) wined3d_pause(&spin_count); + TRACE_(d3d_perf)("Queue is now empty.\n"); } static const struct wined3d_device_context_ops wined3d_cs_mt_ops =

1 0

Matteo Bruni : wined3d: Add a frametime debug channel.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 295c577f1e3c842790862dee992a76b5451b5688 URL: https://gitlab.winehq.org/wine/wine/-/commit/295c577f1e3c842790862dee992a76… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 21 10:23:04 2022 +0200 wined3d: Add a frametime debug channel. --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b704b720cd0..4d34a939ac7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -23,6 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_sync); WINE_DECLARE_DEBUG_CHANNEL(fps); +WINE_DECLARE_DEBUG_CHANNEL(frametime); static NTSTATUS (WINAPI *pNtAlertThreadByThreadId)(HANDLE tid); static NTSTATUS (WINAPI *pNtWaitForAlertByThreadId)(void *addr, const LARGE_INTEGER *timeout); @@ -643,11 +644,18 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { + static LARGE_INTEGER freq; + struct wined3d_texture *logo_texture, *cursor_texture, *back_buffer; struct wined3d_rendertarget_view *dsv = cs->state.fb.depth_stencil; const struct wined3d_cs_present *op = data; const struct wined3d_swapchain_desc *desc; struct wined3d_swapchain *swapchain; + LONGLONG elapsed_time; + LARGE_INTEGER time; + + if (!freq.QuadPart) + QueryPerformanceFrequency(&freq); swapchain = op->swapchain; desc = &swapchain->state.desc; @@ -703,6 +711,16 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) wined3d_rendertarget_view_validate_location(dsv, WINED3D_LOCATION_DISCARDED); } + if (TRACE_ON(frametime)) + { + QueryPerformanceCounter(&time); + if (swapchain->last_present_time.QuadPart) + { + elapsed_time = time.QuadPart - swapchain->last_present_time.QuadPart; + TRACE_(frametime)("Frame duration %u μs.\n", (unsigned int)(elapsed_time * 1000000 / freq.QuadPart)); + } + swapchain->last_present_time = time; + } if (TRACE_ON(fps)) { DWORD time = GetTickCount(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26474cecb07..c17e29cddf2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4029,7 +4029,9 @@ struct wined3d_swapchain unsigned int swap_interval; unsigned int max_frame_latency; - LONG prev_time, frames; /* Performance tracking */ + /* Performance tracking */ + LARGE_INTEGER last_present_time; + LONG prev_time, frames; struct wined3d_swapchain_state state; HWND win_handle;

1 0

Zebediah Figura : wined3d: Sleep when waiting for the CS thread.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: ea48ac41e615368e29185748935031d906bb42af URL: https://gitlab.winehq.org/wine/wine/-/commit/ea48ac41e615368e29185748935031… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 1 19:53:41 2022 -0600 wined3d: Sleep when waiting for the CS thread. --- dlls/wined3d/cs.c | 3 ++- dlls/wined3d/wined3d_private.h | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 61ea75c2776..b704b720cd0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3284,12 +3284,13 @@ static void *wined3d_cs_mt_require_space(struct wined3d_device_context *context, static void wined3d_cs_mt_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { struct wined3d_cs *cs = wined3d_cs_from_context(context); + unsigned int spin_count = 0; if (cs->thread_id == GetCurrentThreadId()) return wined3d_cs_st_finish(context, queue_id); while (cs->queue[queue_id].head != *(volatile ULONG *)&cs->queue[queue_id].tail) - YieldProcessor(); + wined3d_pause(&spin_count); } static const struct wined3d_device_context_ops wined3d_cs_mt_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 494d26ebd02..64b933b2b45 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3566,6 +3566,8 @@ enum wined3d_cs_queue_id #define WINED3D_CS_SPIN_COUNT 2000u /* How long to wait for commands when there are active queries, in µs. */ #define WINED3D_CS_COMMAND_WAIT_WITH_QUERIES_TIMEOUT 100 +/* How long to wait for the CS from the client thread, in µs. */ +#define WINED3D_CS_CLIENT_WAIT_TIMEOUT 0 #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) C_ASSERT(!(WINED3D_CS_QUEUE_SIZE & (WINED3D_CS_QUEUE_SIZE - 1))); @@ -3758,6 +3760,16 @@ static inline void wined3d_resource_reference(struct wined3d_resource *resource) resource->access_time = cs->queue[WINED3D_CS_QUEUE_DEFAULT].head; } +#define WINED3D_PAUSE_SPIN_COUNT 200u + +static inline void wined3d_pause(unsigned int *spin_count) +{ + static const LARGE_INTEGER timeout = {.QuadPart = WINED3D_CS_CLIENT_WAIT_TIMEOUT * -10}; + + if (++*spin_count >= WINED3D_PAUSE_SPIN_COUNT) + NtDelayExecution(FALSE, &timeout); +} + static inline BOOL wined3d_ge_wrap(ULONG x, ULONG y) { return (x - y) < UINT_MAX / 2; @@ -3768,6 +3780,7 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res { const struct wined3d_cs *cs = resource->device->cs; ULONG access_time, tail, head; + unsigned int spin_count = 0; if (!cs->thread || cs->thread_id == GetCurrentThreadId()) return; @@ -3806,7 +3819,7 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res if (!wined3d_ge_wrap(access_time, tail) && access_time != tail) break; - YieldProcessor(); + wined3d_pause(&spin_count); } }

1 0

Zebediah Figura : wined3d: Use thread-ID alerts instead of events, if available, to wait for CS packets.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: c73359902c76ec7498bd8dc4d8877ac6bde6b673 URL: https://gitlab.winehq.org/wine/wine/-/commit/c73359902c76ec7498bd8dc4d8877a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 11 18:06:31 2022 -0600 wined3d: Use thread-ID alerts instead of events, if available, to wait for CS packets. --- dlls/wined3d/cs.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bf171326926..edc2feeaab2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -24,6 +24,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_sync); WINE_DECLARE_DEBUG_CHANNEL(fps); +static NTSTATUS (WINAPI *pNtAlertThreadByThreadId)(HANDLE tid); +static NTSTATUS (WINAPI *pNtWaitForAlertByThreadId)(void *addr, const LARGE_INTEGER *timeout); + #define WINED3D_INITIAL_CS_SIZE 4096 struct wined3d_deferred_upload @@ -3188,7 +3191,12 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined InterlockedExchange((LONG *)&queue->head, queue->head + packet_size); if (InterlockedCompareExchange(&cs->waiting_for_event, FALSE, TRUE)) - SetEvent(cs->event); + { + if (pNtAlertThreadByThreadId) + pNtAlertThreadByThreadId((HANDLE)(ULONG_PTR)cs->thread_id); + else + SetEvent(cs->event); + } } static void wined3d_cs_mt_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) @@ -3328,7 +3336,10 @@ static void wined3d_cs_wait_event(struct wined3d_cs *cs) && InterlockedCompareExchange(&cs->waiting_for_event, FALSE, TRUE)) return; - WaitForSingleObject(cs->event, INFINITE); + if (pNtWaitForAlertByThreadId) + pNtWaitForAlertByThreadId(NULL, NULL); + else + WaitForSingleObject(cs->event, INFINITE); } static void wined3d_cs_command_lock(const struct wined3d_cs *cs) @@ -3529,7 +3540,15 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, { cs->c.ops = &wined3d_cs_mt_ops; - if (!(cs->event = CreateEventW(NULL, FALSE, FALSE, NULL))) + if (!pNtAlertThreadByThreadId) + { + HANDLE ntdll = GetModuleHandleW(L"ntdll.dll"); + + pNtAlertThreadByThreadId = (void *)GetProcAddress(ntdll, "NtAlertThreadByThreadId"); + pNtWaitForAlertByThreadId = (void *)GetProcAddress(ntdll, "NtWaitForAlertByThreadId"); + } + + if (!pNtAlertThreadByThreadId && !(cs->event = CreateEventW(NULL, FALSE, FALSE, NULL))) { ERR("Failed to create command stream event.\n"); heap_free(cs->data); @@ -3547,7 +3566,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, { ERR("Failed to get wined3d module handle.\n"); CloseHandle(cs->present_event); - CloseHandle(cs->event); + if (cs->event) + CloseHandle(cs->event); heap_free(cs->data); goto fail; } @@ -3557,7 +3577,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, ERR("Failed to create wined3d command stream thread.\n"); FreeLibrary(cs->wined3d_module); CloseHandle(cs->present_event); - CloseHandle(cs->event); + if (cs->event) + CloseHandle(cs->event); heap_free(cs->data); goto fail; } @@ -3581,7 +3602,7 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) CloseHandle(cs->thread); if (!CloseHandle(cs->present_event)) ERR("Closing present event failed.\n"); - if (!CloseHandle(cs->event)) + if (cs->event && !CloseHandle(cs->event)) ERR("Closing event failed.\n"); }

1 0

Matteo Bruni : wined3d: Do a blocking wait for CS commands even when there are active queries.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 7d247ca676a16d503dcee1c2a105ec641b1ecf7e URL: https://gitlab.winehq.org/wine/wine/-/commit/7d247ca676a16d503dcee1c2a105ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 11 18:18:53 2022 -0600 wined3d: Do a blocking wait for CS commands even when there are active queries. Make sure we poll queries before we go to sleep, to e.g. avoid hangs in Rocket League. With significant contributions by Zebediah Figura. --- dlls/wined3d/cs.c | 16 +++++++++++----- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index edc2feeaab2..61ea75c2776 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3322,6 +3322,12 @@ static void poll_queries(struct wined3d_cs *cs) static void wined3d_cs_wait_event(struct wined3d_cs *cs) { + static const LARGE_INTEGER query_timeout = {.QuadPart = WINED3D_CS_COMMAND_WAIT_WITH_QUERIES_TIMEOUT * -10}; + const LARGE_INTEGER *timeout = NULL; + + if (!list_empty(&cs->query_poll_list)) + timeout = &query_timeout; + InterlockedExchange(&cs->waiting_for_event, TRUE); /* The main thread might have enqueued a command and blocked on it after @@ -3337,9 +3343,9 @@ static void wined3d_cs_wait_event(struct wined3d_cs *cs) return; if (pNtWaitForAlertByThreadId) - pNtWaitForAlertByThreadId(NULL, NULL); + pNtWaitForAlertByThreadId(NULL, timeout); else - WaitForSingleObject(cs->event, INFINITE); + NtWaitForSingleObject(cs->event, FALSE, timeout); } static void wined3d_cs_command_lock(const struct wined3d_cs *cs) @@ -3451,10 +3457,10 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) YieldProcessor(); if (++spin_count >= WINED3D_CS_SPIN_COUNT) { - if (list_empty(&cs->query_poll_list)) - wined3d_cs_wait_event(cs); + if (poll) + poll = WINED3D_CS_QUERY_POLL_INTERVAL - 1; else - Sleep(0); + wined3d_cs_wait_event(cs); } continue; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea78312fef3..494d26ebd02 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3564,6 +3564,8 @@ enum wined3d_cs_queue_id #define WINED3D_CS_QUEUE_SIZE 0x400000u #endif #define WINED3D_CS_SPIN_COUNT 2000u +/* How long to wait for commands when there are active queries, in µs. */ +#define WINED3D_CS_COMMAND_WAIT_WITH_QUERIES_TIMEOUT 100 #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) C_ASSERT(!(WINED3D_CS_QUEUE_SIZE & (WINED3D_CS_QUEUE_SIZE - 1)));

1 0

Brendan McGrath : user32/tests: Add tests for word breaks before punctuation.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 90d934b5ae92cae68dcf517c2cfd9753374a0d42 URL: https://gitlab.winehq.org/wine/wine/-/commit/90d934b5ae92cae68dcf517c2cfd97… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Fri Dec 8 09:46:37 2023 +1100 user32/tests: Add tests for word breaks before punctuation. Whilst uniscribe won't break on the space here (see LB13 of the Unicode line breaking algorith), DrawText does --- dlls/user32/tests/text.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index a2990a9706b..6290281ceb4 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -45,6 +45,8 @@ static void test_DrawTextCalcRect(void) static WCHAR emptystringW[] = { 0 }; static CHAR wordbreak_text[] = "line1 line2"; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; + static WCHAR wordbreak_text_colonW[] = {'l','i','n','e','1',' ','l','i','n','e','2',' ',':',0}; + static WCHAR wordbreak_text_csbW[] = {'l','i','n','e','1',' ','l','i','n','e','2',' ',']',0}; static char tabstring[] = "one\ttwo"; INT textlen, textheight, heightcheck; RECT rect = { 0, 0, 100, 0 }, rect2; @@ -590,6 +592,36 @@ static void test_DrawTextCalcRect(void) ok(textheight >= heightcheck * 6, "Got unexpected textheight %d, expected at least %d.\n", textheight, heightcheck * 6); + /* Word break tests with space before punctuation */ + SetRect(&rect, 0, 0, 200, 1); + textheight = DrawTextW(hdc, wordbreak_text_colonW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck); + + rect2 = rect; + rect.right--; + + textheight = DrawTextW(hdc, wordbreak_text_colonW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck * 2); + todo_wine ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n", + rect.right, rect2.right - 10); + + SetRect(&rect, 0, 0, 200, 1); + textheight = DrawTextW(hdc, wordbreak_text_csbW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck); + + rect2 = rect; + rect.right--; + + textheight = DrawTextW(hdc, wordbreak_text_csbW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck * 2); + todo_wine ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n", + rect.right, rect2.right - 10); + + /* DT_TABSTOP | DT_EXPANDTABS tests */ SetRect( &rect, 0,0, 10, 10); textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_TABSTOP | DT_EXPANDTABS );

1 0

Matteo Bruni : wined3d: Increase WINED3D_CS_QUERY_POLL_INTERVAL to 100.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 3fc716c90707d1daee1974b8754275b2af330ff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3fc716c90707d1daee1974b8754275… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 8 15:54:23 2019 +0200 wined3d: Increase WINED3D_CS_QUERY_POLL_INTERVAL to 100. --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64b933b2b45..26474cecb07 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3557,7 +3557,7 @@ enum wined3d_cs_queue_id WINED3D_CS_QUEUE_COUNT, }; -#define WINED3D_CS_QUERY_POLL_INTERVAL 10u +#define WINED3D_CS_QUERY_POLL_INTERVAL 100u #if defined(_WIN64) #define WINED3D_CS_QUEUE_SIZE 0x1000000u #else

1 0