mshtml: COM cleanup for the ISupportErrorInfo iface.
This commit is contained in:
parent
a8bb1ab85b
commit
2efc64fbc2
|
@ -1511,23 +1511,26 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp)
|
||||||
update_cp_events(This->window, &This->doc_node->node.event_target, cp, This->doc_node->node.nsnode);
|
update_cp_events(This->window, &This->doc_node->node.event_target, cp, This->doc_node->node.nsnode);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define SUPPINFO_THIS(iface) DEFINE_THIS(HTMLDocument, SupportErrorInfo, iface)
|
static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface)
|
||||||
|
{
|
||||||
|
return CONTAINING_RECORD(iface, HTMLDocument, ISupportErrorInfo_iface);
|
||||||
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **ppv)
|
static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **ppv)
|
||||||
{
|
{
|
||||||
HTMLDocument *This = SUPPINFO_THIS(iface);
|
HTMLDocument *This = impl_from_ISupportErrorInfo(iface);
|
||||||
return htmldoc_query_interface(This, riid, ppv);
|
return htmldoc_query_interface(This, riid, ppv);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface)
|
static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface)
|
||||||
{
|
{
|
||||||
HTMLDocument *This = SUPPINFO_THIS(iface);
|
HTMLDocument *This = impl_from_ISupportErrorInfo(iface);
|
||||||
return htmldoc_addref(This);
|
return htmldoc_addref(This);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface)
|
static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface)
|
||||||
{
|
{
|
||||||
HTMLDocument *This = SUPPINFO_THIS(iface);
|
HTMLDocument *This = impl_from_ISupportErrorInfo(iface);
|
||||||
return htmldoc_release(This);
|
return htmldoc_release(This);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1794,7 +1797,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv)
|
||||||
*ppv = &This->IHTMLDocument2_iface;
|
*ppv = &This->IHTMLDocument2_iface;
|
||||||
}else if(IsEqualGUID(&IID_ISupportErrorInfo, riid)) {
|
}else if(IsEqualGUID(&IID_ISupportErrorInfo, riid)) {
|
||||||
TRACE("(%p)->(IID_ISupportErrorInfo %p)\n", This, ppv);
|
TRACE("(%p)->(IID_ISupportErrorInfo %p)\n", This, ppv);
|
||||||
*ppv = SUPPERRINFO(This);
|
*ppv = &This->ISupportErrorInfo_iface;
|
||||||
}else if(IsEqualGUID(&IID_IPersistHistory, riid)) {
|
}else if(IsEqualGUID(&IID_IPersistHistory, riid)) {
|
||||||
TRACE("(%p)->(IID_IPersistHistory %p)\n", This, ppv);
|
TRACE("(%p)->(IID_IPersistHistory %p)\n", This, ppv);
|
||||||
*ppv = &This->IPersistHistory_iface;
|
*ppv = &This->IPersistHistory_iface;
|
||||||
|
@ -1837,7 +1840,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex)
|
||||||
{
|
{
|
||||||
doc->IHTMLDocument2_iface.lpVtbl = &HTMLDocumentVtbl;
|
doc->IHTMLDocument2_iface.lpVtbl = &HTMLDocumentVtbl;
|
||||||
doc->lpIDispatchExVtbl = &DocDispatchExVtbl;
|
doc->lpIDispatchExVtbl = &DocDispatchExVtbl;
|
||||||
doc->lpSupportErrorInfoVtbl = &SupportErrorInfoVtbl;
|
doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl;
|
||||||
|
|
||||||
doc->unk_impl = unk_impl;
|
doc->unk_impl = unk_impl;
|
||||||
doc->dispex = dispex;
|
doc->dispex = dispex;
|
||||||
|
|
|
@ -363,7 +363,7 @@ struct HTMLDocument {
|
||||||
IHlinkTarget IHlinkTarget_iface;
|
IHlinkTarget IHlinkTarget_iface;
|
||||||
IPersistStreamInit IPersistStreamInit_iface;
|
IPersistStreamInit IPersistStreamInit_iface;
|
||||||
const IDispatchExVtbl *lpIDispatchExVtbl;
|
const IDispatchExVtbl *lpIDispatchExVtbl;
|
||||||
const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl;
|
ISupportErrorInfo ISupportErrorInfo_iface;
|
||||||
const IObjectWithSiteVtbl *lpObjectWithSiteVtbl;
|
const IObjectWithSiteVtbl *lpObjectWithSiteVtbl;
|
||||||
IOleContainer IOleContainer_iface;
|
IOleContainer IOleContainer_iface;
|
||||||
|
|
||||||
|
@ -668,8 +668,6 @@ struct HTMLDocumentNode {
|
||||||
|
|
||||||
#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl)
|
#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl)
|
||||||
|
|
||||||
#define SUPPERRINFO(x) ((ISupportErrorInfo*) &(x)->lpSupportErrorInfoVtbl)
|
|
||||||
|
|
||||||
#define HOSTSECMGR(x) ((IInternetHostSecurityManager*) &(x)->lpIInternetHostSecurityManagerVtbl)
|
#define HOSTSECMGR(x) ((IInternetHostSecurityManager*) &(x)->lpIInternetHostSecurityManagerVtbl)
|
||||||
|
|
||||||
#define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc)))
|
#define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc)))
|
||||||
|
|
Loading…
Reference in New Issue