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

mshtml: Try getting window from notification callback if load group is not available in AsyncOpen.

Browse Source
This commit is contained in:
Jacek Caban 2010-09-17 18:33:32 +02:00 committed by Alexandre Julliard
parent d4071b56a1
commit e081b65aee
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/mshtml/nsio.c
View File

@ -882,16 +882,13 @@ static HTMLWindow *get_window_from_load_group(nsChannel *This)
static HTMLWindow *get_channel_window(nsChannel *This)
{
nsIRequestObserver *req_observer;
nsIWebProgress *web_progress;
nsIDOMWindow *nswindow;
HTMLWindow *window;
nsresult nsres;
if(!This->load_group) {
ERR("NULL load_group\n");
return NULL;
}
if(This->load_group) {
nsIRequestObserver *req_observer;
nsres = nsILoadGroup_GetGroupObserver(This->load_group, &req_observer);
if(NS_FAILED(nsres) || !req_observer) {
@ -905,6 +902,16 @@ static HTMLWindow *get_channel_window(nsChannel *This)
ERR("Could not get nsIWebProgress iface: %08x\n", nsres);
return NULL;
}
}else if(This->notif_callback) {
nsres = nsIInterfaceRequestor_GetInterface(This->notif_callback, &IID_nsIWebProgress, (void**)&web_progress);
if(NS_FAILED(nsres)) {
ERR("GetInterface(IID_nsIWebProgress failed: %08x\n", nsres);
return NULL;
}
}else {
ERR("no load group nor notif callback\n");
return NULL;
}
nsres = nsIWebProgress_GetDOMWindow(web_progress, &nswindow);
nsIWebProgress_Release(web_progress);
@ -1008,8 +1015,12 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
if(This->uri->window_ref && This->uri->window_ref->window) {
window = This->uri->window_ref->window;
IHTMLWindow2_AddRef(HTMLWINDOW2(window));
}else if(This->load_group) {
}else {
/* FIXME: Analyze removing get_window_from_load_group call */
if(This->load_group)
window = get_window_from_load_group(This);
if(!window)
window = get_channel_window(This);
if(window)
set_uri_window(This->uri, window);
}