Changeset 6715 for trunk/include


Ignore:
Timestamp:
Sep 15, 2001, 11:58:36 AM (24 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include/win
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/strmif.h

    r6564 r6715  
     1//#ifndef __WINE__
    12#include "rpc.h"
    23//#include "rpcndr.h"
    … …  
    56#include "ole2.h"
    67#endif
     8//#endif
    79
    810#ifndef __WINE_STRMIF_H_
    … …  
    249251
    250252typedef LONGLONG        REFERENCE_TIME;
    251 typedef DWORD           HSEMAPHORE;
    252 typedef DWORD           HEVENT;
     253#ifdef __WIN32OS2__
     254typedef DWORD           HSEMAPHORE;
     255typedef DWORD           HEVENT;
     256#else
     257typedef DWORD_PTR       HSEMAPHORE;
     258typedef DWORD_PTR       HEVENT;
     259#endif
    253260
    254261/* enums. */
    … …  
    266273        State_Running = 2,
    267274} FILTER_STATE;
     275
     276typedef enum
     277{
     278        Famine = 0,
     279        Flood = 1,
     280} QualityMessageType;
     281
     282typedef enum
     283{
     284        REG_PINFLAG_B_ZERO = 0x1,
     285        REG_PINFLAG_B_RENDERER = 0x2,
     286        REG_PINFLAG_B_MANY = 0x4,
     287        REG_PINFLAG_B_OUTPUT = 0x8,
     288} REG_PINFLAG;
     289
    268290
    269291/* structs. */
    … …  
    320342} COLORKEY;
    321343
     344typedef struct
     345{
     346        QualityMessageType      Type;
     347        long                    Proportion;
     348        REFERENCE_TIME          Late;
     349        REFERENCE_TIME          TimeStamp;
     350} Quality;
     351
     352typedef struct
     353{
     354        const CLSID*    clsMajorType;
     355        const CLSID*    clsMinorType;
     356} REGPINTYPES;
     357
     358typedef struct
     359{
     360        LPWSTR  strName;
     361        BOOL    bRendered;
     362        BOOL    bOutput;
     363        BOOL    bZero;
     364        BOOL    bMany;
     365        const CLSID*    clsConnectsToFilter;
     366        const WCHAR*    strConnectsToPin;
     367        UINT    nMediaTypes;
     368        const REGPINTYPES*      lpMediaType;
     369} REGFILTERPINS;
     370
     371typedef struct
     372{
     373        CLSID   clsMedium;
     374        DWORD   dw1;
     375        DWORD   dw2;
     376} REGPINMEDIUM;
     377
     378typedef struct
     379{
     380        DWORD   dwFlags;
     381        UINT    cInstances;
     382        UINT    nMediaTypes;
     383        const REGPINTYPES*      lpMediaType;
     384        UINT    nMediums;
     385        const REGPINMEDIUM*     lpMedium;
     386        const CLSID*    clsPinCategory;
     387} REGFILTERPINS2;
     388
     389typedef struct
     390{
     391        DWORD   dwVersion;
     392        DWORD   dwMerit;
     393        union {
     394                struct {
     395                        ULONG   cPins;
     396                        const REGFILTERPINS*    rgPins;
     397                } DUMMYSTRUCTNAME1;
     398                struct {
     399                        ULONG   cPins2;
     400                        const REGFILTERPINS2*   rgPins2;
     401                } DUMMYSTRUCTNAME2;
     402        } DUMMYUNIONNAME;
     403} REGFILTER2;
    322404
    323405
    … …  
    395477#define IBaseFilter_GetClassID(p,a1) ICOM_CALL1(GetClassID,p,a1)
    396478    /*** IMediaFilter methods ***/
    397 #define IBaseFilter_Stop(p,a1) ICOM_CALL1(Stop,p,a1)
    398 #define IBaseFilter_Pause(p,a1) ICOM_CALL1(Pause,p,a1)
     479#define IBaseFilter_Stop(p) ICOM_CALL (Stop,p)
     480#define IBaseFilter_Pause(p) ICOM_CALL (Pause,p)
    399481#define IBaseFilter_Run(p,a1) ICOM_CALL1(Run,p,a1)
    400482#define IBaseFilter_GetState(p,a1,a2) ICOM_CALL2(GetState,p,a1,a2)
    … …  
    410492/**************************************************************************
    411493 *
     494 * ICreateDevEnum interface
     495 *
     496 */
     497
     498#define ICOM_INTERFACE ICreateDevEnum
     499#define ICreateDevEnum_METHODS \
     500    ICOM_METHOD3(HRESULT,CreateClassEnumerator,REFCLSID,a1,IEnumMoniker**,a2,DWORD,a3)
     501
     502#define ICreateDevEnum_IMETHODS \
     503    IUnknown_IMETHODS \
     504    ICreateDevEnum_METHODS
     505
     506ICOM_DEFINE(ICreateDevEnum,IUnknown)
     507#undef ICOM_INTERFACE
     508
     509    /*** IUnknown methods ***/
     510#define ICreateDevEnum_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     511#define ICreateDevEnum_AddRef(p) ICOM_CALL (AddRef,p)
     512#define ICreateDevEnum_Release(p) ICOM_CALL (Release,p)
     513    /*** ICreateDevEnum methods ***/
     514#define ICreateDevEnum_CreateClassEnumerator(p,a1,a2,a3) ICOM_CALL3(CreateClassEnumerator,p,a1,a2,a3)
     515
     516/**************************************************************************
     517 *
    412518 * IEnumFilters interface
    413519 *
    … …  
    500606/**************************************************************************
    501607 *
     608 * IFileSinkFilter interface
     609 *
     610 */
     611
     612#define ICOM_INTERFACE IFileSinkFilter
     613#define IFileSinkFilter_METHODS \
     614    ICOM_METHOD2(HRESULT,SetFileName,LPCOLESTR,a1,const AM_MEDIA_TYPE*,a2) \
     615    ICOM_METHOD2(HRESULT,GetCurFile,LPOLESTR*,a1,AM_MEDIA_TYPE*,a2)
     616
     617#define IFileSinkFilter_IMETHODS \
     618    IUnknown_IMETHODS \
     619    IFileSinkFilter_METHODS
     620
     621ICOM_DEFINE(IFileSinkFilter,IUnknown)
     622#undef ICOM_INTERFACE
     623
     624    /*** IUnknown methods ***/
     625#define IFileSinkFilter_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     626#define IFileSinkFilter_AddRef(p) ICOM_CALL (AddRef,p)
     627#define IFileSinkFilter_Release(p) ICOM_CALL (Release,p)
     628    /*** IFileSinkFilter methods ***/
     629#define IFileSinkFilter_SetFileName(p,a1,a2) ICOM_CALL2(SetFileName,p,a1,a2)
     630#define IFileSinkFilter_GetCurFile(p,a1,a2) ICOM_CALL2(GetCurFile,p,a1,a2)
     631
     632/**************************************************************************
     633 *
     634 * IFileSinkFilter2 interface
     635 *
     636 */
     637
     638#define ICOM_INTERFACE IFileSinkFilter2
     639#define IFileSinkFilter2_METHODS \
     640    ICOM_METHOD1(HRESULT,SetMode,DWORD,a1) \
     641    ICOM_METHOD1(HRESULT,GetMode,DWORD*,a1)
     642
     643#define IFileSinkFilter2_IMETHODS \
     644    IFileSinkFilter_IMETHODS \
     645    IFileSinkFilter2_METHODS
     646
     647ICOM_DEFINE(IFileSinkFilter2,IFileSinkFilter)
     648#undef ICOM_INTERFACE
     649
     650    /*** IUnknown methods ***/
     651#define IFileSinkFilter2_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     652#define IFileSinkFilter2_AddRef(p) ICOM_CALL (AddRef,p)
     653#define IFileSinkFilter2_Release(p) ICOM_CALL (Release,p)
     654    /*** IFileSinkFilter methods ***/
     655#define IFileSinkFilter2_SetFileName(p,a1,a2) ICOM_CALL2(SetFileName,p,a1,a2)
     656#define IFileSinkFilter2_GetCurFile(p,a1,a2) ICOM_CALL2(GetCurFile,p,a1,a2)
     657    /*** IFileSinkFilter2 methods ***/
     658#define IFileSinkFilter2_SetMode(p,a1) ICOM_CALL1(SetMode,p,a1)
     659#define IFileSinkFilter2_GetMode(p,a1) ICOM_CALL1(GetMode,p,a1)
     660
     661/**************************************************************************
     662 *
    502663 * IFileSourceFilter interface
    503664 *
    … …  
    523684#define IFileSourceFilter_Load(p,a1,a2) ICOM_CALL2(Load,p,a1,a2)
    524685#define IFileSourceFilter_GetCurFile(p,a1,a2) ICOM_CALL2(GetCurFile,p,a1,a2)
     686
     687/**************************************************************************
     688 *
     689 * IFilterMapper interface
     690 *
     691 */
     692
     693#define ICOM_INTERFACE IFilterMapper
     694#define IFilterMapper_METHODS \
     695    ICOM_METHOD3(HRESULT,RegisterFilter,CLSID,a1,LPCWSTR,a2,DWORD,a3) \
     696    ICOM_METHOD3(HRESULT,RegisterFilterInstance,CLSID,a1,LPCWSTR,a2,CLSID*,a3) \
     697    ICOM_METHOD8(HRESULT,RegisterPin,CLSID,a1,LPCWSTR,a2,BOOL,a3,BOOL,a4,BOOL,a5,BOOL,a6,CLSID,a7,LPCWSTR,a8) \
     698    ICOM_METHOD4(HRESULT,RegisterPinType,CLSID,a1,LPCWSTR,a2,CLSID,a3,CLSID,a4) \
     699    ICOM_METHOD1(HRESULT,UnregisterFilter,CLSID,a1) \
     700    ICOM_METHOD1(HRESULT,UnregisterFilterInstance,CLSID,a1) \
     701    ICOM_METHOD2(HRESULT,UnregisterPin,CLSID,a1,LPCWSTR,a2) \
     702    ICOM_METHOD9(HRESULT,EnumMatchingFilters,IEnumRegFilters**,a1,DWORD,a2,BOOL,a3,CLSID,a4,CLSID,a5,BOOL,a6,BOOL,a7,CLSID,a8,CLSID,a9)
     703
     704#define IFilterMapper_IMETHODS \
     705    IUnknown_IMETHODS \
     706    IFilterMapper_METHODS
     707
     708ICOM_DEFINE(IFilterMapper,IUnknown)
     709#undef ICOM_INTERFACE
     710
     711    /*** IUnknown methods ***/
     712#define IFilterMapper_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     713#define IFilterMapper_AddRef(p) ICOM_CALL (AddRef,p)
     714#define IFilterMapper_Release(p) ICOM_CALL (Release,p)
     715    /*** IFilterMapper methods ***/
     716#define IFilterMapper_RegisterFilter(p,a1,a2,a3) ICOM_CALL3(RegisterFilter,p,a1,a2,a3)
     717#define IFilterMapper_RegisterFilterInstance(p,a1,a2,a3) ICOM_CALL3(RegisterFilterInstance,p,a1,a2,a3)
     718#define IFilterMapper_RegisterPin(p,a1,a2,a3,a4,a5,a6,a7,a8) ICOM_CALL8(RegisterPin,p,a1,a2,a3,a4,a5,a6,a7,a8)
     719#define IFilterMapper_RegisterPinType(p,a1,a2,a3,a4) ICOM_CALL4(RegisterPinType,p,a1,a2,a3,a4)
     720#define IFilterMapper_UnregisterFilter(p,a1) ICOM_CALL1(UnregisterFilter,p,a1)
     721#define IFilterMapper_UnregisterFilterInstance(p,a1) ICOM_CALL1(UnregisterFilterInstance,p,a1)
     722#define IFilterMapper_UnregisterPin(p,a1,a2) ICOM_CALL2(UnregisterPin,p,a1,a2)
     723#define IFilterMapper_EnumMatchingFilters(p,a1,a2,a3,a4,a5,a6,a7,a8,a9) ICOM_CALL9(EnumMatchingFilters,p,a1,a2,a3,a4,a5,a6,a7,a8,a9)
     724
     725/**************************************************************************
     726 *
     727 * IFilterMapper2 interface
     728 *
     729 */
     730
     731#define ICOM_INTERFACE IFilterMapper2
     732#define IFilterMapper2_METHODS \
     733    ICOM_METHOD3(HRESULT,CreateCategory,REFCLSID,a1,DWORD,a2,LPCWSTR,a3) \
     734    ICOM_METHOD3(HRESULT,UnregisterFilter,const CLSID*,a1,const OLECHAR*,a2,REFCLSID,a3) \
     735    ICOM_METHOD6(HRESULT,RegisterFilter,REFCLSID,a1,LPCWSTR,a2,IMoniker**,a3,const CLSID*,a4,const OLECHAR*,a5,const REGFILTER2*,a6) \
     736    ICOM_METHOD15(HRESULT,EnumMatchingFilters,IEnumMoniker**,a1,DWORD,a2,BOOL,a3,DWORD,a4,BOOL,a5,DWORD,a6,const GUID*,a7,const REGPINMEDIUM*,a8,const CLSID*,a9,BOOL,a10,BOOL,a11,DWORD,a12,const GUID*,a13,const REGPINMEDIUM*,a14,const CLSID*,a15)
     737
     738#define IFilterMapper2_IMETHODS \
     739    IUnknown_IMETHODS \
     740    IFilterMapper2_METHODS
     741
     742ICOM_DEFINE(IFilterMapper2,IUnknown)
     743#undef ICOM_INTERFACE
     744
     745    /*** IUnknown methods ***/
     746#define IFilterMapper2_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     747#define IFilterMapper2_AddRef(p) ICOM_CALL (AddRef,p)
     748#define IFilterMapper2_Release(p) ICOM_CALL (Release,p)
     749    /*** IFilterMapper2 methods ***/
     750#define IFilterMapper2_CreateCategory(p,a1,a2,a3) ICOM_CALL3(CreateCategory,p,a1,a2,a3)
     751#define IFilterMapper2_UnregisterFilter(p,a1,a2,a3) ICOM_CALL3(UnregisterFilter,p,a1,a2,a3)
     752#define IFilterMapper2_RegisterFilter(p,a1,a2,a3,a4,a5,a6) ICOM_CALL6(RegisterFilter,p,a1,a2,a3,a4,a5,a6)
     753#define IFilterMapper2_EnumMatchingFilters(p,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15) ICOM_CALL15(EnumMatchingFilters,p,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15)
     754
     755/**************************************************************************
     756 *
     757 * IFilterMapper3 interface
     758 *
     759 */
     760
     761#define ICOM_INTERFACE IFilterMapper3
     762#define IFilterMapper3_METHODS \
     763    ICOM_METHOD1(HRESULT,GetICreateDevEnum,ICreateDevEnum**,a1)
     764
     765#define IFilterMapper3_IMETHODS \
     766    IFilterMapper2_IMETHODS \
     767    IFilterMapper3_METHODS
     768
     769ICOM_DEFINE(IFilterMapper3,IFilterMapper2)
     770#undef ICOM_INTERFACE
     771
     772    /*** IUnknown methods ***/
     773#define IFilterMapper3_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     774#define IFilterMapper3_AddRef(p) ICOM_CALL (AddRef,p)
     775#define IFilterMapper3_Release(p) ICOM_CALL (Release,p)
     776    /*** IFilterMapper2 methods ***/
     777#define IFilterMapper3_CreateCategory(p,a1,a2,a3) ICOM_CALL3(CreateCategory,p,a1,a2,a3)
     778#define IFilterMapper3_UnregisterFilter(p,a1,a2,a3) ICOM_CALL3(UnregisterFilter,p,a1,a2,a3)
     779#define IFilterMapper3_RegisterFilter(p,a1,a2,a3,a4,a5,a6) ICOM_CALL6(RegisterFilter,p,a1,a2,a3,a4,a5,a6)
     780#define IFilterMapper3_EnumMatchingFilters(p,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15) ICOM_CALL15(EnumMatchingFilters,p,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15)
     781    /*** IFilterMapper3 methods ***/
     782#define IFilterMapper3_GetICreateDevEnum(p,a1) ICOM_CALL1(GetICreateDevEnum,p,a1)
    525783
    526784/**************************************************************************
    … …  
    654912/**************************************************************************
    655913 *
     914 * IGraphVersion interface
     915 *
     916 */
     917
     918#define ICOM_INTERFACE IGraphVersion
     919#define IGraphVersion_METHODS \
     920    ICOM_METHOD1(HRESULT,QueryVersion,LONG*,a1)
     921
     922#define IGraphVersion_IMETHODS \
     923    IUnknown_IMETHODS \
     924    IGraphVersion_METHODS
     925
     926ICOM_DEFINE(IGraphVersion,IUnknown)
     927#undef ICOM_INTERFACE
     928
     929    /*** IUnknown methods ***/
     930#define IGraphVersion_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     931#define IGraphVersion_AddRef(p) ICOM_CALL (AddRef,p)
     932#define IGraphVersion_Release(p) ICOM_CALL (Release,p)
     933    /*** IGraphVersion methods ***/
     934#define IGraphVersion_QueryVersion(p,a1) ICOM_CALL1(QueryVersion,p,a1)
     935
     936/**************************************************************************
     937 *
     938 * IMediaEventSink interface
     939 *
     940 */
     941
     942#define ICOM_INTERFACE IMediaEventSink
     943#define IMediaEventSink_METHODS \
     944    ICOM_METHOD3(HRESULT,Notify,long,a1,LONG_PTR,a2,LONG_PTR,a3)
     945
     946#define IMediaEventSink_IMETHODS \
     947    IUnknown_IMETHODS \
     948    IMediaEventSink_METHODS
     949
     950ICOM_DEFINE(IMediaEventSink,IUnknown)
     951#undef ICOM_INTERFACE
     952
     953    /*** IUnknown methods ***/
     954#define IMediaEventSink_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     955#define IMediaEventSink_AddRef(p) ICOM_CALL (AddRef,p)
     956#define IMediaEventSink_Release(p) ICOM_CALL (Release,p)
     957    /*** IMediaEventSink methods ***/
     958#define IMediaEventSink_Notify(p,a1,a2,a3) ICOM_CALL3(Notify,p,a1,a2,a3)
     959
     960/**************************************************************************
     961 *
    656962 * IMediaSample interface
    657963 *
    … …  
    9841290/**************************************************************************
    9851291 *
     1292 * IQualityControl interface
     1293 *
     1294 */
     1295
     1296#define ICOM_INTERFACE IQualityControl
     1297#define IQualityControl_METHODS \
     1298    ICOM_METHOD2(HRESULT,Notify,IBaseFilter*,a1,Quality,a2) \
     1299    ICOM_METHOD1(HRESULT,SetSink,IQualityControl*,a1)
     1300
     1301#define IQualityControl_IMETHODS \
     1302    IUnknown_IMETHODS \
     1303    IQualityControl_METHODS
     1304
     1305ICOM_DEFINE(IQualityControl,IUnknown)
     1306#undef ICOM_INTERFACE
     1307
     1308    /*** IUnknown methods ***/
     1309#define IQualityControl_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     1310#define IQualityControl_AddRef(p) ICOM_CALL (AddRef,p)
     1311#define IQualityControl_Release(p) ICOM_CALL (Release,p)
     1312    /*** IQualityControl methods ***/
     1313#define IQualityControl_Notify(p,a1,a2) ICOM_CALL2(Notify,p,a1,a2)
     1314#define IQualityControl_SetSink(p,a1) ICOM_CALL1(SetSink,p,a1)
     1315
     1316/**************************************************************************
     1317 *
    9861318 * IReferenceClock interface
    9871319 *
    … …  
    10391371    /*** IReferenceClock2 methods ***/
    10401372
     1373/**************************************************************************
     1374 *
     1375 * ISeekingPassThru interface
     1376 *
     1377 */
     1378
     1379#define ICOM_INTERFACE ISeekingPassThru
     1380#define ISeekingPassThru_METHODS \
     1381    ICOM_METHOD2(HRESULT,Init,BOOL,a1,IPin*,a2)
     1382
     1383#define ISeekingPassThru_IMETHODS \
     1384    IUnknown_IMETHODS \
     1385    ISeekingPassThru_METHODS
     1386
     1387ICOM_DEFINE(ISeekingPassThru,IUnknown)
     1388#undef ICOM_INTERFACE
     1389
     1390    /*** IUnknown methods ***/
     1391#define ISeekingPassThru_QueryInterface(p,a1,a2) ICOM_CALL2(QueryInterface,p,a1,a2)
     1392#define ISeekingPassThru_AddRef(p) ICOM_CALL (AddRef,p)
     1393#define ISeekingPassThru_Release(p) ICOM_CALL (Release,p)
     1394    /*** ISeekingPassThru methods ***/
     1395#define ISeekingPassThru_Init(p,a1,a2) ICOM_CALL2(Init,p,a1,a2)
     1396
     1397
     1398
     1399
    10411400#endif  /* __WINE_STRMIF_H_ */

  • trunk/include/win/uuids.h

    r6564 r6715  
    7272/* Stream */
    7373OUR_GUID_ENTRY(MEDIASUBTYPE_Avi,0xe436eb88,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70)
     74OUR_GUID_ENTRY(MEDIASUBTYPE_QTMovie,0xE436EB89,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70)
     75OUR_GUID_ENTRY(MEDIATYPE_MPEG1SystemStream,0xE436EB82,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70)
    7476OUR_GUID_ENTRY(MEDIASUBTYPE_WAVE,0xe436eb8b,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70)
    7577OUR_GUID_ENTRY(MEDIASUBTYPE_AU,0xe436eb8c,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70)
    7678OUR_GUID_ENTRY(MEDIASUBTYPE_AIFF,0xe436eb8d,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70)
     79
     80OUR_GUID_ENTRY(MEDIASUBTYPE_QTRpza,
     81        0x617A7072,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71)
     82OUR_GUID_ENTRY(MEDIASUBTYPE_QTSmc,
     83        0x20636D73,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71)
     84OUR_GUID_ENTRY(MEDIASUBTYPE_QTRle,
     85        0x20656C72,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71)
     86OUR_GUID_ENTRY(MEDIASUBTYPE_QTJpeg,
     87        0x6765706A,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71)
     88
     89OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1System,
     90        0xE436EB84,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70)
     91OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Video,
     92        0xE436EB86,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70)
     93OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Audio,
     94        0xE436EB87,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70)
     95OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Packet,
     96        0xE436EB80,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70)
     97OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Payload,
     98        0xE436EB81,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70)
     99OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1AudioPayload,
     100        0x00000050,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71)
     101
    77102
    78103/* --- Format Type --- */
    … …  
    101126OUR_GUID_ENTRY(CLSID_FilterMapper,
    102127        0xe436ebb2,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70)
     128OUR_GUID_ENTRY(CLSID_FilterMapper2,
     129        0xCDA42200,0xBD88,0x11D0,0xBD,0x4E,0x00,0xA0,0xC9,0x11,0xCE,0x86)
    103130/* Filter Graph */
    104131OUR_GUID_ENTRY(CLSID_FilterGraph,
    … …  
    123150        0x1e651cc0,0xb199,0x11d0,0x82,0x12,0x00,0xc0,0x4f,0xc3,0x2c,0x45)
    124151
     152OUR_GUID_ENTRY(CLSID_VfwCapture,
     153        0x1B544C22,0xFD0B,0x11CE,0x8C,0x63,0x00,0xAA,0x00,0x44,0xB5,0x1E)
     154OUR_GUID_ENTRY(CLSID_SeekingPassThru,
     155        0x060AF76C,0x68DD,0x11D0,0x8F,0xC1,0x00,0xC0,0x4F,0xD9,0x18,0x9D)
     156OUR_GUID_ENTRY(CLSID_SystemDeviceEnum,
     157        0x62BE5D10,0x60EB,0x11D0,0xBD,0x3B,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     158OUR_GUID_ENTRY(CLSID_CDeviceMoniker,
     159        0x4315D437,0x5B8C,0x11D0,0xBD,0x3B,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     160
     161
     162
     163/* Categories */
     164OUR_GUID_ENTRY(CLSID_ActiveMovieCategories,
     165        0xDA4E3DA0,0xD07D,0x11D0,0xBD,0x50,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     166OUR_GUID_ENTRY(CLSID_AudioCompressorCategory,
     167        0x33D9A761,0x90C8,0x11D0,0xBD,0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     168OUR_GUID_ENTRY(CLSID_AudioInputDeviceCategory,
     169        0x33D9A762,0x90C8,0x11D0,0xBD,0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     170OUR_GUID_ENTRY(CLSID_AudioRendererCategory,
     171        0xE0F158E1,0xCB04,0x11D0,0xBD,0x4E,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     172OUR_GUID_ENTRY(CLSID_DeviceControlCategory,
     173        0xCC7BFB46,0xF175,0x11D1,0xA3,0x92,0x00,0xE0,0x29,0x1F,0x39,0x59)
     174OUR_GUID_ENTRY(CLSID_LegacyAmFilterCategory,
     175        0x083863F1,0x70DE,0x11D0,0xBD,0x40,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     176OUR_GUID_ENTRY(CLSID_MidiRendererCategory,
     177        0x4EFE2452,0x168A,0x11D1,0xBC,0x76,0x00,0xC0,0x4F,0xB9,0x45,0x3B)
     178OUR_GUID_ENTRY(CLSID_TransmitCategory,
     179        0xCC7BFB41,0xF175,0x11D1,0xA3,0x92,0x00,0xE0,0x29,0x1F,0x39,0x59)
     180OUR_GUID_ENTRY(CLSID_VideoInputDeviceCategory,
     181        0x860BB310,0x5D01,0x11D0,0xBD,0x3B,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     182OUR_GUID_ENTRY(CLSID_VideoCompressorCategory,
     183        0x33D9A760,0x90C8,0x11D0,0xBD,0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86)
     184
     185/* Time formats */
     186OUR_GUID_ENTRY(TIME_FORMAT_BYTE,
     187        0x7B785571,0x8C82,0x11CF,0xBC,0x0C,0x00,0xAA,0x00,0xAC,0x74,0xF6)
     188OUR_GUID_ENTRY(TIME_FORMAT_FIELD,
     189        0x7B785573,0x8C82,0x11CF,0xBC,0x0C,0x00,0xAA,0x00,0xAC,0x74,0xF6)
     190OUR_GUID_ENTRY(TIME_FORMAT_FRAME,
     191        0x7B785570,0x8C82,0x11CF,0xBC,0x0C,0x00,0xAA,0x00,0xAC,0x74,0xF6)
     192OUR_GUID_ENTRY(TIME_FORMAT_MEDIA_TIME,
     193        0x7B785574,0x8C82,0x11CF,0xBC,0x0C,0x00,0xAA,0x00,0xAC,0x74,0xF6)
     194OUR_GUID_ENTRY(TIME_FORMAT_NONE,
     195        0x00000000,0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00)
     196OUR_GUID_ENTRY(TIME_FORMAT_SAMPLE,
     197        0x7B785572,0x8C82,0x11CF,0xBC,0x0C,0x00,0xAA,0x00,0xAC,0x74,0xF6)
     198
     199
    125200#undef  OUR_GUID_ENTRY
    126201

  • trunk/include/win/winbase.h

    r6694 r6715  
    16151615LONG        WINAPI InterlockedDecrement(LPLONG);
    16161616LONG        WINAPI InterlockedExchange(LPLONG,LONG);
     1617LONG        WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr );
    16171618LONG        WINAPI InterlockedIncrement(LPLONG);
    16181619BOOL      WINAPI IsDBCSLeadByteEx(UINT,BYTE);

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

    r5616 r6715  
    362362#define ICOM_METHOD10(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj) \
    363363     public: virtual ret (CALLBACK xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j) = 0;
     364#define ICOM_METHOD11(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk) \
     365     public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k) = 0;
     366#define ICOM_METHOD12(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl) \
     367    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l) = 0;
     368#define ICOM_METHOD13(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm) \
     369    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m) = 0;
     370#define ICOM_METHOD14(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn) \
     371    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n) = 0;
     372#define ICOM_METHOD15(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no) \
     373    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o) = 0;
     374#define ICOM_METHOD16(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np) \
     375    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p) = 0;
     376#define ICOM_METHOD17(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq) \
     377    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q) = 0;
     378#define ICOM_METHOD18(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr) \
     379    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r) = 0;
     380#define ICOM_METHOD19(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns) \
     381    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s) = 0;
     382#define ICOM_METHOD20(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt) \
     383    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t) = 0;
     384#define ICOM_METHOD21(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu) \
     385    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u) = 0;
     386#define ICOM_METHOD22(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv) \
     387    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v) = 0;
     388#define ICOM_METHOD23(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv,tw,nw) \
     389    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v,tw w) = 0;
     390#define ICOM_METHOD24(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv,tw,nw,tx,nx) \
     391    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v,tw w,tx x) = 0;
     392#define ICOM_METHOD25(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv,tw,nw,tx,nx,ty,ny) \
     393    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v,tw w,tx x,ty y) = 0;
     394#define ICOM_METHOD26(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv,tw,nw,tx,nx,ty,ny,tz,nz) \
     395    public: virtual ret CALLBACK (xfn)(ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v,tw w,tx x,ty y,tz z) = 0;
    364396
    365397
    … …  
    478510#define ICOM_METHOD10(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj) \
    479511    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j);
     512#define ICOM_METHOD11(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk) \
     513    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k);
     514#define ICOM_METHOD12(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl) \
     515    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l);
     516#define ICOM_METHOD13(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm) \
     517    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m);
     518#define ICOM_METHOD14(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn) \
     519    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n);
     520#define ICOM_METHOD15(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no) \
     521    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o);
     522#define ICOM_METHOD16(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np) \
     523    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p);
     524#define ICOM_METHOD17(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq) \
     525    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q);
     526#define ICOM_METHOD18(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr) \
     527    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r);
     528#define ICOM_METHOD19(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns) \
     529    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s);
     530#define ICOM_METHOD20(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt) \
     531    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t);
     532#define ICOM_METHOD21(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu) \
     533    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u);
     534#define ICOM_METHOD22(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv) \
     535    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v);
     536#define ICOM_METHOD23(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv,tw,nw) \
     537    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v,tw w);
     538#define ICOM_METHOD24(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv,tw,nw,tx,nx) \
     539    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v,tw w,tx x);
     540#define ICOM_METHOD25(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv,tw,nw,tx,nx,ty,ny) \
     541    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v,tw w,tx x,ty y);
     542#define ICOM_METHOD26(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk,tl,nl,tm,nm,tn,nn,to,no,tp,np,tq,nq,tr,nr,ts,ns,tt,nt,tu,nu,tv,nv,tw,nw,tx,nx,ty,ny,tz,nz) \
     543    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j,tk k,tl l,tm m,tn n,to o,tp p,tq q,tr r,ts s,tt t,tu u,tv v,tw w,tx x,ty y,tz z);
    480544
    481545#define ICOM_CMETHOD(ret,xfn) \

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

    r641 r6715  
    1 /* $Id: obj_olefont.h,v 1.5 1999-08-22 22:52:09 sandervl Exp $ */
     1/* $Id: obj_olefont.h,v 1.6 2001-09-15 09:58:36 sandervl Exp $ */
    22/*
    33 * Defines the COM interfaces and APIs related to OLE font support.
    … …  
    1010
    1111#include "wine/obj_base.h"
     12#include "wine/obj_oleaut.h"
    1213#include "wingdi.h"     /* TEXTMETRIC*/
    1314
    … …  
    5758  ICOM_METHOD1(HRESULT, SetHdc, HDC, hdc)     
    5859#define IFont_IMETHODS \
    59         IUnknown_IMEHTODS \
     60        IUnknown_IMETHODS \
    6061        IFont_METHODS
    6162ICOM_DEFINE(IFont,IUnknown)
    … …  
    101102#define IFontDisp_METHODS
    102103#define IFontDisp_IMETHODS \
    103   IUnknown_IMETHODS \
     104        IUnknown_IMETHODS \
    104105        IFontDisp_METHODS
    105106ICOM_DEFINE(IFontDisp,IDispatch)
Note: See TracChangeset for help on using the changeset viewer.