ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Moved Exec(DOCHOST_DOCCANNAVIGATE) call to separated function.

This commit is contained in:
Jacek Caban 2013-09-18 16:57:56 +02:00 committed by Alexandre Julliard
parent f8463f28a9
commit 42c1b3936d
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/mshtml/oleobj.c
View File

@ -210,6 +210,22 @@ void call_docview_84(HTMLDocumentObj *doc)
FIXME("handle result\n"); FIXME("handle result\n");
} }
static void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate)
{
VARIANT var;
if(!doc->client_cmdtrg)
return;
if(doc_can_navigate) {
V_VT(&var) = VT_UNKNOWN;
V_UNKNOWN(&var) = (IUnknown*)&doc->basedoc.window->base.IHTMLWindow2_iface;
}
IOleCommandTarget_Exec(doc->client_cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0,
doc_can_navigate ? &var : NULL, NULL);
}
static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite)
{ {
HTMLDocument *This = impl_from_IOleObject(iface); HTMLDocument *This = impl_from_IOleObject(iface);
@ -359,9 +375,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
IDocObjectService *doc_object_service; IDocObjectService *doc_object_service;
IWebBrowser2 *wb; IWebBrowser2 *wb;
V_VT(&var) = VT_UNKNOWN; set_document_navigation(This->doc_obj, TRUE);
V_UNKNOWN(&var) = (IUnknown*)&This->window->base.IHTMLWindow2_iface;
IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL);
if(browser_service) { if(browser_service) {
hres = IBrowserService_QueryInterface(browser_service, hres = IBrowserService_QueryInterface(browser_service,