[PATCH 3/3] oleaut32: Finish COM cleanup for ITypeLib objects

[Andrew Eikum]

---
 dlls/oleaut32/typelib.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 3d0c88e..d42dd34 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -1018,6 +1018,16 @@ typedef struct tagITypeLibImpl
 static const ITypeLib2Vtbl tlbvt;
 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 )
 {
     return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeComp_iface);
@@ -2977,7 +2987,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath
     }
 
     if(*ppTypeLib) {
-	ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib;
+	ITypeLibImpl *impl = impl_from_ITypeLib2(*ppTypeLib);
 
 	TRACE("adding to cache\n");
 	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;
 }
 
-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)
 {
     ITypeLibImpl *This = impl_from_ITypeLib2(iface);
@@ -7102,7 +7107,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
 			SysFreeString(libnam);
 		    }
 		    if(SUCCEEDED(result)) {
-                        ref_type->pImpTLInfo->pImpTypeLib = (ITypeLibImpl*)pTLib;
+                        ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib);
                         ITypeLib_AddRef(pTLib);
 		    }
 		}
-- 
1.8.2.2