ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PROPSHEET_CreateDialog() is documented to return -1 on failure, and 

the dialog handle on success.
This commit is contained in:
Adam Gundy 2003-03-07 20:29:58 +00:00 committed by Alexandre Julliard
parent 3ff6a487d6
commit 1af319d9e2
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/comctl32/propsheet.c
View File

@ -118,7 +118,7 @@ const WCHAR PropSheetInfoStr[] =
/****************************************************************************** /******************************************************************************
* Prototypes * Prototypes
*/ */
static BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo); static int PROPSHEET_CreateDialog(PropSheetInfo* psInfo);
static BOOL PROPSHEET_SizeMismatch(HWND hwndDlg, PropSheetInfo* psInfo); static BOOL PROPSHEET_SizeMismatch(HWND hwndDlg, PropSheetInfo* psInfo);
static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo); static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo);
static BOOL PROPSHEET_AdjustButtons(HWND hwndParent, PropSheetInfo* psInfo); static BOOL PROPSHEET_AdjustButtons(HWND hwndParent, PropSheetInfo* psInfo);
@ -552,7 +552,7 @@ BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp,
* *
* Creates the actual property sheet. * Creates the actual property sheet.
*/ */
BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo) int PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
{ {
LRESULT ret; LRESULT ret;
LPCVOID template; LPCVOID template;
@ -568,10 +568,10 @@ BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
if(!(hRes = FindResourceW(COMCTL32_hModule, if(!(hRes = FindResourceW(COMCTL32_hModule,
MAKEINTRESOURCEW(resID), MAKEINTRESOURCEW(resID),
RT_DIALOGW))) RT_DIALOGW)))
return FALSE; return -1;
if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes))) if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes)))
return FALSE; return -1;
/* /*
* Make a copy of the dialog template. * Make a copy of the dialog template.
@ -581,7 +581,7 @@ BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
temp = COMCTL32_Alloc(resSize); temp = COMCTL32_Alloc(resSize);
if (!temp) if (!temp)
return FALSE; return -1;
memcpy(temp, template, resSize); memcpy(temp, template, resSize);
@ -595,11 +595,14 @@ BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
PROPSHEET_DialogProc, PROPSHEET_DialogProc,
(LPARAM)psInfo); (LPARAM)psInfo);
else else
ret = CreateDialogIndirectParamW(psInfo->ppshheader.hInstance, {
(LPDLGTEMPLATEW) temp, ret = (int)CreateDialogIndirectParamW(psInfo->ppshheader.hInstance,
psInfo->ppshheader.hwndParent, (LPDLGTEMPLATEW) temp,
PROPSHEET_DialogProc, psInfo->ppshheader.hwndParent,
(LPARAM)psInfo) ? TRUE : FALSE; PROPSHEET_DialogProc,
(LPARAM)psInfo);
if ( !ret ) ret = -1;
}
COMCTL32_Free(temp); COMCTL32_Free(temp);