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

mshtml: Access document object via browser object in handle_navigation_error and handle_extern_mime_navigation. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-03-14 14:13:54 +01:00 committed by Alexandre Julliard
parent 225b2f67b1
commit 5ba1725491
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/mshtml/navigate.c
View File

@ -1394,13 +1394,13 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result)
BSTR unk; BSTR unk;
HRESULT hres; HRESULT hres;
if(!This->is_doc_channel || !This->bsc.window) if(!This->is_doc_channel || !This->bsc.window || !This->bsc.window->base.outer_window
|| !This->bsc.window->base.outer_window->browser)
return; return;
outer_window = This->bsc.window->base.outer_window; outer_window = This->bsc.window->base.outer_window;
doc = outer_window->browser->doc;
doc = outer_window->doc_obj; if(!doc->doc_object_service || !doc->client)
if(!doc || !doc->doc_object_service || !doc->client)
return; return;
hres = IDocObjectService_IsErrorUrl(doc->doc_object_service, hres = IDocObjectService_IsErrorUrl(doc->doc_object_service,
@ -1590,10 +1590,10 @@ static void handle_extern_mime_navigation(nsChannelBSC *This)
VARIANT flags; VARIANT flags;
HRESULT hres; HRESULT hres;
if(!This->bsc.window || !This->bsc.window->base.outer_window || !This->bsc.window->base.outer_window->doc_obj) if(!This->bsc.window || !This->bsc.window->base.outer_window || !This->bsc.window->base.outer_window->browser)
return; return;
doc_obj = This->bsc.window->base.outer_window->doc_obj; doc_obj = This->bsc.window->base.outer_window->browser->doc;
hres = IOleClientSite_QueryInterface(doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); hres = IOleClientSite_QueryInterface(doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {