OpenThemeData() now always sets the window theme to the handle

returned (even if that is NULL) - previously, it could happen that when no theme was active or the theme data could not be opened that the window theme remained became then-dangling (and hence subsequent calls to GetWindowTheme() would return that bogus theme).

OpenThemeData() now always sets the window theme to the handle
10092350 · Frank Richter · Alexandre Julliard · be5bf802 · 10092350
Commit 10092350 authored Jul 24, 2005 by Frank Richter Committed by Alexandre Julliard Jul 24, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 13 deletions

system.c dlls/uxtheme/system.c +14 -13

No files found.
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -324,22 +324,23 @@ HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR pszClassList)
    WCHAR szClassBuff[256];
    LPCWSTR pszAppName;
    LPCWSTR pszUseClassList;
-    HTHEME hTheme;
-    TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList));
-    if(!bThemeActive)
-        return NULL;
-
-    pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0]));
-    /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */
-    pszUseClassList = UXTHEME_GetWindowProperty(hwnd, atSubIdList, szClassBuff, sizeof(szClassBuff)/sizeof(szClassBuff[0]));
-    if(!pszUseClassList)
-        pszUseClassList = pszClassList;
+    HTHEME hTheme = NULL;
+    TRACE("(%p,%s)", hwnd, debugstr_w(pszClassList));

-    if (!pszClassList) return NULL;
-    
-    hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList);
+    if(bThemeActive)
+    {
+        pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0]));
+        /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */
+        pszUseClassList = UXTHEME_GetWindowProperty(hwnd, atSubIdList, szClassBuff, sizeof(szClassBuff)/sizeof(szClassBuff[0]));
+        if(!pszUseClassList)
+            pszUseClassList = pszClassList;
+
+        if (pszUseClassList)
+            hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList);
+    }
    if(IsWindow(hwnd))
        SetPropW(hwnd, MAKEINTATOMW(atWindowTheme), hTheme);
+    TRACE(" = %p\n", hTheme);
    return hTheme;
 }