Jacek Caban : mshtml: Use is_main_content_window in a few more places.
Alexandre Julliard
julliard at winehq.org
Thu Mar 14 18:33:21 CDT 2019
Module: wine
Branch: master
Commit: 2b8c553cc98edd319bcae7a1bb3e2a8572930de2
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b8c553cc98edd319bcae7a1bb3e2a8572930de2
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Mar 14 14:12:42 2019 +0100
mshtml: Use is_main_content_window in a few more places.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlwindow.c | 2 +-
dlls/mshtml/persist.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 5d4721e..568a590 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -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)
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index a798650..cb6aab3 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -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)) {
More information about the wine-cvs
mailing list