Skip to content

W
wine-winehq
Commit 8b773b12 authored by Andrew de Quincey's avatar Andrew de Quincey Committed by Alexandre Julliard
Browse files
Options

Upwards traversal of inheritance tree didn't occur for dispatch

interfaces.
parent 27db93dc
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
dlls/oleaut32/typelib.c
View file @ 8b773b12
......@@ -4017,8 +4017,8 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid,
}
else
{
if(This->TypeAttr.typekind==TKIND_INTERFACE && This->TypeAttr.cImplTypes )
{
if(This->TypeAttr.cImplTypes &&
(This->TypeAttr.typekind==TKIND_INTERFACE || This->TypeAttr.typekind==TKIND_DISPATCH)) {
/* recursive search */
ITypeInfo *pTInfo;
HRESULT result;
......@@ -4162,8 +4162,8 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface,
}
}
/* not found, see if this is and interface with an inheritance */
if(This->TypeAttr.typekind==TKIND_INTERFACE &&
This->TypeAttr.cImplTypes ){
if(This->TypeAttr.cImplTypes &&
(This->TypeAttr.typekind==TKIND_INTERFACE || This->TypeAttr.typekind==TKIND_DISPATCH)) {
/* recursive search */
ITypeInfo *pTInfo;
ret=ITypeInfo_GetRefTypeInfo(iface,
......@@ -4613,7 +4613,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
}
}
/* not found, look for it in inherited interfaces */
if (This->TypeAttr.typekind==TKIND_INTERFACE && This->TypeAttr.cImplTypes) {
if (This->TypeAttr.cImplTypes &&
(This->TypeAttr.typekind==TKIND_INTERFACE || This->TypeAttr.typekind==TKIND_DISPATCH)) {
/* recursive search */
ITypeInfo *pTInfo;
HRESULT hr;
......@@ -5511,7 +5512,8 @@ static HRESULT WINAPI ITypeComp_fnBind(
}
}
/* not found, look for it in inherited interfaces */
if ((This->TypeAttr.typekind == TKIND_INTERFACE) && This->TypeAttr.cImplTypes) {
if (This->TypeAttr.cImplTypes &&
(This->TypeAttr.typekind == TKIND_INTERFACE || This->TypeAttr.typekind == TKIND_DISPATCH)) {
/* recursive search */
ITypeInfo *pTInfo;
ITypeComp *pTComp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment