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

oleaut32: Finish COM cleanup for ITypeLib objects.

This commit is contained in:
Andrew Eikum 2013-05-09 15:23:39 -05:00 committed by Alexandre Julliard
parent d7313b21e8
commit b301234f3a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/oleaut32/typelib.c
View File

@ -1018,6 +1018,16 @@ typedef struct tagITypeLibImpl
static const ITypeLib2Vtbl tlbvt; static const ITypeLib2Vtbl tlbvt;
static const ITypeCompVtbl tlbtcvt; static const ITypeCompVtbl tlbtcvt;
static inline ITypeLibImpl *impl_from_ITypeLib2(ITypeLib2 *iface)
{
return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeLib2_iface);
}
static inline ITypeLibImpl *impl_from_ITypeLib(ITypeLib *iface)
{
return impl_from_ITypeLib2((ITypeLib2*)iface);
}
static inline ITypeLibImpl *impl_from_ITypeComp( ITypeComp *iface ) static inline ITypeLibImpl *impl_from_ITypeComp( ITypeComp *iface )
{ {
return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeComp_iface); return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeComp_iface);
@ -2977,7 +2987,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath
} }
if(*ppTypeLib) { if(*ppTypeLib) {
ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib; ITypeLibImpl *impl = impl_from_ITypeLib2(*ppTypeLib);
TRACE("adding to cache\n"); TRACE("adding to cache\n");
impl->path = heap_alloc((strlenW(pszPath)+1) * sizeof(WCHAR)); impl->path = heap_alloc((strlenW(pszPath)+1) * sizeof(WCHAR));
@ -4231,11 +4241,6 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
return &pTypeLibImpl->ITypeLib2_iface; return &pTypeLibImpl->ITypeLib2_iface;
} }
static inline ITypeLibImpl *impl_from_ITypeLib2(ITypeLib2 *iface)
{
return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeLib2_iface);
}
static HRESULT WINAPI ITypeLib2_fnQueryInterface(ITypeLib2 *iface, REFIID riid, void **ppv) static HRESULT WINAPI ITypeLib2_fnQueryInterface(ITypeLib2 *iface, REFIID riid, void **ppv)
{ {
ITypeLibImpl *This = impl_from_ITypeLib2(iface); ITypeLibImpl *This = impl_from_ITypeLib2(iface);
@ -7102,7 +7107,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
SysFreeString(libnam); SysFreeString(libnam);
} }
if(SUCCEEDED(result)) { if(SUCCEEDED(result)) {
ref_type->pImpTLInfo->pImpTypeLib = (ITypeLibImpl*)pTLib; ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib);
ITypeLib_AddRef(pTLib); ITypeLib_AddRef(pTLib);
} }
} }