Commit 7bbe0d5c authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Open document in a new window in IHlinkTarget::Navigate if the document is not embedded.

parent dc5a75a7
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "mshtml_private.h" #include "mshtml_private.h"
#include "binding.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml); WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
...@@ -83,6 +84,9 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L ...@@ -83,6 +84,9 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L
if(pwzJumpLocation) if(pwzJumpLocation)
FIXME("JumpLocation not supported\n"); FIXME("JumpLocation not supported\n");
if(!This->doc_obj->client)
return navigate_new_window(This->window, This->window->uri, NULL, NULL);
return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL);
} }
......
...@@ -2030,7 +2030,10 @@ HRESULT navigate_new_window(HTMLWindow *window, IUri *uri, const WCHAR *name, IH ...@@ -2030,7 +2030,10 @@ HRESULT navigate_new_window(HTMLWindow *window, IUri *uri, const WCHAR *name, IH
IWebBrowser2_put_Visible(web_browser, VARIANT_TRUE); IWebBrowser2_put_Visible(web_browser, VARIANT_TRUE);
IWebBrowser2_Release(web_browser); IWebBrowser2_Release(web_browser);
*ret = new_window; if(ret)
*ret = new_window;
else
IHTMLWindow2_Release(new_window);
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment