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

mshtml: Move AddRequest call to OnStartBinding.

This commit is contained in:
Jacek Caban 2007-02-09 20:20:43 +01:00 committed by Alexandre Julliard
parent 2e53ac9d8e
commit 48b445b80d
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/mshtml/navigate.c
View File

@ -267,6 +267,14 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
IBinding_AddRef(pbind);
This->binding = pbind;
if(This->nschannel && This->nschannel->load_group) {
nsresult nsres = nsILoadGroup_AddRequest(This->nschannel->load_group,
(nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext);
if(NS_FAILED(nsres))
ERR("AddRequest failed:%08x\n", nsres);
}
return S_OK;
}

18
dlls/mshtml/nsio.c
View File

@ -634,16 +634,8 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
nsIWebBrowserChrome_Release(NSWBCHROME(container));
if(do_load_from_moniker_hack(This)) {
if(This->load_group) {
nsres = nsILoadGroup_AddRequest(This->load_group,
(nsIRequest*)NSCHANNEL(This), NULL);
if(NS_FAILED(nsres))
ERR("AddRequest failed:%08x\n", nsres);
}
if(do_load_from_moniker_hack(This))
return WINE_NS_LOAD_FROM_MONIKER;
}
}else if(container->doc) {
BOOL cont = before_async_open(This, container);
nsIWebBrowserChrome_Release(NSWBCHROME(container));
@ -726,14 +718,6 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
bscallback->nscontext = aContext;
}
if(This->load_group) {
nsres = nsILoadGroup_AddRequest(This->load_group,
(nsIRequest*)NSCHANNEL(This), NULL);
if(NS_FAILED(nsres))
ERR("AddRequest failed:%08x\n", nsres);
}
start_binding(bscallback);
IBindStatusCallback_Release(STATUSCLB(bscallback));