ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Get rid of no longer needed support for new window navigation in before_async_open.

This commit is contained in:
Jacek Caban 2012-07-13 14:44:45 +02:00 committed by Alexandre Julliard
parent 35710be128
commit 447f1c89dc
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/mshtml/nsio.c
View File

@ -225,18 +225,8 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO
{ {
HTMLDocumentObj *doc = container->doc; HTMLDocumentObj *doc = container->doc;
BSTR display_uri; BSTR display_uri;
DWORD hlnf = 0;
HRESULT hres; 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) { if(!doc->client) {
*cancel = TRUE; *cancel = TRUE;
return NS_OK; return NS_OK;
@ -246,18 +236,13 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO
if(FAILED(hres)) if(FAILED(hres))
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
if(!hlnf) { if(!exec_shldocvw_67(doc, display_uri)) {
BOOL b; SysFreeString(display_uri);
*cancel = FALSE;
b = !exec_shldocvw_67(doc, display_uri); return NS_OK;
if(b) {
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); SysFreeString(display_uri);
if(FAILED(hres)) if(FAILED(hres))
*cancel = TRUE; *cancel = TRUE;