[PATCH v6 0/1] MR3959: uxtheme: Add ShouldSystemUseDarkMode.
Used in some .NET apps for theming purposes. -- v6: uxtheme: Add ShouldSystemUseDarkMode. https://gitlab.winehq.org/wine/wine/-/merge_requests/3959
From: Helix Graziani <helix.graziani(a)hotmail.com> --- dlls/uxtheme/system.c | 18 ++++++++++++++++++ dlls/uxtheme/tests/system.c | 25 +++++++++++++++++++++++++ dlls/uxtheme/uxtheme.spec | 1 + 3 files changed, 44 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 25f495d29f3..398039b7c6f 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1256,3 +1256,21 @@ BOOL WINAPI ThemeHooksRemove(void) UnregisterUserApiHook(); return TRUE; } + +/********************************************************************** + * ShouldSystemUseDarkMode (UXTHEME.138) + * + * RETURNS + * whether or not the system should use dark mode + */ +BOOL WINAPI ShouldSystemUseDarkMode(void) +{ + DWORD systemUsesLightTheme, systemUsesLightThemeType, systemUsesLightThemeSize = sizeof(DWORD); + HKEY hk = HKEY_CURRENT_USER; + + if (RegGetValueA(hk, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme", + RRF_RT_REG_DWORD, &systemUsesLightThemeType, &systemUsesLightTheme, &systemUsesLightThemeSize)) + systemUsesLightTheme = TRUE; /* when there is no theme selected, it is light */ + + return !systemUsesLightTheme; +} diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 2e769625dab..a025fb5195a 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -48,6 +48,7 @@ static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); 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 LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -2597,6 +2598,29 @@ static void test_theme(void) DestroyWindow(hwnd); } +static void test_ShouldUseDarkMode(void) +{ + DWORD systemUsesLightTheme, systemusesLightThemeType, systemUsesLightThemeSize = sizeof(DWORD); + HKEY hk = HKEY_CURRENT_USER; + LRESULT lr; + + pShouldSystemUseDarkMode = (void *)GetProcAddress(GetModuleHandleA("uxtheme.dll"), + MAKEINTRESOURCEA(138)); + if (!pShouldSystemUseDarkMode) + { + skip("ShouldSystemUseDarkMode was not found.\n"); + return; + } + + lr = RegGetValueA(hk, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme", + RRF_RT_REG_DWORD, &systemusesLightThemeType, &systemUsesLightTheme, &systemUsesLightThemeSize); + ok(lr == 0 || lr == ERROR_FILE_NOT_FOUND, "RegGetValueA failed: %ld.\n", lr); + + if (lr == ERROR_FILE_NOT_FOUND) systemUsesLightTheme = 1; + + ok(pShouldSystemUseDarkMode() == !systemUsesLightTheme, "Expected registry key to match api.\n"); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2622,6 +2646,7 @@ START_TEST(system) test_DrawThemeBackgroundEx(); test_GetThemeBackgroundRegion(); test_theme(); + test_ShouldUseDarkMode(); if (load_v6_module(&ctx_cookie, &ctx)) { diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index c60254b677d..a5bfb88c49a 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 +138 stdcall -noname ShouldSystemUseDarkMode() # Standard functions @ stdcall BeginBufferedAnimation(ptr ptr ptr long ptr ptr ptr ptr) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3959
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=138088 Your paranoid android. === w7u_2qxl (32 bit report) === uxtheme: system.c:1945: Test failed: Expected brush changed. system.c:1952: Test failed: Expected a different brush. system.c:1970: Test failed: Expected a different brush. system.c:1981: Test failed: Expected a different brush. system.c:2005: Test failed: OpenThemeData failed. system.c:2009: Test failed: GetThemePartSize failed, hr 0x80070006. system.c:2032: Test failed: msg 0x132: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x132: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x132: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x132: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x132: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x132: Expected a different brush. system.c:2075: Test failed: msg 0x132: Expected a different brush. system.c:2032: Test failed: msg 0x135: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x135: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x135: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x135: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x135: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x135: Expected a different brush. system.c:2075: Test failed: msg 0x135: Expected a different brush. system.c:2032: Test failed: msg 0x136: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x136: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x136: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x136: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x136: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x136: Expected a different brush. system.c:2075: Test failed: msg 0x136: Expected a different brush. system.c:2088: Test failed: msg 0x136: Expected a different brush. system.c:2090: Test failed: msg 0x136: Expected a different brush. system.c:2032: Test failed: msg 0x138: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x138: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x138: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x138: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x138: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x138: Expected a different brush. system.c:2075: Test failed: msg 0x138: Expected a different brush. system.c:2163: Test failed: Expected a different brush. system.c:2244: Test failed: 0x1 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x1 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x4: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x8: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x4 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x4 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x8 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x8 to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x1: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x2: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x4: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x4: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x8: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x6: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x3: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0xe: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x1: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0x2: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x4: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x8: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0x8: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x6: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x3: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0xe: Expected tab texture enabled. system.c:2244: Test failed: 0 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x3 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x3 to 0xa: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x1: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x1: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x2: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x2: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x3: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x3: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x4: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x4: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x5: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x5: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x6: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x6: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x7: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x7: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x8: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x8: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x9: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x9: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xa: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xa: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xb: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xb: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xc: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xc: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xd: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xd: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xe: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xe: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xf: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xf: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x3: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x3: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x4: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x4: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xd: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xd: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xe: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xe: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xf: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xf: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x10: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x10: Expected tab texture enabled. === w7u_adm (32 bit report) === uxtheme: system.c:1945: Test failed: Expected brush changed. system.c:1952: Test failed: Expected a different brush. system.c:1970: Test failed: Expected a different brush. system.c:1981: Test failed: Expected a different brush. system.c:2005: Test failed: OpenThemeData failed. system.c:2009: Test failed: GetThemePartSize failed, hr 0x80070006. system.c:2032: Test failed: msg 0x132: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x132: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x132: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x132: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x132: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x132: Expected a different brush. system.c:2075: Test failed: msg 0x132: Expected a different brush. system.c:2032: Test failed: msg 0x135: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x135: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x135: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x135: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x135: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x135: Expected a different brush. system.c:2075: Test failed: msg 0x135: Expected a different brush. system.c:2032: Test failed: msg 0x136: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x136: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x136: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x136: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x136: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x136: Expected a different brush. system.c:2075: Test failed: msg 0x136: Expected a different brush. system.c:2088: Test failed: msg 0x136: Expected a different brush. system.c:2090: Test failed: msg 0x136: Expected a different brush. system.c:2032: Test failed: msg 0x138: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x138: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x138: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x138: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x138: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x138: Expected a different brush. system.c:2075: Test failed: msg 0x138: Expected a different brush. system.c:2163: Test failed: Expected a different brush. system.c:2244: Test failed: 0x1 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x1 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x4: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x8: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x4 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x4 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x8 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x8 to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x1: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x2: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x4: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x4: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x8: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x6: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x3: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0xe: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x1: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0x2: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x4: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x8: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0x8: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x6: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x3: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0xe: Expected tab texture enabled. system.c:2244: Test failed: 0 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x3 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x3 to 0xa: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x1: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x1: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x2: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x2: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x3: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x3: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x4: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x4: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x5: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x5: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x6: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x6: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x7: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x7: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x8: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x8: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x9: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x9: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xa: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xa: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xb: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xb: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xc: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xc: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xd: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xd: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xe: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xe: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xf: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xf: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x3: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x3: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x4: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x4: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xd: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xd: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xe: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xe: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xf: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xf: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x10: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x10: Expected tab texture enabled. === w7u_el (32 bit report) === uxtheme: system.c:1945: Test failed: Expected brush changed. system.c:1952: Test failed: Expected a different brush. system.c:1970: Test failed: Expected a different brush. system.c:1981: Test failed: Expected a different brush. system.c:2005: Test failed: OpenThemeData failed. system.c:2009: Test failed: GetThemePartSize failed, hr 0x80070006. system.c:2032: Test failed: msg 0x132: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x132: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x132: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x132: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x132: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x132: Expected a different brush. system.c:2075: Test failed: msg 0x132: Expected a different brush. system.c:2032: Test failed: msg 0x135: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x135: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x135: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x135: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x135: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x135: Expected a different brush. system.c:2075: Test failed: msg 0x135: Expected a different brush. system.c:2032: Test failed: msg 0x136: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x136: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x136: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x136: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x136: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x136: Expected a different brush. system.c:2075: Test failed: msg 0x136: Expected a different brush. system.c:2088: Test failed: msg 0x136: Expected a different brush. system.c:2090: Test failed: msg 0x136: Expected a different brush. system.c:2032: Test failed: msg 0x138: Expected (-1,-2), got (0,0). system.c:2040: Test failed: msg 0x138: Expected mode 0x1, got 0x2. system.c:2055: Test failed: msg 0x138: Expected brush color 0, got 0xf0f0f0. system.c:2056: Test failed: msg 0x138: Expected brush style 0x3, got 0. system.c:2061: Test failed: msg 0x138: GetObjectA failed, error 2147943568. system.c:2067: Test failed: msg 0x138: Expected a different brush. system.c:2075: Test failed: msg 0x138: Expected a different brush. system.c:2163: Test failed: Expected a different brush. system.c:2244: Test failed: 0x1 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x1 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x4: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x8: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x2 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x4 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x4 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x8 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x8 to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x1: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x2: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x4: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x4: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x8: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0x6: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0: Expected tab texture enabled. system.c:2244: Test failed: 0x6 to 0: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0x3: Expected tab texture enabled. system.c:2218: Test failed: 0x6 to 0xe: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x1: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x2: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0x2: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x4: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x8: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0x8: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x6: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0xa: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0: Expected tab texture enabled. system.c:2244: Test failed: 0xa to 0: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0x3: Expected tab texture enabled. system.c:2218: Test failed: 0xa to 0xe: Expected tab texture enabled. system.c:2244: Test failed: 0 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0 to 0xa: Expected tab texture enabled. system.c:2244: Test failed: 0x3 to 0x6: Expected tab texture enabled. system.c:2244: Test failed: 0x3 to 0xa: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x1: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x1: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x2: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x2: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x3: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x3: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x4: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x4: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x5: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x5: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x6: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x6: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x7: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x7: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x8: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x8: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0x9: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0x9: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xa: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xa: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xb: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xb: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xc: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xc: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xd: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xd: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xe: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xe: Expected tab texture enabled. system.c:2302: Test failed: "Button" 0xf: Expected tab texture enabled. system.c:2325: Test failed: "Button" 0xf: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x3: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x3: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x4: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x4: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xd: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xd: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xe: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xe: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0xf: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0xf: Expected tab texture enabled. system.c:2302: Test failed: "Static" 0x10: Expected tab texture enabled. system.c:2325: Test failed: "Static" 0x10: Expected tab texture enabled. === w8 (32 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w8adm (32 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w864 (32 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w1064v1507 (32 bit report) === uxtheme: 0984:system: unhandled exception c0000005 at 74948B41 === w1064v1809 (32 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w1064_tsign (32 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w10pro64 (32 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w10pro64_en_AE_u8 (32 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w864 (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w1064v1507 (64 bit report) === uxtheme: 0d1c:system: unhandled exception c0000005 at 00007FFAD91E50FB === w1064v1809 (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w1064_2qxl (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w1064_adm (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w1064_tsign (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w10pro64 (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w10pro64_ar (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w10pro64_ja (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api. === w10pro64_zh_CN (64 bit report) === uxtheme: system.c:2621: Test failed: Expected registry key to match api.
Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/tests/system.c:
DestroyWindow(hwnd); }
+static void test_ShouldUseDarkMode(void) +{ + DWORD systemUsesLightTheme, systemusesLightThemeType, systemUsesLightThemeSize = sizeof(DWORD);
For variables internal to Wine, we generally use underscore separation. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3959#note_47176
Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/tests/system.c:
DestroyWindow(hwnd); }
+static void test_ShouldUseDarkMode(void) +{ + DWORD systemUsesLightTheme, systemusesLightThemeType, systemUsesLightThemeSize = sizeof(DWORD); + HKEY hk = HKEY_CURRENT_USER;
You can use HKEY_CURRENT_USER directly. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3959#note_47177
Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/tests/system.c:
DestroyWindow(hwnd); }
+static void test_ShouldUseDarkMode(void) +{ + DWORD systemUsesLightTheme, systemusesLightThemeType, systemUsesLightThemeSize = sizeof(DWORD); + HKEY hk = HKEY_CURRENT_USER; + LRESULT lr; + + pShouldSystemUseDarkMode = (void *)GetProcAddress(GetModuleHandleA("uxtheme.dll"), + MAKEINTRESOURCEA(138)); + if (!pShouldSystemUseDarkMode) + { + skip("ShouldSystemUseDarkMode was not found.\n");
You can use win_skip once the function is implemented in Wine. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3959#note_47178
Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/tests/system.c:
+static void test_ShouldUseDarkMode(void) +{ + DWORD systemUsesLightTheme, systemusesLightThemeType, systemUsesLightThemeSize = sizeof(DWORD); + HKEY hk = HKEY_CURRENT_USER; + LRESULT lr; + + pShouldSystemUseDarkMode = (void *)GetProcAddress(GetModuleHandleA("uxtheme.dll"), + MAKEINTRESOURCEA(138)); + if (!pShouldSystemUseDarkMode) + { + skip("ShouldSystemUseDarkMode was not found.\n"); + return; + } + + lr = RegGetValueA(hk, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme",
Many of the RegGetValueA() parameters are optional. You can skip passing them if they're not important. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3959#note_47180
Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/tests/system.c:
+ HKEY hk = HKEY_CURRENT_USER; + LRESULT lr; + + pShouldSystemUseDarkMode = (void *)GetProcAddress(GetModuleHandleA("uxtheme.dll"), + MAKEINTRESOURCEA(138)); + if (!pShouldSystemUseDarkMode) + { + skip("ShouldSystemUseDarkMode was not found.\n"); + return; + } + + lr = RegGetValueA(hk, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme", + RRF_RT_REG_DWORD, &systemusesLightThemeType, &systemUsesLightTheme, &systemUsesLightThemeSize); + ok(lr == 0 || lr == ERROR_FILE_NOT_FOUND, "RegGetValueA failed: %ld.\n", lr); + + if (lr == ERROR_FILE_NOT_FOUND) systemUsesLightTheme = 1; Did you run the tests manually on a system with a dark theme?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3959#note_47181
Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/tests/system.c:
+ + pShouldSystemUseDarkMode = (void *)GetProcAddress(GetModuleHandleA("uxtheme.dll"), + MAKEINTRESOURCEA(138)); + if (!pShouldSystemUseDarkMode) + { + skip("ShouldSystemUseDarkMode was not found.\n"); + return; + } + + lr = RegGetValueA(hk, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme", + RRF_RT_REG_DWORD, &systemusesLightThemeType, &systemUsesLightTheme, &systemUsesLightThemeSize); + ok(lr == 0 || lr == ERROR_FILE_NOT_FOUND, "RegGetValueA failed: %ld.\n", lr); + + if (lr == ERROR_FILE_NOT_FOUND) systemUsesLightTheme = 1; + + ok(pShouldSystemUseDarkMode() == !systemUsesLightTheme, "Expected registry key to match api.\n"); We usually use "Expected value %d, got %d.\n".
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3959#note_47182
Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/tests/system.c:
test_DrawThemeBackgroundEx(); test_GetThemeBackgroundRegion(); test_theme(); + test_ShouldUseDarkMode();
Let's use test_ShouldSystemUseDarkMode(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3959#note_47183
Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/system.c:
UnregisterUserApiHook(); return TRUE; } + +/********************************************************************** + * ShouldSystemUseDarkMode (UXTHEME.138) + * + * RETURNS + * whether or not the system should use dark mode + */ +BOOL WINAPI ShouldSystemUseDarkMode(void) +{ + DWORD systemUsesLightTheme, systemUsesLightThemeType, systemUsesLightThemeSize = sizeof(DWORD); + HKEY hk = HKEY_CURRENT_USER; +
See some of the similar problems mentioned in the tests. I prefer to initialize system_uses_light_theme with TRUE and then if querying AppsUseLightTheme succeeds and the value is 0 then make system_uses_light_theme FALSE. Some online information also suggests that this function changes the last error code. Please add a test and implement that as well. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3959#note_47186
participants (4)
-
Helix Graziani -
Helix Graziani (＠TornadoCookie)
-
Marvin -
Zhiyi Zhang (＠zhiyi)