Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
2686b9b5
Commit
2686b9b5
authored
12 years ago
by
Erich Hoover
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
hhctrl.ocx: Permit WS_CHILD help windows.
parent
97bcef99
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/hhctrl.ocx/help.c
+12
-4
12 additions, 4 deletions
dlls/hhctrl.ocx/help.c
dlls/hhctrl.ocx/hhctrl.c
+2
-2
2 additions, 2 deletions
dlls/hhctrl.ocx/hhctrl.c
dlls/hhctrl.ocx/hhctrl.h
+1
-1
1 addition, 1 deletion
dlls/hhctrl.ocx/hhctrl.h
with
15 additions
and
7 deletions
dlls/hhctrl.ocx/help.c
+
12
−
4
View file @
2686b9b5
...
...
@@ -1585,7 +1585,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
static
BOOL
HH_CreateHelpWindow
(
HHInfo
*
info
)
{
HWND
hWnd
;
HWND
hWnd
,
parent
=
0
;
RECT
winPos
=
info
->
WinType
.
rcWindowPos
;
WNDCLASSEXW
wcex
;
DWORD
dwStyles
,
dwExStyles
;
...
...
@@ -1613,7 +1613,11 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
/* Read in window parameters if available */
if
(
info
->
WinType
.
fsValidMembers
&
HHWIN_PARAM_STYLES
)
dwStyles
=
info
->
WinType
.
dwStyles
|
WS_OVERLAPPEDWINDOW
;
{
dwStyles
=
info
->
WinType
.
dwStyles
;
if
(
!
(
info
->
WinType
.
dwStyles
&
WS_CHILD
))
dwStyles
|=
WS_OVERLAPPEDWINDOW
;
}
else
dwStyles
=
WS_OVERLAPPEDWINDOW
|
WS_VISIBLE
|
WS_CLIPSIBLINGS
|
WS_CLIPCHILDREN
;
...
...
@@ -1655,8 +1659,11 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
caption
=
info
->
WinType
.
pszCaption
;
if
(
!*
caption
)
caption
=
info
->
pCHMInfo
->
defTitle
;
if
(
info
->
WinType
.
dwStyles
&
WS_CHILD
)
parent
=
info
->
WinType
.
hwndCaller
;
hWnd
=
CreateWindowExW
(
dwExStyles
,
windowClassW
,
caption
,
dwStyles
,
x
,
y
,
width
,
height
,
NULL
,
NULL
,
hhctrl_hinstance
,
NULL
);
dwStyles
,
x
,
y
,
width
,
height
,
parent
,
NULL
,
hhctrl_hinstance
,
NULL
);
if
(
!
hWnd
)
return
FALSE
;
...
...
@@ -1773,7 +1780,7 @@ void ReleaseHelpViewer(HHInfo *info)
OleUninitialize
();
}
HHInfo
*
CreateHelpViewer
(
LPCWSTR
filename
)
HHInfo
*
CreateHelpViewer
(
LPCWSTR
filename
,
HWND
caller
)
{
HHInfo
*
info
=
heap_alloc_zero
(
sizeof
(
HHInfo
));
int
i
;
...
...
@@ -1796,6 +1803,7 @@ HHInfo *CreateHelpViewer(LPCWSTR filename)
ReleaseHelpViewer
(
info
);
return
NULL
;
}
info
->
WinType
.
hwndCaller
=
caller
;
if
(
!
CreateViewer
(
info
))
{
ReleaseHelpViewer
(
info
);
...
...
This diff is collapsed.
Click to expand it.
dlls/hhctrl.ocx/hhctrl.c
+
2
−
2
View file @
2686b9b5
...
...
@@ -181,7 +181,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
}
index
=
default_index
;
info
=
CreateHelpViewer
(
fullname
);
info
=
CreateHelpViewer
(
fullname
,
caller
);
if
(
!
info
)
{
heap_free
(
default_index
);
...
...
@@ -253,7 +253,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
return
0
;
}
info
=
CreateHelpViewer
(
fullname
);
info
=
CreateHelpViewer
(
fullname
,
caller
);
if
(
!
info
)
return
NULL
;
...
...
This diff is collapsed.
Click to expand it.
dlls/hhctrl.ocx/hhctrl.h
+
1
−
1
View file @
2686b9b5
...
...
@@ -194,7 +194,7 @@ IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN;
LPWSTR
FindContextAlias
(
CHMInfo
*
,
DWORD
)
DECLSPEC_HIDDEN
;
WCHAR
*
GetDocumentTitle
(
CHMInfo
*
,
LPCWSTR
)
DECLSPEC_HIDDEN
;
HHInfo
*
CreateHelpViewer
(
LPCWSTR
)
DECLSPEC_HIDDEN
;
HHInfo
*
CreateHelpViewer
(
LPCWSTR
,
HWND
)
DECLSPEC_HIDDEN
;
void
ReleaseHelpViewer
(
HHInfo
*
)
DECLSPEC_HIDDEN
;
BOOL
NavigateToUrl
(
HHInfo
*
,
LPCWSTR
)
DECLSPEC_HIDDEN
;
BOOL
NavigateToChm
(
HHInfo
*
,
LPCWSTR
,
LPCWSTR
)
DECLSPEC_HIDDEN
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment