PATCH: propsheet / NULL title
Marcus Meissner
marcus at jet.franken.de
Wed Jul 25 08:26:02 CDT 2001
Hi,
This relaxes the CollectPage check on lpszTitle NULL, which appears
to be some valid value. At least the 'freecommandlineTools.exe' from
the Borland compiler suite sets it and PSP_USETITLE.
Dunno why, but now the Borland Commandline Compiler install with
only visual glitches left.
Ciao, Marcus
Changelog:
Be a bit more graceful on NULL propertysheet titles.
Index: propsheet.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/propsheet.c,v
retrieving revision 1.53
diff -u -r1.53 propsheet.c
--- propsheet.c 2001/07/24 21:45:22 1.53
+++ propsheet.c 2001/07/25 14:08:51
@@ -302,13 +302,14 @@
{
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);
More information about the wine-patches
mailing list