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.

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

43
dlls/mshtml/nsio.c
View File

@ -882,27 +882,34 @@ static HTMLWindow *get_window_from_load_group(nsChannel *This)
static HTMLWindow *get_channel_window(nsChannel *This) static HTMLWindow *get_channel_window(nsChannel *This)
{ {
nsIRequestObserver *req_observer;
nsIWebProgress *web_progress; nsIWebProgress *web_progress;
nsIDOMWindow *nswindow; nsIDOMWindow *nswindow;
HTMLWindow *window; HTMLWindow *window;
nsresult nsres; nsresult nsres;
if(!This->load_group) { if(This->load_group) {
ERR("NULL load_group\n"); nsIRequestObserver *req_observer;
return NULL;
}
nsres = nsILoadGroup_GetGroupObserver(This->load_group, &req_observer); nsres = nsILoadGroup_GetGroupObserver(This->load_group, &req_observer);
if(NS_FAILED(nsres) || !req_observer) { if(NS_FAILED(nsres) || !req_observer) {
ERR("GetGroupObserver failed: %08x\n", nsres); ERR("GetGroupObserver failed: %08x\n", nsres);
return NULL; return NULL;
} }
nsres = nsIRequestObserver_QueryInterface(req_observer, &IID_nsIWebProgress, (void**)&web_progress); nsres = nsIRequestObserver_QueryInterface(req_observer, &IID_nsIWebProgress, (void**)&web_progress);
nsIRequestObserver_Release(req_observer); nsIRequestObserver_Release(req_observer);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Could not get nsIWebProgress iface: %08x\n", nsres); 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; return NULL;
} }
@ -1008,8 +1015,12 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
if(This->uri->window_ref && This->uri->window_ref->window) { if(This->uri->window_ref && This->uri->window_ref->window) {
window = This->uri->window_ref->window; window = This->uri->window_ref->window;
IHTMLWindow2_AddRef(HTMLWINDOW2(window)); IHTMLWindow2_AddRef(HTMLWINDOW2(window));
}else if(This->load_group) { }else {
window = get_window_from_load_group(This); /* 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) if(window)
set_uri_window(This->uri, window); set_uri_window(This->uri, window);
} }