Ignore:
Timestamp:
Nov 21, 2000, 12:34:31 PM (25 years ago)
Author:
sandervl
Message:

header updates for TEB changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/wine/obj_oleaut.h

    r2606 r4657  
    1 /* $Id: obj_oleaut.h,v 1.7 2000-02-03 13:26:23 sandervl Exp $ */
    21/*
    32 * Defines the COM interfaces and APIs related to OLE automation support.
    … …  
    76#define __WINE_WINE_OBJ_OLEAUT_H
    87
    9 #include "wine/obj_base.h"
    10 
    118/*****************************************************************************
    129 * Predeclare the interfaces
    … …  
    4845typedef struct ITypeInfo2 ITypeInfo2,*LPTYPEINFO2;
    4946
    50 DEFINE_GUID(IID_IErrorInfo,         0x1CF2B120,0x547D,0x101B,0x8E,0x65,
    51         0x08,0x00, 0x2B,0x2B,0xD1,0x19);
    52 typedef struct IErrorInfo IErrorInfo,*LPERRORINFO;
    53 
    54 DEFINE_GUID(IID_ICreateErrorInfo,   0x22F03340,0x547D,0x101B,0x8E,0x65,
    55         0x08,0x00, 0x2B,0x2B,0xD1,0x19);
    56 typedef struct ICreateErrorInfo ICreateErrorInfo,*LPCREATEERRORINFO;
    57 
    58 DEFINE_GUID(IID_ISupportErrorInfo,  0xDF0B3D60,0x547D,0x101B,0x8E,0x65,
    59         0x08,0x00, 0x2B,0x2B,0xD1,0x19);
    60 typedef struct ISupportErrorInfo ISupportErrorInfo,*LPSUPPORTERRORINFO;
    61 
    6247/*****************************************************************************
    6348 * Automation data types
    6449 */
    65 #if defined(__cplusplus) && !defined(NONAMELESSUNION)
    66 #define DUMMYUNIONNAME
    67 #else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
    68 #define DUMMYUNIONNAME u
    69 #endif /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
    7050
    7151/*****************************************************************
    … …  
    7353 */
    7454
    75 #define FADF_AUTO       ( 0x1 )
    76 #define FADF_STATIC     ( 0x2 )
    77 #define FADF_EMBEDDED   ( 0x4 )
    78 #define FADF_FIXEDSIZE  ( 0x10 )
    79 #define FADF_BSTR       ( 0x100 )
    80 #define FADF_UNKNOWN    ( 0x200 )
    81 #define FADF_DISPATCH   ( 0x400 )
    82 #define FADF_VARIANT    ( 0x800 )
    83 #define FADF_RESERVED   ( 0xf0e8 )
     55#define FADF_AUTO        ( 0x1 )
     56#define FADF_STATIC      ( 0x2 )
     57#define FADF_EMBEDDED    ( 0x4 )
     58#define FADF_FIXEDSIZE   ( 0x10 )
     59#define FADF_RECORD      ( 0x20 )
     60#define FADF_HAVEIID     ( 0x40 )
     61#define FADF_HAVEVARTYPE ( 0x80 )
     62#define FADF_BSTR        ( 0x100 )
     63#define FADF_UNKNOWN     ( 0x200 )
     64#define FADF_DISPATCH    ( 0x400 )
     65#define FADF_VARIANT     ( 0x800 )
     66#define FADF_RESERVED    ( 0xf008 )
     67
     68/* Undocumented flags */                                                                                 
     69#define FADF_CREATEVECTOR ( 0x2000 ) /* set when the safe array is created using SafeArrayCreateVector */
     70
    8471
    8572typedef struct  tagSAFEARRAYBOUND
    … …  
    225212    DWORD dwHelpContext;
    226213    PVOID pvReserved;
    227     HRESULT (* __stdcall pfnDeferredFillIn)(struct tagEXCEPINFO *);
     214    HRESULT (* WINAPI pfnDeferredFillIn)(struct tagEXCEPINFO *);
    228215    SCODE scode;
    229216} EXCEPINFO, * LPEXCEPINFO;
    … …  
    413400} BINDPTR, *LPBINDPTR;
    414401
    415 typedef enum tagFUNCFLAGS
    416 {
    417         FUNCFLAG_FRESTRICTED    = 0x1,
    418         FUNCFLAG_FSOURCE        = 0x2,
    419         FUNCFLAG_FBINDABLE      = 0x4,
    420         FUNCFLAG_FREQUESTEDIT   = 0x8,
    421         FUNCFLAG_FDISPLAYBIND   = 0x10,
    422         FUNCFLAG_FDEFAULTBIND   = 0x20,
    423         FUNCFLAG_FHIDDEN        = 0x40,
    424         FUNCFLAG_FUSESGETLASTERROR      = 0x80,
    425         FUNCFLAG_FDEFAULTCOLLELEM       = 0x100,
    426         FUNCFLAG_FUIDEFAULT     = 0x200,
    427         FUNCFLAG_FNONBROWSABLE  = 0x400,
    428         FUNCFLAG_FREPLACEABLE   = 0x800,
    429         FUNCFLAG_FIMMEDIATEBIND = 0x1000
    430 }   FUNCFLAGS;
    431 
    432 
    433402typedef enum tagVARFLAGS
    434403{
    … …  
    448417} VARFLAGS;
    449418
    450 /*****************************************************************
    451  *  SafeArray defines and structs
    452  */
    453 
    454 #define FADF_AUTO       ( 0x1 )
    455 #define FADF_STATIC     ( 0x2 )
    456 #define FADF_EMBEDDED   ( 0x4 )
    457 #define FADF_FIXEDSIZE  ( 0x10 )
    458 #define FADF_BSTR       ( 0x100 )
    459 #define FADF_UNKNOWN    ( 0x200 )
    460 #define FADF_DISPATCH   ( 0x400 )
    461 #define FADF_VARIANT    ( 0x800 )
    462 #define FADF_RESERVED   ( 0xf0e8 )
    463419
    464420/*
    … …  
    498454        VT_LPSTR  = 30,
    499455        VT_LPWSTR = 31,
     456        VT_RECORD = 36,
    500457        VT_FILETIME = 64,
    501458        VT_BLOB = 65,
    … …  
    562519#undef ICOM_INTERFACE
    563520
    564 #ifdef ICOM_CINTERFACE
    565521/*** IUnknown methods ***/
    566522#define IDispatch_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
    … …  
    569525/*** IDispatch methods ***/
    570526#define IDispatch_GetTypeInfoCount(p,a)      ICOM_CALL1 (GetTypeInfoCount,p,a)
    571 #define IDispatch_GetTypeInfo(p,a,b,c)       ICOM_CALL3 (GetTypeInfo,p,b,c)
     527#define IDispatch_GetTypeInfo(p,a,b,c)       ICOM_CALL3 (GetTypeInfo,p,a,b,c)
    572528#define IDispatch_GetIDsOfNames(p,a,b,c,d,e) ICOM_CALL5 (GetIDsOfNames,p,a,b,c,d,e)
    573529#define IDispatch_Invoke(p,a,b,c,d,e,f,g,h)  ICOM_CALL8 (Invoke,p,a,b,c,d,e,f,g,h)
    574 #endif
    575530
    576531
    … …  
    598553        ICOM_METHOD1(HRESULT,ReleaseTypeAttr, TYPEATTR*,pTypeAttr) \
    599554        ICOM_METHOD1(HRESULT,ReleaseFuncDesc, FUNCDESC*,pFuncDesc) \
    600         ICOM_METHOD1(HRESULT,ReleaseVarDesc, VARDESC*,pVarDesc)\
    601 \
    602 \
    603         /* itypeinfo2 methods */\
     555        ICOM_METHOD1(HRESULT,ReleaseVarDesc, VARDESC*,pVarDesc)
     556
     557#define ITypeInfo_IMETHODS \
     558        IUnknown_IMETHODS \
     559        ITypeInfo_METHODS
     560ICOM_DEFINE(ITypeInfo,IUnknown)
     561#undef ICOM_INTERFACE
     562
     563/*** IUnknown methods ***/
     564#define ITypeInfo_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
     565#define ITypeInfo_AddRef(p)                     ICOM_CALL (AddRef,p)
     566#define ITypeInfo_Release(p)                    ICOM_CALL (Release,p)
     567/*** ITypeInfo methods ***/
     568#define ITypeInfo_GetTypeAttr(p,a)              ICOM_CALL1(GetTypeAttr,p,a)
     569#define ITypeInfo_GetTypeComp(p,a)              ICOM_CALL1(GetTypeComp,p,a)
     570#define ITypeInfo_GetFuncDesc(p,a,b)            ICOM_CALL2(GetFuncDesc,p,a,b)
     571#define ITypeInfo_GetVarDesc(p,a,b)             ICOM_CALL2(GetVarDesc,p,a,b)
     572#define ITypeInfo_GetNames(p,a,b,c,d)           ICOM_CALL4(GetNames,p,a,b,c,d)
     573#define ITypeInfo_GetRefTypeOfImplType(p,a,b)   ICOM_CALL2(GetRefTypeOfImplType,p,a,b)
     574#define ITypeInfo_GetImplTypeFlags(p,a,b)       ICOM_CALL2(GetImplTypeFlags,p,a,b)
     575#define ITypeInfo_GetIDsOfNames(p,a,b,c)        ICOM_CALL3(GetIDsOfNames,p,a,b,c)
     576#define ITypeInfo_Invoke(p,a,b,c,d,e,f,g)       ICOM_CALL7(Invoke,p,a,b,c,d,e,f,g)
     577#define ITypeInfo_GetDocumentation(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation,p,a,b,c,d,e)
     578#define ITypeInfo_GetDllEntry(p,a,b,c,d,e)      ICOM_CALL5(GetDllEntry,p,a,b,c,d,e)
     579#define ITypeInfo_GetRefTypeInfo(p,a,b)         ICOM_CALL2(GetRefTypeInfo,p,a,b)
     580#define ITypeInfo_AddressOfMember(p,a,b,c)      ICOM_CALL3(AddressOfMember,p,a,b,c)
     581#define ITypeInfo_CreateInstance(p,a,b,c)       ICOM_CALL3(CreateInstance,p,a,b,c)
     582#define ITypeInfo_GetMops(p,a,b)                ICOM_CALL2(GetMops,p,a,b)
     583#define ITypeInfo_GetContainingTypeLib(p,a,b)   ICOM_CALL2(GetContainingTypeLib,p,a,b)
     584#define ITypeInfo_ReleaseTypeAttr(p,a)          ICOM_CALL1(ReleaseTypeAttr,p,a)
     585#define ITypeInfo_ReleaseFuncDesc(p,a)          ICOM_CALL1(ReleaseFuncDesc,p,a)
     586#define ITypeInfo_ReleaseVarDesc(p,a)           ICOM_CALL1(ReleaseVarDesc,p,a)
     587                                 
     588
     589/*****************************************************************************
     590 * ITypeInfo2 interface
     591 */
     592#define ICOM_INTERFACE ITypeInfo2
     593#define ITypeInfo2_METHODS \
    604594        ICOM_METHOD1(HRESULT, GetTypeKind, TYPEKIND*, pTypeKind) \
    605595        ICOM_METHOD1(HRESULT, GetTypeFlags, UINT*, pTypeFlags) \
    … …  
    618608                VARIANT*, pVarVal) \
    619609        ICOM_METHOD5(HRESULT, GetDocumentation2, MEMBERID, memid, LCID, lcid,\
    620                 BSTR*, pbstrHelpString, INT*, pdwHelpStringContext,\
     610                BSTR*, pbstrHelpString, DWORD*, pdwHelpStringContext,\
    621611                BSTR*, pbstrHelpStringDll) \
    622612        ICOM_METHOD1(HRESULT, GetAllCustData, CUSTDATA*, pCustData) \
    … …  
    629619        ICOM_METHOD2(HRESULT, GetAllImplTypeCustData, UINT, index, CUSTDATA*,\
    630620                pCustData)
     621
     622#define ITypeInfo2_IMETHODS \
     623        IUnknown_IMETHODS \
     624        ITypeInfo_METHODS \
     625        ITypeInfo2_METHODS
     626ICOM_DEFINE(ITypeInfo2,ITypeInfo)
     627#undef ICOM_INTERFACE
    631628       
    632 #define ITypeInfo_IMETHODS \
    633         IUnknown_IMETHODS \
    634         ITypeInfo_METHODS
    635 ICOM_DEFINE(ITypeInfo,IUnknown)
    636 #undef ICOM_INTERFACE
    637 
    638 #ifdef ICOM_CINTERFACE
    639629/*** IUnknown methods ***/
    640 #define ITypeInfo_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
    641 #define ITypeInfo_AddRef(p)                     ICOM_CALL (AddRef,p)
    642 #define ITypeInfo_Release(p)                    ICOM_CALL (Release,p)
     630#define ITypeInfo2_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
     631#define ITypeInfo2_AddRef(p)                     ICOM_CALL (AddRef,p)
     632#define ITypeInfo2_Release(p)                    ICOM_CALL (Release,p)
    643633/*** ITypeInfo methods ***/
    644 #define ITypeInfo_GetTypeAttr(p,a)              ICOM_CALL1(GetTypeAttr,p,a)
    645 #define ITypeInfo_GetTypeComp(p,a)              ICOM_CALL1(GetTypeComp,p,a)
    646 #define ITypeInfo_GetFuncDesc(p,a,b)            ICOM_CALL2(GetFuncDesc,p,a,b)
    647 #define ITypeInfo_GetVarDesc(p,a,b)             ICOM_CALL2(GetVarDesc,p,a,b)
    648 #define ITypeInfo_GetNames(p,a,b,c,d)           ICOM_CALL4(GetNames,p,a,b,c,d)
    649 #define ITypeInfo_GetRefTypeOfImplType(p,a,b)   ICOM_CALL2(GetRefTypeOfImplType,p,a,b)
    650 #define ITypeInfo_GetImplTypeFlags(p,a,b)       ICOM_CALL2(GetImplTypeFlags,p,a,b)
    651 #define ITypeInfo_GetIDsOfNames(p,a,b,c)        ICOM_CALL3(GetImplTypeFlags,p,a,b,c)
    652 #define ITypeInfo_Invoke(p,a,b,c,d,e,f,g)       ICOM_CALL7(Invoke,p,a,b,c,d,e,f,g)
    653 #define ITypeInfo_GetDocumentation(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation,p,a,b,c,d,e)
    654 #define ITypeInfo_GetDllEntry(p,a,b,c,d,e)      ICOM_CALL5(GetDllEntry,p,a,b,c,d,e)
    655 #define ITypeInfo_GetRefTypeInfo(p,a,b)         ICOM_CALL2(GetRefTypeInfo,p,a,b)
    656 #define ITypeInfo_AddressOfMember(p,a,b,c)      ICOM_CALL3(AddressOfMember,p,a,b,c)
    657 #define ITypeInfo_CreateInstance(p,a,b,c)       ICOM_CALL3(CreateInstance,p,a,b,c)
    658 #define ITypeInfo_GetMops(p,a,b)                ICOM_CALL2(GetMops,p,a,b)
    659 #define ITypeInfo_GetContainingTypeLib(p,a,b)   ICOM_CALL2(GetContainingTypeLib,p,a,b)
    660 #define ITypeInfo_ReleaseTypeAttr(p,a)          ICOM_CALL1(ReleaseTypeAttr,p,a)
    661 #define ITypeInfo_ReleaseFuncDesc(p,a)          ICOM_CALL1(ReleaseFuncDesc,p,a)
    662 #define ITypeInfo_ReleaseVarDesc(p,a)           ICOM_CALL1(ReleaseVarDesc,p,a)
    663 #endif
    664                                  
     634#define ITypeInfo2_GetTypeAttr(p,a)              ICOM_CALL1(GetTypeAttr,p,a)
     635#define ITypeInfo2_GetTypeComp(p,a)              ICOM_CALL1(GetTypeComp,p,a)
     636#define ITypeInfo2_GetFuncDesc(p,a,b)            ICOM_CALL2(GetFuncDesc,p,a,b)
     637#define ITypeInfo2_GetVarDesc(p,a,b)             ICOM_CALL2(GetVarDesc,p,a,b)
     638#define ITypeInfo2_GetNames(p,a,b,c,d)           ICOM_CALL4(GetNames,p,a,b,c,d)
     639#define ITypeInfo2_GetRefTypeOfImplType(p,a,b)   ICOM_CALL2(GetRefTypeOfImplType,p,a,b)
     640#define ITypeInfo2_GetImplTypeFlags(p,a,b)       ICOM_CALL2(GetImplTypeFlags,p,a,b)
     641#define ITypeInfo2_GetIDsOfNames(p,a,b,c)        ICOM_CALL3(GetIDsOfNames,p,a,b,c)
     642#define ITypeInfo2_Invoke(p,a,b,c,d,e,f,g)       ICOM_CALL7(Invoke,p,a,b,c,d,e,f,g)
     643#define ITypeInfo2_GetDocumentation(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation,p,a,b,c,d,e)
     644#define ITypeInfo2_GetDllEntry(p,a,b,c,d,e)      ICOM_CALL5(GetDllEntry,p,a,b,c,d,e)
     645#define ITypeInfo2_GetRefTypeInfo(p,a,b)         ICOM_CALL2(GetRefTypeInfo,p,a,b)
     646#define ITypeInfo2_AddressOfMember(p,a,b,c)      ICOM_CALL3(AddressOfMember,p,a,b,c)
     647#define ITypeInfo2_CreateInstance(p,a,b,c)       ICOM_CALL3(CreateInstance,p,a,b,c)
     648#define ITypeInfo2_GetMops(p,a,b)                ICOM_CALL2(GetMops,p,a,b)
     649#define ITypeInfo2_GetContainingTypeLib(p,a,b)   ICOM_CALL2(GetContainingTypeLib,p,a,b)
     650#define ITypeInfo2_ReleaseTypeAttr(p,a)          ICOM_CALL1(ReleaseTypeAttr,p,a)
     651#define ITypeInfo2_ReleaseFuncDesc(p,a)          ICOM_CALL1(ReleaseFuncDesc,p,a)
     652#define ITypeInfo2_ReleaseVarDesc(p,a)           ICOM_CALL1(ReleaseVarDesc,p,a)
     653/*** ITypeInfo2 methods ***/
     654#define ITypeInfo2_GetTypeKind(p,a)              ICOM_CALL1(GetTypeKind,p,a)
     655#define ITypeInfo2_GetTypeFlags(p,a)             ICOM_CALL1(GetTypeFlags,p,a)
     656#define ITypeInfo2_GetFuncIndexOfMemId(p,a,b,c)  ICOM_CALL3(GetFuncIndexOfMemId,p,a,b,c)
     657#define ITypeInfo2_GetVarIndexOfMemId(p,a,b)     ICOM_CALL2(GetVarIndexOfMemId,p,a,b)
     658#define ITypeInfo2_GetCustData(p,a,b)            ICOM_CALL2(GetCustData,p,a,b)
     659#define ITypeInfo2_GetFuncCustData(p,a,b,c)      ICOM_CALL3(GetFuncCustData,p,a,b,c)
     660#define ITypeInfo2_GetParamCustData(p,a,b,c,d)   ICOM_CALL4(GetParamCustData,p,a,b,c,d)
     661#define ITypeInfo2_GetVarCustData(p,a,b,c)       ICOM_CALL3(GetVarCustData,p,a,b,c)
     662#define ITypeInfo2_GetImplTypeCustData(p,a,b,c)  ICOM_CALL3(GetImplTypeCustData,p,a,b,c)
     663#define ITypeInfo2_GetDocumentation2(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation2,p,a,b,c,d,e)
     664#define ITypeInfo2_GetAllCustData(p,a)           ICOM_CALL1(GetAllCustData,p,a)
     665#define ITypeInfo2_GetAllFuncCustData(p,a,b)     ICOM_CALL2(GetAllFuncCustData,p,a,b)
     666#define ITypeInfo2_GetAllParamCustData(p,a,b,c)  ICOM_CALL3(GetAllParamCustData,p,a,b,c)
     667#define ITypeInfo2_GetAllVarCustData(p,a,b)      ICOM_CALL2(GetAllVarCustData,p,a,b)
     668#define ITypeInfo2_GetAllImplTypeCustData(p,a,b) ICOM_CALL2(GetAllImplTypeCustData,p,a,b)
    665669
    666670/*****************************************************************************
    … …  
    678682        ICOM_METHOD3(HRESULT,IsName, LPOLESTR,szNameBuf, ULONG,lHashVal, BOOL*,bfName) \
    679683        ICOM_METHOD5(HRESULT,FindName, LPOLESTR,szNameBuf, ULONG,lHashVal, ITypeInfo**,ppTInfo, MEMBERID*,rgMemId, USHORT*,pcFound) \
    680         ICOM_METHOD1(VOID,ReleaseTLibAttr, TLIBATTR*,pTLibAttr)\
    681 \
    682         ICOM_METHOD2(HRESULT,GetCustData, REFGUID,guid, VARIANT*, pVarVal)\
    683         ICOM_METHOD2(HRESULT, GetLibStatistics, UINT *,pcUniqueNames, \
    684                         UINT*, pcchUniqueNames) \
    685         ICOM_METHOD5(HRESULT, GetDocumentation2, INT, index, LCID, lcid,\
    686                 BSTR*, pbstrHelpString, INT*, pdwHelpStringContext,\
    687                 BSTR*, pbstrHelpStringDll)\
    688         ICOM_METHOD1(HRESULT, GetAllCustData, CUSTDATA *, pCustData)
    689        
     684        ICOM_METHOD1(VOID,ReleaseTLibAttr, TLIBATTR*,pTLibAttr)
    690685#define ITypeLib_IMETHODS \
    691686        IUnknown_IMETHODS \
    … …  
    694689#undef ICOM_INTERFACE
    695690
    696 #ifdef ICOM_CINTERFACE
    697691/*** IUnknown methods ***/
    698692#define ITypeLib_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
    … …  
    710704#define ITypeLib_FindName(p,a,b,c,d,e)         ICOM_CALL5(FindName,p,a,b,c,d,e)
    711705#define ITypeLib_ReleaseTLibAttr(p,a)          ICOM_CALL1(ReleaseTLibAttr,p,a)
    712 #endif
    713 
     706
     707
     708/*****************************************************************************
     709 * ITypeLib2 interface
     710 */
     711#define ICOM_INTERFACE ITypeLib2
     712#define ITypeLib2_METHODS \
     713        ICOM_METHOD2(HRESULT, GetCustData, REFGUID, guid, VARIANT*, pVarVal) \
     714        ICOM_METHOD2(HRESULT, GetLibStatistics, ULONG *, pcUniqueNames, ULONG*,pcchUniqueNames) \
     715        ICOM_METHOD5(HRESULT, GetDocumentation2, INT, index, LCID, lcid,BSTR*, pbstrHelpString, DWORD*, pdwHelpStringContext, BSTR*, strHelpStringDll) \
     716        ICOM_METHOD1(HRESULT, GetAllCustData, CUSTDATA *, pCustData)
     717#define ITypeLib2_IMETHODS \
     718        IUnknown_IMETHODS \
     719        ITypeLib_IMETHODS \
     720        ITypeLib2_METHODS
     721ICOM_DEFINE(ITypeLib2,ITypeLib)
     722#undef ICOM_INTERFACE
     723
     724/*** IUnknown methods ***/
     725#define ITypeLib2_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
     726#define ITypeLib2_AddRef(p)                     ICOM_CALL (AddRef,p)
     727#define ITypeLib2_Release(p)                    ICOM_CALL (Release,p)
     728/*** ITypeLib methods ***/
     729#define ITypeLib2_GetTypeInfoCount(p)           ICOM_CALL (GetTypeInfoCount,p)
     730#define ITypeLib2_GetTypeInfo(p,a,b)            ICOM_CALL2(GetTypeInfo,p,a,b)
     731#define ITypeLib2_GetTypeInfoType(p,a,b)        ICOM_CALL2(GetTypeInfoType,p,a,b)
     732#define ITypeLib2_GetTypeInfoOfGuid(p,a,b)      ICOM_CALL2(GetTypeInfoOfGuid,p,a,b)
     733#define ITypeLib2_GetLibAttr(p,a)               ICOM_CALL1(GetLibAttr,p,a)
     734#define ITypeLib2_GetTypeComp(p,a)              ICOM_CALL1(GetTypeComp,p,a)
     735#define ITypeLib2_GetDocumentation(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation,p,a,b,c,d,e)
     736#define ITypeLib2_IsName(p,a,b,c)               ICOM_CALL3(IsName,p,a,b,c)
     737#define ITypeLib2_FindName(p,a,b,c,d,e)         ICOM_CALL5(FindName,p,a,b,c,d,e)
     738#define ITypeLib2_ReleaseTLibAttr(p,a)          ICOM_CALL1(ReleaseTLibAttr,p,a)
     739/*** ITypeLib2 methods ***/
     740#define ITypeLib2_GetCustData(p,a,b)            ICOM_CALL2(GetCustData,p,a,b)
     741#define ITypeLib2_GetLibStatistics(p,a,b)       ICOM_CALL2(GetLibStatistics,p,a,b)
     742#define ITypeLib2_GetDocumentation2(p,a,b,c,d,e,f) ICOM_CALL5(GetDocumentation2,p,a,b,c,d,e)
     743#define ITypeLib2_GetAllCustData(p,a)           ICOM_CALL1(GetAllCustData,p,a)
    714744
    715745/*****************************************************************************
    … …  
    726756#undef ICOM_INTERFACE
    727757
    728 #ifdef ICOM_CINTERFACE
    729758/*** IUnknown methods ***/
    730759#define ITypeComp_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
    … …  
    734763#define ITypeComp_Bind(p,a,b,c,d,e,f)           ICOM_CALL6(Bind,p,a,b,c,d,e,f)
    735764#define ITypeComp_BindType(p,a,b,c,d)           ICOM_CALL4(BindType,p,a,b,c,d)
    736 #endif
    737765                                 
    738766/*****************************************************************************
    … …  
    751779#undef ICOM_INTERFACE
    752780
    753 #ifdef ICOM_CINTERFACE
    754781/*** IUnknown methods ***/
    755782#define IEnumVARIANT_QueryInterface(p,a,b)   ICOM_CALL2(QueryInterface,p,a,b)
    … …  
    761788#define IEnumVARIANT_Reset(p)                ICOM_CALL (Reset,p)
    762789#define IEnumVARIANT_Clone(p,a)              ICOM_CALL1(Clone,p,a)
    763 #endif
    764790                                 
    765791#endif /* __WINE_WINE_OBJ_OLEAUT_H */
Note: See TracChangeset for help on using the changeset viewer.