[PATCH v9 0/1] MR2183: winecfg: Add an option to set WinRT app dark theme.

[Mohamad Al-Jaf (＠maljaf)]

This is what it looks like:

![Screenshot_20230310_015941](/uploads/99b3d279bcddbd40212808a045444a7b/Screenshot_20230310_015941.png)

--
  v9: winecfg: Add an option to set WinRT app dark theme.

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

[PATCH v9 1/1] winecfg: Add an option to set WinRT app dark theme.

[Mohamad Al-Jaf]

From: Mohamad Al-Jaf

---
 dlls/windows.ui/tests/uisettings.c |  8 ++---
 programs/winecfg/resource.h        | 29 +++++++++--------
 programs/winecfg/theme.c           | 52 +++++++++++++++++++++++++++---
 programs/winecfg/winecfg.rc        | 14 ++++++--
 4 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/dlls/windows.ui/tests/uisettings.c b/dlls/windows.ui/tests/uisettings.c
index bd1e7a02d20..8d739cb7bef 100644
--- a/dlls/windows.ui/tests/uisettings.c
+++ b/dlls/windows.ui/tests/uisettings.c
@@ -152,15 +152,15 @@ static void test_UISettings(void)
     type = UIColorType_Foreground;
     hr = IUISettings3_GetColorValue( uisettings3, type, &value );
     ok( hr == S_OK, "GetColorValue returned %#lx\n", hr );
-    todo_wine ok( value.A == 255 && value.R == 255 && value.G == 255 && value.B == 255,
-                  "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B );
+    ok( value.A == 255 && value.R == 255 && value.G == 255 && value.B == 255,
+        "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B );

reset_color( &value );
     type = UIColorType_Background;
     hr = IUISettings3_GetColorValue( uisettings3, type, &value );
     ok( hr == S_OK, "GetColorValue returned %#lx\n", hr );
-    todo_wine ok( value.A == 255 && value.R == 0 && value.G == 0 && value.B == 0,
-                  "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B );
+    ok( value.A == 255 && value.R == 0 && value.G == 0 && value.B == 0,
+        "got unexpected value.A == %d value.R == %d value.G == %d value.B == %d\n", value.A, value.R, value.G, value.B );

done:
     set_app_theme( default_theme );
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index dd46bc71b40..cd7eaaf711e 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -163,19 +163,22 @@
 #define IDC_THEME_SIZECOMBO             1403
 #define IDC_THEME_SIZETEXT              1404
 #define IDC_THEME_THEMECOMBO            1405
-#define IDC_THEME_INSTALL               1406
-#define IDC_LIST_SFPATHS                1407
-#define IDC_LINK_SFPATH                 1408
-#define IDC_EDIT_SFPATH                 1409
-#define IDC_BROWSE_SFPATH               1410
-#define IDC_SYSPARAM_COMBO              1411
-#define IDC_SYSPARAM_SIZE_TEXT          1412
-#define IDC_SYSPARAM_SIZE               1413
-#define IDC_SYSPARAM_SIZE_UD            1414
-#define IDC_SYSPARAM_COLOR_TEXT         1415
-#define IDC_SYSPARAM_COLOR              1416
-#define IDC_SYSPARAM_FONT               1417
-#define IDC_ENABLE_FILE_ASSOCIATIONS    1418
+#define IDC_THEME_APPCOMBO              1406
+#define IDC_THEME_APPCOMBO_LIGHT        1407
+#define IDC_THEME_APPCOMBO_DARK         1408
+#define IDC_THEME_INSTALL               1409
+#define IDC_LIST_SFPATHS                1410
+#define IDC_LINK_SFPATH                 1411
+#define IDC_EDIT_SFPATH                 1412
+#define IDC_BROWSE_SFPATH               1413
+#define IDC_SYSPARAM_COMBO              1414
+#define IDC_SYSPARAM_SIZE_TEXT          1415
+#define IDC_SYSPARAM_SIZE               1416
+#define IDC_SYSPARAM_SIZE_UD            1417
+#define IDC_SYSPARAM_COLOR_TEXT         1418
+#define IDC_SYSPARAM_COLOR              1419
+#define IDC_SYSPARAM_FONT               1420
+#define IDC_ENABLE_FILE_ASSOCIATIONS    1421

#define IDC_SYSPARAMS_BUTTON            8400
 #define IDC_SYSPARAMS_BUTTON_TEXT       8401
diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c
index bbc4d3cc11f..84337b4fcb1 100644
--- a/programs/winecfg/theme.c
+++ b/programs/winecfg/theme.c
@@ -418,11 +418,48 @@ static void enable_size_and_color_controls (HWND dialog, BOOL enable)
     EnableWindow (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), enable);
     EnableWindow (GetDlgItem (dialog, IDC_THEME_SIZETEXT), enable);
 }
+
+static DWORD get_app_theme(void)
+{
+    DWORD ret = 0, len = sizeof(ret), type;
+    HKEY hkey;
+
+    if (RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", 0, KEY_QUERY_VALUE, &hkey ))
+        return 1;
+    if (RegQueryValueExW( hkey, L"AppsUseLightTheme", NULL, &type, (BYTE *)&ret, &len ) || type != REG_DWORD)
+        ret = 1;
+
+    RegCloseKey( hkey );
+    return ret;
+}

static void init_dialog (HWND dialog)
 {
-    SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETBUDDY,
-                        (WPARAM)GetDlgItem(dialog, IDC_SYSPARAM_SIZE), 0);
+    DWORD apps_use_light_theme;
+    WCHAR apps_theme_str[256];
+
+    static const struct
+    {
+        int id;
+        DWORD value;
+    }
+    app_themes[] =
+    {
+        { IDC_THEME_APPCOMBO_LIGHT, 1 },
+        { IDC_THEME_APPCOMBO_DARK,  0 },
+    };
+
+    SendDlgItemMessageW( dialog, IDC_THEME_APPCOMBO, CB_RESETCONTENT, 0, 0 );
+
+    LoadStringW( GetModuleHandleW(NULL), app_themes[0].id, apps_theme_str, ARRAY_SIZE(apps_theme_str) );
+    SendDlgItemMessageW( dialog, IDC_THEME_APPCOMBO, CB_ADDSTRING, 0, (LPARAM)apps_theme_str );
+    LoadStringW( GetModuleHandleW(NULL), app_themes[1].id, apps_theme_str, ARRAY_SIZE(apps_theme_str) );
+    SendDlgItemMessageW( dialog, IDC_THEME_APPCOMBO, CB_ADDSTRING, 0, (LPARAM)apps_theme_str );
+
+    apps_use_light_theme = get_app_theme();
+    SendDlgItemMessageW( dialog, IDC_THEME_APPCOMBO, CB_SETCURSEL, app_themes[apps_use_light_theme].value, 0 );
+
+    SendDlgItemMessageW( dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETBUDDY, (WPARAM)GetDlgItem(dialog, IDC_SYSPARAM_SIZE), 0 );
 }

static void update_dialog (HWND dialog)
@@ -450,8 +487,9 @@ static void update_dialog (HWND dialog)
 }

