Module: wine Branch: master Commit: 447f1c89dca3741e9f87b1e1de52146370adce09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447f1c89dca3741e9f87b1e1de... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:44:45 2012 +0200 mshtml: Get rid of no longer needed support for new window navigation in before_async_open. --- dlls/mshtml/nsio.c | 25 +++++-------------------- 1 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b2a8aaa..1be94e8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -225,18 +225,8 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO { HTMLDocumentObj *doc = container->doc; BSTR display_uri; - DWORD hlnf = 0; HRESULT hres; - if(!doc) { - NSContainer *container_iter = container; - - hlnf = HLNF_OPENINNEWWINDOW; - while(!container_iter->doc) - container_iter = container_iter->parent; - doc = container_iter->doc; - } - if(!doc->client) { *cancel = TRUE; return NS_OK; @@ -246,18 +236,13 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO if(FAILED(hres)) return NS_ERROR_FAILURE; - if(!hlnf) { - BOOL b; - - b = !exec_shldocvw_67(doc, display_uri); - if(b) { - SysFreeString(display_uri); - *cancel = FALSE; - return NS_OK; - } + if(!exec_shldocvw_67(doc, display_uri)) { + SysFreeString(display_uri); + *cancel = FALSE; + return NS_OK; } - hres = hlink_frame_navigate(&doc->basedoc, display_uri, channel, hlnf, cancel); + hres = hlink_frame_navigate(&doc->basedoc, display_uri, channel, 0, cancel); SysFreeString(display_uri); if(FAILED(hres)) *cancel = TRUE;