Commit 76d8d022 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Inherit NSContainer in NewURI.

parent 7ceaf5b3
...@@ -1377,6 +1377,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * ...@@ -1377,6 +1377,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval)
{ {
const char *spec = NULL; const char *spec = NULL;
NSContainer *nscontainer = NULL;
nsIURI *uri; nsIURI *uri;
PRBool is_javascript = FALSE; PRBool is_javascript = FALSE;
nsresult nsres; nsresult nsres;
...@@ -1416,7 +1417,24 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * ...@@ -1416,7 +1417,24 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
return NS_OK; return NS_OK;
} }
return create_uri(uri, NULL, _retval); if(aBaseURI) {
nsIWineURI *wine_uri;
nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsIWineURI, (void**)&wine_uri);
if(NS_SUCCEEDED(nsres)) {
nsIWineURI_GetNSContainer(wine_uri, &nscontainer);
nsIWineURI_Release(wine_uri);
}else {
ERR("Could not get nsIWineURI: %08lx\n", nsres);
}
}
nsres = create_uri(uri, nscontainer, _retval);
if(nscontainer)
nsIWebBrowserChrome_Release(NSWBCHROME(nscontainer));
return nsres;
} }
static nsresult NSAPI nsIOService_NewFileURI(nsIIOService *iface, nsIFile *aFile, static nsresult NSAPI nsIOService_NewFileURI(nsIIOService *iface, nsIFile *aFile,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment