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
221bb426
Commit
221bb426
authored
Aug 14, 2015
by
Jacek Caban
Committed by
Alexandre Julliard
Aug 17, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ieframe: Store container IOleCommandTarget in DocHost.
parent
92468f78
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
18 deletions
+19
-18
dochost.c
dlls/ieframe/dochost.c
+5
-0
ieframe.h
dlls/ieframe/ieframe.h
+1
-0
oleobject.c
dlls/ieframe/oleobject.c
+11
-0
webbrowser.c
dlls/ieframe/webbrowser.c
+2
-18
No files found.
dlls/ieframe/dochost.c
View file @
221bb426
...
...
@@ -582,6 +582,11 @@ void release_dochost_client(DocHost *This)
IOleInPlaceFrame_Release
(
This
->
frame
);
This
->
frame
=
NULL
;
}
if
(
This
->
olecmd
)
{
IOleCommandTarget_Release
(
This
->
olecmd
);
This
->
olecmd
=
NULL
;
}
}
static
inline
DocHost
*
impl_from_IOleCommandTarget
(
IOleCommandTarget
*
iface
)
...
...
dlls/ieframe/ieframe.h
View file @
221bb426
...
...
@@ -128,6 +128,7 @@ struct DocHost {
IDispatch
*
client_disp
;
IDocHostUIHandler
*
hostui
;
IOleInPlaceFrame
*
frame
;
IOleCommandTarget
*
olecmd
;
IUnknown
*
document
;
IOleDocumentView
*
view
;
...
...
dlls/ieframe/oleobject.c
View file @
221bb426
...
...
@@ -458,6 +458,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
{
WebBrowser
*
This
=
impl_from_IOleObject
(
iface
);
IDocHostUIHandler
*
hostui
;
IOleCommandTarget
*
olecmd
;
IOleContainer
*
container
;
IDispatch
*
disp
;
HRESULT
hres
;
...
...
@@ -502,9 +503,19 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE
ITargetContainer_Release
(
target_container
);
}
hres
=
IOleContainer_QueryInterface
(
container
,
&
IID_IOleCommandTarget
,
(
void
**
)
&
olecmd
);
if
(
FAILED
(
hres
))
olecmd
=
NULL
;
IOleContainer_Release
(
container
);
}
else
{
hres
=
IOleClientSite_QueryInterface
(
This
->
client
,
&
IID_IOleCommandTarget
,
(
void
**
)
&
olecmd
);
if
(
FAILED
(
hres
))
olecmd
=
NULL
;
}
This
->
doc_host
.
olecmd
=
olecmd
;
create_shell_embedding_hwnd
(
This
);
on_offlineconnected_change
(
This
);
...
...
dlls/ieframe/webbrowser.c
View file @
221bb426
...
...
@@ -1206,33 +1206,17 @@ static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text
static
void
WINAPI
DocHostContainer_SetURL
(
DocHost
*
This
,
LPCWSTR
url
)
{
}
static
HRESULT
DocHostContainer_exec
(
DocHost
*
doc_host
,
const
GUID
*
cmd_group
,
DWORD
cmdid
,
DWORD
execopt
,
VARIANT
*
in
,
VARIANT
*
out
)
{
WebBrowser
*
This
=
impl_from_DocHost
(
doc_host
);
IOleCommandTarget
*
cmdtrg
=
NULL
;
HRESULT
hres
;
if
(
This
->
client
)
{
hres
=
IOleClientSite_QueryInterface
(
This
->
client
,
&
IID_IOleCommandTarget
,
(
void
**
)
&
cmdtrg
);
if
(
FAILED
(
hres
))
cmdtrg
=
NULL
;
}
if
(
!
cmdtrg
&&
This
->
container
)
{
hres
=
IOleContainer_QueryInterface
(
This
->
container
,
&
IID_IOleCommandTarget
,
(
void
**
)
&
cmdtrg
);
if
(
FAILED
(
hres
))
cmdtrg
=
NULL
;
}
if
(
!
cmdtrg
)
if
(
!
doc_host
->
olecmd
)
return
E_NOTIMPL
;
hres
=
IOleCommandTarget_Exec
(
cmdtrg
,
cmd_group
,
cmdid
,
execopt
,
in
,
out
);
IOleCommandTarget_Release
(
cmdtrg
);
hres
=
IOleCommandTarget_Exec
(
doc_host
->
olecmd
,
cmd_group
,
cmdid
,
execopt
,
in
,
out
);
if
(
SUCCEEDED
(
hres
))
TRACE
(
"Exec returned %08x %s
\n
"
,
hres
,
debugstr_variant
(
out
));
else
...
...
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