comctl32: Use the dialog template caption as default propsheet title.

232a44ed · Hans Leidekker · Alexandre Julliard · a41ba1c3 · 232a44ed
Commit 232a44ed authored Oct 29, 2012 by Hans Leidekker Committed by Alexandre Julliard Oct 29, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

propsheet.c dlls/comctl32/propsheet.c +5 -6

No files found.
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -555,13 +555,12 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp,

    if (IS_INTRESOURCE( lppsp->pszTitle ))
    {
-      if (!LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle,szTitle,sizeof(szTitle)/sizeof(szTitle[0]) ))
-      {
-        pTitle = pszNull;
-	FIXME("Could not load resource #%04x?\n",LOWORD(lppsp->pszTitle));
-      }
-      else
+      if (LoadStringW( lppsp->hInstance, (DWORD_PTR)lppsp->pszTitle, szTitle, sizeof(szTitle)/sizeof(szTitle[0]) ))
        pTitle = szTitle;
+      else if (*p)
+        pTitle = p;
+      else
+        pTitle = pszNull;
    }
    else
      pTitle = lppsp->pszTitle;