Changeset 1656 for trunk/src

Timestamp:

Nov 9, 1999, 12:04:33 PM (26 years ago)

Author:

bird

Message:

Corrections for lpvtbl using ICOM_VTBL.

File:

• trunk/src/oleaut32/typelib.cpp (modified) (90 diffs)

trunk/src/oleaut32/typelib.cpp

@@ -1 @@
-/* $Id: typelib.cpp,v 1.4 1999-09-12 21:51:03 davidr Exp $ */
+/* $Id: typelib.cpp,v 1.5 1999-11-09 11:04:33 bird Exp $ */
 /*
  *      TYPELIB
@@ -28 +28 @@
  * -. some methods just return pointers to internal data structures, this is
  *      partly laziness, partly I want to check how windows does it.
- * 
+ *
  */
 
@@ -46 +46 @@
 #include "winversion.h"
 /* FIXME: get rid of these */
-typedef struct ITypeInfoVtbl ITypeLib_VTable, *LPTYPEINFO_VTABLE ; 
-typedef struct ITypeLibVtbl *LPTYPELIB_VTABLE  ; 
+typedef struct ITypeInfoVtbl ITypeLib_VTable, *LPTYPEINFO_VTABLE ;
+typedef struct ITypeLibVtbl *LPTYPELIB_VTABLE  ;
 #include "typelib.h"
 
@@ -53 +53 @@
 DECLARE_DEBUG_CHANNEL(typelib)
 
- 
+
 /****************************************************************************
  *              QueryPathOfRegTypeLib   [OLEAUT32.164]
@@ -60 +60 @@
  */
 HRESULT WINAPI
-QueryPathOfRegTypeLib(  
+QueryPathOfRegTypeLib(
         REFGUID guid,   /* [in] referenced guid */
         WORD wMaj,      /* [in] major version */
@@ -135 +135 @@
     HRESULT res;
     TRACE_(typelib)("('%s',%p)\n",debugstr_w(szFile),pptLib);
-    
+
     p=HEAP_strdupWtoA(GetProcessHeap(),0,szFile);
     res= TLB_ReadTypeLib(p, pptLib);
@@ -148 +148 @@
  *              LoadRegTypeLib  [OLEAUT32.162]
  */
-HRESULT WINAPI LoadRegTypeLib(  
+HRESULT WINAPI LoadRegTypeLib(
         REFGUID rguid,  /* [in] referenced guid */
         WORD wVerMajor, /* [in] major version */
@@ -169 +169 @@
     }
     return res;
-}       
+}
 
 
 /******************************************************************************
  *              RegisterTypeLib [OLEAUT32.163]
- * Adds information about a type library to the System Registry           
+ * Adds information about a type library to the System Registry
  * NOTES
  *    Docs: ITypeLib FAR * ptlib
@@ -196 +196 @@
 /******************************************************************************
  *      UnRegisterTypeLib       [OLEAUT32.186]
- * Removes information about a type library from the System Registry           
+ * Removes information about a type library from the System Registry
  * NOTES
  *
@@ -209 +209 @@
         LCID lcid,      /* [in] locale id */
         SYSKIND syskind)
-{   
+{
     char xriid[50];
     WINE_StringFromCLSID((LPCLSID)libid,xriid);
@@ -223 +223 @@
 /* ITypeLib methods */
 static HRESULT WINAPI ITypeLib_fnQueryInterface( LPTYPELIB This, REFIID riid,
-    VOID **ppvObject); 
-static ULONG WINAPI ITypeLib_fnAddRef( LPTYPELIB This); 
-static ULONG WINAPI ITypeLib_fnRelease( LPTYPELIB This); 
-static UINT WINAPI ITypeLib_fnGetTypeInfoCount( LPTYPELIB This); 
-static HRESULT WINAPI ITypeLib_fnGetTypeInfo( LPTYPELIB This, UINT index, 
-    ITypeInfo **ppTInfo); 
+    VOID **ppvObject);
+static ULONG WINAPI ITypeLib_fnAddRef( LPTYPELIB This);
+static ULONG WINAPI ITypeLib_fnRelease( LPTYPELIB This);
+static UINT WINAPI ITypeLib_fnGetTypeInfoCount( LPTYPELIB This);
+static HRESULT WINAPI ITypeLib_fnGetTypeInfo( LPTYPELIB This, UINT index,
+    ITypeInfo **ppTInfo);
 
 static HRESULT WINAPI ITypeLib_fnGetTypeInfoType( LPTYPELIB This, UINT index,
-    TYPEKIND *pTKind); 
+    TYPEKIND *pTKind);
 
 static HRESULT WINAPI ITypeLib_fnGetTypeInfoOfGuid( LPTYPELIB This, REFGUID guid,
     ITypeInfo **ppTinfo);
 
-static HRESULT WINAPI ITypeLib_fnGetLibAttr( LPTYPELIB This, 
-    LPTLIBATTR *ppTLibAttr); 
+static HRESULT WINAPI ITypeLib_fnGetLibAttr( LPTYPELIB This,
+    LPTLIBATTR *ppTLibAttr);
 
 static HRESULT WINAPI ITypeLib_fnGetTypeComp( LPTYPELIB This,
-    ITypeComp **ppTComp); 
+    ITypeComp **ppTComp);
 
 static HRESULT WINAPI ITypeLib_fnGetDocumentation( LPTYPELIB This, INT index,
-    BSTR *pBstrName, BSTR *pBstrDocString, DWORD *pdwHelpContext, 
+    BSTR *pBstrName, BSTR *pBstrDocString, DWORD *pdwHelpContext,
     BSTR *pBstrHelpFile);
 
@@ -255 +255 @@
                 TLIBATTR *pTLibAttr);
 
