Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
bc2258d6
Commit
bc2258d6
authored
Oct 02, 2012
by
Erich Hoover
Committed by
Alexandre Julliard
Oct 03, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hhctrl.ocx: Store all the parameters the first time the WinType is filled in.
parent
46fca31c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
chm.c
dlls/hhctrl.ocx/chm.c
+7
-1
No files found.
dlls/hhctrl.ocx/chm.c
View file @
bc2258d6
...
@@ -263,6 +263,13 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override)
...
@@ -263,6 +263,13 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override)
if
(
unhandled_params
)
if
(
unhandled_params
)
FIXME
(
"Unsupported fsValidMembers fields: 0x%x
\n
"
,
unhandled_params
);
FIXME
(
"Unsupported fsValidMembers fields: 0x%x
\n
"
,
unhandled_params
);
dst
->
fsValidMembers
|=
merge
;
if
(
dst
->
cbStruct
==
0
)
{
/* If the structure has not been filled in yet then use all of the values */
dst
->
cbStruct
=
sizeof
(
HH_WINTYPEW
);
merge
=
~
0
;
}
if
(
merge
&
HHWIN_PARAM_PROPERTIES
)
dst
->
fsWinProperties
=
src
->
fsWinProperties
;
if
(
merge
&
HHWIN_PARAM_PROPERTIES
)
dst
->
fsWinProperties
=
src
->
fsWinProperties
;
if
(
merge
&
HHWIN_PARAM_STYLES
)
dst
->
dwStyles
=
src
->
dwStyles
;
if
(
merge
&
HHWIN_PARAM_STYLES
)
dst
->
dwStyles
=
src
->
dwStyles
;
if
(
merge
&
HHWIN_PARAM_EXSTYLES
)
dst
->
dwExStyles
=
src
->
dwExStyles
;
if
(
merge
&
HHWIN_PARAM_EXSTYLES
)
dst
->
dwExStyles
=
src
->
dwExStyles
;
...
@@ -276,7 +283,6 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override)
...
@@ -276,7 +283,6 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override)
if
(
merge
&
HHWIN_PARAM_TABORDER
)
memcpy
(
&
dst
->
tabOrder
,
&
src
->
tabOrder
,
sizeof
(
src
->
tabOrder
));
if
(
merge
&
HHWIN_PARAM_TABORDER
)
memcpy
(
&
dst
->
tabOrder
,
&
src
->
tabOrder
,
sizeof
(
src
->
tabOrder
));
if
(
merge
&
HHWIN_PARAM_HISTORY_COUNT
)
dst
->
cHistory
=
src
->
cHistory
;
if
(
merge
&
HHWIN_PARAM_HISTORY_COUNT
)
dst
->
cHistory
=
src
->
cHistory
;
if
(
merge
&
HHWIN_PARAM_CUR_TAB
)
dst
->
curNavType
=
src
->
curNavType
;
if
(
merge
&
HHWIN_PARAM_CUR_TAB
)
dst
->
curNavType
=
src
->
curNavType
;
dst
->
fsValidMembers
|=
merge
;
/*
/*
* Note: We assume that hwndHelp, hwndCaller, hwndToolBar, hwndNavigation, and hwndHTML cannot be
* Note: We assume that hwndHelp, hwndCaller, hwndToolBar, hwndNavigation, and hwndHTML cannot be
...
...
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