[PATCH v4 0/1] MR3959: uxtheme: Add ShouldSystemUseDarkMode.

[Helix Graziani (＠TornadoCookie)]

Used in some .NET apps for theming purposes.

--
  v4: uxtheme: Add ShouldSystemUseDarkMode.

https://gitlab.winehq.org/wine/wine/-/merge_requests/3959

[PATCH v4 1/1] uxtheme: Add ShouldSystemUseDarkMode.

[Helix Graziani]

From: Helix Graziani

---
 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..00642eb18ad 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)
+{
+    HKEY hk = HKEY_CURRENT_USER;
+    DWORD systemUsesLightTheme;
+
+    if (RegGetValueA(hk, "Software\Microsoft\Windows\CurrentVersion\Themes\Personalize",
+                     "AppsUseLightTheme", RRF_RT_REG_DWORD, NULL, &systemUsesLightTheme, NULL))
+        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..5f340a17e6f 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)
+{
+    HKEY hk = HKEY_CURRENT_USER;
+    DWORD systemUsesLightTheme;
+    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, NULL, &systemUsesLightTheme, NULL);
+    ok(lr == 0 || lr == ERROR_FILE_NOT_FOUND, "RegGetValueA failed.\n");
+
+    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)

[PATCH v4 1/1] uxtheme: Add ShouldSystemUseDarkMode.

[Marvin]

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=138059

Your paranoid android.

=== w7u_2qxl (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== w7u_adm (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== w7u_el (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== w8 (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w8adm (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w864 (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w1064v1507 (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w1064v1809 (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w1064_tsign (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w10pro64 (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w10pro64_en_AE_u8 (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w11pro64 (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== w7pro64 (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== w864 (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w1064v1507 (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
09cc:system: unhandled exception c0000005 at 00007FFAD91E50FB

=== w1064v1809 (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w1064_2qxl (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w1064_adm (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w1064_tsign (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w10pro64 (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w10pro64_ar (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w10pro64_ja (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w10pro64_zh_CN (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.
system.c:2621: Test failed: Expected registry key to match api.

=== w11pro64_amd (64 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11 (32 bit report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11 (32 bit ar:MA report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11 (32 bit de report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11 (32 bit fr report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11 (32 bit he:IL report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11 (32 bit hi:IN report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11 (32 bit ja:JP report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11 (32 bit zh:CN report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11b (32 bit WoW report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

=== debian11b (64 bit WoW report) ===

uxtheme:
system.c:2617: Test failed: RegGetValueA failed.

[Helix Graziani (＠TornadoCookie)]

On Thu Sep 28 21:28:13 2023 +0000, Helix Graziani wrote:
> changed this line in [version 3 of the diff](/wine/wine/-/merge_requests/3959/diffs?diff_id=72706&start_sha=c2b69487455da4acee9ce74a328f416cfdb07c01#9abf4dcbc82c6a38a5c702d852b4d3fe7a9c13b9_1268_1268)

In the most recent version of the commit I changed the name of the function to ShouldSystemUseDarkMode because there is another function with ordinal 132 that is called ShouldAppsuseDarkMode. I also added a conformance test.

Thank you for pointing out that there is a dark theme option in winecfg. It seems that winecfg sets the AppsUseLightTheme registry value.

The .NET code that uses this: https://github.com/search?q=%23138+language%3AC%23+&type=code
The .NET code where I found this function: https://github.com/theLeaxx/JaLoader/blob/master/JaPatcher/JaPatcher/Form1.c...