Zebediah Figura : mshtml: Don' t query for an INewWindowManager if the client site is NULL.
Alexandre Julliard
julliard at winehq.org
Fri Sep 22 15:49:05 CDT 2017
Module: wine
Branch: master
Commit: 02641e33a98c68435eb70a240f640bdfa2e5fd22
URL: http://source.winehq.org/git/wine.git/?a=commit;h=02641e33a98c68435eb70a240f640bdfa2e5fd22
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Sep 21 09:59:43 2017 -0500
mshtml: Don't query for an INewWindowManager if the client site is NULL.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/navigate.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 423d650..1597de9 100644
--- 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;
}
More information about the wine-cvs
mailing list