[PATCH 0/2] MR4140: uxtheme/tests: Add some tests for OpenThemeData() with various app/class names.

[Dmitry Timoshkov (＠dmitry)]

Themed Delphi applications use "explorer::listview" and "explorer::treeview":
https://gitlab.com/freepascal.org/lazarus/lazarus/-/blob/main/lcl/interfaces...

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

[PATCH 1/2] uxtheme/tests: Add some tests for OpenThemeData() with various app/class names.

[Dmitry Timoshkov]

From: Dmitry Timoshkov <dmitry(a)baikal.ru>

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/uxtheme/tests/system.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index 197cd86f6b6..accb000f728 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -2629,6 +2629,42 @@ static void test_ShouldSystemUseDarkMode(void)
     ok(result == !light_theme, "Expected value %d, got %d.\n", !light_theme, result);
 }
 
+static void test_OpenThemeData_class(void)
+{
+    static const WCHAR * const app_class[] =
+    {
+        L"button", L"combobox", L"edit", L"explorerbar", L"header",
+        L"listview", L"explorer::listview", L"menu", L"progress",
+        L"rebar", L"scrollbar", L"spin", L"startpanel", L"status",
+        L"tab", L"taskband", L"taskbar", L"toolbar", L"tooltip",
+        L"trackbar", L"treeview", L"explorer::treeview", L"window"
+    };
+    HWND hwnd;
+    HTHEME htheme;
+    int i;
+
+    if (!IsThemeActive())
+    {
+        skip("Theme is not active.\n");
+        return;
+    }
+
+    hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL);
+    ok(hwnd != NULL, "CreateWindowExA error %lu.\n", GetLastError());
+
+    for (i = 0; i < ARRAY_SIZE(app_class); i++)
+    {
+        BOOL win8_fail = !lstrcmpW(app_class[i], L"clock") || !lstrcmpW(app_class[i], L"page") || !lstrcmpW(app_class[i], L"traynotify");
+
+        htheme = OpenThemeData(hwnd, app_class[i]);
+        todo_wine_if(i == 3 || i == 6 || i == 12 || i == 15 || i == 16 || i == 21)
+        ok(htheme != NULL || broken(win8_fail), "OpenThemeData(%s) error %#lx.\n", wine_dbgstr_w(app_class[i]), GetLastError());
+        CloseThemeData(htheme);
+    }
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(system)
 {
     ULONG_PTR ctx_cookie;
@@ -2642,6 +2678,7 @@ START_TEST(system)
     test_GetWindowTheme();
     test_SetWindowTheme();
     test_OpenThemeData();
+    test_OpenThemeData_class();
     test_OpenThemeDataEx();
     test_OpenThemeDataForDpi();
     test_GetCurrentThemeName();
-- 
GitLab


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

[PATCH 2/2] uxtheme: Parse app/class name in OpenThemeData().

[Dmitry Timoshkov]

From: Dmitry Timoshkov <dmitry(a)baikal.ru>

Themed Delphi applications use "explorer::listview" and "explorer::treeview":
https://gitlab.com/freepascal.org/lazarus/lazarus/-/blob/main/lcl/interfaces...

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/uxtheme/system.c       | 15 ++++++++++++++-
 dlls/uxtheme/tests/system.c |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index 156051406e3..441ea8146df 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -640,7 +640,20 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT
             pszUseClassList = pszClassList;
 
         if (pszUseClassList)
-            hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList, dpi);
+        {
+            const WCHAR *p = wcschr(pszUseClassList, ':');
+            if (p)
+            {
+                p++;
+                lstrcpynW(szAppBuff, pszUseClassList, min(p - pszUseClassList, 256));
+                szAppBuff[p - pszUseClassList] = 0;
+                if (*p == ':') p++;
+                lstrcpynW(szClassBuff, p, min(wcslen(p) + 1, 256));
+                hTheme = MSSTYLES_OpenThemeClass(pszAppName ? pszAppName : szAppBuff, szClassBuff, dpi);
+            }
+            else
+                hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList, dpi);
+        }
 
         /* Fall back to default class if the specified subclass is not found */
         if (!hTheme)
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index accb000f728..edbab8e5a63 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -2657,7 +2657,7 @@ static void test_OpenThemeData_class(void)
         BOOL win8_fail = !lstrcmpW(app_class[i], L"clock") || !lstrcmpW(app_class[i], L"page") || !lstrcmpW(app_class[i], L"traynotify");
 
         htheme = OpenThemeData(hwnd, app_class[i]);
-        todo_wine_if(i == 3 || i == 6 || i == 12 || i == 15 || i == 16 || i == 21)
+        todo_wine_if(i == 3 || i == 6 || i == 12 || i == 15 || i == 16)
         ok(htheme != NULL || broken(win8_fail), "OpenThemeData(%s) error %#lx.\n", wine_dbgstr_w(app_class[i]), GetLastError());
         CloseThemeData(htheme);
     }
-- 
GitLab

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

[Zhiyi Zhang (＠zhiyi)]

Zhiyi Zhang (@zhiyi) commented about dlls/uxtheme/tests/system.c:
> ok(result == !light_theme, "Expected value %d, got %d.\n", !light_theme, result);
>  }
>
> +static void test_OpenThemeData_class(void)

Let's add these tests to test_theme() instead.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4140#note_49513