Skip to content

W
wine-winehq
Commit 26d3e0c5 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

mshtml: Access document object via browser object in super_navigate.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 54323080
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dlls/mshtml/navigate.c
View file @ 26d3e0c5
......@@ -2139,10 +2139,10 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC
if(!uri_nofrag)
return E_FAIL;
if(window->doc_obj->client && !(flags & BINDING_REFRESH)) {
if(window->browser->doc->client && !(flags & BINDING_REFRESH)) {
IOleCommandTarget *cmdtrg;
hres = IOleClientSite_QueryInterface(window->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg);
hres = IOleClientSite_QueryInterface(window->browser->doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg);
if(SUCCEEDED(hres)) {
VARIANT in, out;
BSTR url_str;
......@@ -2187,7 +2187,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC
return hres;
}
prepare_for_binding(&window->doc_obj->basedoc, mon, flags);
prepare_for_binding(&window->browser->doc->basedoc, mon, flags);
hres = IUri_GetScheme(uri, &scheme);
if(SUCCEEDED(hres) && scheme == URL_SCHEME_JAVASCRIPT) {
......@@ -2203,7 +2203,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC
/* Why silently? */
window->readystate = READYSTATE_COMPLETE;
if(!(flags & BINDING_FROMHIST))
call_docview_84(window->doc_obj);
call_docview_84(window->browser->doc);
IUri_AddRef(uri);
task->window = window;
......@@ -2228,7 +2228,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC
/* Silently and repeated when real loading starts? */
window->readystate = READYSTATE_LOADING;
if(!(flags & (BINDING_FROMHIST|BINDING_REFRESH)))
call_docview_84(window->doc_obj);
call_docview_84(window->browser->doc);
task->window = window;
task->bscallback = bsc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment