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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fc2306d58caa4a57e8c840a59361f93b21974bad
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fc2306d58caa4a57e8c840a59361f93b21974bad

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Nov 30 17:59:53 2009 +0100

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

---

 dlls/mshtml/nsio.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 9e5b2e2..80a32b5 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -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;