Ignore:
Timestamp:
Dec 24, 2000, 12:23:57 PM (25 years ago)
Author:
sandervl
Message:

update

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r4662 r4833  
    1 /* $Id: obj_oleaut.h,v 1.9 2000-11-21 12:17:58 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"
     8
     9DEFINE_OLEGUID(IID_StdOle, 0x00020430,0,0);
    1010
    1111/*****************************************************************************
    … …  
    5151 * Automation data types
    5252 */
    53 #if defined(__cplusplus) && !defined(NONAMELESSUNION)
    54 #define DUMMYUNIONNAME
    55 #else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
    56 #define DUMMYUNIONNAME u
    57 #endif /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
    5853
    5954/*****************************************************************
    … …  
    6156 */
    6257
    63 #define FADF_AUTO       ( 0x1 )
    64 #define FADF_STATIC     ( 0x2 )
    65 #define FADF_EMBEDDED   ( 0x4 )
    66 #define FADF_FIXEDSIZE  ( 0x10 )
    67 #define FADF_BSTR       ( 0x100 )
    68 #define FADF_UNKNOWN    ( 0x200 )
    69 #define FADF_DISPATCH   ( 0x400 )
    70 #define FADF_VARIANT    ( 0x800 )
    71 #define FADF_RESERVED   ( 0xf0e8 )
     58#define FADF_AUTO        ( 0x1 )
     59#define FADF_STATIC      ( 0x2 )
     60#define FADF_EMBEDDED    ( 0x4 )
     61#define FADF_FIXEDSIZE   ( 0x10 )
     62#define FADF_RECORD      ( 0x20 )
     63#define FADF_HAVEIID     ( 0x40 )
     64#define FADF_HAVEVARTYPE ( 0x80 )
     65#define FADF_BSTR        ( 0x100 )
     66#define FADF_UNKNOWN     ( 0x200 )
     67#define FADF_DISPATCH    ( 0x400 )
     68#define FADF_VARIANT     ( 0x800 )
     69#define FADF_RESERVED    ( 0xf008 )
     70
     71/* Undocumented flags */                                                                                 
     72#define FADF_CREATEVECTOR ( 0x2000 ) /* set when the safe array is created using SafeArrayCreateVector */
     73
    7274
    7375typedef struct  tagSAFEARRAYBOUND
    … …  
    213215    DWORD dwHelpContext;
    214216    PVOID pvReserved;
     217#ifdef __WIN32OS2__
    215218    HRESULT (* __stdcall pfnDeferredFillIn)(struct tagEXCEPINFO *);
     219#else
     220    HRESULT __stdcall (*pfnDeferredFillIn)(struct tagEXCEPINFO *);
     221#endif
    216222    SCODE scode;
    217223} EXCEPINFO, * LPEXCEPINFO;
    … …  
    298304} TYPEATTR, *LPTYPEATTR;
    299305
     306#define TYPEFLAG_NONE                     (0x00)
     307#define TYPEFLAG_FAPPOBJECT               (0x01)
     308#define TYPEFLAG_FCANCREATE               (0x02)
     309#define TYPEFLAG_FLICENSED                (0x04)
     310#define TYPEFLAG_FPREDECLID               (0x08)
     311#define TYPEFLAG_FHIDDEN                  (0x0f)
     312#define TYPEFLAG_FCONTROL                 (0x20) 
     313#define TYPEFLAG_FDUAL                    (0x40) 
     314#define TYPEFLAG_FNONEXTENSIBLE           (0x80)           
     315#define TYPEFLAG_FOLEAUTOMATION           (0x100) 
     316#define TYPEFLAG_FRESTRICTED              (0x200) 
     317#define TYPEFLAG_FAGGREGATABLE            (0x400) 
     318#define TYPEFLAG_FREPLACEABLE             (0x800) 
     319#define TYPEFLAG_FDISPATCHABLE            (0x1000) 
     320#define TYPEFLAG_FREVERSEBIND             (0x2000)
     321#define TYPEFLAG_FPROXY                   (0x4000)
     322#define TYPEFLAG_DEFAULTFILTER            (0x8000)
     323#define TYPEFLAG_COCLASSATTRIBUTES        (0x63f)
     324#define TYPEFLAG_INTERFACEATTRIBUTES      (0x7bd0)
     325#define TYPEFLAG_DISPATCHATTRIBUTES       (0x5a90)
     326#define TYPEFLAG_ALIASATTRIBUTES          (0x210)
     327#define TYPEFLAG_MODULEATTRIBUTES         (0x210)
     328#define TYPEFLAG_ENUMATTRIBUTES           (0x210)
     329#define TYPEFLAG_RECORDATTRIBUTES         (0x210)
     330#define TYPEFLAG_UNIONATTRIBUTES          (0x210)
     331
    300332typedef struct tagARRAYDESC
    301333{
    … …  
    400432        ITypeComp *lptcomp;
    401433} BINDPTR, *LPBINDPTR;
    402 
    403 typedef enum tagFUNCFLAGS
    404 {
    405         FUNCFLAG_FRESTRICTED    = 0x1,
    406         FUNCFLAG_FSOURCE        = 0x2,
    407         FUNCFLAG_FBINDABLE      = 0x4,
    408         FUNCFLAG_FREQUESTEDIT   = 0x8,
    409         FUNCFLAG_FDISPLAYBIND   = 0x10,
    410         FUNCFLAG_FDEFAULTBIND   = 0x20,
    411         FUNCFLAG_FHIDDEN        = 0x40,
    412         FUNCFLAG_FUSESGETLASTERROR      = 0x80,
    413         FUNCFLAG_FDEFAULTCOLLELEM       = 0x100,
    414         FUNCFLAG_FUIDEFAULT     = 0x200,
    415         FUNCFLAG_FNONBROWSABLE  = 0x400,
    416         FUNCFLAG_FREPLACEABLE   = 0x800,
    417         FUNCFLAG_FIMMEDIATEBIND = 0x1000
    418 }   FUNCFLAGS;
    419 
    420434
    421435typedef enum tagVARFLAGS
    … …  
    436450} VARFLAGS;
    437451
    438 /*****************************************************************
    439  *  SafeArray defines and structs
    440  */
    441 
    442 #define FADF_AUTO       ( 0x1 )
    443 #define FADF_STATIC     ( 0x2 )
    444 #define FADF_EMBEDDED   ( 0x4 )
    445 #define FADF_FIXEDSIZE  ( 0x10 )
    446 #define FADF_BSTR       ( 0x100 )
    447 #define FADF_UNKNOWN    ( 0x200 )
    448 #define FADF_DISPATCH   ( 0x400 )
    449 #define FADF_VARIANT    ( 0x800 )
    450 #define FADF_RESERVED   ( 0xf0e8 )
    451452
    452453/*
    … …  
    486487        VT_LPSTR  = 30,
    487488        VT_LPWSTR = 31,
     489        VT_RECORD = 36,
    488490        VT_FILETIME = 64,
    489491        VT_BLOB = 65,
    … …  
    550552#undef ICOM_INTERFACE
    551553
    552 #ifdef ICOM_CINTERFACE
    553554/*** IUnknown methods ***/
    554555#define IDispatch_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
    … …  
    557558/*** IDispatch methods ***/
    558559#define IDispatch_GetTypeInfoCount(p,a)      ICOM_CALL1 (GetTypeInfoCount,p,a)
    559 #define IDispatch_GetTypeInfo(p,a,b,c)       ICOM_CALL3 (GetTypeInfo,p,b,c)
     560#define IDispatch_GetTypeInfo(p,a,b,c)       ICOM_CALL3 (GetTypeInfo,p,a,b,c)
    560561#define IDispatch_GetIDsOfNames(p,a,b,c,d,e) ICOM_CALL5 (GetIDsOfNames,p,a,b,c,d,e)
    561562#define IDispatch_Invoke(p,a,b,c,d,e,f,g,h)  ICOM_CALL8 (Invoke,p,a,b,c,d,e,f,g,h)
    562 #endif
    563563
    564564
    … …  
    586586        ICOM_METHOD1(HRESULT,ReleaseTypeAttr, TYPEATTR*,pTypeAttr) \
    587587        ICOM_METHOD1(HRESULT,ReleaseFuncDesc, FUNCDESC*,pFuncDesc) \
    588         ICOM_METHOD1(HRESULT,ReleaseVarDesc, VARDESC*,pVarDesc)\
    589 \
    590 \
    591         /* itypeinfo2 methods */\
     588        ICOM_METHOD1(HRESULT,ReleaseVarDesc, VARDESC*,pVarDesc)
     589
     590#define ITypeInfo_IMETHODS \
     591        IUnknown_IMETHODS \
     592        ITypeInfo_METHODS
     593ICOM_DEFINE(ITypeInfo,IUnknown)
     594#undef ICOM_INTERFACE
     595
     596/*** IUnknown methods ***/
     597#define ITypeInfo_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
     598#define ITypeInfo_AddRef(p)                     ICOM_CALL (AddRef,p)
     599#define ITypeInfo_Release(p)                    ICOM_CALL (Release,p)
     600/*** ITypeInfo methods ***/
     601#define ITypeInfo_GetTypeAttr(p,a)              ICOM_CALL1(GetTypeAttr,p,a)
     602#define ITypeInfo_GetTypeComp(p,a)              ICOM_CALL1(GetTypeComp,p,a)
     603#define ITypeInfo_GetFuncDesc(p,a,b)            ICOM_CALL2(GetFuncDesc,p,a,b)
     604#define ITypeInfo_GetVarDesc(p,a,b)             ICOM_CALL2(GetVarDesc,p,a,b)
     605#define ITypeInfo_GetNames(p,a,b,c,d)           ICOM_CALL4(GetNames,p,a,b,c,d)
     606#define ITypeInfo_GetRefTypeOfImplType(p,a,b)   ICOM_CALL2(GetRefTypeOfImplType,p,a,b)
     607#define ITypeInfo_GetImplTypeFlags(p,a,b)       ICOM_CALL2(GetImplTypeFlags,p,a,b)
     608#define ITypeInfo_GetIDsOfNames(p,a,b,c)        ICOM_CALL3(GetIDsOfNames,p,a,b,c)
     609#define ITypeInfo_Invoke(p,a,b,c,d,e,f,g)       ICOM_CALL7(Invoke,p,a,b,c,d,e,f,g)
     610#define ITypeInfo_GetDocumentation(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation,p,a,b,c,d,e)
     611#define ITypeInfo_GetDllEntry(p,a,b,c,d,e)      ICOM_CALL5(GetDllEntry,p,a,b,c,d,e)
     612#define ITypeInfo_GetRefTypeInfo(p,a,b)         ICOM_CALL2(GetRefTypeInfo,p,a,b)
     613#define ITypeInfo_AddressOfMember(p,a,b,c)      ICOM_CALL3(AddressOfMember,p,a,b,c)
     614#define ITypeInfo_CreateInstance(p,a,b,c)       ICOM_CALL3(CreateInstance,p,a,b,c)
     615#define ITypeInfo_GetMops(p,a,b)                ICOM_CALL2(GetMops,p,a,b)
     616#define ITypeInfo_GetContainingTypeLib(p,a,b)   ICOM_CALL2(GetContainingTypeLib,p,a,b)
     617#define ITypeInfo_ReleaseTypeAttr(p,a)          ICOM_CALL1(ReleaseTypeAttr,p,a)
     618#define ITypeInfo_ReleaseFuncDesc(p,a)          ICOM_CALL1(ReleaseFuncDesc,p,a)
     619#define ITypeInfo_ReleaseVarDesc(p,a)           ICOM_CALL1(ReleaseVarDesc,p,a)
     620                                 
     621
     622/*****************************************************************************
     623 * ITypeInfo2 interface
     624 */
     625#define ICOM_INTERFACE ITypeInfo2
     626#define ITypeInfo2_METHODS \
    592627        ICOM_METHOD1(HRESULT, GetTypeKind, TYPEKIND*, pTypeKind) \
    593628        ICOM_METHOD1(HRESULT, GetTypeFlags, UINT*, pTypeFlags) \
    … …  
    606641                VARIANT*, pVarVal) \
    607642        ICOM_METHOD5(HRESULT, GetDocumentation2, MEMBERID, memid, LCID, lcid,\
    608                 BSTR*, pbstrHelpString, INT*, pdwHelpStringContext,\
     643                BSTR*, pbstrHelpString, DWORD*, pdwHelpStringContext,\
    609644                BSTR*, pbstrHelpStringDll) \
    610645        ICOM_METHOD1(HRESULT, GetAllCustData, CUSTDATA*, pCustData) \
    … …  
    617652        ICOM_METHOD2(HRESULT, GetAllImplTypeCustData, UINT, index, CUSTDATA*,\
    618653                pCustData)
     654
     655#define ITypeInfo2_IMETHODS \
     656        IUnknown_IMETHODS \
     657        ITypeInfo_METHODS \
     658        ITypeInfo2_METHODS
     659ICOM_DEFINE(ITypeInfo2,ITypeInfo)
     660#undef ICOM_INTERFACE
    619661       
    620 #define ITypeInfo_IMETHODS \
    621         IUnknown_IMETHODS \
    622         ITypeInfo_METHODS
    623 ICOM_DEFINE(ITypeInfo,IUnknown)
    624 #undef ICOM_INTERFACE
    625 
    626 #ifdef ICOM_CINTERFACE
    627662/*** IUnknown methods ***/
    628 #define ITypeInfo_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
    629 #define ITypeInfo_AddRef(p)                     ICOM_CALL (AddRef,p)
    630 #define ITypeInfo_Release(p)                    ICOM_CALL (Release,p)
     663#define ITypeInfo2_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
     664#define ITypeInfo2_AddRef(p)                     ICOM_CALL (AddRef,p)
     665#define ITypeInfo2_Release(p)                    ICOM_CALL (Release,p)
    631666/*** ITypeInfo methods ***/
    632 #define ITypeInfo_GetTypeAttr(p,a)              ICOM_CALL1(GetTypeAttr,p,a)
    633 #define ITypeInfo_GetTypeComp(p,a)              ICOM_CALL1(GetTypeComp,p,a)
    634 #define ITypeInfo_GetFuncDesc(p,a,b)            ICOM_CALL2(GetFuncDesc,p,a,b)
    635 #define ITypeInfo_GetVarDesc(p,a,b)             ICOM_CALL2(GetVarDesc,p,a,b)
    636 #define ITypeInfo_GetNames(p,a,b,c,d)           ICOM_CALL4(GetNames,p,a,b,c,d)
    637 #define ITypeInfo_GetRefTypeOfImplType(p,a,b)   ICOM_CALL2(GetRefTypeOfImplType,p,a,b)
    638 #define ITypeInfo_GetImplTypeFlags(p,a,b)       ICOM_CALL2(GetImplTypeFlags,p,a,b)
    639 #define ITypeInfo_GetIDsOfNames(p,a,b,c)        ICOM_CALL3(GetImplTypeFlags,p,a,b,c)
    640 #define ITypeInfo_Invoke(p,a,b,c,d,e,f,g)       ICOM_CALL7(Invoke,p,a,b,c,d,e,f,g)
    641 #define ITypeInfo_GetDocumentation(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation,p,a,b,c,d,e)
    642 #define ITypeInfo_GetDllEntry(p,a,b,c,d,e)      ICOM_CALL5(GetDllEntry,p,a,b,c,d,e)
    643 #define ITypeInfo_GetRefTypeInfo(p,a,b)         ICOM_CALL2(GetRefTypeInfo,p,a,b)
    644 #define ITypeInfo_AddressOfMember(p,a,b,c)      ICOM_CALL3(AddressOfMember,p,a,b,c)
    645 #define ITypeInfo_CreateInstance(p,a,b,c)       ICOM_CALL3(CreateInstance,p,a,b,c)
    646 #define ITypeInfo_GetMops(p,a,b)                ICOM_CALL2(GetMops,p,a,b)
    647 #define ITypeInfo_GetContainingTypeLib(p,a,b)   ICOM_CALL2(GetContainingTypeLib,p,a,b)
    648 #define ITypeInfo_ReleaseTypeAttr(p,a)          ICOM_CALL1(ReleaseTypeAttr,p,a)
    649 #define ITypeInfo_ReleaseFuncDesc(p,a)          ICOM_CALL1(ReleaseFuncDesc,p,a)
    650 #define ITypeInfo_ReleaseVarDesc(p,a)           ICOM_CALL1(ReleaseVarDesc,p,a)
    651 #endif
    652                                  
     667#define ITypeInfo2_GetTypeAttr(p,a)              ICOM_CALL1(GetTypeAttr,p,a)
     668#define ITypeInfo2_GetTypeComp(p,a)              ICOM_CALL1(GetTypeComp,p,a)
     669#define ITypeInfo2_GetFuncDesc(p,a,b)            ICOM_CALL2(GetFuncDesc,p,a,b)
     670#define ITypeInfo2_GetVarDesc(p,a,b)             ICOM_CALL2(GetVarDesc,p,a,b)
     671#define ITypeInfo2_GetNames(p,a,b,c,d)           ICOM_CALL4(GetNames,p,a,b,c,d)
     672#define ITypeInfo2_GetRefTypeOfImplType(p,a,b)   ICOM_CALL2(GetRefTypeOfImplType,p,a,b)
     673#define ITypeInfo2_GetImplTypeFlags(p,a,b)       ICOM_CALL2(GetImplTypeFlags,p,a,b)
     674#define ITypeInfo2_GetIDsOfNames(p,a,b,c)        ICOM_CALL3(GetIDsOfNames,p,a,b,c)
     675#define ITypeInfo2_Invoke(p,a,b,c,d,e,f,g)       ICOM_CALL7(Invoke,p,a,b,c,d,e,f,g)
     676#define ITypeInfo2_GetDocumentation(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation,p,a,b,c,d,e)
     677#define ITypeInfo2_GetDllEntry(p,a,b,c,d,e)      ICOM_CALL5(GetDllEntry,p,a,b,c,d,e)
     678#define ITypeInfo2_GetRefTypeInfo(p,a,b)         ICOM_CALL2(GetRefTypeInfo,p,a,b)
     679#define ITypeInfo2_AddressOfMember(p,a,b,c)      ICOM_CALL3(AddressOfMember,p,a,b,c)
     680#define ITypeInfo2_CreateInstance(p,a,b,c)       ICOM_CALL3(CreateInstance,p,a,b,c)
     681#define ITypeInfo2_GetMops(p,a,b)                ICOM_CALL2(GetMops,p,a,b)
     682#define ITypeInfo2_GetContainingTypeLib(p,a,b)   ICOM_CALL2(GetContainingTypeLib,p,a,b)
     683#define ITypeInfo2_ReleaseTypeAttr(p,a)          ICOM_CALL1(ReleaseTypeAttr,p,a)
     684#define ITypeInfo2_ReleaseFuncDesc(p,a)          ICOM_CALL1(ReleaseFuncDesc,p,a)
     685#define ITypeInfo2_ReleaseVarDesc(p,a)           ICOM_CALL1(ReleaseVarDesc,p,a)
     686/*** ITypeInfo2 methods ***/
     687#define ITypeInfo2_GetTypeKind(p,a)              ICOM_CALL1(GetTypeKind,p,a)
     688#define ITypeInfo2_GetTypeFlags(p,a)             ICOM_CALL1(GetTypeFlags,p,a)
     689#define ITypeInfo2_GetFuncIndexOfMemId(p,a,b,c)  ICOM_CALL3(GetFuncIndexOfMemId,p,a,b,c)
     690#define ITypeInfo2_GetVarIndexOfMemId(p,a,b)     ICOM_CALL2(GetVarIndexOfMemId,p,a,b)
     691#define ITypeInfo2_GetCustData(p,a,b)            ICOM_CALL2(GetCustData,p,a,b)
     692#define ITypeInfo2_GetFuncCustData(p,a,b,c)      ICOM_CALL3(GetFuncCustData,p,a,b,c)
     693#define ITypeInfo2_GetParamCustData(p,a,b,c,d)   ICOM_CALL4(GetParamCustData,p,a,b,c,d)
     694#define ITypeInfo2_GetVarCustData(p,a,b,c)       ICOM_CALL3(GetVarCustData,p,a,b,c)
     695#define ITypeInfo2_GetImplTypeCustData(p,a,b,c)  ICOM_CALL3(GetImplTypeCustData,p,a,b,c)
     696#define ITypeInfo2_GetDocumentation2(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation2,p,a,b,c,d,e)
     697#define ITypeInfo2_GetAllCustData(p,a)           ICOM_CALL1(GetAllCustData,p,a)
     698#define ITypeInfo2_GetAllFuncCustData(p,a,b)     ICOM_CALL2(GetAllFuncCustData,p,a,b)
     699#define ITypeInfo2_GetAllParamCustData(p,a,b,c)  ICOM_CALL3(GetAllParamCustData,p,a,b,c)
     700#define ITypeInfo2_GetAllVarCustData(p,a,b)      ICOM_CALL2(GetAllVarCustData,p,a,b)
     701#define ITypeInfo2_GetAllImplTypeCustData(p,a,b) ICOM_CALL2(GetAllImplTypeCustData,p,a,b)
    653702
    654703/*****************************************************************************
    … …  
    666715        ICOM_METHOD3(HRESULT,IsName, LPOLESTR,szNameBuf, ULONG,lHashVal, BOOL*,bfName) \
    667716        ICOM_METHOD5(HRESULT,FindName, LPOLESTR,szNameBuf, ULONG,lHashVal, ITypeInfo**,ppTInfo, MEMBERID*,rgMemId, USHORT*,pcFound) \
    668         ICOM_METHOD1(VOID,ReleaseTLibAttr, TLIBATTR*,pTLibAttr)\
    669 \
    670         ICOM_METHOD2(HRESULT,GetCustData, REFGUID,guid, VARIANT*, pVarVal)\
    671         ICOM_METHOD2(HRESULT, GetLibStatistics, UINT *,pcUniqueNames, \
    672                         UINT*, pcchUniqueNames) \
    673         ICOM_METHOD5(HRESULT, GetDocumentation2, INT, index, LCID, lcid,\
    674                 BSTR*, pbstrHelpString, INT*, pdwHelpStringContext,\
    675                 BSTR*, pbstrHelpStringDll)\
    676         ICOM_METHOD1(HRESULT, GetAllCustData, CUSTDATA *, pCustData)
    677        
     717        ICOM_METHOD1(VOID,ReleaseTLibAttr, TLIBATTR*,pTLibAttr)
    678718#define ITypeLib_IMETHODS \
    679719        IUnknown_IMETHODS \
    … …  
    682722#undef ICOM_INTERFACE
    683723
    684 #ifdef ICOM_CINTERFACE
    685724/*** IUnknown methods ***/
    686725#define ITypeLib_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
    … …  
    698737#define ITypeLib_FindName(p,a,b,c,d,e)         ICOM_CALL5(FindName,p,a,b,c,d,e)
    699738#define ITypeLib_ReleaseTLibAttr(p,a)          ICOM_CALL1(ReleaseTLibAttr,p,a)
    700 #endif
    701 
     739
     740
     741/*****************************************************************************
     742 * ITypeLib2 interface
     743 */
     744#define ICOM_INTERFACE ITypeLib2
     745#define ITypeLib2_METHODS \
     746        ICOM_METHOD2(HRESULT, GetCustData, REFGUID, guid, VARIANT*, pVarVal) \
     747        ICOM_METHOD2(HRESULT, GetLibStatistics, ULONG *, pcUniqueNames, ULONG*,pcchUniqueNames) \
     748        ICOM_METHOD5(HRESULT, GetDocumentation2, INT, index, LCID, lcid,BSTR*, pbstrHelpString, DWORD*, pdwHelpStringContext, BSTR*, strHelpStringDll) \
     749        ICOM_METHOD1(HRESULT, GetAllCustData, CUSTDATA *, pCustData)
     750#define ITypeLib2_IMETHODS \
     751        IUnknown_IMETHODS \
     752        ITypeLib_IMETHODS \
     753        ITypeLib2_METHODS
     754ICOM_DEFINE(ITypeLib2,ITypeLib)
     755#undef ICOM_INTERFACE
     756
     757/*** IUnknown methods ***/
     758#define ITypeLib2_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
     759#define ITypeLib2_AddRef(p)                     ICOM_CALL (AddRef,p)
     760#define ITypeLib2_Release(p)                    ICOM_CALL (Release,p)
     761/*** ITypeLib methods ***/
     762#define ITypeLib2_GetTypeInfoCount(p)           ICOM_CALL (GetTypeInfoCount,p)
     763#define ITypeLib2_GetTypeInfo(p,a,b)            ICOM_CALL2(GetTypeInfo,p,a,b)
     764#define ITypeLib2_GetTypeInfoType(p,a,b)        ICOM_CALL2(GetTypeInfoType,p,a,b)
     765#define ITypeLib2_GetTypeInfoOfGuid(p,a,b)      ICOM_CALL2(GetTypeInfoOfGuid,p,a,b)
     766#define ITypeLib2_GetLibAttr(p,a)               ICOM_CALL1(GetLibAttr,p,a)
     767#define ITypeLib2_GetTypeComp(p,a)              ICOM_CALL1(GetTypeComp,p,a)
     768#define ITypeLib2_GetDocumentation(p,a,b,c,d,e) ICOM_CALL5(GetDocumentation,p,a,b,c,d,e)
     769#define ITypeLib2_IsName(p,a,b,c)               ICOM_CALL3(IsName,p,a,b,c)
     770#define ITypeLib2_FindName(p,a,b,c,d,e)         ICOM_CALL5(FindName,p,a,b,c,d,e)
     771#define ITypeLib2_ReleaseTLibAttr(p,a)          ICOM_CALL1(ReleaseTLibAttr,p,a)
     772/*** ITypeLib2 methods ***/
     773#define ITypeLib2_GetCustData(p,a,b)            ICOM_CALL2(GetCustData,p,a,b)
     774#define ITypeLib2_GetLibStatistics(p,a,b)       ICOM_CALL2(GetLibStatistics,p,a,b)
     775#define ITypeLib2_GetDocumentation2(p,a,b,c,d,e,f) ICOM_CALL5(GetDocumentation2,p,a,b,c,d,e)
     776#define ITypeLib2_GetAllCustData(p,a)           ICOM_CALL1(GetAllCustData,p,a)
    702777
    703778/*****************************************************************************
    … …  
    714789#undef ICOM_INTERFACE
    715790
    716 #ifdef ICOM_CINTERFACE
    717791/*** IUnknown methods ***/
    718792#define ITypeComp_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
    … …  
    722796#define ITypeComp_Bind(p,a,b,c,d,e,f)           ICOM_CALL6(Bind,p,a,b,c,d,e,f)
    723797#define ITypeComp_BindType(p,a,b,c,d)           ICOM_CALL4(BindType,p,a,b,c,d)
    724 #endif
    725798                                 
    726799/*****************************************************************************
    … …  
    739812#undef ICOM_INTERFACE
    740813
    741 #ifdef ICOM_CINTERFACE
    742814/*** IUnknown methods ***/
    743815#define IEnumVARIANT_QueryInterface(p,a,b)   ICOM_CALL2(QueryInterface,p,a,b)
    … …  
    749821#define IEnumVARIANT_Reset(p)                ICOM_CALL (Reset,p)
    750822#define IEnumVARIANT_Clone(p,a)              ICOM_CALL1(Clone,p,a)
    751 #endif
    752823                                 
    753824#endif /* __WINE_WINE_OBJ_OLEAUT_H */
Note: See TracChangeset for help on using the changeset viewer.