marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32: Add support for PSP_USEHEADERTITLE, PSP_USEHEADERSUBTITLE 

and PSP_HIDEHEADER in CreatePropertySheetPageA/W, handle resource ids.
oldstable
Dmitry Timoshkov 2006-05-05 22:58:55 +09:00 committed by Alexandre Julliard
parent 34cf29efbb
commit 308813112e
1 changed files with 135 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
dlls/comctl32/propsheet.c
View File

@ -2925,26 +2925,69 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA))); memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA)));
ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE; ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE;
if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) && HIWORD( ppsp->u.pszTemplate ) )
{
int len = strlen(lpPropSheetPage->u.pszTemplate);
ppsp->u.pszTemplate = Alloc( len+1 ); if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) )
strcpy( (LPSTR)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate ); {
} if (HIWORD( ppsp->u.pszTemplate ))
if ( (ppsp->dwFlags & PSP_USEICONID) && HIWORD( ppsp->u2.pszIcon ) ) {
{ int len = strlen(lpPropSheetPage->u.pszTemplate) + 1;
PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon); ppsp->u.pszTemplate = Alloc( len );
} strcpy( (LPSTR)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate );
}
}
if ((ppsp->dwFlags & PSP_USETITLE) && HIWORD( ppsp->pszTitle )) if (ppsp->dwFlags & PSP_USEICONID)
{ {
PROPSHEET_AtoW(&ppsp->pszTitle, lpPropSheetPage->pszTitle); if (HIWORD( ppsp->u2.pszIcon ))
} PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon);
else if ( !(ppsp->dwFlags & PSP_USETITLE) ) }
ppsp->pszTitle = NULL;
return (HPROPSHEETPAGE)ppsp; if (ppsp->dwFlags & PSP_USETITLE)
{
if (HIWORD( ppsp->pszTitle ))
PROPSHEET_AtoW( &ppsp->pszTitle, lpPropSheetPage->pszTitle );
else
{
int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), NULL, 0 ) + 1;
ppsp->pszTitle = Alloc( len );
LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), (LPWSTR)ppsp->pszTitle, len );
}
}
else
ppsp->pszTitle = NULL;
if (ppsp->dwFlags & PSP_HIDEHEADER)
ppsp->dwFlags &= ~(PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE);
if (ppsp->dwFlags & PSP_USEHEADERTITLE)
{
if (HIWORD( ppsp->pszHeaderTitle ))
PROPSHEET_AtoW(&ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle);
else
{
int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), NULL, 0 ) + 1;
ppsp->pszHeaderTitle = Alloc( len );
LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), (LPWSTR)ppsp->pszHeaderTitle, len );
}
}
else
ppsp->pszHeaderTitle = NULL;
if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE)
{
if (HIWORD( ppsp->pszHeaderSubTitle ))
PROPSHEET_AtoW(&ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle);
else
{
int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), NULL, 0 ) + 1;
ppsp->pszHeaderSubTitle = Alloc( len );
LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), (LPWSTR)ppsp->pszHeaderSubTitle, len );
}
}
else
ppsp->pszHeaderSubTitle = NULL;
return (HPROPSHEETPAGE)ppsp;
} }
/****************************************************************************** /******************************************************************************
@ -2960,30 +3003,84 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage
ppsp->dwFlags |= PSP_INTERNAL_UNICODE; ppsp->dwFlags |= PSP_INTERNAL_UNICODE;
if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) && HIWORD( ppsp->u.pszTemplate ) ) if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) )
{ {
int len = strlenW(lpPropSheetPage->u.pszTemplate); if (HIWORD( ppsp->u.pszTemplate ))
{
int len = strlenW(lpPropSheetPage->u.pszTemplate) + 1;
ppsp->u.pszTemplate = Alloc( len * sizeof (WCHAR) );
strcpyW( (WCHAR *)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate );
}
}
ppsp->u.pszTemplate = Alloc( (len+1)*sizeof (WCHAR) ); if ( ppsp->dwFlags & PSP_USEICONID )
strcpyW( (WCHAR *)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate ); {
} if (HIWORD( ppsp->u2.pszIcon ))
if ( (ppsp->dwFlags & PSP_USEICONID) && HIWORD( ppsp->u2.pszIcon ) ) {
{ int len = strlenW(lpPropSheetPage->u2.pszIcon) + 1;
int len = strlenW(lpPropSheetPage->u2.pszIcon); ppsp->u2.pszIcon = Alloc( len * sizeof (WCHAR) );
ppsp->u2.pszIcon = Alloc( (len+1)*sizeof (WCHAR) ); strcpyW( (WCHAR *)ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon );
strcpyW( (WCHAR *)ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon ); }
} }
if ((ppsp->dwFlags & PSP_USETITLE) && HIWORD( ppsp->pszTitle )) if (ppsp->dwFlags & PSP_USETITLE)
{ {
int len = strlenW(lpPropSheetPage->pszTitle); if (HIWORD( ppsp->pszTitle ))
ppsp->pszTitle = Alloc( (len+1)*sizeof (WCHAR) ); {
strcpyW( (WCHAR *)ppsp->pszTitle, lpPropSheetPage->pszTitle ); int len = strlenW(lpPropSheetPage->pszTitle) + 1;
} ppsp->pszTitle = Alloc( len * sizeof (WCHAR) );
else if ( !(ppsp->dwFlags & PSP_USETITLE) ) strcpyW( (WCHAR *)ppsp->pszTitle, lpPropSheetPage->pszTitle );
ppsp->pszTitle = NULL; }
else
{
int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), NULL, 0 ) + 1;
ppsp->pszTitle = Alloc( len );
LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), (LPWSTR)ppsp->pszTitle, len );
}
}
else
ppsp->pszTitle = NULL;
return (HPROPSHEETPAGE)ppsp; if (ppsp->dwFlags & PSP_HIDEHEADER)
ppsp->dwFlags &= ~(PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE);
if (ppsp->dwFlags & PSP_USEHEADERTITLE)
{
if (HIWORD( ppsp->pszHeaderTitle ))
{
int len = strlenW(lpPropSheetPage->pszHeaderTitle) + 1;
ppsp->pszHeaderTitle = Alloc( len * sizeof (WCHAR) );
strcpyW( (WCHAR *)ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle );
}
else
{
int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), NULL, 0 ) + 1;
ppsp->pszHeaderTitle = Alloc( len );
LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), (LPWSTR)ppsp->pszHeaderTitle, len );
}
}
else
ppsp->pszHeaderTitle = NULL;
if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE)
{
if (HIWORD( ppsp->pszHeaderSubTitle ))
{
int len = strlenW(lpPropSheetPage->pszHeaderSubTitle) + 1;
ppsp->pszHeaderSubTitle = Alloc( len * sizeof (WCHAR) );
strcpyW( (WCHAR *)ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle );
}
else
{
int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), NULL, 0 ) + 1;
ppsp->pszHeaderSubTitle = Alloc( len );
LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), (LPWSTR)ppsp->pszHeaderSubTitle, len );
}
}
else
ppsp->pszHeaderSubTitle = NULL;
return (HPROPSHEETPAGE)ppsp;
} }
/****************************************************************************** /******************************************************************************