October 2023 - Wine-Commits

Bartosz Kosiorek : gdiplus: Improve performance of units_to_pixels by not using division.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 012f61067591c53a5d2508d8721223ae9a835383 URL: https://gitlab.winehq.org/wine/wine/-/commit/012f61067591c53a5d2508d8721223… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Oct 24 22:12:21 2023 +0200 gdiplus: Improve performance of units_to_pixels by not using division. Single float division (divss) is at least four time slower, than multiplication (mulss). More information: https://www.agner.org/optimize/instruction_tables.pdf The units_to_pixels was optimized to use only multiplication (mulss), and avoid using divisions (divss). --- dlls/gdiplus/gdiplus.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index a3c85986ffc..3c4ecdeab5f 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -36,7 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static const REAL mm_per_inch = 25.4; +static const REAL inch_per_mm = 1.0 / 25.4; static const REAL point_per_inch = 72.0; +static const REAL inch_per_point = 1.0 / 72.0; static Status WINAPI NotificationHook(ULONG_PTR *token) { @@ -333,17 +335,17 @@ REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi, BOOL printer_display) return units; case UnitDisplay: if (printer_display) - return units * dpi / 100.0; + return units * dpi * 0.01f; else return units; case UnitPoint: - return units * dpi / point_per_inch; + return units * dpi * inch_per_point; case UnitInch: return units * dpi; case UnitDocument: - return units * dpi / 300.0; /* Per MSDN */ + return units * dpi * (1.0f / 300.0f); /* Per MSDN */ case UnitMillimeter: - return units * dpi / mm_per_inch; + return units * dpi * inch_per_mm; default: FIXME("Unhandled unit type: %d\n", unit); return 0;

1 0

Rémi Bernon : dmime/tests: Remove flaky track playing state test.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 3e31e29d653c6593ea4d18558a6c1946f3d13eca URL: https://gitlab.winehq.org/wine/wine/-/commit/3e31e29d653c6593ea4d18558a6c19… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 22:49:46 2023 +0200 dmime/tests: Remove flaky track playing state test. This fails regularly on Win7. --- dlls/dmime/tests/dmime.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 6dc9d8e0f5e..151dbead3c1 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3971,11 +3971,6 @@ static void test_segment_state(void) ok(hr == S_OK, "got %#lx\n", hr); - /* This might be timing dependent and if PlaySegment is already - * late, the tracks are played synchronously and right away. - */ - todo_wine check_track_state(track, playing, FALSE); - ret = test_track_wait_playing(track, 50); ok(ret == 0, "got %#lx\n", ret);

1 0

Rémi Bernon : dmime/tests: Avoid checking message segment state reference count.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: b971c55a3a180d77132cbfe4156de4928ce447c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b971c55a3a180d77132cbfe4156de4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 14:19:31 2023 +0200 dmime/tests: Avoid checking message segment state reference count. --- dlls/dmime/tests/dmime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 151dbead3c1..7ed6568ecd4 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -38,8 +38,8 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported, BOOL check_refs) { ULONG expect_ref = get_refcount(iface_ptr); IUnknown *iface = iface_ptr; @@ -52,10 +52,10 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO if (SUCCEEDED(hr)) { LONG ref = get_refcount(unk); - ok_(__FILE__, line)(ref == expect_ref + 1, "got %ld\n", ref); + if (check_refs) ok_(__FILE__, line)(ref == expect_ref + 1, "got %ld\n", ref); IUnknown_Release(unk); ref = get_refcount(iface_ptr); - ok_(__FILE__, line)(ref == expect_ref, "got %ld\n", ref); + if (check_refs) ok_(__FILE__, line)(ref == expect_ref, "got %ld\n", ref); } } @@ -3024,8 +3024,8 @@ static void check_dmus_notification_pmsg_(int line, DMUS_NOTIFICATION_PMSG *msg, ok_(__FILE__, line)(!msg->punkUser, "got punkUser %p\n", msg->punkUser); else { - check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState, TRUE); - check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState8, TRUE); + check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState, TRUE, FALSE); + check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState8, TRUE, FALSE); } }

1 0

