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

mshtml: Added support for BSCallback::QueryService(IID_IWindowForBindingUI).

This commit is contained in:
Jacek Caban 2012-05-30 15:49:28 +02:00 committed by Alexandre Julliard
parent cf9d0d320c
commit 3c1e2132e5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/mshtml/navigate.c
View File

@ -582,7 +582,11 @@ static HRESULT WINAPI BSCServiceProvider_QueryService(IServiceProvider *iface,
REFGUID guidService, REFIID riid, void **ppv) REFGUID guidService, REFIID riid, void **ppv)
{ {
BSCallback *This = impl_from_IServiceProvider(iface); BSCallback *This = impl_from_IServiceProvider(iface);
TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
if(This->doc && IsEqualGUID(guidService, &IID_IWindowForBindingUI))
return IServiceProvider_QueryService(&This->doc->basedoc.IServiceProvider_iface, guidService, riid, ppv);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
@ -721,6 +725,8 @@ HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bsc
TRACE("(%p %p %p %p)\n", window, doc, bscallback, bctx); TRACE("(%p %p %p %p)\n", window, doc, bscallback, bctx);
bscallback->doc = doc; bscallback->doc = doc;
if(!doc && window)
bscallback->doc = window->doc;
/* NOTE: IE7 calls IsSystemMoniker here*/ /* NOTE: IE7 calls IsSystemMoniker here*/
@ -992,8 +998,11 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This)
list_remove(&This->bsc.entry); list_remove(&This->bsc.entry);
list_init(&This->bsc.entry); list_init(&This->bsc.entry);
update_window_doc(This->window); update_window_doc(This->window);
if(This->window->doc != This->bsc.doc) if(This->window->doc != This->bsc.doc) {
if(This->bsc.doc)
list_remove(&This->bsc.entry);
This->bsc.doc = This->window->doc; This->bsc.doc = This->window->doc;
}
list_add_head(&This->bsc.doc->bindings, &This->bsc.entry); list_add_head(&This->bsc.doc->bindings, &This->bsc.entry);
if(This->window->readystate != READYSTATE_LOADING) if(This->window->readystate != READYSTATE_LOADING)
set_ready_state(This->window, READYSTATE_LOADING); set_ready_state(This->window, READYSTATE_LOADING);