Jacek Caban : mshtml: Access document object via browser object in navigate_new_window.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: da055b64569632d16749066496c479d72eee67dd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=da055b64569632d1674906649...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Thu Mar 14 14:14:15 2019 +0100

mshtml: Access document object via browser object in navigate_new_window.

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/mshtml/navigate.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 19dda29..81c9db5 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -2253,8 +2253,11 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam
     nsChannelBSC *bsc;
     HRESULT hres;
 
-    if (window->doc_obj->client) {
-        hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager,
+    if(!window->browser)
+        return E_UNEXPECTED;
+
+    if (window->browser->doc->client) {
+        hres = do_query_service((IUnknown*)window->browser->doc->client, &SID_SNewWindowManager,
                                 &IID_INewWindowManager, (void**)&new_window_mgr);
         if (FAILED(hres)) {
             FIXME("No INewWindowManager\n");
@@ -2272,8 +2275,8 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam
         }
 
         hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, display_uri, name, context_url,
-                NULL, FALSE, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0);
-        window->doc_obj->has_popup = TRUE;
+                NULL, FALSE, window->browser->doc->has_popup ? 0 : NWMF_FIRST, 0);
+        window->browser->doc->has_popup = TRUE;
         SysFreeString(display_uri);
         SysFreeString(context_url);
         INewWindowManager_Release(new_window_mgr);