static void on_theme_changed(HWND dialog) {
-    int index = SendMessageW (GetDlgItem (dialog, IDC_THEME_THEMECOMBO),
-        CB_GETCURSEL, 0, 0);
+    int index;
+
+    index = SendMessageW (GetDlgItem (dialog, IDC_THEME_THEMECOMBO), CB_GETCURSEL, 0, 0);
     if (!update_color_and_size (index, GetDlgItem (dialog, IDC_THEME_COLORCOMBO),
         GetDlgItem (dialog, IDC_THEME_SIZECOMBO)))
     {
@@ -463,6 +501,11 @@ static void on_theme_changed(HWND dialog) {
     {
         enable_size_and_color_controls (dialog, TRUE);
     }
+
+    index = SendMessageW (GetDlgItem (dialog, IDC_THEME_APPCOMBO), CB_GETCURSEL, 0, 0);
+    set_reg_key_dword(HKEY_CURRENT_USER, L"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize",
+                      L"AppsUseLightTheme", !index);
+
     theme_dirty = TRUE;
 }

@@ -1148,6 +1191,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     if (updating_ui) break;
                     switch (LOWORD(wParam))
                     {
+                        case IDC_THEME_APPCOMBO: /* fall through */
                         case IDC_THEME_THEMECOMBO: on_theme_changed(hDlg); break;
                         case IDC_THEME_COLORCOMBO: /* fall through */
                         case IDC_THEME_SIZECOMBO: theme_dirty = TRUE; break;
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 8775b3b691b..fcfe606f426 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -92,6 +92,12 @@ BEGIN
     IDS_AUDIO_SPEAKER_MONO "Mono"
 END

+STRINGTABLE
+BEGIN
+    IDC_THEME_APPCOMBO_LIGHT "Light"
+    IDC_THEME_APPCOMBO_DARK  "Dark"
+END
+
 STRINGTABLE
 BEGIN
     IDC_SYSPARAMS_BUTTON            "Controls Background"
@@ -283,9 +289,11 @@ STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Appearance",IDC_STATIC,8,4,244,90
-    LTEXT           "&Theme:",IDC_STATIC,15,15,130,8
-    COMBOBOX        IDC_THEME_THEMECOMBO,15,25,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&Install theme...",IDC_THEME_INSTALL,152,25,93,13
+    LTEXT           "&Theme:",IDC_STATIC,15,15,70,8
+    COMBOBOX        IDC_THEME_THEMECOMBO,15,25,70,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "&WinRT app theme:",IDC_STATIC,90,15,70,8
+    COMBOBOX        IDC_THEME_APPCOMBO,90,25,70,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Install theme...",IDC_THEME_INSTALL,165,25,80,13
     LTEXT           "&Color:",IDC_THEME_COLORTEXT,15,40,105,8
     COMBOBOX        IDC_THEME_COLORCOMBO,15,50,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "&Size:",IDC_THEME_SIZETEXT,126,40,120,8