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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 232a44edafd074c092628d65b513fa0674c2cd18
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=232a44edafd074c092628d65b5...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Mon Oct 29 12:11:24 2012 +0100

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

---

 dlls/comctl32/propsheet.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index b2ceee8..b73c448 100644
--- 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;