uxtheme: If the application class is already set then OpenThemeData() should fail.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>

uxtheme: If the application class is already set then OpenThemeData() should fail.
dfffe7b4 · Dmitry Timoshkov · Alexandre Julliard · 87f1a380 · dfffe7b4 · dfffe7b4
Commit dfffe7b4 authored Nov 02, 2023 by Dmitry Timoshkov Committed by Alexandre Julliard Nov 08, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 8 deletions

msstyles.c dlls/uxtheme/msstyles.c +12 -6

system.c dlls/uxtheme/tests/system.c +0 -2

No files found.
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -1076,9 +1076,12 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U

        parse_app_class_name(buf, szAppName, szClassName);
        if (szAppName[0])
-            cls = MSSTYLES_FindClass(tfActiveTheme, szAppName, szClassName);
-        else
-            cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName);
+        {
+            /* If the application class is already set then fail */
+            if (pszAppName) return NULL;
+            pszAppName = szAppName;
+        }
+        cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName);

        /* Fall back to default class if the specified subclass is not found */
        if (!cls) cls = MSSTYLES_FindClass(tfActiveTheme, NULL, szClassName);
@@ -1088,9 +1091,12 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U
    if(!cls && *start) {
        parse_app_class_name(start, szAppName, szClassName);
        if (szAppName[0])
-            cls = MSSTYLES_FindClass(tfActiveTheme, szAppName, szClassName);
-        else
-            cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName);
+        {
+            /* If the application class is already set then fail */
+            if (pszAppName) return NULL;
+            pszAppName = szAppName;
+        }
+        cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName);

        /* Fall back to default class if the specified subclass is not found */
        if (!cls) cls = MSSTYLES_FindClass(tfActiveTheme, NULL, szClassName);

--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -562,9 +562,7 @@ static void test_OpenThemeData(void)
    ok(hRes == S_OK, "Got unexpected hr %#lx.\n", hRes);
    SetLastError(0xdeadbeef);
    hTheme = OpenThemeData(hWnd, L"explorer::treeview");
-    todo_wine
    ok(!hTheme, "OpenThemeData() should fail\n");
-    todo_wine
    ok(GetLastError() == E_PROP_ID_UNSUPPORTED, "Got unexpected %#lx.\n", GetLastError());
    SetWindowTheme(hWnd, NULL, NULL);