December 2023 - Wine-commits

Matteo Bruni : wined3d: Add a bunch of d3d_perf traces.
by Alexandre Julliard 08 Dec '23

08 Dec '23

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

Brendan McGrath : user32/tests: Add tests for word breaks before punctuation.
by Alexandre Julliard 08 Dec '23

08 Dec '23

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

Brendan McGrath : user32: Wrap at whitespace rather than soft break.
by Alexandre Julliard 08 Dec '23

08 Dec '23

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

Alexandre Julliard : configure: Disable building programs for ARM64EC.
by Alexandre Julliard 08 Dec '23

08 Dec '23

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

Alexandre Julliard : windowscodecs: Don't free memory at process exit.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 505455de69acbc1390d2bf69313f1e76a19100ea URL: https://gitlab.winehq.org/wine/wine/-/commit/505455de69acbc1390d2bf69313f1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 16:09:07 2023 +0100 windowscodecs: Don't free memory at process exit. --- dlls/windowscodecs/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 4784ad23005..27012f7431d 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -44,6 +44,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) windowscodecs_module = hinstDLL; break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; ReleaseComponentInfos(); break; }

1 0

Alexandre Julliard : winepulse.drv: Don't free memory at process exit.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 6e9728bee52ac7e1f5a3d3bfe3bfaf5d9d1e01c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e9728bee52ac7e1f5a3d3bfe3bfaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 16:09:19 2023 +0100 winepulse.drv: Don't free memory at process exit. --- dlls/winepulse.drv/mmdevdrv.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 19d3d4040a3..0617c5977c9 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -72,10 +72,12 @@ static WCHAR drv_key_devicesW[256]; BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { - if (reason == DLL_PROCESS_ATTACH) { - WCHAR buf[MAX_PATH]; - WCHAR *filename; + WCHAR buf[MAX_PATH]; + WCHAR *filename; + switch (reason) + { + case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(dll); if (__wine_init_unix_call()) return FALSE; @@ -87,11 +89,16 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) swprintf(drv_key_devicesW, ARRAY_SIZE(drv_key_devicesW), L"Software\\Wine\\Drivers\\%s\\devices", filename); - } else if (reason == DLL_PROCESS_DETACH) { - struct device_cache *device, *device_next; - - LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry) - free(device); + break; + case DLL_PROCESS_DETACH: + if (!reserved) + { + struct device_cache *device, *device_next; + + LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry) + free(device); + } + break; } return TRUE; }

1 0

Alexandre Julliard : ntdll: Only free reserved memory for HIGH_ENTROPY_VA binaries.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: f03c3a167c2e4abe92b1e1bf2ea5f7c31a07fc3b URL: https://gitlab.winehq.org/wine/wine/-/commit/f03c3a167c2e4abe92b1e1bf2ea5f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 16:13:51 2023 +0100 ntdll: Only free reserved memory for HIGH_ENTROPY_VA binaries. To avoid triggering pointer-truncation bugs in applications. --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 75e6319c007..5bdeef4c1bc 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4397,7 +4397,7 @@ void virtual_set_large_address_space(void) if (is_wow64()) user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; #ifndef __APPLE__ /* don't free the zerofill section on macOS */ - else + else if (main_image_info.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA) free_reserved_memory( 0, (char *)0x7ffe0000 ); #endif }

1 0

