Be a bit more graceful on NULL property sheet titles.

40734af7 · Marcus Meissner · Alexandre Julliard · 24352375 · 40734af7
Commit 40734af7 authored Jul 26, 2001 by Marcus Meissner Committed by Alexandre Julliard Jul 26, 2001
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

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

No files found.
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -302,13 +302,14 @@ BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEA lppsp,
    {
      char szTitle[256];
      
-      if ( !LoadStringA( lppsp->hInstance, (UINT) lppsp->pszTitle, szTitle, 256 ) )
-	return FALSE;
+      if (LoadStringA( lppsp->hInstance, (UINT)lppsp->pszTitle,szTitle,256 )) {
+        psInfo->proppage[index].pszText = HEAP_strdupAtoW( GetProcessHeap(), 0, szTitle );
+      } else {
+        psInfo->proppage[index].pszText = HEAP_strdupAtoW( GetProcessHeap(), 0, "(null)" );
+	FIXME("Could not load resource #%04x?\n",LOWORD(lppsp->pszTitle));
+      }
      
-      psInfo->proppage[index].pszText = HEAP_strdupAtoW( GetProcessHeap(),
-							 0, szTitle );
-    }
-    else
+    } else
      psInfo->proppage[index].pszText = HEAP_strdupAtoW(GetProcessHeap(),
 							0,
 							lppsp->pszTitle);