Jacek Caban : mshtml: Added nsIURI:: Clone implementation on URIs without necko interface associated.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Thu Feb 28 12:41:22 2008 +0100

mshtml: Added nsIURI::Clone implementation on URIs without necko interface associated.

---

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

diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 3517a27..ca269fc 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -1533,29 +1533,28 @@ static nsresult NSAPI nsURI_SchemeIs(nsIWineURI *iface, const char *scheme, PRBo
 static nsresult NSAPI nsURI_Clone(nsIWineURI *iface, nsIURI **_retval)
 {
     nsURI *This = NSURI_THIS(iface);
+    nsIURI *nsuri = NULL;
+    nsIWineURI *wine_uri;
+    nsresult nsres;
 
     TRACE("(%p)->(%p)\n", This, _retval);
 
     if(This->uri) {
-        nsIURI *uri;
-        nsIWineURI *wine_uri;
-        nsresult nsres;
-
-        nsres = nsIURI_Clone(This->uri, &uri);
+        nsres = nsIURI_Clone(This->uri, &nsuri);
         if(NS_FAILED(nsres)) {
             WARN("Clone failed: %08x\n", nsres);
             return nsres;
         }
+    }
 
-        nsres = create_uri(uri, This->container, &wine_uri);
-        *_retval = (nsIURI*)wine_uri;
-        if(NS_SUCCEEDED(nsres))
-            return nsIWineURI_SetWineURL(wine_uri, This->wine_url);
+    nsres = create_uri(nsuri, This->container, &wine_uri);
+    if(NS_FAILED(nsres)) {
+        WARN("create_uri failed: %08x\n", nsres);
         return nsres;
     }
 
-    FIXME("default action not implemented\n");
-    return NS_ERROR_NOT_IMPLEMENTED;
+    *_retval = (nsIURI*)wine_uri;
+    return nsIWineURI_SetWineURL(wine_uri, This->wine_url);
 }
 
 static nsresult NSAPI nsURI_Resolve(nsIWineURI *iface, const nsACString *arelativePath,