Brendan McGrath : comctl32/tests: Add test for setitemsize return value.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 7296bcd84a863c256d18e4df56b868fe8eca4dfa URL: https://gitlab.winehq.org/wine/wine/-/commit/7296bcd84a863c256d18e4df56b868… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon Dec 4 13:17:55 2023 +1100 comctl32/tests: Add test for setitemsize return value. --- dlls/comctl32/tests/tab.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index a5c51690689..b0a882e6e26 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -674,6 +674,30 @@ static void test_width(void) test_tab(94); } +static void test_setitemsize(void) +{ + HWND hwTab; + LRESULT result; + HDC hdc; + INT dpi; + + hwTab = create_tabcontrol(0, TCIF_TEXT); + SendMessageA(hwTab, TCM_SETMINTABWIDTH, 0, -1); + + hdc = GetDC(hwTab); + dpi = GetDeviceCaps(hdc, LOGPIXELSX); + ReleaseDC(hwTab, hdc); + + result = SendMessageA(hwTab, TCM_SETITEMSIZE, 0, MAKELPARAM(50, 20)); + todo_wine ok (LOWORD(result) == dpi, "Excepted width to be %d, got %d\n", dpi, LOWORD(result)); + + result = SendMessageA(hwTab, TCM_SETITEMSIZE, 0, MAKELPARAM(0, 1)); + todo_wine ok (LOWORD(result) == 50, "Excepted width to be 50, got %d\n", LOWORD(result)); + ok (HIWORD(result) == 20, "Excepted height to be 20, got %d\n", HIWORD(result)); + + DestroyWindow (hwTab); +} + static void test_curfocus(void) { const INT nTabs = 5; @@ -1581,6 +1605,7 @@ START_TEST(tab) ok(parent_wnd != NULL, "Failed to create parent window!\n"); test_width(); + test_setitemsize(); test_curfocus(); test_cursel(); test_extendedstyle();

1 0

Brendan McGrath : comctl32: Fix TAB_SetItemSize.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 1970556b6dfa683279975313c0db0734c9ed2cf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1970556b6dfa683279975313c0db07… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon Dec 4 12:43:57 2023 +1100 comctl32: Fix TAB_SetItemSize. Windows sets the default width to LOGPIXELSX regardless of the style. It will also always return the previous cx value provided. --- dlls/comctl32/tab.c | 14 +++++++------- dlls/comctl32/tests/tab.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 13abbd8078d..73b3f313086 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2662,19 +2662,20 @@ TAB_SetItemSize (TAB_INFO *infoPtr, INT cx, INT cy) lResult = MAKELONG(infoPtr->tabWidth, infoPtr->tabHeight); /* UNDOCUMENTED: If requested Width or Height is 0 this means that program wants to use auto size. */ - if (infoPtr->dwStyle & TCS_FIXEDWIDTH && (infoPtr->tabWidth != cx)) + if (infoPtr->tabWidth != cx) { infoPtr->tabWidth = cx; bNeedPaint = TRUE; } - if (infoPtr->tabHeight != cy) + if (infoPtr->tabHeight != cy && cy != 0) { - if ((infoPtr->fHeightSet = (cy != 0))) - infoPtr->tabHeight = cy; - + infoPtr->tabHeight = cy; bNeedPaint = TRUE; } + + infoPtr->fHeightSet = (cy != 0); + TRACE("was h=%d,w=%d, now h=%d,w=%d\n", HIWORD(lResult), LOWORD(lResult), infoPtr->tabHeight, infoPtr->tabWidth); @@ -3063,8 +3064,7 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) infoPtr->uVItemPadding; /* Initialize the width of a tab. */ - if (infoPtr->dwStyle & TCS_FIXEDWIDTH) - infoPtr->tabWidth = GetDeviceCaps(hdc, LOGPIXELSX); + infoPtr->tabWidth = GetDeviceCaps(hdc, LOGPIXELSX); infoPtr->tabMinWidth = -1; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index b0a882e6e26..0704dce940c 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -689,10 +689,10 @@ static void test_setitemsize(void) ReleaseDC(hwTab, hdc); result = SendMessageA(hwTab, TCM_SETITEMSIZE, 0, MAKELPARAM(50, 20)); - todo_wine ok (LOWORD(result) == dpi, "Excepted width to be %d, got %d\n", dpi, LOWORD(result)); + ok (LOWORD(result) == dpi, "Excepted width to be %d, got %d\n", dpi, LOWORD(result)); result = SendMessageA(hwTab, TCM_SETITEMSIZE, 0, MAKELPARAM(0, 1)); - todo_wine ok (LOWORD(result) == 50, "Excepted width to be 50, got %d\n", LOWORD(result)); + ok (LOWORD(result) == 50, "Excepted width to be 50, got %d\n", LOWORD(result)); ok (HIWORD(result) == 20, "Excepted height to be 20, got %d\n", HIWORD(result)); DestroyWindow (hwTab);

1 0

Brendan McGrath : comctl32: Use selected font to determine default min tab width.
by Alexandre Julliard 08 Dec '23

08 Dec '23

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