Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
ebe35f6f
Commit
ebe35f6f
authored
Sep 26, 2022
by
Piotr Caban
Committed by
Alexandre Julliard
Oct 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32: Add support for adding extra data in CreatePropertySheetPage.
parent
cae20edb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
propsheet.c
dlls/comctl32/propsheet.c
+5
-4
propsheet.c
dlls/comctl32/tests/propsheet.c
+2
-2
No files found.
dlls/comctl32/propsheet.c
View file @
ebe35f6f
...
...
@@ -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
)
)
{
...
...
dlls/comctl32/tests/propsheet.c
View file @
ebe35f6f
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment