system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 12:34:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mshtml: Use query_interface in the dispex vtbl for HTMLAttributeCollection.

Browse source 
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
This commit is contained in:
Gabriel Ivăncescu 2023-09-08 18:24:28 +03:00 committed by Alexandre Julliard
parent 5a53915532
commit 6be26997bf
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dlls/mshtml/htmlelem.c
View file

@ -8543,26 +8543,12 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle
{
HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface);
TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
if(IsEqualGUID(&IID_IUnknown, riid)) {
*ppv = &This->IHTMLAttributeCollection_iface;
}else if(IsEqualGUID(&IID_IHTMLAttributeCollection, riid)) {
*ppv = &This->IHTMLAttributeCollection_iface;
}else if(IsEqualGUID(&IID_IHTMLAttributeCollection2, riid)) {
*ppv = &This->IHTMLAttributeCollection2_iface;
}else if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid)) {
*ppv = &This->IHTMLAttributeCollection3_iface;
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
if(dispex_query_interface(&This->dispex, riid, ppv))
return *ppv ? S_OK : E_NOINTERFACE;
}else {
*ppv = NULL;
WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
return E_NOINTERFACE;
}
IUnknown_AddRef((IUnknown*)*ppv);
return S_OK;
*ppv = NULL;
WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
return E_NOINTERFACE;
}
static ULONG WINAPI HTMLAttributeCollection_AddRef(IHTMLAttributeCollection *iface)
@ -8929,6 +8915,20 @@ static inline HTMLAttributeCollection *HTMLAttributeCollection_from_DispatchEx(D
return CONTAINING_RECORD(iface, HTMLAttributeCollection, dispex);
}
static void *HTMLAttributeCollection_query_interface(DispatchEx *dispex, REFIID riid)
{
HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex);
if(IsEqualGUID(&IID_IHTMLAttributeCollection, riid))
return &This->IHTMLAttributeCollection_iface;
if(IsEqualGUID(&IID_IHTMLAttributeCollection2, riid))
return &This->IHTMLAttributeCollection2_iface;
if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid))
return &This->IHTMLAttributeCollection3_iface;
return NULL;
}
static void HTMLAttributeCollection_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{
HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex);
@ -9022,6 +9022,7 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI
}
static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = {
.query_interface = HTMLAttributeCollection_query_interface,
.destructor = HTMLAttributeCollection_destructor,
.traverse = HTMLAttributeCollection_traverse,
.unlink = HTMLAttributeCollection_unlink,