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

comctl32: Add support for adding extra data in CreatePropertySheetPage.

Browse source
This commit is contained in:
Piotr Caban 2022-09-26 17:23:21 +02:00 committed by Alexandre Julliard
parent cae20edb0b
commit ebe35f6f0a
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/comctl32/propsheet.c
View file

@ -103,6 +103,7 @@ struct _PSP
{
PROPSHEETPAGEA pspA;
PROPSHEETPAGEW pspW;
BYTE data[1];
};
};
@ -3076,10 +3077,10 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
if (lpPropSheetPage->dwSize < PROPSHEETPAGEA_V1_SIZE)
return NULL;
ret = Alloc(sizeof(*ret));
ret = Alloc(FIELD_OFFSET(struct _PSP, data[lpPropSheetPage->dwSize]));
ret->magic = HPROPSHEETPAGE_MAGIC;
ppsp = &ret->pspA;
memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA)));
memcpy(ppsp, lpPropSheetPage, lpPropSheetPage->dwSize);
if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) )
{
@ -3131,11 +3132,11 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage
if (lpPropSheetPage->dwSize < PROPSHEETPAGEW_V1_SIZE)
return NULL;
ret = Alloc(sizeof(*ret));
ret = Alloc(FIELD_OFFSET(struct _PSP, data[lpPropSheetPage->dwSize]));
ret->magic = HPROPSHEETPAGE_MAGIC;
ret->unicode = TRUE;
ppsp = &ret->pspW;
memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW)));
memcpy(ppsp, lpPropSheetPage, lpPropSheetPage->dwSize);
if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) )
{

4
dlls/comctl32/tests/propsheet.c
View file

@ -1058,7 +1058,7 @@ static UINT CALLBACK proppage_callback_a(HWND hwnd, UINT msg, PROPSHEETPAGEA *ps
if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called))
{
struct custom_proppage *extra_data = (struct custom_proppage *)psp;
todo_wine ok(extra_data->extra_data == 0x1234, "Expected extra_data to be preserved, got %lx\n",
ok(extra_data->extra_data == 0x1234, "Expected extra_data to be preserved, got %lx\n",
extra_data->extra_data);
}
@ -1092,7 +1092,7 @@ static UINT CALLBACK proppage_callback_w(HWND hwnd, UINT msg, PROPSHEETPAGEW *ps
if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called))
{
struct custom_proppage *extra_data = (struct custom_proppage *)psp;
todo_wine ok(extra_data->extra_data == 0x4321, "Expected extra_data to be preserved, got %lx\n",
ok(extra_data->extra_data == 0x4321, "Expected extra_data to be preserved, got %lx\n",
extra_data->extra_data);
}