Changeset 4962 for trunk/src


Ignore:
Timestamp:
Jan 18, 2001, 7:12:38 PM (25 years ago)
Author:
sandervl
Message:

typelib resync

Location:
trunk/src/oleaut32
Files:
1 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/oleaut32/itypeinfo.cpp

    r4278 r4962  
    1 /* $Id: itypeinfo.cpp,v 1.4 2000-09-17 22:31:41 davidr Exp $ */
     1/* $Id: itypeinfo.cpp,v 1.5 2001-01-18 18:12:20 sandervl Exp $ */
    22/*
    33 * ITypeInfo interface
    … …  
    2525// ======================================================================
    2626
    27 static ICOM_VTABLE(ITypeInfo) ITypeInfo_Vtable =
     27static ICOM_VTABLE(ITypeInfo2) ITypeInfo_Vtable =
    2828{
    2929    ITypeInfoImpl_QueryInterface,
    … …  
    103103// This object supports IUnknown, ITypeInfo, ITypeInfo2
    104104// ----------------------------------------------------------------------
    105 HRESULT WIN32API ITypeInfoImpl_QueryInterface(LPTYPEINFO iface,
     105HRESULT WIN32API ITypeInfoImpl_QueryInterface(ITypeInfo2 * iface,
    106106                                REFIID riid, VOID **ppvObject)
    107107{
    … …  
    144144
    145145    // Query Interface always increases the reference count by one...
    146     ITypeInfoImpl_AddRef((LPTYPEINFO)This);
     146    ITypeInfoImpl_AddRef((ITypeInfo2 *)This);
    147147
    148148    return S_OK;
    … …  
    153153// ITypeInfoImpl_AddRef
    154154// ----------------------------------------------------------------------
    155 ULONG   WIN32API ITypeInfoImpl_AddRef(LPTYPEINFO iface)
     155ULONG   WIN32API ITypeInfoImpl_AddRef(ITypeInfo2 * iface)
    156156{
    157157    ICOM_THIS(ITypeInfoImpl, iface);
    … …  
    166166// ITypeInfoImpl_Release
    167167// ----------------------------------------------------------------------
    168 ULONG   WIN32API ITypeInfoImpl_Release(LPTYPEINFO iface)
     168ULONG   WIN32API ITypeInfoImpl_Release(ITypeInfo2 * iface)
    169169{
    170170    ICOM_THIS(ITypeInfoImpl, iface);
    … …  
    184184// ITypeInfoImpl_GetTypeAttr
    185185// ----------------------------------------------------------------------
    186 HRESULT WIN32API ITypeInfoImpl_GetTypeAttr(LPTYPEINFO iface,
     186HRESULT WIN32API ITypeInfoImpl_GetTypeAttr(ITypeInfo2 * iface,
    187187                                LPTYPEATTR  *ppTypeAttr)
    188188{
    … …  
    203203//
    204204// ----------------------------------------------------------------------
    205 HRESULT WIN32API ITypeInfoImpl_GetTypeComp(LPTYPEINFO iface,
     205HRESULT WIN32API ITypeInfoImpl_GetTypeComp(ITypeInfo2 * iface,
    206206                                ITypeComp  * *ppTComp)
    207207{
    … …  
    217217// ITypeInfoImpl_GetFuncDesc
    218218// ----------------------------------------------------------------------
    219 HRESULT WIN32API ITypeInfoImpl_GetFuncDesc(LPTYPEINFO iface,
     219HRESULT WIN32API ITypeInfoImpl_GetFuncDesc(ITypeInfo2 * iface,
    220220                                UINT index, LPFUNCDESC  *ppFuncDesc)
    221221{
    … …  
    238238// ITypeInfoImpl_GetVarDesc
    239239// ----------------------------------------------------------------------
    240 HRESULT WIN32API ITypeInfoImpl_GetVarDesc(LPTYPEINFO iface,
     240HRESULT WIN32API ITypeInfoImpl_GetVarDesc(ITypeInfo2 * iface,
    241241                                UINT index, LPVARDESC  *ppVarDesc)
    242242{
    … …  
    259259// ITypeInfoImpl_GetNames
    260260// ----------------------------------------------------------------------
    261 HRESULT WIN32API ITypeInfoImpl_GetNames(LPTYPEINFO iface,
     261HRESULT WIN32API ITypeInfoImpl_GetNames(ITypeInfo2 * iface,
    262262                                MEMBERID memid, BSTR  *rgBstrNames,
    263263                                UINT cMaxNames, UINT  *pcNames)
    … …  
    313313        {
    314314            // recursive search
    315             ITypeInfo * pTInfo;
     315            ITypeInfo2 *        pTInfo;
    316316            HRESULT             result;
    317317
    318             result = This->lpvtbl->fnGetRefTypeInfo(iface, itrRef.Element()->reference, &pTInfo);
     318            result = This->lpvtbl->fnGetRefTypeInfo(iface, itrRef.Element()->reference, (ITypeInfo **)&pTInfo);
    319319            if(SUCCEEDED(result))
    320320            {
    … …  
    338338// ITypeInfoImpl_GetRefTypeOfImplType
    339339// ----------------------------------------------------------------------
    340 HRESULT WIN32API ITypeInfoImpl_GetRefTypeOfImplType(LPTYPEINFO iface,
     340HRESULT WIN32API ITypeInfoImpl_GetRefTypeOfImplType(ITypeInfo2 * iface,
    341341                                UINT index, HREFTYPE  *pRefType)
    342342{
    … …  
    356356//  ITypeInfoImpl_GetImplTypeFlags
    357357// ----------------------------------------------------------------------
    358 HRESULT WIN32API ITypeInfoImpl_GetImplTypeFlags(LPTYPEINFO iface,
     358HRESULT WIN32API ITypeInfoImpl_GetImplTypeFlags(ITypeInfo2 * iface,
    359359                                UINT index, INT  *pImplTypeFlags)
    360360{
    … …  
    374374// ITypeInfoImpl_GetIDsOfNames
    375375// ----------------------------------------------------------------------
    376 HRESULT WIN32API ITypeInfoImpl_GetIDsOfNames(LPTYPEINFO iface,
     376HRESULT WIN32API ITypeInfoImpl_GetIDsOfNames(ITypeInfo2 * iface,
    377377                                LPOLESTR  *rgszNames, UINT cNames, MEMBERID  *pMemId)
    378378{
    … …  
    463463//
    464464// ----------------------------------------------------------------------
    465 HRESULT WIN32API ITypeInfoImpl_Invoke(LPTYPEINFO iface,
     465HRESULT WIN32API ITypeInfoImpl_Invoke(ITypeInfo2 * iface,
    466466                                VOID  *pIUnk, MEMBERID memid, UINT16 dwFlags,
    467467                                DISPPARAMS  *pDispParams, VARIANT *pVarResult,
    … …  
    479479// ITypeInfoImpl_GetDocumentation
    480480// ----------------------------------------------------------------------
    481 HRESULT WIN32API ITypeInfoImpl_GetDocumentation(LPTYPEINFO iface,
     481HRESULT WIN32API ITypeInfoImpl_GetDocumentation(ITypeInfo2 * iface,
    482482                                MEMBERID memid, BSTR  *pBstrName, BSTR  *pBstrDocString,
    483483                                DWORD  *pdwHelpContext, BSTR  *pBstrHelpFile)
    … …  
    545545//
    546546// ----------------------------------------------------------------------
    547 HRESULT WIN32API ITypeInfoImpl_GetDllEntry(LPTYPEINFO iface,
     547HRESULT WIN32API ITypeInfoImpl_GetDllEntry(ITypeInfo2 * iface,
    548548                                MEMBERID memid, INVOKEKIND invKind, BSTR  *pBstrDllName,
    549549                                BSTR  *pBstrName, WORD  *pwOrdinal)
    … …  
    560560//
    561561// ----------------------------------------------------------------------
    562 HRESULT WIN32API ITypeInfoImpl_GetRefTypeInfo(LPTYPEINFO iface,
     562HRESULT WIN32API ITypeInfoImpl_GetRefTypeInfo(ITypeInfo2 * iface,
    563563                                HREFTYPE hRefType, ITypeInfo  * *ppTInfo)
    564564{
    … …  
    594594            {
    595595                return pTypeLib->lpvtbl->fnGetTypeInfoOfGuid(
    596                         (LPTYPELIB)pTypeLib, &itrRef.Element()->guid, ppTInfo);
     596                        (ITypeLib2 *)pTypeLib, &itrRef.Element()->guid, ppTInfo);
    597597            }
    598598            rc = LoadRegTypeLib( &itrRef.Element()->pImpTLInfo->guid,
    … …  
    608608            {
    609609                rc = pTypeLib->lpvtbl->fnGetTypeInfoOfGuid(
    610                         (LPTYPELIB)pTypeLib, &itrRef.Element()->guid, ppTInfo);
     610                        (ITypeLib2 *)pTypeLib, &itrRef.Element()->guid, ppTInfo);
    611611                itrRef.Element()->pImpTLInfo->pImpTypeLib = pTypeLib;
    612612            }
    … …  
    622622//
    623623// ----------------------------------------------------------------------
    624 HRESULT WIN32API ITypeInfoImpl_AddressOfMember(LPTYPEINFO iface,
     624HRESULT WIN32API ITypeInfoImpl_AddressOfMember(ITypeInfo2 * iface,
    625625                                MEMBERID memid, INVOKEKIND invKind, PVOID *ppv)
    626626{
    … …  
    636636//
    637637// ----------------------------------------------------------------------
    638 HRESULT WIN32API ITypeInfoImpl_CreateInstance(LPTYPEINFO iface,
     638HRESULT WIN32API ITypeInfoImpl_CreateInstance(ITypeInfo2 * iface,
    639639                                IUnknown *pUnk, REFIID riid, VOID  * *ppvObj)
    640640{
    … …  
    650650//
    651651// ----------------------------------------------------------------------
    652 HRESULT WIN32API ITypeInfoImpl_GetMops(LPTYPEINFO iface,
     652HRESULT WIN32API ITypeInfoImpl_GetMops(ITypeInfo2 * iface,
    653653                                MEMBERID memid, BSTR  *pBstrMops)
    654654{
    … …  
    664664// ITypeInfoImpl_GetContainingTypeLib
    665665// ----------------------------------------------------------------------
    666 HRESULT WIN32API ITypeInfoImpl_GetContainingTypeLib(LPTYPEINFO iface,
     666HRESULT WIN32API ITypeInfoImpl_GetContainingTypeLib(ITypeInfo2 * iface,
    667667                                ITypeLib  * *ppTLib, UINT  *pIndex)
    668668{
    … …  
    683683// ITypeInfoImpl_ReleaseTypeAttr
    684684// ----------------------------------------------------------------------
    685 HRESULT WIN32API ITypeInfoImpl_ReleaseTypeAttr(LPTYPEINFO iface,
     685HRESULT WIN32API ITypeInfoImpl_ReleaseTypeAttr(ITypeInfo2 * iface,
    686686                                TYPEATTR *pTypeAttr)
    687687{
    … …  
    699699// ITypeInfoImpl_ReleaseFuncDesc
    700700// ----------------------------------------------------------------------
    701 HRESULT WIN32API ITypeInfoImpl_ReleaseFuncDesc(LPTYPEINFO iface,
     701HRESULT WIN32API ITypeInfoImpl_ReleaseFuncDesc(ITypeInfo2 * iface,
    702702                                FUNCDESC *pFuncDesc)
    703703{
    … …  
    715715// ITypeInfoImpl_ReleaseVarDesc
    716716// ----------------------------------------------------------------------
    717 HRESULT WIN32API ITypeInfoImpl_ReleaseVarDesc(LPTYPEINFO iface,
     717HRESULT WIN32API ITypeInfoImpl_ReleaseVarDesc(ITypeInfo2 * iface,
    718718                                VARDESC *pVarDesc)
    719719{
    … …  
    731731// ITypeInfo2Impl_GetTypeKind
    732732// ----------------------------------------------------------------------
    733 HRESULT WIN32API ITypeInfo2Impl_GetTypeKind(LPTYPEINFO iface,
     733HRESULT WIN32API ITypeInfo2Impl_GetTypeKind(ITypeInfo2 * iface,
    734734                                TYPEKIND *pTypeKind)
    735735{
    … …  
    746746// ITypeInfo2Impl_GetTypeFlags
    747747// ----------------------------------------------------------------------
    748 HRESULT WIN32API ITypeInfo2Impl_GetTypeFlags(LPTYPEINFO iface,
     748HRESULT WIN32API ITypeInfo2Impl_GetTypeFlags(ITypeInfo2 * iface,
    749749                                UINT *pTypeFlags)
    750750{
    … …  
    762762// ITypeInfo2Impl_GetFuncIndexOfMemId
    763763// ----------------------------------------------------------------------
    764 HRESULT WIN32API ITypeInfo2Impl_GetFuncIndexOfMemId(LPTYPEINFO iface,
     764HRESULT WIN32API ITypeInfo2Impl_GetFuncIndexOfMemId(ITypeInfo2 * iface,
    765765                                MEMBERID memid, INVOKEKIND invKind, UINT *pFuncIndex)
    766766{
    … …  
    790790// ITypeInfo2Impl_GetVarIndexOfMemId
    791791// ----------------------------------------------------------------------
    792 HRESULT WIN32API ITypeInfo2Impl_GetVarIndexOfMemId(LPTYPEINFO iface,
     792HRESULT WIN32API ITypeInfo2Impl_GetVarIndexOfMemId(ITypeInfo2 * iface,
    793793                                MEMBERID memid, UINT *pVarIndex)
    794794{
    … …  
    836836// ITypeInfo2Impl_GetCustData
    837837// ----------------------------------------------------------------------
    838 HRESULT WIN32API ITypeInfo2Impl_GetCustData(LPTYPEINFO iface,
     838HRESULT WIN32API ITypeInfo2Impl_GetCustData(ITypeInfo2 * iface,
    839839                                REFGUID guid, VARIANT *pVarVal)
    840840{
    … …  
    850850// ITypeInfo2Impl_GetFuncCustData
    851851// ----------------------------------------------------------------------
    852 HRESULT WIN32API ITypeInfo2Impl_GetFuncCustData(LPTYPEINFO iface,
     852HRESULT WIN32API ITypeInfo2Impl_GetFuncCustData(ITypeInfo2 * iface,
    853853                                UINT index, REFGUID guid, VARIANT *pVarVal)
    854854{
    … …  
    867867//  ITypeInfo2Impl_GetParamCustData
    868868// ----------------------------------------------------------------------
    869 HRESULT WIN32API ITypeInfo2Impl_GetParamCustData(LPTYPEINFO iface,
     869HRESULT WIN32API ITypeInfo2Impl_GetParamCustData(ITypeInfo2 * iface,
    870870                                UINT indexFunc, UINT indexParam, REFGUID guid, VARIANT *pVarVal)
    871871{
    … …  
    891891// ITypeInfo2Impl_GetVarCustData
    892892// ----------------------------------------------------------------------
    893 HRESULT WIN32API ITypeInfo2Impl_GetVarCustData(LPTYPEINFO iface,
     893HRESULT WIN32API ITypeInfo2Impl_GetVarCustData(ITypeInfo2 * iface,
    894894                                UINT index, REFGUID guid, VARIANT *pVarVal)
    895895{
    … …  
    908908// ITypeInfo2Impl_GetImplTypeCustData
    909909// ----------------------------------------------------------------------
    910 HRESULT WIN32API ITypeInfo2Impl_GetImplTypeCustData(LPTYPEINFO iface,
     910HRESULT WIN32API ITypeInfo2Impl_GetImplTypeCustData(ITypeInfo2 * iface,
    911911                                UINT index, REFGUID guid, VARIANT *pVarVal)
    912912{
    … …  
    925925// ITypeInfo2Impl_GetDocumentation2
    926926// ----------------------------------------------------------------------
    927 HRESULT WIN32API ITypeInfo2Impl_GetDocumentation2(LPTYPEINFO iface,
     927HRESULT WIN32API ITypeInfo2Impl_GetDocumentation2(ITypeInfo2 * iface,
    928928                                MEMBERID memid, LCID lcid, BSTR *pbstrHelpString,
    929                                 INT *pdwHelpStringContext, BSTR *pbstrHelpStringDll)
     929                                DWORD *pdwHelpStringContext, BSTR *pbstrHelpStringDll)
    930930{
    931931    ICOM_THIS(ITypeInfoImpl, iface);
    … …  
    10151015// ITypeInfo2Impl_GetAllCustData
    10161016// ----------------------------------------------------------------------
    1017 HRESULT WIN32API ITypeInfo2Impl_GetAllCustData(LPTYPEINFO iface,
     1017HRESULT WIN32API ITypeInfo2Impl_GetAllCustData(ITypeInfo2 * iface,
    10181018                                CUSTDATA *pCustData)
    10191019{
    … …  
    10291029// ITypeInfo2Impl_GetAllFuncCustData
    10301030// ----------------------------------------------------------------------
    1031 HRESULT WIN32API ITypeInfo2Impl_GetAllFuncCustData(LPTYPEINFO iface,
     1031HRESULT WIN32API ITypeInfo2Impl_GetAllFuncCustData(ITypeInfo2 * iface,
    10321032                                UINT index, CUSTDATA *pCustData)
    10331033{
    … …  
    10461046// ITypeInfo2Impl_GetAllParamCustData
    10471047// ----------------------------------------------------------------------
    1048 HRESULT WIN32API ITypeInfo2Impl_GetAllParamCustData(LPTYPEINFO iface,
     1048HRESULT WIN32API ITypeInfo2Impl_GetAllParamCustData(ITypeInfo2 * iface,
    10491049                                UINT indexFunc, UINT indexParam, CUSTDATA *pCustData)
    10501050{
    … …  
    10701070// ITypeInfo2Impl_GetAllVarCustData
    10711071// ----------------------------------------------------------------------
    1072 HRESULT WIN32API ITypeInfo2Impl_GetAllVarCustData(LPTYPEINFO iface,
     1072HRESULT WIN32API ITypeInfo2Impl_GetAllVarCustData(ITypeInfo2 * iface,
    10731073                                UINT index, CUSTDATA *pCustData)
    10741074{
    … …  
    10871087// ITypeInfo2Impl_GetAllImplTypeCustData
    10881088// ----------------------------------------------------------------------
    1089 HRESULT WIN32API ITypeInfo2Impl_GetAllImplTypeCustData(LPTYPEINFO iface,
     1089HRESULT WIN32API ITypeInfo2Impl_GetAllImplTypeCustData(ITypeInfo2 * iface,
    10901090                                UINT index, CUSTDATA *pCustData)
    10911091{

  • trunk/src/oleaut32/itypelib.cpp

    r4278 r4962  
    1 /* $Id: itypelib.cpp,v 1.4 2000-09-17 22:31:41 davidr Exp $ */
     1/* $Id: itypelib.cpp,v 1.5 2001-01-18 18:12:21 sandervl Exp $ */
    22/*
    33 * ITypelib interface
    … …  
    2222// Local Data
    2323// ======================================================================
    24 static ICOM_VTABLE(ITypeLib) ITypeLib_VTable =
     24static ICOM_VTABLE(ITypeLib2) ITypeLib_VTable =
    2525{
    2626    ITypeLibImpl_QueryInterface,
    … …  
    8282// This object supports IUnknown, ITypeLib, ITypeLib2
    8383// ----------------------------------------------------------------------
    84 HRESULT WIN32API ITypeLibImpl_QueryInterface(LPTYPELIB iface,
     84HRESULT WIN32API ITypeLibImpl_QueryInterface(ITypeLib2 * iface,
    8585                                REFIID riid, VOID **ppvObject)
    8686{
    … …  
    123123
    124124    // Query Interface always increases the reference count by one...
    125     ITypeLibImpl_AddRef((LPTYPELIB)This);
     125    ITypeLibImpl_AddRef((ITypeLib2 *)This);
    126126
    127127    return S_OK;
    … …  
    132132// ITypeLibImpl_AddRef
    133133// ----------------------------------------------------------------------
    134 ULONG   WIN32API ITypeLibImpl_AddRef(LPTYPELIB iface)
     134ULONG   WIN32API ITypeLibImpl_AddRef(ITypeLib2 * iface)
    135135{
    136136    ICOM_THIS(ITypeLibImpl, iface);
    … …  
    145145// ITypeLibImpl_Release
    146146// ----------------------------------------------------------------------
    147 ULONG   WIN32API ITypeLibImpl_Release(LPTYPELIB iface)
     147ULONG   WIN32API ITypeLibImpl_Release(ITypeLib2 * iface)
    148148{
    149149    ICOM_THIS(ITypeLibImpl, iface);
    … …  
    163163// ITypeLibImpl_GetTypeInfoCount
    164164// ----------------------------------------------------------------------
    165 UINT    WIN32API ITypeLibImpl_GetTypeInfoCount(LPTYPELIB iface)
     165UINT    WIN32API ITypeLibImpl_GetTypeInfoCount(ITypeLib2 * iface)
    166166{
    167167    ICOM_THIS(ITypeLibImpl, iface);
    … …  
    176176// ITypeLibImpl_GetTypeInfo
    177177// ----------------------------------------------------------------------
    178 HRESULT WIN32API ITypeLibImpl_GetTypeInfo(LPTYPELIB iface,
     178HRESULT WIN32API ITypeLibImpl_GetTypeInfo(ITypeLib2 * iface,
    179179                                UINT index, ITypeInfo **ppTInfo)
    180180{
    … …  
    195195    ITypeInfoImpl * pInfo = This->pTypeInfo[index];
    196196    *ppTInfo = (ITypeInfo *)pInfo;
    197     pInfo->lpvtbl->fnAddRef(*ppTInfo);
     197    pInfo->lpvtbl->fnAddRef((ITypeInfo2 *)*ppTInfo);
    198198
    199199    return S_OK;
    … …  
    204204// ITypeLibImpl_GetTypeInfoType
    205205// ----------------------------------------------------------------------
    206 HRESULT WIN32API ITypeLibImpl_GetTypeInfoType(LPTYPELIB iface,
     206HRESULT WIN32API ITypeLibImpl_GetTypeInfoType(ITypeLib2 * iface,
    207207                                UINT index, TYPEKIND *pTKind)
    208208{
    … …  
    229229// ITypeLibImpl_GetTypeInfoOfGuid
    230230// ----------------------------------------------------------------------
    231 HRESULT WIN32API ITypeLibImpl_GetTypeInfoOfGuid(LPTYPELIB iface,
     231HRESULT WIN32API ITypeLibImpl_GetTypeInfoOfGuid(ITypeLib2 * iface,
    232232                                REFGUID guid, ITypeInfo **ppTInfo)
    233233{
    … …  
    252252                ITypeInfoImpl * pInfo = itrTypeInfo.Element();
    253253                *ppTInfo = (ITypeInfo *)pInfo;
    254                 pInfo->lpvtbl->fnAddRef(*ppTInfo);
     254                pInfo->lpvtbl->fnAddRef((ITypeInfo2 *)*ppTInfo);
    255255
    256256                return S_OK;
    … …  
    266266// ITypeLibImpl_GetLibAttr
    267267// ----------------------------------------------------------------------
    268 HRESULT WIN32API ITypeLibImpl_GetLibAttr(LPTYPELIB iface,
     268HRESULT WIN32API ITypeLibImpl_GetLibAttr(ITypeLib2 * iface,
    269269                                LPTLIBATTR *ppTLibAttr)
    270270{
    … …  
    285285// ITypeLibImpl_GetTypeComp
    286286// ----------------------------------------------------------------------
    287 HRESULT WIN32API ITypeLibImpl_GetTypeComp(LPTYPELIB iface,
     287HRESULT WIN32API ITypeLibImpl_GetTypeComp(ITypeLib2 * iface,
    288288                                ITypeComp **ppTComp)
    289289{
    … …  
    305305// ITypeLibImpl_GetDocumentation
    306306// ----------------------------------------------------------------------
    307 HRESULT WIN32API ITypeLibImpl_GetDocumentation(LPTYPELIB iface,
     307HRESULT WIN32API ITypeLibImpl_GetDocumentation(ITypeLib2 * iface,
    308308                                INT index, BSTR *pBstrName, BSTR *pBstrDocString,
    309309                                DWORD *plHelpContext, BSTR *pBstrHelpFile)
    … …  
    330330    else
    331331    { // for specified typeinfo
    332         ITypeInfo *     pTInfo;
    333 
    334         rc = ITypeLibImpl_GetTypeInfo(iface, index, &pTInfo);
     332        ITypeInfo2 *    pTInfo;
     333
     334        rc = ITypeLibImpl_GetTypeInfo(iface, index, (ITypeInfo **)&pTInfo);
    335335
    336336        if (SUCCEEDED(rc))
    … …  
    386386// ITypeLibImpl_IsName
    387387// ----------------------------------------------------------------------
    388 HRESULT WIN32API ITypeLibImpl_IsName(LPTYPELIB iface,
     388HRESULT WIN32API ITypeLibImpl_IsName(ITypeLib2 * iface,
    389389                                LPOLESTR szNameBuf, ULONG lHashVal, BOOL *pfName)
    390390{
    … …  
    444444// ITypeLibImpl_FindName
    445445// ----------------------------------------------------------------------
    446 HRESULT WIN32API ITypeLibImpl_FindName(LPTYPELIB iface,
     446HRESULT WIN32API ITypeLibImpl_FindName(ITypeLib2 * iface,
    447447                                LPOLESTR szNameBuf, ULONG lHashVal, ITypeInfo **ppTInfo,
    448448                                MEMBERID *rgMemId, UINT16 *pcFound)
    … …  
    467467            ppTInfo[cFound] = (ITypeInfo *)pInfo;
    468468            rgMemId[cFound] = lMemID;
    469             pInfo->lpvtbl->fnAddRef((ITypeInfo *)pInfo);
     469            pInfo->lpvtbl->fnAddRef((ITypeInfo2 *)pInfo);
    470470            cFound += 1;
    471471        }
    … …  
    481481//
    482482// ----------------------------------------------------------------------
    483 void WIN32API ITypeLibImpl_ReleaseTLibAttr(LPTYPELIB iface,
     483void WIN32API ITypeLibImpl_ReleaseTLibAttr(ITypeLib2 * iface,
    484484                                TLIBATTR *pTLibAttr)
    485485{
    … …  
    495495// ITypeLib2Impl_GetCustData
    496496// ----------------------------------------------------------------------
    497 HRESULT WIN32API ITypeLib2Impl_GetCustData(LPTYPELIB iface,
     497HRESULT WIN32API ITypeLib2Impl_GetCustData(ITypeLib2 * iface,
    498498                                REFGUID guid, VARIANT *pVarVal)
    499499{
    … …  
    521521// ITypeLib2Impl_GetLibStatistics               STUB
    522522// ----------------------------------------------------------------------
    523 HRESULT WIN32API ITypeLib2Impl_GetLibStatistics(LPTYPELIB iface,
    524                                 UINT *pcUniqueNames, UINT *pcchUniqueNames)
     523HRESULT WIN32API ITypeLib2Impl_GetLibStatistics(ITypeLib2 * iface,
     524                                ULONG *pcUniqueNames, ULONG *pcchUniqueNames)
    525525{
    526526    ICOM_THIS(ITypeLibImpl, iface);
    … …  
    541541// ITypeLib2Impl_GetDocumentation2
    542542// ----------------------------------------------------------------------
    543 HRESULT WIN32API ITypeLib2Impl_GetDocumentation2(LPTYPELIB iface,
     543HRESULT WIN32API ITypeLib2Impl_GetDocumentation2(ITypeLib2 * iface,
    544544                                INT index, LCID lcid, BSTR *pbstrHelpString,
    545                                 INT *plHelpStringContext, BSTR *pbstrHelpStringDll)
     545                                DWORD *plHelpStringContext, BSTR *pbstrHelpStringDll)
    546546{
    547547    ICOM_THIS(ITypeLibImpl, iface);
    … …  
    563563    else
    564564    { // for specified typeinfo
    565         ITypeInfo *     pTInfo;
    566 
    567         rc = ITypeLibImpl_GetTypeInfo(iface, index, &pTInfo);
     565        ITypeInfo2 *    pTInfo;
     566
     567        rc = ITypeLibImpl_GetTypeInfo(iface, index, (ITypeInfo **)&pTInfo);
    568568
    569569        if (SUCCEEDED(rc))
    … …  
    587587// ITypeLib2Impl_GetAllCustData
    588588// ----------------------------------------------------------------------
    589 HRESULT WIN32API ITypeLib2Impl_GetAllCustData(LPTYPELIB iface,
     589HRESULT WIN32API ITypeLib2Impl_GetAllCustData(ITypeLib2 * iface,
    590590                                CUSTDATA *pCustData)
    591591{

  • trunk/src/oleaut32/itypelib.h

    r4276 r4962  
    1 /* $Id: itypelib.h,v 1.3 2000-09-17 22:28:54 davidr Exp $ */
     1/* $Id: itypelib.h,v 1.4 2001-01-18 18:12:21 sandervl Exp $ */
    22/*
    33 * OLE Typelib functions private header
    … …  
    8484typedef struct ITypeInfoImpl
    8585{
    86     ICOM_VTABLE(ITypeInfo) *    lpvtbl;
     86    ICOM_VTABLE(ITypeInfo2) *   lpvtbl;
    8787    ULONG                       ref;                    /* Reference count */
    8888    TYPEATTR                    TypeAttr ;              /* _lots_ of type information. */
    … …  
    104104typedef struct ITypeLibImpl
    105105{
    106     ICOM_VTABLE(ITypeLib) *     lpvtbl;
     106    ICOM_VTABLE(ITypeLib2) *    lpvtbl;
    107107    ULONG                       ref;                    // Reference count...
    108108
    … …  
    468468void    ITypeLibImpl_Destructor(ITypeLibImpl * This);
    469469
    470 HRESULT WIN32API ITypeLibImpl_QueryInterface(LPTYPELIB iface,
     470HRESULT WIN32API ITypeLibImpl_QueryInterface(ITypeLib2 * iface,
    471471                                REFIID riid, VOID **ppvObject);
    472 ULONG   WIN32API ITypeLibImpl_AddRef(LPTYPELIB iface);
    473 ULONG   WIN32API ITypeLibImpl_Release(LPTYPELIB iface);
    474 UINT    WIN32API ITypeLibImpl_GetTypeInfoCount(LPTYPELIB iface);
    475 HRESULT WIN32API ITypeLibImpl_GetTypeInfo(LPTYPELIB iface,
     472ULONG   WIN32API ITypeLibImpl_AddRef(ITypeLib2 * iface);
     473ULONG   WIN32API ITypeLibImpl_Release(ITypeLib2 * iface);
     474UINT    WIN32API ITypeLibImpl_GetTypeInfoCount(ITypeLib2 * iface);
     475HRESULT WIN32API ITypeLibImpl_GetTypeInfo(ITypeLib2 * iface,
    476476                                UINT index, ITypeInfo **ppTInfo);
    477 HRESULT WIN32API ITypeLibImpl_GetTypeInfoType(LPTYPELIB iface,
     477HRESULT WIN32API ITypeLibImpl_GetTypeInfoType(ITypeLib2 * iface,
    478478                                UINT index, TYPEKIND *pTKind);
    479 HRESULT WIN32API ITypeLibImpl_GetTypeInfoOfGuid(LPTYPELIB iface,
     479HRESULT WIN32API ITypeLibImpl_GetTypeInfoOfGuid(ITypeLib2 * iface,
    480480                                REFGUID guid, ITypeInfo **ppTinfo);
    481 HRESULT WIN32API ITypeLibImpl_GetLibAttr(LPTYPELIB iface,
     481HRESULT WIN32API ITypeLibImpl_GetLibAttr(ITypeLib2 * iface,
    482482                                LPTLIBATTR *ppTLibAttr);
    483 HRESULT WIN32API ITypeLibImpl_GetTypeComp(LPTYPELIB iface,
     483HRESULT WIN32API ITypeLibImpl_GetTypeComp(ITypeLib2 * iface,
    484484                                ITypeComp **ppTComp);
    485 HRESULT WIN32API ITypeLibImpl_GetDocumentation(LPTYPELIB iface,
     485HRESULT WIN32API ITypeLibImpl_GetDocumentation(ITypeLib2 * iface,
    486486                                INT index, BSTR *pBstrName, BSTR *pBstrDocString,
    487487                                DWORD *pdwHelpContext, BSTR *pBstrHelpFile);
    488 HRESULT WIN32API ITypeLibImpl_IsName(LPTYPELIB iface,
     488HRESULT WIN32API ITypeLibImpl_IsName(ITypeLib2 * iface,
    489489                                LPOLESTR szNameBuf, ULONG lHashVal, BOOL *pfName);
    490 HRESULT WIN32API ITypeLibImpl_FindName(LPTYPELIB iface,
     490HRESULT WIN32API ITypeLibImpl_FindName(ITypeLib2 * iface,
    491491                                LPOLESTR szNameBuf, ULONG lHashVal, ITypeInfo **ppTInfo,
    492492                                MEMBERID *rgMemId, UINT16 *pcFound);
    493 VOID WIN32API ITypeLibImpl_ReleaseTLibAttr(LPTYPELIB iface,
     493VOID WIN32API ITypeLibImpl_ReleaseTLibAttr(ITypeLib2 * iface,
    494494                                TLIBATTR *pTLibAttr);
    495 HRESULT WIN32API ITypeLib2Impl_GetCustData(LPTYPELIB iface,
     495HRESULT WIN32API ITypeLib2Impl_GetCustData(ITypeLib2 * iface,
    496496                                REFGUID guid, VARIANT *pVarVal);
    497 HRESULT WIN32API ITypeLib2Impl_GetLibStatistics(LPTYPELIB iface,
    498                                 UINT *pcUniqueNames, UINT *pcchUniqueNames);
    499 HRESULT WIN32API ITypeLib2Impl_GetDocumentation2(LPTYPELIB iface,
     497HRESULT WIN32API ITypeLib2Impl_GetLibStatistics(ITypeLib2 * iface,
     498                                ULONG *pcUniqueNames, ULONG *pcchUniqueNames);
     499HRESULT WIN32API ITypeLib2Impl_GetDocumentation2(ITypeLib2 * iface,
    500500                                INT index, LCID lcid, BSTR *pbstrHelpString,
    501                                 INT *pdwHelpStringContext, BSTR *pbstrHelpStringDll);
    502 HRESULT WIN32API ITypeLib2Impl_GetAllCustData(LPTYPELIB iface,
     501                                DWORD *pdwHelpStringContext, BSTR *pbstrHelpStringDll);
     502HRESULT WIN32API ITypeLib2Impl_GetAllCustData(ITypeLib2 * iface,
    503503                                CUSTDATA *pCustData);
    504504
    … …  
    509509void    ITypeInfoImpl_Destructor(ITypeInfoImpl * This);
    510510
    511 HRESULT WIN32API ITypeInfoImpl_QueryInterface(LPTYPEINFO iface,
     511HRESULT WIN32API ITypeInfoImpl_QueryInterface(ITypeInfo2 * iface,
    512512                                REFIID riid, VOID **ppvObject);
    513 ULONG   WIN32API ITypeInfoImpl_AddRef(LPTYPEINFO iface);
    514 ULONG   WIN32API ITypeInfoImpl_Release(LPTYPEINFO iface);
    515 HRESULT WIN32API ITypeInfoImpl_GetTypeAttr(LPTYPEINFO iface,
     513ULONG   WIN32API ITypeInfoImpl_AddRef(ITypeInfo2 * iface);
     514ULONG   WIN32API ITypeInfoImpl_Release(ITypeInfo2 * iface);
     515HRESULT WIN32API ITypeInfoImpl_GetTypeAttr(ITypeInfo2 * iface,
    516516                                LPTYPEATTR  *ppTypeAttr);
    517 HRESULT WIN32API ITypeInfoImpl_GetTypeComp(LPTYPEINFO iface,
     517HRESULT WIN32API ITypeInfoImpl_GetTypeComp(ITypeInfo2 * iface,
    518518                                ITypeComp  * *ppTComp);
    519 HRESULT WIN32API ITypeInfoImpl_GetFuncDesc(LPTYPEINFO iface,
     519HRESULT WIN32API ITypeInfoImpl_GetFuncDesc(ITypeInfo2 * iface,
    520520                                UINT index, LPFUNCDESC  *ppFuncDesc);
    521 HRESULT WIN32API ITypeInfoImpl_GetVarDesc(LPTYPEINFO iface,
     521HRESULT WIN32API ITypeInfoImpl_GetVarDesc(ITypeInfo2 * iface,
    522522                                UINT index, LPVARDESC  *ppVarDesc);
    523 HRESULT WIN32API ITypeInfoImpl_GetNames(LPTYPEINFO iface,
     523HRESULT WIN32API ITypeInfoImpl_GetNames(ITypeInfo2 * iface,
    524524                                MEMBERID memid, BSTR  *rgBstrNames,
    525525                                UINT cMaxNames, UINT  *pcNames);
    526 HRESULT WIN32API ITypeInfoImpl_GetRefTypeOfImplType(LPTYPEINFO iface,
     526HRESULT WIN32API ITypeInfoImpl_GetRefTypeOfImplType(ITypeInfo2 * iface,
    527527                                UINT index, HREFTYPE  *pRefType);
    528 HRESULT WIN32API ITypeInfoImpl_GetImplTypeFlags(LPTYPEINFO iface,
     528HRESULT WIN32API ITypeInfoImpl_GetImplTypeFlags(ITypeInfo2 * iface,
    529529                                UINT index, INT  *pImplTypeFlags);
    530 HRESULT WIN32API ITypeInfoImpl_GetIDsOfNames(LPTYPEINFO iface,
     530HRESULT WIN32API ITypeInfoImpl_GetIDsOfNames(ITypeInfo2 * iface,
    531531                                LPOLESTR  *rgszNames, UINT cNames, MEMBERID  *pMemId);
    532 HRESULT WIN32API ITypeInfoImpl_Invoke(LPTYPEINFO iface,
     532HRESULT WIN32API ITypeInfoImpl_Invoke(ITypeInfo2 * iface,
    533533                                VOID  *pIUnk, MEMBERID memid, UINT16 dwFlags,
    534534                                DISPPARAMS  *pDispParams, VARIANT *pVarResult,
    535535                                EXCEPINFO  *pExcepInfo, UINT  *pArgErr);
    536 HRESULT WIN32API ITypeInfoImpl_GetDocumentation(LPTYPEINFO iface,
     536HRESULT WIN32API ITypeInfoImpl_GetDocumentation(ITypeInfo2 * iface,
    537537                                MEMBERID memid, BSTR  *pBstrName, BSTR  *pBstrDocString,
    538538                                DWORD  *pdwHelpContext, BSTR  *pBstrHelpFile);
    539 HRESULT WIN32API ITypeInfoImpl_GetDllEntry(LPTYPEINFO iface,
     539HRESULT WIN32API ITypeInfoImpl_GetDllEntry(ITypeInfo2 * iface,
    540540                                MEMBERID memid, INVOKEKIND invKind, BSTR  *pBstrDllName,
    541541                                BSTR  *pBstrName, WORD  *pwOrdinal);
    542 HRESULT WIN32API ITypeInfoImpl_GetRefTypeInfo(LPTYPEINFO iface,
     542HRESULT WIN32API ITypeInfoImpl_GetRefTypeInfo(ITypeInfo2 * iface,
    543543                                HREFTYPE hRefType, ITypeInfo  * *ppTInfo);
    544 HRESULT WIN32API ITypeInfoImpl_AddressOfMember(LPTYPEINFO iface,
     544HRESULT WIN32API ITypeInfoImpl_AddressOfMember(ITypeInfo2 * iface,
    545545                                MEMBERID memid, INVOKEKIND invKind, PVOID *ppv);
    546 HRESULT WIN32API ITypeInfoImpl_CreateInstance(LPTYPEINFO iface,
     546HRESULT WIN32API ITypeInfoImpl_CreateInstance(ITypeInfo2 * iface,
    547547                                IUnknown *pUnk, REFIID riid, VOID  * *ppvObj);
    548 HRESULT WIN32API ITypeInfoImpl_GetMops(LPTYPEINFO iface,
     548HRESULT WIN32API ITypeInfoImpl_GetMops(ITypeInfo2 * iface,
    549549                                MEMBERID memid, BSTR  *pBstrMops);
    550 HRESULT WIN32API ITypeInfoImpl_GetContainingTypeLib(LPTYPEINFO iface,
     550HRESULT WIN32API ITypeInfoImpl_GetContainingTypeLib(ITypeInfo2 * iface,
    551551                                ITypeLib  * *ppTLib, UINT  *pIndex);
    552 HRESULT WIN32API ITypeInfoImpl_ReleaseTypeAttr(LPTYPEINFO iface,
     552HRESULT WIN32API ITypeInfoImpl_ReleaseTypeAttr(ITypeInfo2 * iface,
    553553                                TYPEATTR *pTypeAttr);
    554 HRESULT WIN32API ITypeInfoImpl_ReleaseFuncDesc(LPTYPEINFO iface,
     554HRESULT WIN32API ITypeInfoImpl_ReleaseFuncDesc(ITypeInfo2 * iface,
    555555                                FUNCDESC *pFuncDesc);
    556 HRESULT WIN32API ITypeInfoImpl_ReleaseVarDesc(LPTYPEINFO iface,
     556HRESULT WIN32API ITypeInfoImpl_ReleaseVarDesc(ITypeInfo2 * iface,
    557557                                VARDESC *pVarDesc);
    558 HRESULT WIN32API ITypeInfo2Impl_GetTypeKind(LPTYPEINFO iface,
     558HRESULT WIN32API ITypeInfo2Impl_GetTypeKind(ITypeInfo2 * iface,
    559559                                TYPEKIND *pTypeKind);
    560 HRESULT WIN32API ITypeInfo2Impl_GetTypeFlags(LPTYPEINFO iface,
     560HRESULT WIN32API ITypeInfo2Impl_GetTypeFlags(ITypeInfo2 * iface,
    561561                                UINT *pTypeFlags);
    562 HRESULT WIN32API ITypeInfo2Impl_GetFuncIndexOfMemId(LPTYPEINFO iface,
     562HRESULT WIN32API ITypeInfo2Impl_GetFuncIndexOfMemId(ITypeInfo2 * iface,
    563563                                MEMBERID memid, INVOKEKIND invKind, UINT *pFuncIndex);
    564 HRESULT WIN32API ITypeInfo2Impl_GetVarIndexOfMemId(LPTYPEINFO iface,
     564HRESULT WIN32API ITypeInfo2Impl_GetVarIndexOfMemId(ITypeInfo2 * iface,
    565565                                MEMBERID memid, UINT *pVarIndex);
    566 HRESULT WIN32API ITypeInfo2Impl_GetCustData(LPTYPEINFO iface,
     566HRESULT WIN32API ITypeInfo2Impl_GetCustData(ITypeInfo2 * iface,
    567567                                REFGUID guid, VARIANT *pVarVal);
    568 HRESULT WIN32API ITypeInfo2Impl_GetFuncCustData(LPTYPEINFO iface,
     568HRESULT WIN32API ITypeInfo2Impl_GetFuncCustData(ITypeInfo2 * iface,
    569569                                UINT index, REFGUID guid, VARIANT *pVarVal);
    570 HRESULT WIN32API ITypeInfo2Impl_GetParamCustData(LPTYPEINFO iface,
     570HRESULT WIN32API ITypeInfo2Impl_GetParamCustData(ITypeInfo2 * iface,
    571571                                UINT indexFunc, UINT indexParam, REFGUID guid, VARIANT *pVarVal);
    572 HRESULT WIN32API ITypeInfo2Impl_GetVarCustData(LPTYPEINFO iface,
     572HRESULT WIN32API ITypeInfo2Impl_GetVarCustData(ITypeInfo2 * iface,
    573573                                UINT index, REFGUID guid, VARIANT *pVarVal);
    574 HRESULT WIN32API ITypeInfo2Impl_GetImplTypeCustData(LPTYPEINFO iface,
     574HRESULT WIN32API ITypeInfo2Impl_GetImplTypeCustData(ITypeInfo2 * iface,
    575575                                UINT index, REFGUID guid, VARIANT *pVarVal);
    576 HRESULT WIN32API ITypeInfo2Impl_GetDocumentation2(LPTYPEINFO iface,
     576HRESULT WIN32API ITypeInfo2Impl_GetDocumentation2(ITypeInfo2 * iface,
    577577                                MEMBERID memid, LCID lcid, BSTR *pbstrHelpString,
    578                                 INT *pdwHelpStringContext, BSTR *pbstrHelpStringDll);
    579 HRESULT WIN32API ITypeInfo2Impl_GetAllCustData(LPTYPEINFO iface,
     578                                DWORD *pdwHelpStringContext, BSTR *pbstrHelpStringDll);
     579HRESULT WIN32API ITypeInfo2Impl_GetAllCustData(ITypeInfo2 * iface,
    580580                                CUSTDATA *pCustData);
    581 HRESULT WIN32API ITypeInfo2Impl_GetAllFuncCustData(LPTYPEINFO iface,
     581HRESULT WIN32API ITypeInfo2Impl_GetAllFuncCustData(ITypeInfo2 * iface,
    582582                                UINT index, CUSTDATA *pCustData);
    583 HRESULT WIN32API ITypeInfo2Impl_GetAllParamCustData(LPTYPEINFO iface,
     583HRESULT WIN32API ITypeInfo2Impl_GetAllParamCustData(ITypeInfo2 * iface,
    584584                                UINT indexFunc, UINT indexParam, CUSTDATA *pCustData);
    585 HRESULT WIN32API ITypeInfo2Impl_GetAllVarCustData(LPTYPEINFO iface,
     585HRESULT WIN32API ITypeInfo2Impl_GetAllVarCustData(ITypeInfo2 * iface,
    586586                                UINT index, CUSTDATA *pCustData);
    587 HRESULT WIN32API ITypeInfo2Impl_GetAllImplTypeCustData(LPTYPEINFO iface,
     587HRESULT WIN32API ITypeInfo2Impl_GetAllImplTypeCustData(ITypeInfo2 * iface,
    588588                                UINT index, CUSTDATA *pCustData);
    589589

  • trunk/src/oleaut32/makefile

    r4837 r4962  
    1 # $Id: makefile,v 1.22 2000-12-24 14:39:54 sandervl Exp $
     1# $Id: makefile,v 1.23 2001-01-18 18:12:21 sandervl Exp $
    22
    33#
    … …  
    1212#
    1313!include ../../makefile.inc
    14 
    1514
    1615#
    … …  
    3433#$(OBJDIR)\iPictureEmf.obj \
    3534$(OBJDIR)\typelib.obj \
    36 #$(OBJDIR)\itypelib.obj \
    37 #$(OBJDIR)\itypecomp.obj \
    38 #$(OBJDIR)\itypeinfo.obj \
     35$(OBJDIR)\itypelib.obj \
     36$(OBJDIR)\itypecomp.obj \
     37$(OBJDIR)\itypeinfo.obj \
    3938$(OBJDIR)\hash.obj \
    4039$(OBJDIR)\safearray.obj \
Note: See TracChangeset for help on using the changeset viewer.