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

mshtml: Added nsIIOService::NewChannelFromURI2 semi-stub implementation.

This commit is contained in:
Jacek Caban 2015-07-02 17:50:10 +02:00 committed by Alexandre Julliard
parent bca49f1403
commit 7f7e460a75
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/mshtml/nsio.c
View File

@ -3580,28 +3580,16 @@ static nsresult NSAPI nsIOService_NewFileURI(nsIIOService *iface, nsIFile *aFile
return nsIIOService_NewFileURI(nsio, aFile, _retval); return nsIIOService_NewFileURI(nsio, aFile, _retval);
} }
static nsresult NSAPI nsIOService_NewChannelFromURI2(nsIIOService *iface, nsIURI *aURI, static nsresult new_channel_from_uri(nsIURI *uri, nsIChannel **_retval)
nsIDOMNode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, nsIPrincipal *aTriggeringPrincipal,
UINT32 aSecurityFlags, UINT32 aContentPolicyType, nsIChannel **_retval)
{
FIXME("(%p %p %p %p %x %d %p)\n", aURI, aLoadingNode, aLoadingPrincipal, aTriggeringPrincipal,
aSecurityFlags, aContentPolicyType, _retval);
return NS_ERROR_NOT_IMPLEMENTED;
}
static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI *aURI,
nsIChannel **_retval)
{ {
nsWineURI *wine_uri; nsWineURI *wine_uri;
nsChannel *ret; nsChannel *ret;
nsresult nsres; nsresult nsres;
TRACE("(%p %p)\n", aURI, _retval); nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri);
nsres = nsIURI_QueryInterface(aURI, &IID_nsWineURI, (void**)&wine_uri);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
TRACE("Could not get nsWineURI: %08x\n", nsres); TRACE("Could not get nsWineURI: %08x\n", nsres);
return nsIIOService_NewChannelFromURI(nsio, aURI, _retval); return nsIIOService_NewChannelFromURI(nsio, uri, _retval);
} }
nsres = create_nschannel(wine_uri, &ret); nsres = create_nschannel(wine_uri, &ret);
@ -3609,13 +3597,29 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
return nsres; return nsres;
nsIURI_AddRef(aURI); nsIURI_AddRef(uri);
ret->original_uri = aURI; ret->original_uri = uri;
*_retval = (nsIChannel*)&ret->nsIHttpChannel_iface; *_retval = (nsIChannel*)&ret->nsIHttpChannel_iface;
return NS_OK; return NS_OK;
} }
static nsresult NSAPI nsIOService_NewChannelFromURI2(nsIIOService *iface, nsIURI *aURI,
nsIDOMNode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, nsIPrincipal *aTriggeringPrincipal,
UINT32 aSecurityFlags, UINT32 aContentPolicyType, nsIChannel **_retval)
{
FIXME("(%p %p %p %p %x %d %p) semi-stub\n", aURI, aLoadingNode, aLoadingPrincipal, aTriggeringPrincipal,
aSecurityFlags, aContentPolicyType, _retval);
return new_channel_from_uri(aURI, _retval);
}
static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI *aURI,
nsIChannel **_retval)
{
TRACE("(%p %p)\n", aURI, _retval);
return new_channel_from_uri(aURI, _retval);
}
static nsresult NSAPI nsIOService_NewChannel2(nsIIOService *iface, const nsACString *aSpec, static nsresult NSAPI nsIOService_NewChannel2(nsIIOService *iface, const nsACString *aSpec,
const char *aOriginCharset, nsIURI *aBaseURI, nsIDOMNode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, const char *aOriginCharset, nsIURI *aBaseURI, nsIDOMNode *aLoadingNode, nsIPrincipal *aLoadingPrincipal,
nsIPrincipal *aTriggeringPrincipal, UINT32 aSecurityFlags, UINT32 aContentPolicyType, nsIChannel **_retval) nsIPrincipal *aTriggeringPrincipal, UINT32 aSecurityFlags, UINT32 aContentPolicyType, nsIChannel **_retval)