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

mshtml: Use IUri instead of wine_url in before_async_open.

This commit is contained in:
Jacek Caban 2011-06-23 13:45:34 +02:00 committed by Alexandre Julliard
parent f7b8eccd5f
commit 7a0363cd94
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dlls/mshtml/nsio.c
View File

@ -126,7 +126,7 @@ HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret)
return S_OK; return S_OK;
} }
static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url) static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, BSTR url)
{ {
IOleCommandTarget *cmdtrg = NULL; IOleCommandTarget *cmdtrg = NULL;
HRESULT hres; HRESULT hres;
@ -136,13 +136,12 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url)
VARIANT varUrl, varRes; VARIANT varUrl, varRes;
V_VT(&varUrl) = VT_BSTR; V_VT(&varUrl) = VT_BSTR;
V_BSTR(&varUrl) = SysAllocString(url); V_BSTR(&varUrl) = url;
V_VT(&varRes) = VT_BOOL; V_VT(&varRes) = VT_BOOL;
hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 67, 0, &varUrl, &varRes); hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 67, 0, &varUrl, &varRes);
IOleCommandTarget_Release(cmdtrg); IOleCommandTarget_Release(cmdtrg);
SysFreeString(V_BSTR(&varUrl));
if(SUCCEEDED(hres) && !V_BOOL(&varRes)) { if(SUCCEEDED(hres) && !V_BOOL(&varRes)) {
TRACE("got VARIANT_FALSE, do not load\n"); TRACE("got VARIANT_FALSE, do not load\n");
@ -153,11 +152,10 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, LPCWSTR url)
return TRUE; return TRUE;
} }
static BOOL before_async_open(nsChannel *channel, NSContainer *container) static nsresult before_async_open(nsChannel *channel, NSContainer *container, BOOL *cancel)
{ {
HTMLDocumentObj *doc = container->doc; HTMLDocumentObj *doc = container->doc;
DWORD hlnf = 0; DWORD hlnf = 0;
BOOL cancel;
HRESULT hres; HRESULT hres;
if(!doc) { if(!doc) {
@ -169,14 +167,31 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container)
doc = container_iter->doc; doc = container_iter->doc;
} }
if(!doc->client) if(!doc->client) {
return TRUE; *cancel = TRUE;
return NS_OK;
}
if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) if(!hlnf) {
return FALSE; BSTR display_uri;
BOOL b;
hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, &cancel); hres = IUri_GetDisplayUri(channel->uri->uri, &display_uri);
return FAILED(hres) || cancel; if(FAILED(hres))
return NS_ERROR_FAILURE;
b = !exec_shldocvw_67(doc, display_uri);
SysFreeString(display_uri);
if(b) {
*cancel = FALSE;
return NS_OK;
}
}
hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, cancel);
if(FAILED(hres))
*cancel = TRUE;
return NS_OK;
} }
HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, DWORD flags) HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, DWORD flags)
@ -948,7 +963,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
{ {
nsChannel *This = impl_from_nsIHttpChannel(iface); nsChannel *This = impl_from_nsIHttpChannel(iface);
HTMLWindow *window = NULL; HTMLWindow *window = NULL;
BOOL open = TRUE; BOOL cancel = FALSE;
nsresult nsres = NS_OK; nsresult nsres = NS_OK;
TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url));
@ -967,7 +982,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
if(This->uri->container->doc) if(This->uri->container->doc)
FIXME("nscontainer->doc = %p\n", This->uri->container->doc); FIXME("nscontainer->doc = %p\n", This->uri->container->doc);
b = before_async_open(This, This->uri->container); nsres = before_async_open(This, This->uri->container, &b);
if(NS_FAILED(nsres))
return nsres;
if(b) if(b)
FIXME("Navigation not cancelled\n"); FIXME("Navigation not cancelled\n");
return NS_ERROR_UNEXPECTED; return NS_ERROR_UNEXPECTED;
@ -1003,17 +1020,17 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
This->content_type = heap_strdupWtoA(window->doc_obj->mime); This->content_type = heap_strdupWtoA(window->doc_obj->mime);
} }
open = FALSE; cancel = TRUE;
}else { }else {
open = !before_async_open(This, window->doc_obj->nscontainer); nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel);
if(!open) { if(NS_SUCCEEDED(nsres) && cancel) {
TRACE("canceled\n"); TRACE("canceled\n");
nsres = NS_ERROR_UNEXPECTED; nsres = NS_ERROR_UNEXPECTED;
} }
} }
} }
if(open) if(!cancel)
nsres = async_open(This, window, This->uri->is_doc_uri, aListener, aContext); nsres = async_open(This, window, This->uri->is_doc_uri, aListener, aContext);
if(NS_SUCCEEDED(nsres) && This->load_group) { if(NS_SUCCEEDED(nsres) && This->load_group) {