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

mshtml: Inherit NSContainer in NewURI.

This commit is contained in:
Jacek Caban 2006-06-22 16:09:29 +02:00 committed by Alexandre Julliard
parent 7ceaf5b386
commit 76d8d022ca
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/mshtml/nsio.c
View File

@ -1377,6 +1377,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval)
{
const char *spec = NULL;
NSContainer *nscontainer = NULL;
nsIURI *uri;
PRBool is_javascript = FALSE;
nsresult nsres;
@ -1416,7 +1417,24 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
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,