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
fab93047
Commit
fab93047
authored
Mar 13, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 15, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shdocvw: Store object passed in DOCHOST_DOCCANNAVIGATE command.
parent
c5e53bd6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
2 deletions
+39
-2
dochost.c
dlls/shdocvw/dochost.c
+38
-2
shdocvw.h
dlls/shdocvw/shdocvw.h
+1
-0
No files found.
dlls/shdocvw/dochost.c
View file @
fab93047
...
...
@@ -21,9 +21,14 @@
#include "hlink.h"
#include "exdispid.h"
#include "mshtml.h"
#include "initguid.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
shdocvw
);
DEFINE_OLEGUID
(
CGID_DocHostCmdPriv
,
0x000214D4L
,
0
,
0
);
#define DOCHOST_DOCCANNAVIGATE 0
static
ATOM
doc_view_atom
=
0
;
void
push_dochost_task
(
DocHost
*
This
,
task_header_t
*
task
,
task_proc_t
proc
,
BOOL
send
)
...
...
@@ -314,6 +319,11 @@ void deactivate_document(DocHost *This)
IHlinkTarget
*
hlink
=
NULL
;
HRESULT
hres
;
if
(
This
->
doc_navigate
)
{
IUnknown_Release
(
This
->
doc_navigate
);
This
->
doc_navigate
=
NULL
;
}
if
(
This
->
is_prop_notif
)
advise_prop_notif
(
This
,
FALSE
);
...
...
@@ -425,8 +435,34 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
VARIANT
*
pvaOut
)
{
DocHost
*
This
=
OLECMD_THIS
(
iface
);
FIXME
(
"(%p)->(%s %d %d %p %p)
\n
"
,
This
,
debugstr_guid
(
pguidCmdGroup
),
nCmdID
,
nCmdexecopt
,
pvaIn
,
pvaOut
);
TRACE
(
"(%p)->(%s %d %d %p %p)
\n
"
,
This
,
debugstr_guid
(
pguidCmdGroup
),
nCmdID
,
nCmdexecopt
,
debugstr_variant
(
pvaIn
),
debugstr_variant
(
pvaOut
));
if
(
!
pguidCmdGroup
)
{
FIXME
(
"Unimplemented cmdid %d
\n
"
,
nCmdID
);
return
E_NOTIMPL
;
}
if
(
IsEqualGUID
(
pguidCmdGroup
,
&
CGID_DocHostCmdPriv
))
{
switch
(
nCmdID
)
{
case
DOCHOST_DOCCANNAVIGATE
:
if
(
!
pvaIn
||
V_VT
(
pvaIn
)
!=
VT_UNKNOWN
)
return
E_INVALIDARG
;
if
(
This
->
doc_navigate
)
IUnknown_Release
(
This
->
doc_navigate
);
IUnknown_AddRef
(
V_UNKNOWN
(
pvaIn
));
This
->
doc_navigate
=
V_UNKNOWN
(
pvaIn
);
return
S_OK
;
default:
FIXME
(
"unsupported command %d of CGID_DocHostCmdPriv
\n
"
,
nCmdID
);
return
E_NOTIMPL
;
}
}
FIXME
(
"Unimplemented group %s
\n
"
,
debugstr_guid
(
pguidCmdGroup
));
return
E_NOTIMPL
;
}
...
...
dlls/shdocvw/shdocvw.h
View file @
fab93047
...
...
@@ -92,6 +92,7 @@ struct DocHost {
IUnknown
*
document
;
IOleDocumentView
*
view
;
IUnknown
*
doc_navigate
;
HWND
hwnd
;
HWND
frame_hwnd
;
...
...
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