Hans Leidekker : kernelbase: Trace global memory counters in decimal.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 3f6510c1d6b9bca6594f22693faed1a3b0fc80c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f6510c1d6b9bca6594f22693faed1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 20 16:00:19 2023 +0200 kernelbase: Trace global memory counters in decimal. --- dlls/kernelbase/memory.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 05d521da321..4f4bba9a13b 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1247,12 +1247,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH GlobalMemoryStatusEx( MEMORYSTATUSEX *status ) if (status->ullTotalPhys) status->dwMemoryLoad = (status->ullTotalPhys - status->ullAvailPhys) / (status->ullTotalPhys / 100); - TRACE_(virtual)( "MemoryLoad %ld, TotalPhys %s, AvailPhys %s, TotalPageFile %s," - "AvailPageFile %s, TotalVirtual %s, AvailVirtual %s\n", - status->dwMemoryLoad, wine_dbgstr_longlong(status->ullTotalPhys), - wine_dbgstr_longlong(status->ullAvailPhys), wine_dbgstr_longlong(status->ullTotalPageFile), - wine_dbgstr_longlong(status->ullAvailPageFile), wine_dbgstr_longlong(status->ullTotalVirtual), - wine_dbgstr_longlong(status->ullAvailVirtual) ); + TRACE_(virtual)( "MemoryLoad %lu, TotalPhys %I64u, AvailPhys %I64u, TotalPageFile %I64u, " + "AvailPageFile %I64u, TotalVirtual %I64u, AvailVirtual %I64u\n", + status->dwMemoryLoad, status->ullTotalPhys, status->ullAvailPhys, status->ullTotalPageFile, + status->ullAvailPageFile, status->ullTotalVirtual, status->ullAvailVirtual ); cached_status = *status; return TRUE;

1 0

Zebediah Figura : include: Convert d3d10shader.h to an IDL.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: d78ca75c566679f6c03aa6a545e5b5216d797bb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d78ca75c566679f6c03aa6a545e5b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 17:30:22 2023 -0500 include: Convert d3d10shader.h to an IDL. --- include/Makefile.in | 2 +- include/d3d10shader.h | 233 ------------------------------------------------ include/d3d10shader.idl | 217 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+), 234 deletions(-)

1 0

Zebediah Figura : include: Convert d3d10effect.h to an IDL.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: b57d4fcd2172e5403653bde4f1010478c57d4415 URL: https://gitlab.winehq.org/wine/wine/-/commit/b57d4fcd2172e5403653bde4f10104… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 17:30:36 2023 -0500 include: Convert d3d10effect.h to an IDL. --- include/Makefile.in | 2 +- include/d3d10effect.h | 859 ------------------------------------------------ include/d3d10effect.idl | 512 +++++++++++++++++++++++++++++ 3 files changed, 513 insertions(+), 860 deletions(-)

1 0

