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

mshtml: Use is_main_content_window in a few more places. 

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:12:42 +01:00 committed by Alexandre Julliard
parent d150cc192e
commit 2b8c553cc9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/htmlwindow.c
View File

@ -127,7 +127,7 @@ static void detach_inner_window(HTMLInnerWindow *window)
IHTMLWindow2_Release(&child->base.IHTMLWindow2_iface);
}
if(outer_window && outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window)
if(outer_window && is_main_content_window(outer_window))
window->doc->basedoc.cp_container.forward_container = NULL;
if(doc)

14
dlls/mshtml/persist.c
View File

@ -115,9 +115,9 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags)
HRESULT hres;
if(This->mon) {
if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) {
if(This == This->doc_obj->basedoc.window)
notify_travellog_update(This->doc_obj);
if(This->browser && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) {
if(is_main_content_window(This))
notify_travellog_update(This->browser->doc);
else
TRACE("Skipping travellog update for frame navigation.\n");
}
@ -351,8 +351,8 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind
IUri *uri;
HRESULT hres;
if(window->doc_obj && window->doc_obj->basedoc.window == window)
doc_obj = window->doc_obj;
if(is_main_content_window(window))
doc_obj = window->browser->doc;
hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url);
if(FAILED(hres)) {
@ -436,8 +436,8 @@ static void notif_readystate(HTMLOuterWindow *window)
window->readystate_pending = FALSE;
if(window->doc_obj && window->doc_obj->basedoc.window == window)
call_property_onchanged(&window->doc_obj->basedoc.cp_container, DISPID_READYSTATE);
if(is_main_content_window(window))
call_property_onchanged(&window->browser->doc->basedoc.cp_container, DISPID_READYSTATE);
hres = create_document_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, &event);
if(SUCCEEDED(hres)) {