Skip to content

W
wine-cw
Commit e98ec6db authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

oleaut32: Fix the references in function descriptions returned for dual IDispatch interfaces.

Do this by changing references from other interfaces (and possibly other typelibs) to uniquely identify them. Add special handling to GetRefTypeInfo to cope with this.
parent eb239a47
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 6 deletions
dlls/oleaut32/typelib.c
View file @ e98ec6db
...@@ -104,6 +104,8 @@ static DWORD FromLEDWord(DWORD p_iVal) ...@@ -104,6 +104,8 @@ static DWORD FromLEDWord(DWORD p_iVal)
#define FromLEDWord(X) (X) #define FromLEDWord(X) (X)
#endif #endif
#define DISPATCH_HREF_OFFSET 0x01000000
#define DISPATCH_HREF_MASK 0xff000000
/**************************************************************************** /****************************************************************************
* FromLExxx * FromLExxx
...@@ -4756,7 +4758,7 @@ HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const F ...@@ -4756,7 +4758,7 @@ HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const F
/* internal function to make the inherited interfaces' methods appear /* internal function to make the inherited interfaces' methods appear
* part of the interface */ * part of the interface */
static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface,
UINT index, const FUNCDESC **ppFuncDesc, UINT *funcs) UINT index, const FUNCDESC **ppFuncDesc, UINT *funcs, UINT *hrefoffset)
{ {
ITypeInfoImpl *This = (ITypeInfoImpl *)iface; ITypeInfoImpl *This = (ITypeInfoImpl *)iface;
HRESULT hr; HRESULT hr;
...@@ -4764,6 +4766,8 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, ...@@ -4764,6 +4766,8 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface,
if (funcs) if (funcs)
*funcs = 0; *funcs = 0;
else
*hrefoffset = DISPATCH_HREF_OFFSET;
if(This->impltypelist) if(This->impltypelist)
{ {
...@@ -4777,15 +4781,18 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, ...@@ -4777,15 +4781,18 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface,
hr = ITypeInfoImpl_GetInternalDispatchFuncDesc(pSubTypeInfo, hr = ITypeInfoImpl_GetInternalDispatchFuncDesc(pSubTypeInfo,
index, index,
ppFuncDesc, ppFuncDesc,
&sub_funcs); &sub_funcs, hrefoffset);
implemented_funcs += sub_funcs; implemented_funcs += sub_funcs;
ITypeInfo_Release(pSubTypeInfo); ITypeInfo_Release(pSubTypeInfo);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
return hr; return hr;
*hrefoffset += DISPATCH_HREF_OFFSET;
} }
if (funcs) if (funcs)
*funcs = implemented_funcs + This->TypeAttr.cFuncs; *funcs = implemented_funcs + This->TypeAttr.cFuncs;
else
*hrefoffset = 0;
if (index < implemented_funcs) if (index < implemented_funcs)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -4793,6 +4800,37 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface, ...@@ -4793,6 +4800,37 @@ static HRESULT ITypeInfoImpl_GetInternalDispatchFuncDesc( ITypeInfo *iface,
ppFuncDesc); ppFuncDesc);
} }
static inline void ITypeInfoImpl_ElemDescAddHrefOffset( LPELEMDESC pElemDesc, UINT hrefoffset)
{
TYPEDESC *pTypeDesc = &pElemDesc->tdesc;
while (TRUE)
{
switch (pTypeDesc->vt)
{
case VT_USERDEFINED:
pTypeDesc->u.hreftype += hrefoffset;
return;
case VT_PTR:
case VT_SAFEARRAY:
pTypeDesc = pTypeDesc->u.lptdesc;
break;
case VT_CARRAY:
pTypeDesc = &pTypeDesc->u.lpadesc->tdescElem;
break;
default:
return;
}
}
}
static inline void ITypeInfoImpl_FuncDescAddHrefOffset( LPFUNCDESC pFuncDesc, UINT hrefoffset)
{
SHORT i;
for (i = 0; i < pFuncDesc->cParams; i++)
ITypeInfoImpl_ElemDescAddHrefOffset(&pFuncDesc->lprgelemdescParam[i], hrefoffset);
ITypeInfoImpl_ElemDescAddHrefOffset(&pFuncDesc->elemdescFunc, hrefoffset);
}
/* ITypeInfo::GetFuncDesc /* ITypeInfo::GetFuncDesc
* *
* Retrieves the FUNCDESC structure that contains information about a * Retrieves the FUNCDESC structure that contains information about a
...@@ -4805,12 +4843,14 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, ...@@ -4805,12 +4843,14 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index,
ITypeInfoImpl *This = (ITypeInfoImpl *)iface; ITypeInfoImpl *This = (ITypeInfoImpl *)iface;
const FUNCDESC *internal_funcdesc; const FUNCDESC *internal_funcdesc;
HRESULT hr; HRESULT hr;
UINT hrefoffset = 0;
TRACE("(%p) index %d\n", This, index); TRACE("(%p) index %d\n", This, index);
if (This->TypeAttr.typekind == TKIND_DISPATCH) if (This->TypeAttr.typekind == TKIND_DISPATCH)
hr = ITypeInfoImpl_GetInternalDispatchFuncDesc((ITypeInfo *)iface, index, hr = ITypeInfoImpl_GetInternalDispatchFuncDesc((ITypeInfo *)iface, index,
&internal_funcdesc, NULL); &internal_funcdesc, NULL,
&hrefoffset);
else else
hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index,
&internal_funcdesc); &internal_funcdesc);
...@@ -4820,10 +4860,16 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, ...@@ -4820,10 +4860,16 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index,
return hr; return hr;
} }
return TLB_AllocAndInitFuncDesc( hr = TLB_AllocAndInitFuncDesc(
internal_funcdesc, internal_funcdesc,
ppFuncDesc, ppFuncDesc,
This->TypeAttr.typekind == TKIND_DISPATCH); This->TypeAttr.typekind == TKIND_DISPATCH);
if ((This->TypeAttr.typekind == TKIND_DISPATCH) && hrefoffset)
ITypeInfoImpl_FuncDescAddHrefOffset(*ppFuncDesc, hrefoffset);
TRACE("-- 0x%08x\n", hr);
return hr;
} }
static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr ) static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr )
...@@ -6005,6 +6051,38 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid ...@@ -6005,6 +6051,38 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid
return TYPE_E_ELEMENTNOTFOUND; return TYPE_E_ELEMENTNOTFOUND;
} }
/* internal function to make the inherited interfaces' methods appear
* part of the interface */
static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface,
HREFTYPE *hRefType, ITypeInfo **ppTInfo)
{
ITypeInfoImpl *This = (ITypeInfoImpl *)iface;
HRESULT hr;
TRACE("%p, 0x%x\n", iface, *hRefType);
if (This->impltypelist && (*hRefType & DISPATCH_HREF_MASK))
{
ITypeInfo *pSubTypeInfo;
hr = ITypeInfo_GetRefTypeInfo(iface, This->impltypelist->hRef, &pSubTypeInfo);
if (FAILED(hr))
return hr;
hr = ITypeInfoImpl_GetDispatchRefTypeInfo(pSubTypeInfo,
hRefType, ppTInfo);
ITypeInfo_Release(pSubTypeInfo);
if (SUCCEEDED(hr))
return hr;
}
*hRefType -= DISPATCH_HREF_OFFSET;
if (!(*hRefType & DISPATCH_HREF_MASK))
return ITypeInfo_GetRefTypeInfo(iface, *hRefType, ppTInfo);
else
return E_FAIL;
}
/* ITypeInfo::GetRefTypeInfo /* ITypeInfo::GetRefTypeInfo
* *
* If a type description references other type descriptions, it retrieves * If a type description references other type descriptions, it retrieves
...@@ -6025,8 +6103,8 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ...@@ -6025,8 +6103,8 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
result = S_OK; result = S_OK;
} }
else if (hRefType == -1 && else if (hRefType == -1 &&
(((ITypeInfoImpl*) This)->TypeAttr.typekind == TKIND_DISPATCH) && (This->TypeAttr.typekind == TKIND_DISPATCH) &&
(((ITypeInfoImpl*) This)->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) (This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL))
{ {
/* when we meet a DUAL dispinterface, we must create the interface /* when we meet a DUAL dispinterface, we must create the interface
* version of it. * version of it.
...@@ -6056,6 +6134,12 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ...@@ -6056,6 +6134,12 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
result = S_OK; result = S_OK;
} else if ((hRefType != -1) && (hRefType & DISPATCH_HREF_MASK) &&
(This->TypeAttr.typekind == TKIND_DISPATCH) &&
(This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL))
{
HREFTYPE href_dispatch = hRefType;
result = ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &href_dispatch, ppTInfo);
} else { } else {
TLBRefType *ref_type; TLBRefType *ref_type;
LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry) LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry)
......
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