Louis Lenders : uxtheme: Add ShouldAppsUseDarkMode.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: b5f4a6a4dbb6f4d7b9f182d0d551393558458712 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5f4a6a4dbb6f4d7b9f182d0d55139… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Oct 19 15:15:36 2023 +0200 uxtheme: Add ShouldAppsUseDarkMode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55821 --- dlls/uxtheme/system.c | 17 +++++++++++++++++ dlls/uxtheme/tests/system.c | 32 ++++++++++++++++++++++++++++++++ dlls/uxtheme/uxtheme.spec | 1 + 3 files changed, 50 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 156051406e3..f1a4d0d5566 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1273,3 +1273,20 @@ BOOL WINAPI ShouldSystemUseDarkMode(void) return !light_theme; } + +/********************************************************************** + * ShouldAppsUseDarkMode (UXTHEME.132) + * + * RETURNS + * Whether or not apps should use dark mode. + */ +BOOL WINAPI ShouldAppsUseDarkMode(void) +{ + DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); + + RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", + L"AppsUseLightTheme", RRF_RT_REG_DWORD, NULL, &light_theme, &light_theme_size); + + return !light_theme; +} diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 197cd86f6b6..c5fc19dd86a 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -49,6 +49,7 @@ static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, DWORD *); static BOOL (WINAPI *pShouldSystemUseDarkMode)(void); +static BOOL (WINAPI *pShouldAppsUseDarkMode)(void); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -76,6 +77,7 @@ static void init_funcs(void) HMODULE uxtheme = GetModuleHandleA("uxtheme.dll"); pShouldSystemUseDarkMode = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(138)); + pShouldAppsUseDarkMode = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(132)); #define GET_PROC(module, func) \ p##func = (void *)GetProcAddress(module, #func); \ @@ -2629,6 +2631,35 @@ static void test_ShouldSystemUseDarkMode(void) ok(result == !light_theme, "Expected value %d, got %d.\n", !light_theme, result); } +static void test_ShouldAppsUseDarkMode(void) +{ + DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; + BOOL result; + LSTATUS ls; + + if (!pShouldAppsUseDarkMode) + { + win_skip("ShouldAppsUseDarkMode() is unavailable\n"); + return; + } + + ls = RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", + L"AppsUseLightTheme", RRF_RT_REG_DWORD, NULL, &light_theme, &light_theme_size); + if (ls == ERROR_FILE_NOT_FOUND) + { + skip("AppsUseLightTheme registry value not found.\n"); + return; + } + ok(ls == 0, "RegGetValue failed: %ld.\n", ls); + + SetLastError(0xdeadbeef); + result = pShouldAppsUseDarkMode(); + last_error = GetLastError(); + ok(last_error == 0xdeadbeef, "ShouldAppsUseDarkMode set last error: %ld.\n", last_error); + ok(result == !light_theme, "Expected value %d, got %d\n", !light_theme, result); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2655,6 +2686,7 @@ START_TEST(system) test_GetThemeBackgroundRegion(); test_theme(); test_ShouldSystemUseDarkMode(); + test_ShouldAppsUseDarkMode(); if (load_v6_module(&ctx_cookie, &ctx)) { diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index a5bfb88c49a..d31621e11a7 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -42,6 +42,7 @@ 61 stdcall OpenThemeDataEx(ptr wstr long) 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection +132 stdcall -noname ShouldAppsUseDarkMode() 138 stdcall -noname ShouldSystemUseDarkMode() # Standard functions

1 0

Brendan Shanks : makedep: Replace sprintf with snprintf to avoid a deprecation warning on macOS.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: c17d1adb6ef961ce557408141791b910945b74ed URL: https://gitlab.winehq.org/wine/wine/-/commit/c17d1adb6ef961ce557408141791b9… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 14:02:21 2023 -0500 makedep: Replace sprintf with snprintf to avoid a deprecation warning on macOS. --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8495d93d8c6..e35de8a00f3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3898,7 +3898,7 @@ static FILE *create_temp_file( const char *orig ) for (i = 0; i < 100; i++) { - sprintf( name, "%s.tmp%08x", orig, id ); + snprintf( name, strlen(orig) + 13, "%s.tmp%08x", orig, id ); if ((fd = open( name, O_RDWR | O_CREAT | O_EXCL, 0666 )) != -1) { ret = fdopen( fd, "w" );

1 0

Brendan Shanks : winscard: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 2e2f9bdb65c237d2e4f9b6bf560708b489195ec6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e2f9bdb65c237d2e4f9b6bf560708… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 20:52:37 2023 -0500 winscard: Ensure unixlib function tables and enum stay in sync. --- dlls/winscard/unixlib.c | 4 ++++ dlls/winscard/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index d332b404a58..f1228b0eef6 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -354,6 +354,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_set_attrib, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -705,4 +707,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_scard_set_attrib, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index ecb1b40ef68..7dda417705f 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -184,4 +184,5 @@ enum winscard_funcs unix_scard_control, unix_scard_get_attrib, unix_scard_set_attrib, + unix_funcs_count };

1 0

Brendan Shanks : wpcap: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 2c487406ae52a3b50a2bd7895f2b50e7344ca096 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c487406ae52a3b50a2bd7895f2b50… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 20:19:00 2023 -0500 wpcap: Ensure unixlib function tables and enum stay in sync. --- dlls/wpcap/unixlib.c | 4 ++++ dlls/wpcap/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 55069fac79e..4f5c2337b10 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -498,6 +498,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = wrap_tstamp_type_val_to_name, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -961,6 +963,8 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_tstamp_type_val_to_name, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ #endif /* HAVE_PCAP_PCAP_H */ diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 668658089f3..d13d62a97aa 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -379,4 +379,5 @@ enum pcap_funcs unix_tstamp_type_name_to_val, unix_tstamp_type_val_to_description, unix_tstamp_type_val_to_name, + unix_funcs_count };

1 0