system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 20:28:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

comctl32: Don't use PROPSHEETPAGE structure to store internal HPROPSHEETPAGE data.

Browse source
This commit is contained in:
Piotr Caban 2022-09-26 13:11:56 +02:00 committed by Alexandre Julliard
parent fc767fd589
commit eb5a4f2160
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/comctl32/propsheet.c
View file

@ -97,7 +97,8 @@ typedef struct
struct _PSP
{
ULONG_PTR magic;
DWORD magic;
BOOL unicode;
PROPSHEETPAGEW psp;
PROPSHEETPAGEW callback_psp;
};
@ -149,8 +150,6 @@ typedef struct
static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo";
#define PSP_INTERNAL_UNICODE 0x80000000
#define MAX_CAPTION_LENGTH 255
#define MAX_TABTEXT_LENGTH 255
#define MAX_BUTTONTEXT_LENGTH 64
@ -361,7 +360,7 @@ static const DLGTEMPLATE* HPSP_load_template(HPROPSHEETPAGE hpsp, DWORD *size)
return hpsp->psp.u.pResource;
}
if (hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE)
if (hpsp->unicode)
{
res = FindResourceW(hpsp->psp.hInstance, hpsp->psp.u.pszTemplate,
(LPWSTR)RT_DIALOG);
@ -428,7 +427,7 @@ static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND pa
{
HWND hwnd;
if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE)
if (hpsp->unicode)
{
hwnd = CreateDialogIndirectParamW(hpsp->psp.hInstance, template,
parent, hpsp->psp.pfnDlgProc, (LPARAM)&hpsp->psp);
@ -3017,8 +3016,6 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA)));
}
ppsp->dwFlags &= ~PSP_INTERNAL_UNICODE;
if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) )
{
if (!IS_INTRESOURCE( ppsp->u.pszTemplate ))
@ -3088,6 +3085,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage
ret = Alloc(sizeof(*ret));
ret->magic = HPROPSHEETPAGE_MAGIC;
ret->unicode = TRUE;
ppsp = &ret->psp;
memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW)));
/* original data is used for callback notifications */
@ -3097,8 +3095,6 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage
min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW)));
}
ppsp->dwFlags |= PSP_INTERNAL_UNICODE;
if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) )
{
if (!IS_INTRESOURCE( ppsp->u.pszTemplate ))