-static HRESULT WINAPI ITypeLib2_fnGetCustData( ITypeLib * This, REFGUID guid, 
-        VARIANT *pVarVal); 
-
-static HRESULT WINAPI ITypeLib2_fnGetLibStatistics( ITypeLib * This, 
-        UINT *pcUniqueNames, UINT *pcchUniqueNames); 
-
-static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( ITypeLib * This, 
+static HRESULT WINAPI ITypeLib2_fnGetCustData( ITypeLib * This, REFGUID guid,
+        VARIANT *pVarVal);
+
+static HRESULT WINAPI ITypeLib2_fnGetLibStatistics( ITypeLib * This,
+        UINT *pcUniqueNames, UINT *pcchUniqueNames);
+
+static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( ITypeLib * This,
         INT index, LCID lcid, BSTR *pbstrHelpString,
-        INT *pdwHelpStringContext, BSTR *pbstrHelpStringDll); 
+        INT *pdwHelpStringContext, BSTR *pbstrHelpStringDll);
 
 static HRESULT WINAPI ITypeLib2_fnGetAllCustData( ITypeLib * This,
@@ -289 +289 @@
 
 static HRESULT WINAPI ITypeInfo_fnQueryInterface( LPTYPEINFO This, REFIID riid,
-    VOID **ppvObject); 
-static ULONG WINAPI ITypeInfo_fnAddRef( LPTYPEINFO This); 
-static ULONG WINAPI ITypeInfo_fnRelease( LPTYPEINFO This); 
+    VOID **ppvObject);
+static ULONG WINAPI ITypeInfo_fnAddRef( LPTYPEINFO This);
+static ULONG WINAPI ITypeInfo_fnRelease( LPTYPEINFO This);
 static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( LPTYPEINFO This,
-        LPTYPEATTR  *ppTypeAttr); 
+        LPTYPEATTR  *ppTypeAttr);
 
 static HRESULT WINAPI ITypeInfo_fnGetTypeComp( LPTYPEINFO This,
-        ITypeComp  * *ppTComp); 
+        ITypeComp  * *ppTComp);
 
 static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( LPTYPEINFO This, UINT index,
-        LPFUNCDESC  *ppFuncDesc); 
+        LPFUNCDESC  *ppFuncDesc);
 
 static HRESULT WINAPI ITypeInfo_fnGetVarDesc( LPTYPEINFO This, UINT index,
-        LPVARDESC  *ppVarDesc); 
+        LPVARDESC  *ppVarDesc);
 
 static HRESULT WINAPI ITypeInfo_fnGetNames( LPTYPEINFO This, MEMBERID memid,
@@ -309 +309 @@
 
 static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( LPTYPEINFO This,
-        UINT index, HREFTYPE  *pRefType); 
+        UINT index, HREFTYPE  *pRefType);
 
 static HRESULT WINAPI ITypeInfo_fnGetImplTypeFlags( LPTYPEINFO This,
-        UINT index, INT  *pImplTypeFlags); 
+        UINT index, INT  *pImplTypeFlags);
 
 static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( LPTYPEINFO This,
-        LPOLESTR  *rgszNames, UINT cNames, MEMBERID  *pMemId); 
+        LPOLESTR  *rgszNames, UINT cNames, MEMBERID  *pMemId);
 
 static HRESULT WINAPI ITypeInfo_fnInvoke( LPTYPEINFO This, VOID  *pIUnk,
-        MEMBERID memid, UINT16 dwFlags, DISPPARAMS  *pDispParams, 
+        MEMBERID memid, UINT16 dwFlags, DISPPARAMS  *pDispParams,
         VARIANT  *pVarResult, EXCEPINFO  *pExcepInfo, UINT  *pArgErr);
 
 static HRESULT WINAPI ITypeInfo_fnGetDocumentation( LPTYPEINFO This,
-        MEMBERID memid, BSTR  *pBstrName, BSTR  *pBstrDocString, 
-        DWORD  *pdwHelpContext, BSTR  *pBstrHelpFile); 
+        MEMBERID memid, BSTR  *pBstrName, BSTR  *pBstrDocString,
+        DWORD  *pdwHelpContext, BSTR  *pBstrHelpFile);
 
 static HRESULT WINAPI ITypeInfo_fnGetDllEntry( LPTYPEINFO This,
         MEMBERID memid, INVOKEKIND invKind, BSTR  *pBstrDllName,
-        BSTR  *pBstrName, WORD  *pwOrdinal); 
+        BSTR  *pBstrName, WORD  *pwOrdinal);
 
 static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( LPTYPEINFO This,
-        HREFTYPE hRefType, ITypeInfo  * *ppTInfo); 
+        HREFTYPE hRefType, ITypeInfo  * *ppTInfo);
 
 static HRESULT WINAPI ITypeInfo_fnAddressOfMember( LPTYPEINFO This,
-        MEMBERID memid, INVOKEKIND invKind, PVOID *ppv); 
-
-static HRESULT WINAPI ITypeInfo_fnCreateInstance( LPTYPEINFO This, 
-        IUnknown *pUnk, REFIID riid, VOID  * *ppvObj); 
-
-static HRESULT WINAPI ITypeInfo_fnGetMops( LPTYPEINFO This, MEMBERID memid, 
+        MEMBERID memid, INVOKEKIND invKind, PVOID *ppv);
+
+static HRESULT WINAPI ITypeInfo_fnCreateInstance( LPTYPEINFO This,
+        IUnknown *pUnk, REFIID riid, VOID  * *ppvObj);
+
+static HRESULT WINAPI ITypeInfo_fnGetMops( LPTYPEINFO This, MEMBERID memid,
         BSTR  *pBstrMops);
 
 
 static HRESULT WINAPI ITypeInfo_fnGetContainingTypeLib( LPTYPEINFO This,
-        ITypeLib  * *ppTLib, UINT  *pIndex); 
+        ITypeLib  * *ppTLib, UINT  *pIndex);
 
 static HRESULT WINAPI ITypeInfo_fnReleaseTypeAttr( LPTYPEINFO This,
-        TYPEATTR *pTypeAttr); 
+        TYPEATTR *pTypeAttr);
 
 static HRESULT WINAPI ITypeInfo_fnReleaseFuncDesc( LPTYPEINFO This,
-        FUNCDESC *pFuncDesc); 
+        FUNCDESC *pFuncDesc);
 
 static HRESULT WINAPI ITypeInfo_fnReleaseVarDesc( LPTYPEINFO This,
-        VARDESC *pVarDesc); 
+        VARDESC *pVarDesc);
 /* itypeinfo2 methods */
 static HRESULT WINAPI ITypeInfo2_fnGetTypeKind( ITypeInfo * This,
@@ -477 +477 @@
 {
         DWORD bytesread=0;
-        
+
         if ((   where != DO_NOT_SEEK &&
                 (0xffffffff == SetFilePointer( pcx->hFile, where, 0,FILE_BEGIN))
@@ -526 +526 @@
 }
 /*
- * read a value and fill a VARIANT structure 
+ * read a value and fill a VARIANT structure
  */
 static void TLB_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx )
@@ -536 +536 @@
         return;
     }
-    TLB_Read(&(pVar->vt), sizeof(VARTYPE), pcx, 
+    TLB_Read(&(pVar->vt), sizeof(VARTYPE), pcx,
         pcx->pTblDir->pCustData.offset + offset );
     switch(pVar->vt){
@@ -544 +544 @@
         case VT_I4  :
         case VT_R4  :
-        case VT_ERROR   : 
-        case VT_BOOL    : 
-        case VT_I1  : 
-        case VT_UI1 : 
-        case VT_UI2 : 
-        case VT_UI4 : 
-        case VT_INT : 
-        case VT_UINT    : 
+        case VT_ERROR   :
+        case VT_BOOL    :
+        case VT_I1  :
+        case VT_UI1 :
+        case VT_UI2 :
+        case VT_UI4 :
+        case VT_INT :
+        case VT_UINT    :
         case VT_VOID    : /* FIXME: is this right? */
-        case VT_HRESULT : 
+        case VT_HRESULT :
             size=4; break;
         case VT_R8  :
         case VT_CY  :
-        case VT_DATE    : 
-        case VT_I8  : 
-        case VT_UI8 : 
+        case VT_DATE    :
+        case VT_I8  :
+        case VT_UI8 :
         case VT_DECIMAL :  /* FIXME: is this right? */
         case VT_FILETIME :
@@ -578 +578 @@
     /* FIXME: this will not work AT ALL when the variant contains a pointer */
         case VT_DISPATCH :
-        case VT_VARIANT : 
-        case VT_UNKNOWN : 
-        case VT_PTR : 
+        case VT_VARIANT :
+        case VT_UNKNOWN :
+        case VT_PTR :
         case VT_SAFEARRAY :
-        case VT_CARRAY  : 
-        case VT_USERDEFINED : 
-        case VT_LPSTR   : 
-        case VT_LPWSTR  : 
-        case VT_BLOB    : 
-        case VT_STREAM  : 
-        case VT_STORAGE : 
-        case VT_STREAMED_OBJECT : 
-        case VT_STORED_OBJECT   : 
-        case VT_BLOB_OBJECT : 
-        case VT_CF  : 
-        case VT_CLSID   : 
-        default: 
-            size=0; 
+        case VT_CARRAY  :
+        case VT_USERDEFINED :
+        case VT_LPSTR   :
+        case VT_LPWSTR  :
+        case VT_BLOB    :
+        case VT_STREAM  :
+        case VT_STORAGE :
+        case VT_STREAMED_OBJECT :
+        case VT_STORED_OBJECT   :
+        case VT_BLOB_OBJECT :
+        case VT_CF  :
+        case VT_CLSID   :
+        default:
+            size=0;
             FIXME_(ole)("VARTYPE %d is not supported, setting pointer to NULL\n",
                 pVar->vt);
@@ -615 +615 @@
         count++;
         pNew=(TLBCustData* )TLB_Alloc(sizeof(TLBCustData));
-        TLB_Read(&entry, sizeof(entry), pcx, 
+        TLB_Read(&entry, sizeof(entry), pcx,
             pcx->pTblDir->pCDGuids.offset+offset);
         TLB_ReadGuid(&(pNew->guid), entry.GuidOffset , pcx);
@@ -637 +637 @@
                           int offset, TLBFuncDesc ** pptfd)
 {
-    /* 
+    /*
      * member information is stored in a data structure at offset
      * indicated by the memoffset field of the typeinfo structure
      * There are several distinctive parts.
-     * the first part starts with a field that holds the total length 
+     * the first part starts with a field that holds the total length
      * of this (first) part excluding this field. Then follow the records,
      * for each member there is one record.
      *
      * First entry is always the length of the record (excluding this
-     * length word). 
-     * Rest of the record depends on the type of the member. If there is 
+     * length word).
+     * Rest of the record depends on the type of the member. If there is
      * a field indicating the member type (function variable intereface etc)
      * I have not found it yet. At this time we depend on the information
@@ -654 +654 @@
      * Second follows an array sized nrMEM*sizeof(INT) with a memeber id
      * for each member;
-     * 
-     * Third is a equal sized array with file offsets to the name entry 
+     *
+     * Third is a equal sized array with file offsets to the name entry
      * of each member.
-     * 
+     *
      * Forth and last (?) part is an array with offsets to the records in the
      * first part of this file segment.
@@ -671 +671 @@
         *pptfd=(TLBFuncDesc*)TLB_Alloc(sizeof(TLBFuncDesc));
     /* name, eventually add to a hash table */
-        TLB_Read(&nameoffset, sizeof(INT), pcx, 
+        TLB_Read(&nameoffset, sizeof(INT), pcx,
             offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT));
         (*pptfd)->Name=TLB_ReadName(pcx, nameoffset);
@@ -677 +677 @@
         TLB_Read(&reclength, sizeof(INT), pcx, recoffset);
         reclength &=0x1ff;
-        TLB_Read(pFuncRec, reclength - sizeof(INT), pcx, DO_NOT_SEEK) ; 
+        TLB_Read(pFuncRec, reclength - sizeof(INT), pcx, DO_NOT_SEEK) ;
     /* do the attributes */
         nrattributes=(reclength-pFuncRec->nrargs*3*sizeof(int)-0x18)
@@ -702 +702 @@
         }
     /* fill the FuncDesc Structure */
-        TLB_Read(&(*pptfd)->funcdesc.memid, sizeof(INT), pcx, 
+        TLB_Read(&(*pptfd)->funcdesc.memid, sizeof(INT), pcx,
             offset + infolen + ( i + 1) * sizeof(INT));
         (*pptfd)->funcdesc.funckind = (tagFUNCKIND)((pFuncRec->FKCCIC) & 0x7);
@@ -711 +711 @@
         (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset ;
         (*pptfd)->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags)  ;
-        TLB_GetTdesc(pcx, pFuncRec->DataType,   
+        TLB_GetTdesc(pcx, pFuncRec->DataType,
             &(*pptfd)->funcdesc.elemdescFunc.tdesc) ;
-                                    
+
         /* do the parameters/arguments */
         if(pFuncRec->nrargs){
@@ -725 +725 @@
                 pFuncRec->nrargs * sizeof(TLBParameterInfo));
             for(j=0;j<pFuncRec->nrargs;j++){
-                TLB_GetTdesc(pcx, paraminfo.DataType,   
+                TLB_GetTdesc(pcx, paraminfo.DataType,
                     &(*pptfd)->funcdesc.lprgelemdescParam[j].tdesc) ;
                 V_UNION(&((*pptfd)->funcdesc.lprgelemdescParam[j]),
@@ -748 +748 @@
                     pParamDesc->pparamdescex = (tagPARAMDESCEX*)TLB_Alloc(sizeof(PARAMDESCEX));
                     pParamDesc->pparamdescex->cBytes= sizeof(PARAMDESCEX);
-                    TLB_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), 
+                    TLB_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue),
                         pInt[j], pcx);
                 }
@@ -773 +773 @@
     int recoffset;
     TLB_Read(&infolen,sizeof(INT), pcx, offset);
-    TLB_Read(&recoffset,sizeof(INT), pcx, offset + infolen + 
+    TLB_Read(&recoffset,sizeof(INT), pcx, offset + infolen +
         ((cFuncs+cVars)*2+cFuncs + 1)*sizeof(INT));
     recoffset += offset+sizeof(INT);
@@ -779 +779 @@
         *pptvd=(TLBVarDesc*)TLB_Alloc(sizeof(TLBVarDesc));
     /* name, eventually add to a hash table */
-        TLB_Read(&nameoffset, sizeof(INT), pcx, 
+        TLB_Read(&nameoffset, sizeof(INT), pcx,
             offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT));
         (*pptvd)->Name=TLB_ReadName(pcx, nameoffset);
@@ -785 +785 @@
         TLB_Read(&reclength, sizeof(INT), pcx, recoffset);
         reclength &=0xff;
-        TLB_Read(pVarRec, reclength - sizeof(INT), pcx, DO_NOT_SEEK) ; 
+        TLB_Read(pVarRec, reclength - sizeof(INT), pcx, DO_NOT_SEEK) ;
     /* Optional data */
         if(reclength >(6*sizeof(INT)) )
@@ -795 +795 @@
             (*pptvd)->HelpStringContext=pVarRec->HelpStringContext;
     /* fill the VarDesc Structure */
-        TLB_Read(&(*pptvd)->vardesc.memid, sizeof(INT), pcx, 
+        TLB_Read(&(*pptvd)->vardesc.memid, sizeof(INT), pcx,
             offset + infolen + ( i + 1) * sizeof(INT));
         (*pptvd)->vardesc.varkind = (tagVARKIND)pVarRec->VarKind;
         (*pptvd)->vardesc.wVarFlags = pVarRec->Flags;
-        TLB_GetTdesc(pcx, pVarRec->DataType,    
+        TLB_GetTdesc(pcx, pVarRec->DataType,
             &(*pptvd)->vardesc.elemdescVar.tdesc) ;
 /*   (*pptvd)->vardesc.lpstrSchema; is reserved (SDK) fixme?? */
         if(pVarRec->VarKind == VAR_CONST ){
             V_UNION(&((*pptvd)->vardesc),lpvarValue)=(VARIANT*)TLB_Alloc(sizeof(VARIANT));
-            TLB_ReadValue(V_UNION(&((*pptvd)->vardesc),lpvarValue), 
+            TLB_ReadValue(V_UNION(&((*pptvd)->vardesc),lpvarValue),
                 pVarRec->OffsValue, pcx);
         }else
@@ -816 +816 @@
  * If comes fom import, its an offset+1 in the ImpInfo table
  * */
-static void TLB_DoRefType(TLBContext *pcx, 
+static void TLB_DoRefType(TLBContext *pcx,
                           int offset, TLBRefType ** pprtd)
 {
@@ -824 +824 @@
         TLBImpInfo impinfo;
         TLBImpLib *pImpLib=(pcx->pLibInfo->pImpLibs);
-        TLB_Read(&impinfo, sizeof(impinfo), pcx, 
+        TLB_Read(&impinfo, sizeof(impinfo), pcx,
             pcx->pTblDir->pImpInfo.offset + (offset & 0xfffffffc));
         for(j=0;pImpLib;j++){   /* search the known offsets of all import libraries */
@@ -896 +896 @@
     ptiRet->TypeAttr.cbSizeVft=tiBase.cbSizeVft; /* FIXME: this is only the non inherited part */
     if(ptiRet->TypeAttr.typekind == TKIND_ALIAS)
-        TLB_GetTdesc(pcx, tiBase.datatype1, 
+        TLB_GetTdesc(pcx, tiBase.datatype1,
             &ptiRet->TypeAttr.tdescAlias) ;
 /*  FIXME: */
@@ -913 +913 @@
     /* functions */
     if(ptiRet->TypeAttr.cFuncs >0 )
-        TLB_DoFuncs(pcx, ptiRet->TypeAttr.cFuncs ,ptiRet->TypeAttr.cVars, 
+        TLB_DoFuncs(pcx, ptiRet->TypeAttr.cFuncs ,ptiRet->TypeAttr.cVars,
         tiBase.memoffset, & ptiRet->funclist);
     /* variables */
     if(ptiRet->TypeAttr.cVars >0 )
-        TLB_DoVars(pcx, ptiRet->TypeAttr.cFuncs ,ptiRet->TypeAttr.cVars, 
+        TLB_DoVars(pcx, ptiRet->TypeAttr.cFuncs ,ptiRet->TypeAttr.cVars,
         tiBase.memoffset, & ptiRet->varlist);
     if(ptiRet->TypeAttr.cImplTypes >0 ){
         if(ptiRet->TypeAttr.typekind == TKIND_COCLASS)
-            TLB_DoImplTypes(pcx, ptiRet->TypeAttr.cImplTypes , 
+            TLB_DoImplTypes(pcx, ptiRet->TypeAttr.cImplTypes ,
                 tiBase.datatype1, & ptiRet->impltypelist);
         else if(ptiRet->TypeAttr.typekind != TKIND_DISPATCH){
@@ -1074 +1074 @@
             (tlbHeader.varflags & HELPDLLFLAG? 4 :0);
     /* now read the segment directory */
-    TLB_Read((void*)&tlbSegDir, sizeof(tlbSegDir), &cx, oStart + lPSegDir);  
+    TLB_Read((void*)&tlbSegDir, sizeof(tlbSegDir), &cx, oStart + lPSegDir);
     cx.pTblDir=&tlbSegDir;
     /* just check two entries */
@@ -1148 +1148 @@
                 V_UNION(&(pLibInfo->pTypeDesc[i]),lpadesc)->cDims=td[2];
                 for(j=0;j<td[2];j++){
-                    TLB_Read(& V_UNION(&(pLibInfo->pTypeDesc[i]),lpadesc)->rgbounds[j].cElements, 
+                    TLB_Read(& V_UNION(&(pLibInfo->pTypeDesc[i]),lpadesc)->rgbounds[j].cElements,
                         sizeof(INT), &cx, DO_NOT_SEEK);
                     TLB_Read(& V_UNION(&(pLibInfo->pTypeDesc[i]),lpadesc)
-                        ->rgbounds[j].lLbound, 
+                        ->rgbounds[j].lLbound,
                         sizeof(INT), &cx, DO_NOT_SEEK);
                 }
@@ -1211 +1211 @@
     }
     *ppvObject=NULL;
-    if(IsEqualIID(riid, &IID_IUnknown) || 
+    if(IsEqualIID(riid, &IID_IUnknown) ||
             IsEqualIID(riid,&IID_ITypeLib)||
             IsEqualIID(riid,&IID_ITypeLib2))
         *ppvObject = This;
     if(*ppvObject){
-        (*(LPTYPELIB*)ppvObject)->lpvtbl->fnAddRef(This);
+        (ICOM_VTBL(*(LPTYPELIB*)ppvObject))->fnAddRef(This);
         TRACE_(typelib)("-- Interface: (%p)->(%p)\n",ppvObject,*ppvObject);
         return S_OK;
@@ -1244 +1244 @@
 
 /* ITypeLib::GetTypeInfoCount
- * 
+ *
  * Returns the number of type descriptions in the type library
  */
@@ -1258 +1258 @@
  *etrieves the specified type description in the library.
  */
-static HRESULT WINAPI ITypeLib_fnGetTypeInfo( LPTYPELIB iface, UINT index, 
+static HRESULT WINAPI ITypeLib_fnGetTypeInfo( LPTYPELIB iface, UINT index,
     ITypeInfo **ppTInfo)
 {
@@ -1314 +1314 @@
         TRACE_(typelib)("(%p) guid %sx)\n",This,xriid);
     }
-    for(i=0,*ppTLBTInfo=This->pTypeInfo;*ppTLBTInfo && 
+    for(i=0,*ppTLBTInfo=This->pTypeInfo;*ppTLBTInfo &&
             !IsEqualIID(guid,&(*ppTLBTInfo)->TypeAttr.guid);i++)
         *ppTLBTInfo=(*ppTLBTInfo)->next;
@@ -1331 +1331 @@
  *
  */
-static HRESULT WINAPI ITypeLib_fnGetLibAttr( LPTYPELIB iface, 
+static HRESULT WINAPI ITypeLib_fnGetLibAttr( LPTYPELIB iface,
     LPTLIBATTR *ppTLibAttr)
 {
@@ -1363 +1363 @@
  */
 static HRESULT WINAPI ITypeLib_fnGetDocumentation( LPTYPELIB iface, INT index,
-    BSTR *pBstrName, BSTR *pBstrDocString, DWORD *pdwHelpContext, 
+    BSTR *pBstrName, BSTR *pBstrDocString, DWORD *pdwHelpContext,
     BSTR *pBstrHelpFile)
 {
@@ -1421 +1421 @@
         for(pVInfo=pTInfo->varlist;pVInfo;pVInfo=pVInfo->next) ;
             if(!strcmp(astr,pVInfo->Name)) goto ITypeLib_fnIsName_exit;
-       
+
     }
     *pfName=FALSE;
@@ -1428 +1428 @@
     TRACE_(typelib)("(%p)slow! search for %s: %s found!\n", This,
             debugstr_a(astr), *pfName?"NOT":"");
-    
+
     HeapFree( GetProcessHeap(), 0, astr );
     return S_OK;
@@ -1468 +1468 @@
 
     *pcFound=j;
-    
+
     HeapFree( GetProcessHeap(), 0, astr );
     return S_OK;
@@ -1489 +1489 @@
  * gets the custom data
  */
-static HRESULT WINAPI ITypeLib2_fnGetCustData( ITypeLib * iface, REFGUID guid, 
+static HRESULT WINAPI ITypeLib2_fnGetCustData( ITypeLib * iface, REFGUID guid,
         VARIANT *pVarVal)
 {
@@ -1516 +1516 @@
  *
  */
-static HRESULT WINAPI ITypeLib2_fnGetLibStatistics( ITypeLib * iface, 
+static HRESULT WINAPI ITypeLib2_fnGetLibStatistics( ITypeLib * iface,
         UINT *pcUniqueNames, UINT *pcchUniqueNames)
 {
@@ -1533 +1533 @@
  *
  */
-static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( ITypeLib * iface, 
+static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( ITypeLib * iface,
         INT index, LCID lcid, BSTR *pbstrHelpString,
         INT *pdwHelpStringContext, BSTR *pbstrHelpStringDll)
@@ -1568 +1568 @@
 /* ITypeLib2::GetAllCustData
  *
- * Gets all custom data items for the library. 
+ * Gets all custom data items for the library.
  *
  */
@@ -1577 +1577 @@
     TLBCustData *pCData;
     int i;
-    TRACE_(typelib)("(%p) returning %d items\n", This, This->ctCustData); 
+    TRACE_(typelib)("(%p) returning %d items\n", This, This->ctCustData);
     pCustData->prgCustData = (tagCUSTDATAITEM*)TLB_Alloc(This->ctCustData * sizeof(CUSTDATAITEM));
     if(pCustData->prgCustData ){
@@ -1607 +1607 @@
     }
     *ppvObject=NULL;
-    if(IsEqualIID(riid, &IID_IUnknown) || 
+    if(IsEqualIID(riid, &IID_IUnknown) ||
             IsEqualIID(riid,&IID_ITypeInfo)||
             IsEqualIID(riid,&IID_ITypeInfo2))
         *ppvObject = This;
     if(*ppvObject){
-        (*(LPTYPEINFO*)ppvObject)->lpvtbl->fnAddRef(iface);
+        (ICOM_VTBL(*(LPTYPEINFO*)ppvObject))->fnAddRef(iface);
         TRACE_(typelib)("-- Interface: (%p)->(%p)\n",ppvObject,*ppvObject);
         return S_OK;
@@ -1682 +1682 @@
         ICOM_THIS( TLBTypeInfo, iface);
     int i;
-    TLBFuncDesc * pFDesc; 
+    TLBFuncDesc * pFDesc;
     TRACE_(typelib)("(%p) index %d\n", This, index);
     for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next)
@@ -1696 +1696 @@
 /* ITypeInfo::GetVarDesc
  *
- * Retrieves a VARDESC structure that describes the specified variable. 
+ * Retrieves a VARDESC structure that describes the specified variable.
  *
  */
@@ -1704 +1704 @@
         ICOM_THIS( TLBTypeInfo, iface);
     int i;
-    TLBVarDesc * pVDesc; 
+    TLBVarDesc * pVDesc;
     TRACE_(typelib)("(%p) index %d\n", This, index);
     for(i=0, pVDesc=This->varlist; i!=index && pVDesc; i++, pVDesc=pVDesc->next)
@@ -1726 +1726 @@
 {
         ICOM_THIS( TLBTypeInfo, iface);
-    TLBFuncDesc * pFDesc; 
-    TLBVarDesc * pVDesc; 
+    TLBFuncDesc * pFDesc;
+    TLBVarDesc * pVDesc;
     int i;
     TRACE_(typelib)("(%p) memid=0x%08lx Maxname=%d\n", This, memid,
@@ -1740 +1740 @@
             else
                 rgBstrNames[i]=TLB_DupAtoBstr(pFDesc->pParamDesc[i-1].Name);
-                
+
         }
         *pcNames=i;
@@ -1751 +1751 @@
             *pcNames=1;
         }else{
-            if(This->TypeAttr.typekind==TKIND_INTERFACE && 
+            if(This->TypeAttr.typekind==TKIND_INTERFACE &&
                     This->TypeAttr.cImplTypes ){
                 /* recursive search */
                 ITypeInfo *pTInfo;
                 HRESULT result;
-                result=This->lpvtbl->fnGetRefTypeInfo(iface, 
+                result=This->lpvtbl->fnGetRefTypeInfo(iface,
                         This->impltypelist->reference, &pTInfo);
                 if(SUCCEEDED(result)){
-                    result=pTInfo->lpvtbl->fnGetNames(pTInfo, memid, rgBstrNames,
+                    result=ICOM_VTBL(pTInfo)->fnGetNames(pTInfo, memid, rgBstrNames,
                             cMaxNames, pcNames);
-                    pTInfo->lpvtbl->fnRelease(pTInfo);
+                    ICOM_VTBL(pTInfo)->fnRelease(pTInfo);
                     return result;
                 }
@@ -1801 +1801 @@
 
 /* ITypeInfo::GetImplTypeFlags
- * 
- * Retrieves the IMPLTYPEFLAGS enumeration for one implemented interface 
+ *
+ * Retrieves the IMPLTYPEFLAGS enumeration for one implemented interface
  * or base interface in a type description.
  */
@@ -1830 +1830 @@
 {
         ICOM_THIS( TLBTypeInfo, iface);
-    TLBFuncDesc * pFDesc; 
-    TLBVarDesc * pVDesc; 
+    TLBFuncDesc * pFDesc;
+    TLBVarDesc * pVDesc;
     HRESULT ret=S_OK;
     PCHAR aszName= HEAP_strdupWtoA( GetProcessHeap(), 0, *rgszNames);
@@ -1850 +1850 @@
                 else
                    ret=DISP_E_UNKNOWNNAME;
-                HeapFree( GetProcessHeap(), 0, aszPar);         
+                HeapFree( GetProcessHeap(), 0, aszPar);
             };
             HeapFree (GetProcessHeap(), 0, aszName);
             return ret;
         }
-    }   
+    }
     for(pVDesc=This->varlist; pVDesc; pVDesc=pVDesc->next) {
         if( !strcmp(aszName, pVDesc->Name)) {
@@ -1863 +1863 @@
         }
     }
-    /* not found, see if this is and interface with an inheritance */       
-    if(This->TypeAttr.typekind==TKIND_INTERFACE && 
+    /* not found, see if this is and interface with an inheritance */
+    if(This->TypeAttr.typekind==TKIND_INTERFACE &&
             This->TypeAttr.cImplTypes ){
         /* recursive search */
         ITypeInfo *pTInfo;
-        ret=This->lpvtbl->fnGetRefTypeInfo(iface, 
+        ret=This->lpvtbl->fnGetRefTypeInfo(iface,
                 This->impltypelist->reference, &pTInfo);
         if(SUCCEEDED(ret)){
-            ret=pTInfo->lpvtbl->fnGetIDsOfNames(pTInfo, rgszNames, cNames, pMemId );
-            pTInfo->lpvtbl->fnRelease(pTInfo);
+            ret=ICOM_VTBL(pTInfo)->fnGetIDsOfNames(pTInfo, rgszNames, cNames, pMemId );
+            ICOM_VTBL(pTInfo)->fnRelease(pTInfo);
             return ret;
         }
@@ -1882 +1882 @@
 
 /* ITypeInfo::Invoke
- * 
+ *
  * Invokes a method, or accesses a property of an object, that implements the
  * interface described by the type description.
@@ -1896 +1896 @@
 
 /* ITypeInfo::GetDocumentation
- * 
+ *
  * Retrieves the documentation string, the complete Help file name and path,
  * and the context ID for the Help topic for a specified type description.
@@ -1905 +1905 @@
 {
         ICOM_THIS( TLBTypeInfo, iface);
-    TLBFuncDesc * pFDesc; 
-    TLBVarDesc * pVDesc; 
+    TLBFuncDesc * pFDesc;
+    TLBVarDesc * pVDesc;
     TRACE_(typelib)("(%p) memid %ld Name(%p) DocString(%p)"
            " HelpContext(%p) HelpFile(%p)\n",
@@ -1934 +1934 @@
 
 /*  ITypeInfo::GetDllEntry
- * 
+ *
  * Retrieves a description or specification of an entry point for a function
  * in a DLL.
@@ -1948 +1948 @@
 
 /* ITypeInfo::GetRefTypeInfo
- * 
+ *
  * If a type description references other type descriptions, it retrieves
  * the referenced type descriptions.
@@ -1960 +1960 @@
         ITypeLib *pTLib;
         int Index;
-        result=This->lpvtbl->fnGetContainingTypeLib(iface, &pTLib, 
+        result=This->lpvtbl->fnGetContainingTypeLib(iface, &pTLib,
                 (UINT*)&Index);
         if(SUCCEEDED(result)){
-            result=pTLib->lpvtbl->fnGetTypeInfo(pTLib,
+            result=ICOM_VTBL(pTLib)->fnGetTypeInfo(pTLib,
                     HREFTYPE_INDEX(hRefType),
                     ppTInfo);
-            pTLib->lpvtbl->fnRelease(pTLib );
+            ICOM_VTBL(pTLib)->fnRelease(pTLib );
         }
     } else{
@@ -2003 +2003 @@
 
 /* ITypeInfo::AddressOfMember
- * 
+ *
  * Retrieves the addresses of static functions or variables, such as those
  * defined in a DLL.
@@ -2016 +2016 @@
 
 /* ITypeInfo::CreateInstance
- * 
- * Creates a new instance of a type that describes a component object class 
+ *
+ * Creates a new instance of a type that describes a component object class
  * (coclass).
  */
-static HRESULT WINAPI ITypeInfo_fnCreateInstance( LPTYPEINFO iface, 
-        IUnknown *pUnk, REFIID riid, VOID  **ppvObj) 
+static HRESULT WINAPI ITypeInfo_fnCreateInstance( LPTYPEINFO iface,
+        IUnknown *pUnk, REFIID riid, VOID  **ppvObj)
 {
         ICOM_THIS( TLBTypeInfo, iface);
@@ -2041 +2041 @@
 
 /* ITypeInfo::GetContainingTypeLib
- * 
+ *
  * Retrieves the containing type library and the index of the type description
  * within that type library.
@@ -2051 +2051 @@
     *ppTLib=(LPTYPELIB )(This->pTypeLib);
     *pIndex=This->index;
-    (*ppTLib)->lpvtbl->fnAddRef(*ppTLib);
+    ICOM_VTBL(*ppTLib)->fnAddRef(*ppTLib);
     TRACE_(typelib)("(%p) returns (%p) index %d!\n", This, *ppTLib, *pIndex);
     return S_OK;
@@ -2111 +2111 @@
  * Returns the type flags without any allocations. This returns a DWORD type
  * flag, which expands the type flags without growing the TYPEATTR (type
- * attribute). 
+ * attribute).
  *
  */
@@ -2136 +2136 @@
     HRESULT result;
     /* FIXME: should check for invKind??? */
-    for(i=0, pFuncInfo=This->funclist;pFuncInfo && 
+    for(i=0, pFuncInfo=This->funclist;pFuncInfo &&
             memid != pFuncInfo->funcdesc.memid; i++, pFuncInfo=pFuncInfo->next);
     if(pFuncInfo){
@@ -2153 +2153 @@
  *
  * Binds to a specific member based on a known DISPID, where the member name
- * is not known (for example, when binding to a default member). 
+ * is not known (for example, when binding to a default member).
  *
  */
@@ -2163 +2163 @@
     int i;
     HRESULT result;
-    for(i=0, pVarInfo=This->varlist; pVarInfo && 
+    for(i=0, pVarInfo=This->varlist; pVarInfo &&
             memid != pVarInfo->vardesc.memid; i++, pVarInfo=pVarInfo->next)
         ;
@@ -2212 +2212 @@
         ICOM_THIS( TLBTypeInfo, iface);
     TLBCustData *pCData=NULL;
-    TLBFuncDesc * pFDesc; 
+    TLBFuncDesc * pFDesc;
     int i;
     for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++,
@@ -2240 +2240 @@
 static HRESULT WINAPI ITypeInfo2_fnGetParamCustData( ITypeInfo * iface,
     UINT indexFunc, UINT indexParam, REFGUID guid, VARIANT *pVarVal)
-{   
+{
         ICOM_THIS( TLBTypeInfo, iface);
     TLBCustData *pCData=NULL;
-    TLBFuncDesc * pFDesc; 
+    TLBFuncDesc * pFDesc;
     int i;
     for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++,
@@ -2249 +2249 @@
         ;
     if(pFDesc && indexParam >=0 && indexParam<pFDesc->funcdesc.cParams)
-        for(pCData=pFDesc->pParamDesc[indexParam].pCustData; pCData; 
+        for(pCData=pFDesc->pParamDesc[indexParam].pCustData; pCData;
                 pCData = pCData->next)
             if( IsEqualIID(guid, &pCData->guid)) break;
@@ -2272 +2272 @@
 static HRESULT WINAPI ITypeInfo2_fnGetVarCustData( ITypeInfo * iface,
     UINT index, REFGUID guid, VARIANT *pVarVal)
-{   
+{
         ICOM_THIS( TLBTypeInfo, iface);
     TLBCustData *pCData=NULL;
-    TLBVarDesc * pVDesc; 
+    TLBVarDesc * pVDesc;
     int i;
     for(i=0, pVDesc=This->varlist; i!=index && pVDesc; i++,
@@ -2303 +2303 @@
 static HRESULT WINAPI ITypeInfo2_fnGetImplTypeCustData( ITypeInfo * iface,
     UINT index, REFGUID guid, VARIANT *pVarVal)
-{   
+{
         ICOM_THIS( TLBTypeInfo, iface);
     TLBCustData *pCData=NULL;
-    TLBRefType * pRDesc; 
+    TLBRefType * pRDesc;
     int i;
     for(i=0, pRDesc=This->impltypelist; i!=index && pRDesc; i++,
@@ -2329 +2329 @@
 
 /* ITypeInfo2::GetDocumentation2
- * 
+ *
  * Retrieves the documentation string, the complete Help file name and path,
  * the localization context to use, and the context ID for the library Help
@@ -2340 +2340 @@
 {
         ICOM_THIS( TLBTypeInfo, iface);
-    TLBFuncDesc * pFDesc; 
-    TLBVarDesc * pVDesc; 
+    TLBFuncDesc * pFDesc;
+    TLBVarDesc * pVDesc;
     TRACE_(typelib)("(%p) memid %ld lcid(0x%lx)  HelpString(%p) "
            "HelpStringContext(%p) HelpStringDll(%p)\n",
@@ -2388 +2388 @@
 /* ITypeInfo2::GetAllCustData
  *
- * Gets all custom data items for the Type info. 
+ * Gets all custom data items for the Type info.
  *
  */
@@ -2397 +2397 @@
     TLBCustData *pCData;
     int i;
-    TRACE_(typelib)("(%p) returning %d items\n", This, This->ctCustData); 
+    TRACE_(typelib)("(%p) returning %d items\n", This, This->ctCustData);
     pCustData->prgCustData = (tagCUSTDATAITEM*)TLB_Alloc(This->ctCustData * sizeof(CUSTDATAITEM));
     if(pCustData->prgCustData ){
@@ -2422 +2422 @@
         ICOM_THIS( TLBTypeInfo, iface);
     TLBCustData *pCData;
-    TLBFuncDesc * pFDesc; 
+    TLBFuncDesc * pFDesc;
     int i;
-    TRACE_(typelib)("(%p) index %d\n", This, index); 
+    TRACE_(typelib)("(%p) index %d\n", This, index);
     for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++,
             pFDesc=pFDesc->next)
@@ -2458 +2458 @@
         ICOM_THIS( TLBTypeInfo, iface);
     TLBCustData *pCData=NULL;
-    TLBFuncDesc * pFDesc; 
+    TLBFuncDesc * pFDesc;
     int i;
-    TRACE_(typelib)("(%p) index %d\n", This, indexFunc); 
+    TRACE_(typelib)("(%p) index %d\n", This, indexFunc);
     for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++,
             pFDesc=pFDesc->next)
         ;
     if(pFDesc && indexParam >=0 && indexParam<pFDesc->funcdesc.cParams){
-        pCustData->prgCustData =(tagCUSTDATAITEM*) 
+        pCustData->prgCustData =(tagCUSTDATAITEM*)
             TLB_Alloc(pFDesc->pParamDesc[indexParam].ctCustData *
                     sizeof(CUSTDATAITEM));
@@ -2495 +2495 @@
         ICOM_THIS( TLBTypeInfo, iface);
     TLBCustData *pCData;
-    TLBVarDesc * pVDesc; 
+    TLBVarDesc * pVDesc;
     int i;
-    TRACE_(typelib)("(%p) index %d\n", This, index); 
+    TRACE_(typelib)("(%p) index %d\n", This, index);
     for(i=0, pVDesc=This->varlist; i!=index && pVDesc; i++,
             pVDesc=pVDesc->next)
@@ -2531 +2531 @@
         ICOM_THIS( TLBTypeInfo, iface);
     TLBCustData *pCData;
-    TLBRefType * pRDesc; 
+    TLBRefType * pRDesc;
     int i;
-    TRACE_(typelib)("(%p) index %d\n", This, index); 
+    TRACE_(typelib)("(%p) index %d\n", This, index);
     for(i=0, pRDesc=This->impltypelist; i!=index && pRDesc; i++,
             pRDesc=pRDesc->next)