mshtml: Don't query for an INewWindowManager if the client site is NULL.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Don't query for an INewWindowManager if the client site is NULL.
02641e33 · Zebediah Figura · Alexandre Julliard · 3559c261 · 02641e33
Commit 02641e33 authored Sep 21, 2017 by Zebediah Figura Committed by Alexandre Julliard Sep 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

navigate.c dlls/mshtml/navigate.c +8 -6

No files found.
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -2246,9 +2246,14 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam
    nsChannelBSC *bsc;
    HRESULT hres;

-    hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager,
-            (void**)&new_window_mgr);
-    if(SUCCEEDED(hres)) {
+    if (window->doc_obj->client) {
+        hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager,
+                                &IID_INewWindowManager, (void**)&new_window_mgr);
+        if (FAILED(hres)) {
+            FIXME("No INewWindowManager\n");
+            return hres;
+        }
+
        hres = IUri_GetDisplayUri(window->uri_nofrag, &context_url);
        if(FAILED(hres))
            return hres;
@@ -2270,9 +2275,6 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam
                *ret = NULL;
            return S_OK;
        }
-    }else {
-        FIXME("No INewWindowManager\n");
-        return E_NOTIMPL;
    }