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

mshtml: Don't fail in NewChannelFromURI if necko failed to create a channel.

This commit is contained in:
Jacek Caban 2009-11-30 17:59:53 +01:00 committed by Alexandre Julliard
parent d0dbf57c36
commit fc2306d58c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/mshtml/nsio.c
View File

@ -2693,20 +2693,14 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI
TRACE("(%p %p)\n", aURI, _retval);
nsres = nsIIOService_NewChannelFromURI(nsio, aURI, &channel);
if(NS_FAILED(nsres) && nsres != NS_ERROR_UNKNOWN_PROTOCOL) {
WARN("NewChannelFromURI failed: %08x\n", nsres);
*_retval = channel;
return nsres;
}
nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri);
if(NS_FAILED(nsres)) {
WARN("Could not get nsIWineURI: %08x\n", nsres);
*_retval = channel;
return channel ? NS_OK : NS_ERROR_UNEXPECTED;
TRACE("Could not get nsIWineURI: %08x\n", nsres);
return nsIIOService_NewChannelFromURI(nsio, aURI, _retval);
}
nsIIOService_NewChannelFromURI(nsio, aURI, &channel);
ret = heap_alloc_zero(sizeof(nsChannel));
ret->lpHttpChannelVtbl = &nsChannelVtbl;