mshtml: Added nsIURI::Clone implementation on URIs without necko interface associated.
This commit is contained in:
parent
6832c8327d
commit
6a3984c397
@ -1533,29 +1533,28 @@ static nsresult NSAPI nsURI_SchemeIs(nsIWineURI *iface, const char *scheme, PRBo
|
|||||||
static nsresult NSAPI nsURI_Clone(nsIWineURI *iface, nsIURI **_retval)
|
static nsresult NSAPI nsURI_Clone(nsIWineURI *iface, nsIURI **_retval)
|
||||||
{
|
{
|
||||||
nsURI *This = NSURI_THIS(iface);
|
nsURI *This = NSURI_THIS(iface);
|
||||||
|
nsIURI *nsuri = NULL;
|
||||||
|
nsIWineURI *wine_uri;
|
||||||
|
nsresult nsres;
|
||||||
|
|
||||||
TRACE("(%p)->(%p)\n", This, _retval);
|
TRACE("(%p)->(%p)\n", This, _retval);
|
||||||
|
|
||||||
if(This->uri) {
|
if(This->uri) {
|
||||||
nsIURI *uri;
|
nsres = nsIURI_Clone(This->uri, &nsuri);
|
||||||
nsIWineURI *wine_uri;
|
|
||||||
nsresult nsres;
|
|
||||||
|
|
||||||
nsres = nsIURI_Clone(This->uri, &uri);
|
|
||||||
if(NS_FAILED(nsres)) {
|
if(NS_FAILED(nsres)) {
|
||||||
WARN("Clone failed: %08x\n", nsres);
|
WARN("Clone failed: %08x\n", nsres);
|
||||||
return nsres;
|
return nsres;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
nsres = create_uri(uri, This->container, &wine_uri);
|
nsres = create_uri(nsuri, This->container, &wine_uri);
|
||||||
*_retval = (nsIURI*)wine_uri;
|
if(NS_FAILED(nsres)) {
|
||||||
if(NS_SUCCEEDED(nsres))
|
WARN("create_uri failed: %08x\n", nsres);
|
||||||
return nsIWineURI_SetWineURL(wine_uri, This->wine_url);
|
|
||||||
return nsres;
|
return nsres;
|
||||||
}
|
}
|
||||||
|
|
||||||
FIXME("default action not implemented\n");
|
*_retval = (nsIURI*)wine_uri;
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
return nsIWineURI_SetWineURL(wine_uri, This->wine_url);
|
||||||
}
|
}
|
||||||
|
|
||||||
static nsresult NSAPI nsURI_Resolve(nsIWineURI *iface, const nsACString *arelativePath,
|
static nsresult NSAPI nsURI_Resolve(nsIWineURI *iface, const nsACString *arelativePath,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user