Skip to content

W
wine-cw
Commit f00c46f0 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Use a more compatible technique to declare COM interfaces methods,

using Microsoft's STDMETHOD macros instead of the Wine-specific ICOM_METHOD ones.
parent deeb2abd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 914 additions and 972 deletions
dlls/ddraw/direct3d/mesa.c
View file @ f00c46f0
......@@ -123,7 +123,7 @@ create_device_helper(IDirect3DImpl *This,
REFCLSID iid,
IDirectDrawSurfaceImpl *lpDDS,
void **obj,
int interface) {
int version) {
IDirect3DDeviceImpl *lpd3ddev;
HRESULT ret_value;
......@@ -135,7 +135,7 @@ create_device_helper(IDirect3DImpl *This,
(IsEqualGUID(&IID_IDirect3DHALDevice, iid)) ||
(IsEqualGUID(&IID_IDirect3DTnLHalDevice, iid)) ||
(IsEqualGUID(&IID_IDirect3DRefDevice, iid))) {
switch (interface) {
switch (version) {
case 1:
*obj = ICOM_INTERFACE(lpd3ddev, IDirect3DDevice);
TRACE(" returning OpenGL D3DDevice %p.\n", *obj);
......
dlls/dplayx/dplaysp.h
View file @ f00c46f0
......@@ -51,27 +51,27 @@ typedef BOOL (CALLBACK *LPENUMMRUCALLBACK)( LPCVOID lpData,
#define DPLAYI_GROUP_HIDDEN 0x00000400
/* Define the COM interface */
#define ICOM_INTERFACE IDirectPlaySP
#define INTERFACE IDirectPlaySP
#define IDirectPlaySP_METHODS \
ICOM_METHOD5(HRESULT,AddMRUEntry, LPCWSTR,lpSection, LPCWSTR,lpKey, LPCVOID,lpData, DWORD,dwDataSize, DWORD,dwMaxEntries ) \
ICOM_METHOD6(HRESULT,CreateAddress, REFGUID,guidSP, REFGUID,guidDataType, LPCVOID,lpData, DWORD,dwDataSize, LPVOID,lpAddress,LPDWORD,lpdwAddressSize) \
ICOM_METHOD4(HRESULT,EnumAddress, LPDPENUMADDRESSCALLBACK,lpEnumAddressCallback, LPCVOID,lpAddress, DWORD,dwAddressSize, LPVOID,lpContext ) \
ICOM_METHOD4(HRESULT,EnumMRUEntries, LPCWSTR,lpSection, LPCWSTR,lpKey, LPENUMMRUCALLBACK,lpEnumMRUCallback, LPVOID,lpContext ) \
ICOM_METHOD2(HRESULT,GetPlayerFlags, DPID,idPlayer, LPDWORD,lpdwPlayerFlags ) \
ICOM_METHOD4(HRESULT,GetSPPlayerData, DPID,idPlayer, LPVOID*,lplpData, LPDWORD,lpdwDataSize, DWORD,dwFlags ) \
ICOM_METHOD3(HRESULT,HandleMessage, LPVOID,lpMessageBody, DWORD,dwMessageBodySize, LPVOID,lpMessageHeader ) \
ICOM_METHOD4(HRESULT,SetSPPlayerData, DPID,idPlayer, LPVOID,lpData, DWORD,dwDataSize, DWORD,dwFlags ) \
ICOM_METHOD4(HRESULT,CreateCompoundAddress, LPCDPCOMPOUNDADDRESSELEMENT,lpElements, DWORD,dwElementCount, LPVOID,lpAddress, LPDWORD,lpdwAddressSize ) \
ICOM_METHOD3(HRESULT,GetSPData, LPVOID*,lplpData, LPDWORD,dwDataSize, DWORD,dwFlags ) \
ICOM_METHOD3(HRESULT,SetSPData, LPVOID,lpData, DWORD,dwDataSize, DWORD,dwFlags ) \
ICOM_METHOD2(VOID,SendComplete, LPVOID,, DWORD, )
STDMETHOD(AddMRUEntry)(THIS_ LPCWSTR lpSection, LPCWSTR lpKey, LPCVOID lpData, DWORD dwDataSize, DWORD dwMaxEntries ) PURE; \
STDMETHOD(CreateAddress)(THIS_ REFGUID guidSP, REFGUID guidDataType, LPCVOID lpData, DWORD dwDataSize, LPVOID lpAddress,LPDWORD lpdwAddressSize) PURE; \
STDMETHOD(EnumAddress)(THIS_ LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, LPVOID lpContext ) PURE; \
STDMETHOD(EnumMRUEntries)(THIS_ LPCWSTR lpSection, LPCWSTR lpKey, LPENUMMRUCALLBACK lpEnumMRUCallback, LPVOID lpContext ) PURE; \
STDMETHOD(GetPlayerFlags)(THIS_ DPID idPlayer, LPDWORD lpdwPlayerFlags ) PURE; \
STDMETHOD(GetSPPlayerData)(THIS_ DPID idPlayer, LPVOID *lplpData, LPDWORD lpdwDataSize, DWORD dwFlags ) PURE; \
STDMETHOD(HandleMessage)(THIS_ LPVOID lpMessageBody, DWORD dwMessageBodySize, LPVOID lpMessageHeader ) PURE; \
STDMETHOD(SetSPPlayerData)(THIS_ DPID idPlayer, LPVOID lpData, DWORD dwDataSize, DWORD dwFlags ) PURE; \
STDMETHOD(CreateCompoundAddress)(THIS_ LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, LPVOID lpAddress, LPDWORD lpdwAddressSize ) PURE; \
STDMETHOD(GetSPData)(THIS_ LPVOID *lplpData, LPDWORD dwDataSize, DWORD dwFlags ) PURE; \
STDMETHOD(SetSPData)(THIS_ LPVOID lpData, DWORD dwDataSize, DWORD dwFlags ) PURE; \
STDMETHOD_(VOID,SendComplete)(THIS_ LPVOID , DWORD ) PURE;
#define IDirectPlaySP_IMETHODS \
IUnknown_IMETHODS \
IDirectPlaySP_METHODS
ICOM_DEFINE(IDirectPlaySP,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/* NOTE: The microsoft provided header file doesn't have these access
......@@ -356,4 +356,3 @@ typedef HRESULT (WINAPI *LPDPSP_SPINIT)(LPSPINITDATA);
extern DWORD gdwDPlaySPRefCount;
#endif
dlls/dplayx/lobbysp.h
View file @ f00c46f0
......@@ -456,31 +456,31 @@ typedef HRESULT (WINAPI *LPSP_INIT)(LPSPDATA_INIT);
HRESULT WINAPI DPLSPInit(LPSPDATA_INIT);
/* Define the COM interface */
#define ICOM_INTERFACE IDPLobbySP
#define INTERFACE IDPLobbySP
#define IDPLobbySP_METHODS \
ICOM_METHOD1(HRESULT, AddGroupToGroup, LPSPDATA_ADDREMOTEGROUPTOGROUP, argtg ) \
ICOM_METHOD1(HRESULT, AddPlayerToGroup, LPSPDATA_ADDREMOTEPLAYERTOGROUP, arptg ) \
ICOM_METHOD1(HRESULT, CreateGroup, LPSPDATA_CREATEREMOTEGROUP, crg ) \
ICOM_METHOD1(HRESULT, CreateGroupInGroup, LPSPDATA_CREATEREMOTEGROUPINGROUP, crgig ) \
ICOM_METHOD1(HRESULT, DeleteGroupFromGroup, LPSPDATA_DELETEREMOTEGROUPFROMGROUP, drgfg ) \
ICOM_METHOD1(HRESULT, DeletePlayerFromGroup, LPSPDATA_DELETEREMOTEPLAYERFROMGROUP, drpfg ) \
ICOM_METHOD1(HRESULT, DestroyGroup, LPSPDATA_DESTROYREMOTEGROUP, drg ) \
ICOM_METHOD1(HRESULT, EnumSessionsResponse, LPSPDATA_ENUMSESSIONSRESPONSE, er ) \
ICOM_METHOD1(HRESULT, GetSPDataPointer, LPVOID*, lplpData ) \
ICOM_METHOD1(HRESULT, HandleMessage, LPSPDATA_HANDLEMESSAGE, hm ) \
ICOM_METHOD1(HRESULT, SendChatMessage, LPSPDATA_CHATMESSAGE, cm ) \
ICOM_METHOD1(HRESULT, SetGroupName, LPSPDATA_SETREMOTEGROUPNAME, srgn ) \
ICOM_METHOD1(HRESULT, SetPlayerName, LPSPDATA_SETREMOTEPLAYERNAME, srpn ) \
ICOM_METHOD1(HRESULT, SetSessionDesc, LPSPDATA_SETSESSIONDESC, ssd ) \
ICOM_METHOD1(HRESULT, SetSPDataPointer, LPVOID, lpData ) \
ICOM_METHOD1(HRESULT, StartSession, LPSPDATA_STARTSESSIONCOMMAND, ssc )
STDMETHOD(AddGroupToGroup)(THIS_ LPSPDATA_ADDREMOTEGROUPTOGROUP argtg ) PURE; \
STDMETHOD(AddPlayerToGroup)(THIS_ LPSPDATA_ADDREMOTEPLAYERTOGROUP arptg ) PURE; \
STDMETHOD(CreateGroup)(THIS_ LPSPDATA_CREATEREMOTEGROUP crg ) PURE; \
STDMETHOD(CreateGroupInGroup)(THIS_ LPSPDATA_CREATEREMOTEGROUPINGROUP crgig ) PURE; \
STDMETHOD(DeleteGroupFromGroup)(THIS_ LPSPDATA_DELETEREMOTEGROUPFROMGROUP drgfg ) PURE; \
STDMETHOD(DeletePlayerFromGroup)(THIS_ LPSPDATA_DELETEREMOTEPLAYERFROMGROUP drpfg ) PURE; \
STDMETHOD(DestroyGroup)(THIS_ LPSPDATA_DESTROYREMOTEGROUP drg ) PURE; \
STDMETHOD(EnumSessionsResponse)(THIS_ LPSPDATA_ENUMSESSIONSRESPONSE er ) PURE; \
STDMETHOD(GetSPDataPointer)(THIS_ LPVOID * lplpData ) PURE; \
STDMETHOD(HandleMessage)(THIS_ LPSPDATA_HANDLEMESSAGE hm ) PURE; \
STDMETHOD(SendChatMessage)(THIS_ LPSPDATA_CHATMESSAGE cm ) PURE; \
STDMETHOD(SetGroupName)(THIS_ LPSPDATA_SETREMOTEGROUPNAME srgn ) PURE; \
STDMETHOD(SetPlayerName)(THIS_ LPSPDATA_SETREMOTEPLAYERNAME srpn ) PURE; \
STDMETHOD(SetSessionDesc)(THIS_ LPSPDATA_SETSESSIONDESC ssd ) PURE; \
STDMETHOD(SetSPDataPointer)(THIS_ LPVOID lpData ) PURE; \
STDMETHOD(StartSession)(THIS_ LPSPDATA_STARTSESSIONCOMMAND ssc ) PURE;
#define IDPLobbySP_IMETHODS \
IUnknown_IMETHODS \
IDPLobbySP_METHODS
ICOM_DEFINE(IDPLobbySP,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDPLobbySP_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
dlls/ole32/ifs.h
View file @ f00c46f0
......@@ -27,19 +27,19 @@
typedef struct IMalloc16 IMalloc16, *LPMALLOC16;
#define ICOM_INTERFACE IMalloc16
#define INTERFACE IMalloc16
#define IMalloc16_METHODS \
ICOM_METHOD1 (LPVOID, Alloc, DWORD, cb) \
ICOM_METHOD2 (LPVOID, Realloc, LPVOID, pv, DWORD, cb) \
ICOM_VMETHOD1( Free, LPVOID, pv) \
ICOM_METHOD1 (DWORD, GetSize, LPVOID, pv) \
ICOM_METHOD1 (INT16, DidAlloc, LPVOID, pv) \
ICOM_METHOD (LPVOID, HeapMinimize)
STDMETHOD_(LPVOID,Alloc)(THIS_ DWORD cb) PURE; \
STDMETHOD_(LPVOID,Realloc)(THIS_ LPVOID pv, DWORD cb) PURE; \
STDMETHOD_(void,Free)(THIS_ LPVOID pv) PURE; \
STDMETHOD_(DWORD,GetSize)(THIS_ LPVOID pv) PURE; \
STDMETHOD_(INT16,DidAlloc)(THIS_ LPVOID pv) PURE; \
STDMETHOD_(LPVOID,HeapMinimize)(THIS) PURE;
#define IMalloc16_IMETHODS \
IUnknown_IMETHODS \
IMalloc16_METHODS
ICOM_DEFINE(IMalloc16,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/**********************************************************************/
......@@ -49,22 +49,22 @@ extern LPMALLOC16 IMalloc16_Constructor();
typedef struct ILockBytes16 *LPLOCKBYTES16, ILockBytes16;
#define ICOM_INTERFACE ILockBytes
#define INTERFACE ILockBytes
#define ILockBytes16_METHODS \
ICOM_METHOD4(HRESULT,ReadAt, ULARGE_INTEGER,ulOffset, void*,pv, ULONG, cb, ULONG*,pcbRead) \
ICOM_METHOD4(HRESULT,WriteAt, ULARGE_INTEGER,ulOffset, const void*,pv, ULONG,cb, ULONG*,pcbWritten) \
ICOM_METHOD (HRESULT,Flush) \
ICOM_METHOD1(HRESULT,SetSize, ULARGE_INTEGER,cb) \
ICOM_METHOD3(HRESULT,LockRegion, ULARGE_INTEGER,libOffset, ULARGE_INTEGER, cb, DWORD,dwLockType) \
ICOM_METHOD3(HRESULT,UnlockRegion, ULARGE_INTEGER,libOffset, ULARGE_INTEGER, cb, DWORD,dwLockType) \
ICOM_METHOD2(HRESULT,Stat, STATSTG*,pstatstg, DWORD,grfStatFlag)
STDMETHOD(ReadAt)(THIS_ ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) PURE; \
STDMETHOD(WriteAt)(THIS_ ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) PURE; \
STDMETHOD(Flush)(THIS) PURE; \
STDMETHOD(SetSize)(THIS_ ULARGE_INTEGER cb) PURE; \
STDMETHOD(LockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE; \
STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE; \
STDMETHOD(Stat)(THIS_ STATSTG *pstatstg, DWORD grfStatFlag) PURE;
#define ILockBytes16_IMETHODS \
IUnknown_IMETHODS \
ILockBytes16_METHODS
ICOM_DEFINE(ILockBytes16,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#endif /* __WINE_OLE_IFS_H */
dlls/shell32/shellfolder.h
View file @ f00c46f0
......@@ -35,17 +35,17 @@ typedef struct ISFHelper ISFHelper, *LPISFHELPER;
* ISFHelper interface
*/
#define ICOM_INTERFACE ISFHelper
#define INTERFACE ISFHelper
#define ISFHelper_METHODS \
ICOM_METHOD2 (HRESULT, GetUniqueName, LPSTR, lpName, UINT, uLen) \
ICOM_METHOD3 (HRESULT, AddFolder, HWND, hwnd, LPCSTR, lpName, LPITEMIDLIST*, ppidlOut) \
ICOM_METHOD2 (HRESULT, DeleteItems, UINT, cidl, LPCITEMIDLIST*, apidl) \
ICOM_METHOD3 (HRESULT, CopyItems, IShellFolder*, pSFFrom, UINT, cidl, LPCITEMIDLIST*, apidl)
STDMETHOD(GetUniqueName)(THIS_ LPSTR lpName, UINT uLen) PURE; \
STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCSTR lpName, LPITEMIDLIST * ppidlOut) PURE; \
STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; \
STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) PURE;
#define ISFHelper_IMETHODS \
IUnknown_IMETHODS \
ISFHelper_METHODS
ICOM_DEFINE(ISFHelper, IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define ISFHelper_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/d3dx8core.h
View file @ f00c46f0
......@@ -55,19 +55,19 @@ typedef struct ID3DXFont ID3DXFont, *LPD3DXFONT;
/*****************************************************************************
* ID3DXBuffer interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE ID3DXBuffer
#undef INTERFACE
#define INTERFACE ID3DXBuffer
#define ID3DXBuffer_METHODS \
/*** ID3DXBuffer methods ***/ \
ICOM_METHOD (LPVOID, GetBufferPointer) \
ICOM_METHOD (DWORD, GetBufferSize)
STDMETHOD_(LPVOID,GetBufferPointer)(THIS) PURE; \
STDMETHOD_(DWORD,GetBufferSize)(THIS) PURE;
/*** ID3DXBuffer methods ***/
#define ID3DXBuffer_IMETHODS \
IUnknown_IMETHODS \
ID3DXBuffer_METHODS
ICOM_DEFINE(ID3DXBuffer,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define ID3DXBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -80,20 +80,20 @@ ICOM_DEFINE(ID3DXBuffer,IUnknown)
/*****************************************************************************
* ID3DXFont interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE ID3DXFont
#undef INTERFACE
#define INTERFACE ID3DXFont
#define ID3DXFont_METHODS \
/*** ID3DXFont methods ***/ \
ICOM_METHOD (HRESULT, Begin) \
ICOM_METHOD (HRESULT, DrawTextA) \
ICOM_METHOD (HRESULT, End)
STDMETHOD(Begin)(THIS) PURE; \
STDMETHOD(DrawTextA)(THIS) PURE; \
STDMETHOD(End)(THIS) PURE;
/*** ID3DXFont methods ***/
#define ID3DXFont_IMETHODS \
IUnknown_IMETHODS \
ID3DXFont_METHODS
ICOM_DEFINE(ID3DXFont,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define ID3DXFont_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/dmplugin.h
View file @ f00c46f0
......@@ -64,23 +64,23 @@ DEFINE_GUID(CLSID_DirectMusicWaveTrack, 0xeed36461,0x9ea5,0x11d3,0x9b,0xd1,
/*****************************************************************************
* IDirectMusicTool interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE IDirectMusicTool
#undef INTERFACE
#define INTERFACE IDirectMusicTool
#define IDirectMusicTool_METHODS \
/*** IDirectMusicTool methods ***/ \
ICOM_METHOD1(HRESULT, Init, IDirectMusicGraph*,pGraph) \
ICOM_METHOD1(HRESULT, GetMsgDeliveryType, DWORD*,pdwDeliveryType) \
ICOM_METHOD1(HRESULT, GetMediaTypeArraySize, DWORD*,pdwNumElements) \
ICOM_METHOD2(HRESULT, GetMediaTypes, DWORD**,padwMediaTypes, DWORD,dwNumElements) \
ICOM_METHOD2(HRESULT, ProcessPMsg, IDirectMusicPerformance*,pPerf, DMUS_PMSG*,pPMSG) \
ICOM_METHOD3(HRESULT, Flush, IDirectMusicPerformance*,pPerf, DMUS_PMSG*,pPMSG, REFERENCE_TIME,rtTime)
STDMETHOD(Init)(THIS_ IDirectMusicGraph *pGraph) PURE; \
STDMETHOD(GetMsgDeliveryType)(THIS_ DWORD *pdwDeliveryType) PURE; \
STDMETHOD(GetMediaTypeArraySize)(THIS_ DWORD *pdwNumElements) PURE; \
STDMETHOD(GetMediaTypes)(THIS_ DWORD **padwMediaTypes, DWORD dwNumElements) PURE; \
STDMETHOD(ProcessPMsg)(THIS_ IDirectMusicPerformance *pPerf, DMUS_PMSG *pPMSG) PURE; \
STDMETHOD(Flush)(THIS_ IDirectMusicPerformance *pPerf, DMUS_PMSG *pPMSG, REFERENCE_TIME rtTime) PURE;
/*** IDirectMusicTool methods ***/
#define IDirectMusicTool_IMETHODS \
IUnknown_IMETHODS \
IDirectMusicTool_METHODS
ICOM_DEFINE(IDirectMusicTool,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDirectMusicTool_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -98,11 +98,11 @@ ICOM_DEFINE(IDirectMusicTool,IUnknown)
/*****************************************************************************
* IDirectMusicTool8 interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE IDirectMusicTool8
#undef INTERFACE
#define INTERFACE IDirectMusicTool8
#define IDirectMusicTool8_METHODS \
/*** IDirectMusicTool8 methods ***/ \
ICOM_METHOD1(HRESULT, Clone, IDirectMusicTool**,ppTool)
STDMETHOD(Clone)(THIS_ IDirectMusicTool **ppTool) PURE;
/*** IDirectMusicTool8 methods ***/
#define IDirectMusicTool8_IMETHODS \
......@@ -110,7 +110,7 @@ ICOM_DEFINE(IDirectMusicTool,IUnknown)
IDirectMusicTool_METHODS \
IDirectMusicTool8_METHODS
ICOM_DEFINE(IDirectMusicTool8,IDirectMusicTool)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDirectMusicTool8_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -149,27 +149,27 @@ typedef enum enumDMUS_TRACKF_FLAGS
/*****************************************************************************
* IDirectMusicTrack interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE IDirectMusicTrack
#undef INTERFACE
#define INTERFACE IDirectMusicTrack
#define IDirectMusicTrack_METHODS \
/*** IDirectMusicTrack methods ***/ \
ICOM_METHOD1(HRESULT, Init, IDirectMusicSegment*,pSegment) \
ICOM_METHOD5(HRESULT, InitPlay, IDirectMusicSegmentState*,pSegmentState, IDirectMusicPerformance*,pPerformance, void**,ppStateData, DWORD,dwVirtualTrackID, DWORD,dwFlags) \
ICOM_METHOD1(HRESULT, EndPlay, void*,pStateData) \
ICOM_METHOD8(HRESULT, Play, void*,pStateData, MUSIC_TIME,mtStart, MUSIC_TIME,mtEnd, MUSIC_TIME,mtOffset, DWORD,dwFlags, IDirectMusicPerformance*,pPerf, IDirectMusicSegmentState*,pSegSt, DWORD,dwVirtualID) \
ICOM_METHOD4(HRESULT, GetParam, REFGUID,rguidType, MUSIC_TIME,mtTime, MUSIC_TIME*,pmtNext, void*,pParam) \
ICOM_METHOD3(HRESULT, SetParam, REFGUID,rguidType, MUSIC_TIME,mtTime, void*,pParam) \
ICOM_METHOD1(HRESULT, IsParamSupported, REFGUID,rguidType) \
ICOM_METHOD1(HRESULT, AddNotificationType, REFGUID,rguidNotificationType) \
ICOM_METHOD1(HRESULT, RemoveNotificationType, REFGUID,rguidNotificationType) \
ICOM_METHOD3(HRESULT, Clone, MUSIC_TIME,mtStart, MUSIC_TIME,mtEnd, IDirectMusicTrack**,ppTrack)
STDMETHOD(Init)(THIS_ IDirectMusicSegment *pSegment) PURE; \
STDMETHOD(InitPlay)(THIS_ IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, void **ppStateData, DWORD dwVirtualTrackID, DWORD dwFlags) PURE; \
STDMETHOD(EndPlay)(THIS_ void *pStateData) PURE; \
STDMETHOD(Play)(THIS_ void *pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) PURE; \
STDMETHOD(GetParam)(THIS_ REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) PURE; \
STDMETHOD(SetParam)(THIS_ REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) PURE; \
STDMETHOD(IsParamSupported)(THIS_ REFGUID rguidType) PURE; \
STDMETHOD(AddNotificationType)(THIS_ REFGUID rguidNotificationType) PURE; \
STDMETHOD(RemoveNotificationType)(THIS_ REFGUID rguidNotificationType) PURE; \
STDMETHOD(Clone)(THIS_ MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) PURE;
/*** IDirectMusicTrack methods ***/
#define IDirectMusicTrack_IMETHODS \
IUnknown_IMETHODS \
IDirectMusicTrack_METHODS
ICOM_DEFINE(IDirectMusicTrack,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDirectMusicTrack_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -191,15 +191,15 @@ ICOM_DEFINE(IDirectMusicTrack,IUnknown)
/*****************************************************************************
* IDirectMusicTrack8 interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE IDirectMusicTrack8
#undef INTERFACE
#define INTERFACE IDirectMusicTrack8
#define IDirectMusicTrack8_METHODS \
/*** IDirectMusicTrack8 methods ***/ \
ICOM_METHOD8(HRESULT, PlayEx, void*,pStateData, REFERENCE_TIME,rtStart, REFERENCE_TIME,rtEnd, REFERENCE_TIME,rtOffset, DWORD,dwFlags, IDirectMusicPerformance*,pPerf, IDirectMusicSegmentState*,pSegSt, DWORD,dwVirtualID) \
ICOM_METHOD6(HRESULT, GetParamEx, REFGUID,rguidType, REFERENCE_TIME,rtTime, REFERENCE_TIME*,prtNext, void*,pParam, void*,pStateData, DWORD,dwFlags) \
ICOM_METHOD5(HRESULT, SetParamEx, REFGUID,rguidType, REFERENCE_TIME,rtTime, void*,pParam, void*,pStateData, DWORD,dwFlags) \
ICOM_METHOD3(HRESULT, Compose, IUnknown*,pContext, DWORD,dwTrackGroup, IDirectMusicTrack**,ppResultTrack) \
ICOM_METHOD5(HRESULT, Join, IDirectMusicTrack*,pNewTrack, MUSIC_TIME,mtJoin, IUnknown*,pContext, DWORD,dwTrackGroup, IDirectMusicTrack**,ppResultTrack)
STDMETHOD(PlayEx)(THIS_ void *pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) PURE; \
STDMETHOD(GetParamEx)(THIS_ REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam, void *pStateData, DWORD dwFlags) PURE; \
STDMETHOD(SetParamEx)(THIS_ REFGUID rguidType, REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) PURE; \
STDMETHOD(Compose)(THIS_ IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) PURE; \
STDMETHOD(Join)(THIS_ IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) PURE;
/*** IDirectMusicTrack8 methods ***/
#define IDirectMusicTrack8_IMETHODS \
......@@ -208,7 +208,7 @@ ICOM_DEFINE(IDirectMusicTrack,IUnknown)
IDirectMusicTrack8_METHODS
ICOM_DEFINE(IDirectMusicTrack8,IDirectMusicTrack)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDirectMusicTrack8_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/dmusics.h
View file @ f00c46f0
......@@ -63,34 +63,34 @@ typedef struct _DMUS_VOICE_STATE
/*****************************************************************************
* IDirectMusicSynth interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE IDirectMusicSynth
#undef INTERFACE
#define INTERFACE IDirectMusicSynth
#define IDirectMusicSynth_METHODS \
/*** IDirectMusicSynth methods ***/ \
ICOM_METHOD1(HRESULT, Open, LPDMUS_PORTPARAMS,pPortParams) \
ICOM_METHOD (HRESULT, Close) \
ICOM_METHOD1(HRESULT, SetNumChannelGroups, DWORD,dwGroups) \
ICOM_METHOD3(HRESULT, Download, LPHANDLE,phDownload, LPVOID,pvData, LPBOOL,pbFree) \
ICOM_METHOD3(HRESULT, Unload, HANDLE,hDownload, HRESULT,(CALLBACK* lpFreeHandle)(HANDLE,HANDLE), HANDLE,hUserData) \
ICOM_METHOD3(HRESULT, PlayBuffer, REFERENCE_TIME,rt, LPBYTE,pbBuffer, DWORD,cbBuffer) \
ICOM_METHOD1(HRESULT, GetRunningStats, LPDMUS_SYNTHSTATS,pStats) \
ICOM_METHOD1(HRESULT, GetPortCaps, LPDMUS_PORTCAPS,pCaps) \
ICOM_METHOD1(HRESULT, SetMasterClock, IReferenceClock*,pClock) \
ICOM_METHOD1(HRESULT, GetLatencyClock, IReferenceClock**,ppClock) \
ICOM_METHOD1(HRESULT, Activate, BOOL,fEnable) \
ICOM_METHOD1(HRESULT, SetSynthSink, IDirectMusicSynthSink*,pSynthSink) \
ICOM_METHOD3(HRESULT, Render, short*,pBuffer, DWORD,dwLength, LONGLONG,llPosition) \
ICOM_METHOD3(HRESULT, SetChannelPriority, DWORD,dwChannelGroup, DWORD,dwChannel, DWORD,dwPriority) \
ICOM_METHOD3(HRESULT, GetChannelPriority, DWORD,dwChannelGroup, DWORD,dwChannel, LPDWORD,pdwPriority) \
ICOM_METHOD2(HRESULT, GetFormat, LPWAVEFORMATEX,pWaveFormatEx, LPDWORD,pdwWaveFormatExSiz) \
ICOM_METHOD1(HRESULT, GetAppend, DWORD*,pdwAppend)
STDMETHOD(Open)(THIS_ LPDMUS_PORTPARAMS pPortParams) PURE; \
STDMETHOD(Close)(THIS) PURE; \
STDMETHOD(SetNumChannelGroups)(THIS_ DWORD dwGroups) PURE; \
STDMETHOD(Download)(THIS_ LPHANDLE phDownload, LPVOID pvData, LPBOOL pbFree) PURE; \
STDMETHOD(Unload)(THIS_ HANDLE hDownload, HRESULT (CALLBACK* lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData) PURE; \
STDMETHOD(PlayBuffer)(THIS_ REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) PURE; \
STDMETHOD(GetRunningStats)(THIS_ LPDMUS_SYNTHSTATS pStats) PURE; \
STDMETHOD(GetPortCaps)(THIS_ LPDMUS_PORTCAPS pCaps) PURE; \
STDMETHOD(SetMasterClock)(THIS_ IReferenceClock *pClock) PURE; \
STDMETHOD(GetLatencyClock)(THIS_ IReferenceClock **ppClock) PURE; \
STDMETHOD(Activate)(THIS_ BOOL fEnable) PURE; \
STDMETHOD(SetSynthSink)(THIS_ IDirectMusicSynthSink *pSynthSink) PURE; \
STDMETHOD(Render)(THIS_ short *pBuffer, DWORD dwLength, LONGLONG llPosition) PURE; \
STDMETHOD(SetChannelPriority)(THIS_ DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) PURE; \
STDMETHOD(GetChannelPriority)(THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) PURE; \
STDMETHOD(GetFormat)(THIS_ LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSiz) PURE; \
STDMETHOD(GetAppend)(THIS_ DWORD *pdwAppend) PURE;
/*** IDirectMusicSynth methods ***/
#define IDirectMusicSynth_IMETHODS \
IUnknown_IMETHODS \
IDirectMusicSynth_METHODS
ICOM_DEFINE(IDirectMusicSynth,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDirectMusicSynth_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -119,23 +119,23 @@ ICOM_DEFINE(IDirectMusicSynth,IUnknown)
/*****************************************************************************
* IDirectMusicSynth8 interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE IDirectMusicSynth8
#undef INTERFACE
#define INTERFACE IDirectMusicSynth8
#define IDirectMusicSynth8_METHODS \
/*** IDirectMusicSynth8 methods ***/ \
ICOM_METHOD10(HRESULT, PlayVoice, REFERENCE_TIME,rt, DWORD,dwVoiceId, DWORD,dwChannelGroup, DWORD,dwChannel, DWORD,dwDLId, long,prPitch, long,vrVolume, SAMPLE_TIME,stVoiceStart, SAMPLE_TIME,stLoopStart, SAMPLE_TIME,stLoopEnd) \
ICOM_METHOD2(HRESULT, StopVoice, REFERENCE_TIME,rt, DWORD,dwVoiceId) \
ICOM_METHOD3(HRESULT, GetVoiceState, DWORD,dwVoice[], DWORD,cbVoice, DMUS_VOICE_STATE,dwVoiceState[]) \
ICOM_METHOD2(HRESULT, Refresh, DWORD,dwDownloadID, DWORD,dwFlags) \
ICOM_METHOD4(HRESULT, AssignChannelToBuses, DWORD,dwChannelGroup, DWORD,dwChannel, LPDWORD,pdwBuses, DWORD,cBuses)
STDMETHOD(PlayVoice)(THIS_ REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) PURE; \
STDMETHOD(StopVoice)(THIS_ REFERENCE_TIME rt, DWORD dwVoiceId) PURE; \
STDMETHOD(GetVoiceState)(THIS_ DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[]) PURE; \
STDMETHOD(Refresh)(THIS_ DWORD dwDownloadID, DWORD dwFlags) PURE; \
STDMETHOD(AssignChannelToBuses)(THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwBuses, DWORD cBuses) PURE;
/*** IDirectMusicSynth methods ***/
#define IDirectMusicSynth8_IMETHODS \
IUnknown_IMETHODS \
IDirectMusicSynth_METHODS \
IDirectMusicSynth_METHODS \
IDirectMusicSynth8_METHODS
ICOM_DEFINE(IDirectMusicSynth8,IDirectMusicSynth)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDirectMusicSynth8_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -170,25 +170,25 @@ ICOM_DEFINE(IDirectMusicSynth8,IDirectMusicSynth)
/*****************************************************************************
* IDirectMusicSynthSink interface
*/
#undef ICOM_INTERFACE
#define ICOM_INTERFACE IDirectMusicSynthSink
#undef INTERFACE
#define INTERFACE IDirectMusicSynthSink
#define IDirectMusicSynthSink_METHODS \
/*** IDirectMusicSynthSink methods ***/ \
ICOM_METHOD1(HRESULT, Init, IDirectMusicSynth*,pSynth) \
ICOM_METHOD1(HRESULT, SetMasterClock, IReferenceClock*,pClock) \
ICOM_METHOD1(HRESULT, GetLatencyClock, IReferenceClock**,ppClock) \
ICOM_METHOD1(HRESULT, Activate, BOOL,fEnable) \
ICOM_METHOD2(HRESULT, SampleToRefTime, LONGLONG,llSampleTime, REFERENCE_TIME*,prfTime) \
ICOM_METHOD2(HRESULT, RefTimeToSample, REFERENCE_TIME,rfTime, LONGLONG*,pllSampleTime) \
ICOM_METHOD2(HRESULT, SetDirectSound, LPDIRECTSOUND,pDirectSound, LPDIRECTSOUNDBUFFER,pDirectSoundBuffer) \
ICOM_METHOD1(HRESULT, GetDesiredBufferSize, LPDWORD,pdwBufferSizeInSamples)
STDMETHOD(Init)(THIS_ IDirectMusicSynth *pSynth) PURE; \
STDMETHOD(SetMasterClock)(THIS_ IReferenceClock *pClock) PURE; \
STDMETHOD(GetLatencyClock)(THIS_ IReferenceClock **ppClock) PURE; \
STDMETHOD(Activate)(THIS_ BOOL fEnable) PURE; \
STDMETHOD(SampleToRefTime)(THIS_ LONGLONG llSampleTime, REFERENCE_TIME *prfTime) PURE; \
STDMETHOD(RefTimeToSample)(THIS_ REFERENCE_TIME rfTime, LONGLONG *pllSampleTime) PURE; \
STDMETHOD(SetDirectSound)(THIS_ LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE; \
STDMETHOD(GetDesiredBufferSize)(THIS_ LPDWORD pdwBufferSizeInSamples) PURE;
/*** IDirectMusicSynthSink methods ***/
#define IDirectMusicSynthSink_IMETHODS \
IUnknown_IMETHODS \
IDirectMusicSynthSink_METHODS
ICOM_DEFINE(IDirectMusicSynthSink,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDirectMusicSynthSink_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/docobj.h
View file @ f00c46f0
......@@ -193,16 +193,16 @@ typedef struct IPrint IPrint, *LPPRINT;
/*****************************************************************************
* IOleDocument interface
*/
#define ICOM_INTERFACE IOleDocument
#define INTERFACE IOleDocument
#define IOleDocument_METHODS \
ICOM_METHOD4(HRESULT,CreateView, IOleInPlaceSite*,pIPSite, IStream*,pstm, DWORD,dwReserved, IOleDocumentView**,ppView) \
ICOM_METHOD1(HRESULT,GetDocMiscStatus, DWORD*,pdwStatus) \
ICOM_METHOD2(HRESULT,EnumViews, IEnumOleDocumentViews**,ppEnum, IOleDocumentView**,ppView)
STDMETHOD(CreateView)(THIS_ IOleInPlaceSite *pIPSite, IStream *pstm, DWORD dwReserved, IOleDocumentView **ppView) PURE; \
STDMETHOD(GetDocMiscStatus)(THIS_ DWORD *pdwStatus) PURE; \
STDMETHOD(EnumViews)(THIS_ IEnumOleDocumentViews **ppEnum, IOleDocumentView **ppView) PURE;
#define IOleDocument_IMETHODS \
IUnknown_IMETHODS \
IOleDocument_METHODS
ICOM_DEFINE(IOleDocument,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleDocument_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -217,14 +217,14 @@ ICOM_DEFINE(IOleDocument,IUnknown)
/*****************************************************************************
* IOleDocumentSite interface
*/
#define ICOM_INTERFACE IOleDocumentSite
#define INTERFACE IOleDocumentSite
#define IOleDocumentSite_METHODS \
ICOM_METHOD1(HRESULT,ActivateMe, IOleDocumentView*,pViewToActivate)
STDMETHOD(ActivateMe)(THIS_ IOleDocumentView *pViewToActivate) PURE;
#define IOleDocumentSite_IMETHODS \
IUnknown_IMETHODS \
IOleDocumentSite_METHODS
ICOM_DEFINE(IOleDocumentSite,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleDocumentSite_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -237,26 +237,26 @@ ICOM_DEFINE(IOleDocumentSite,IUnknown)
/*****************************************************************************
* IOleDocumentSite interface
*/
#define ICOM_INTERFACE IOleDocumentView
#define INTERFACE IOleDocumentView
#define IOleDocumentView_METHODS \
ICOM_METHOD1(HRESULT,SetInPlaceSite, IOleInPlaceSite*,pIPSite) \
ICOM_METHOD1(HRESULT,GetInPlaceSite, IOleInPlaceSite**,ppIPSite) \
ICOM_METHOD1(HRESULT,GetDocument, IUnknown**,ppunk) \
ICOM_METHOD1(HRESULT,SetRect, LPRECT,prcView) \
ICOM_METHOD1(HRESULT,GetRect, LPRECT,prcView) \
ICOM_METHOD4(HRESULT,SetRectComplex, LPRECT,prcView, LPRECT,prcHScroll, LPRECT,prcVScroll, LPRECT,prcSizeBox) \
ICOM_METHOD1(HRESULT,Show, BOOL,fShow) \
ICOM_METHOD1(HRESULT,UIActivate, BOOL,fUIActivate) \
ICOM_METHOD (HRESULT,Open) \
ICOM_METHOD1(HRESULT,CloseView, DWORD,dwReserved) \
ICOM_METHOD1(HRESULT,SaveViewState, LPSTREAM,pstm) \
ICOM_METHOD1(HRESULT,ApplyViewState,LPSTREAM,pstm) \
ICOM_METHOD2(HRESULT,Clone, IOleInPlaceSite*,pIPSiteNew, IOleDocumentView**,ppViewNew)
STDMETHOD(SetInPlaceSite)(THIS_ IOleInPlaceSite *pIPSite) PURE; \
STDMETHOD(GetInPlaceSite)(THIS_ IOleInPlaceSite **ppIPSite) PURE; \
STDMETHOD(GetDocument)(THIS_ IUnknown **ppunk) PURE; \
STDMETHOD(SetRect)(THIS_ LPRECT prcView) PURE; \
STDMETHOD(GetRect)(THIS_ LPRECT prcView) PURE; \
STDMETHOD(SetRectComplex)(THIS_ LPRECT prcView, LPRECT prcHScroll, LPRECT prcVScroll, LPRECT prcSizeBox) PURE; \
STDMETHOD(Show)(THIS_ BOOL fShow) PURE; \
STDMETHOD(UIActivate)(THIS_ BOOL fUIActivate) PURE; \
STDMETHOD(Open)(THIS) PURE; \
STDMETHOD(CloseView)(THIS_ DWORD dwReserved) PURE; \
STDMETHOD(SaveViewState)(THIS_ LPSTREAM pstm) PURE; \
STDMETHOD(ApplyViewState)(THIS_ LPSTREAM pstm) PURE; \
STDMETHOD(Clone)(THIS_ IOleInPlaceSite *pIPSiteNew, IOleDocumentView **ppViewNew) PURE;
#define IOleDocumentView_IMETHODS \
IUnknown_IMETHODS \
IOleDocumentView_METHODS
ICOM_DEFINE(IOleDocumentView,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleDocumentView_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -281,17 +281,17 @@ ICOM_DEFINE(IOleDocumentView,IUnknown)
/*****************************************************************************
* IOleDocumentSite interface
*/
#define ICOM_INTERFACE IEnumOleDocumentViews
#define INTERFACE IEnumOleDocumentViews
#define IEnumOleDocumentViews_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,cViews, IOleDocumentView**,rgpView, ULONG*,pcFetched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,cViews) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumOleDocumentViews**,ppEnum)
STDMETHOD(Next)(THIS_ ULONG cViews, IOleDocumentView **rgpView, ULONG *pcFetched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG cViews) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumOleDocumentViews **ppEnum) PURE;
#define IEnumOleDocumentViews_IMETHODS \
IUnknown_IMETHODS \
IEnumOleDocumentViews_METHODS
ICOM_DEFINE(IEnumOleDocumentViews,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IEnumOleDocumentViews_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -307,15 +307,15 @@ ICOM_DEFINE(IEnumOleDocumentViews,IUnknown)
/*****************************************************************************
* IOleCommandTarget interface
*/
#define ICOM_INTERFACE IOleCommandTarget
#define INTERFACE IOleCommandTarget
#define IOleCommandTarget_METHODS \
ICOM_METHOD4(HRESULT,QueryStatus, const GUID*,pguidCmdGroup, ULONG,cCmds, OLECMD*,prgCmds, OLECMDTEXT*,pCmdText) \
ICOM_METHOD5(HRESULT,Exec, const GUID*,pguidCmdGroup, DWORD,nCmdID, DWORD,nCmdexecopt, VARIANT*,pvaIn, VARIANT*,pvaOut)
STDMETHOD(QueryStatus)(THIS_ const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText) PURE; \
STDMETHOD(Exec)(THIS_ const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) PURE;
#define IOleCommandTarget_IMETHODS \
IUnknown_IMETHODS \
IOleCommandTarget_METHODS
ICOM_DEFINE(IOleCommandTarget,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleCommandTarget_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -329,15 +329,15 @@ ICOM_DEFINE(IOleCommandTarget,IUnknown)
/*****************************************************************************
* IContinueCallback interface
*/
#define ICOM_INTERFACE IContinueCallback
#define INTERFACE IContinueCallback
#define IContinueCallback_METHODS \
ICOM_METHOD (HRESULT,FContinue) \
ICOM_METHOD3(HRESULT,FContinuePrinting, LONG,nCntPrinted, LONG,nCurPage, WCHAR*,pwszPrintStatus)
STDMETHOD(FContinue)(THIS) PURE; \
STDMETHOD(FContinuePrinting)(THIS_ LONG nCntPrinted, LONG nCurPage, WCHAR *pwszPrintStatus) PURE;
#define IContinueCallback_IMETHODS \
IUnknown_IMETHODS \
IContinueCallback_METHODS
ICOM_DEFINE(IContinueCallback,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IContinueCallback_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -351,16 +351,16 @@ ICOM_DEFINE(IContinueCallback,IUnknown)
/*****************************************************************************
* IPrint interface
*/
#define ICOM_INTERFACE IPrint
#define INTERFACE IPrint
#define IPrint_METHODS \
ICOM_METHOD1(HRESULT,SetInitialPageNum, LONG,nFirstPage) \
ICOM_METHOD2(HRESULT,GetPageInfo, LONG*,pnFirstPage, LONG*,pcPages) \
ICOM_METHOD8(HRESULT,Print, DWORD,grfFlags, DVTARGETDEVICE**,pptd, PAGESET**,ppPageSet, STGMEDIUM*,pstgmOptions, IContinueCallback*,pcallback, LONG,nFirstPage, LONG*,pcPagesPrinted, LONG*,pnLastPage)
STDMETHOD(SetInitialPageNum)(THIS_ LONG nFirstPage) PURE; \
STDMETHOD(GetPageInfo)(THIS_ LONG *pnFirstPage, LONG *pcPages) PURE; \
STDMETHOD(Print)(THIS_ DWORD grfFlags, DVTARGETDEVICE **pptd, PAGESET **ppPageSet, STGMEDIUM *pstgmOptions, IContinueCallback *pcallback, LONG nFirstPage, LONG *pcPagesPrinted, LONG *pnLastPage) PURE;
#define IPrint_IMETHODS \
IUnknown_IMETHODS \
IPrint_METHODS
ICOM_DEFINE(IPrint,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IPrint_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/dplobby.h
View file @ f00c46f0
......@@ -368,52 +368,52 @@ typedef BOOL (CALLBACK *LPDPLENUMLOCALAPPLICATIONSCALLBACK)(
/*****************************************************************************
* IDirectPlayLobby and IDirectPlayLobbyA interface
*/
#define ICOM_INTERFACE IDirectPlayLobby
#define INTERFACE IDirectPlayLobby
#define IDirectPlayLobby_METHODS \
ICOM_METHOD3(HRESULT,Connect, DWORD,, LPDIRECTPLAY2*,, IUnknown*,) \
ICOM_METHOD6(HRESULT,CreateAddress, REFGUID,, REFGUID,, LPCVOID,, DWORD,, LPVOID,, LPDWORD,) \
ICOM_METHOD4(HRESULT,EnumAddress, LPDPENUMADDRESSCALLBACK,, LPCVOID,, DWORD,, LPVOID,) \
ICOM_METHOD4(HRESULT,EnumAddressTypes, LPDPLENUMADDRESSTYPESCALLBACK,, REFGUID,, LPVOID,, DWORD,) \
ICOM_METHOD3(HRESULT,EnumLocalApplications, LPDPLENUMLOCALAPPLICATIONSCALLBACK,, LPVOID,, DWORD,) \
ICOM_METHOD3(HRESULT,GetConnectionSettings, DWORD,, LPVOID,, LPDWORD,) \
ICOM_METHOD5(HRESULT,ReceiveLobbyMessage, DWORD,, DWORD,, LPDWORD,, LPVOID,, LPDWORD,) \
ICOM_METHOD4(HRESULT,RunApplication, DWORD,, LPDWORD,, LPDPLCONNECTION,, HANDLE,) \
ICOM_METHOD4(HRESULT,SendLobbyMessage, DWORD,, DWORD,, LPVOID,, DWORD,) \
ICOM_METHOD3(HRESULT,SetConnectionSettings, DWORD,, DWORD,, LPDPLCONNECTION,) \
ICOM_METHOD3(HRESULT,SetLobbyMessageEvent, DWORD,, DWORD,, HANDLE,)
STDMETHOD(Connect)(THIS_ DWORD, LPDIRECTPLAY2*, IUnknown*) PURE; \
STDMETHOD(CreateAddress)(THIS_ REFGUID, REFGUID, LPCVOID, DWORD, LPVOID, LPDWORD) PURE; \
STDMETHOD(EnumAddress)(THIS_ LPDPENUMADDRESSCALLBACK, LPCVOID, DWORD, LPVOID) PURE; \
STDMETHOD(EnumAddressTypes)(THIS_ LPDPLENUMADDRESSTYPESCALLBACK, REFGUID, LPVOID, DWORD) PURE; \
STDMETHOD(EnumLocalApplications)(THIS_ LPDPLENUMLOCALAPPLICATIONSCALLBACK, LPVOID, DWORD) PURE; \
STDMETHOD(GetConnectionSettings)(THIS_ DWORD, LPVOID, LPDWORD) PURE; \
STDMETHOD(ReceiveLobbyMessage)(THIS_ DWORD, DWORD, LPDWORD, LPVOID, LPDWORD) PURE; \
STDMETHOD(RunApplication)(THIS_ DWORD, LPDWORD, LPDPLCONNECTION, HANDLE) PURE; \
STDMETHOD(SendLobbyMessage)(THIS_ DWORD, DWORD, LPVOID, DWORD) PURE; \
STDMETHOD(SetConnectionSettings)(THIS_ DWORD, DWORD, LPDPLCONNECTION) PURE; \
STDMETHOD(SetLobbyMessageEvent)(THIS_ DWORD, DWORD, HANDLE) PURE;
#define IDirectPlayLobby_IMETHODS \
IUnknown_IMETHODS \
IDirectPlayLobby_METHODS
ICOM_DEFINE(IDirectPlayLobby,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*****************************************************************************
* IDirectPlayLobby2 and IDirectPlayLobby2A interface
*/
#define ICOM_INTERFACE IDirectPlayLobby2
#define INTERFACE IDirectPlayLobby2
#define IDirectPlayLobby2_METHODS \
ICOM_METHOD4(HRESULT,CreateCompoundAddress, LPCDPCOMPOUNDADDRESSELEMENT,, DWORD,, LPVOID,, LPDWORD,)
STDMETHOD(CreateCompoundAddress)(THIS_ LPCDPCOMPOUNDADDRESSELEMENT, DWORD, LPVOID, LPDWORD) PURE;
#define IDirectPlayLobby2_IMETHODS \
IDirectPlayLobby_IMETHODS \
IDirectPlayLobby2_METHODS
ICOM_DEFINE(IDirectPlayLobby2,IDirectPlayLobby)
#undef ICOM_INTERFACE
#undef INTERFACE
/*****************************************************************************
* IDirectPlayLobby3 and IDirectPlayLobby3A interface
*/
#define ICOM_INTERFACE IDirectPlayLobby3
#define INTERFACE IDirectPlayLobby3
#define IDirectPlayLobby3_METHODS \
ICOM_METHOD4( HRESULT, ConnectEx, DWORD,, REFIID,, LPVOID *,, IUnknown *,) \
ICOM_METHOD2( HRESULT, RegisterApplication, DWORD,, LPDPAPPLICATIONDESC, ) \
ICOM_METHOD2( HRESULT, UnregisterApplication, DWORD,, REFGUID, ) \
ICOM_METHOD1( HRESULT, WaitForConnectionSettings, DWORD, )
STDMETHOD(ConnectEx)(THIS_ DWORD, REFIID, LPVOID *, IUnknown *) PURE; \
STDMETHOD(RegisterApplication)(THIS_ DWORD, LPDPAPPLICATIONDESC) PURE; \
STDMETHOD(UnregisterApplication)(THIS_ DWORD, REFGUID) PURE; \
STDMETHOD(WaitForConnectionSettings)(THIS_ DWORD) PURE;
#define IDirectPlayLobby3_IMETHODS \
IDirectPlayLobby2_IMETHODS \
IDirectPlayLobby3_METHODS
ICOM_DEFINE(IDirectPlayLobby3,IDirectPlayLobby2)
#undef ICOM_INTERFACE
#undef INTERFACE
#define IDirectPlayLobby_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectPlayLobby_AddRef(p) ICOM_CALL (AddRef,p)
......
include/dsdriver.h
View file @ f00c46f0
......@@ -132,19 +132,19 @@ typedef struct _DSCDRIVERCAPS
/*****************************************************************************
* IDsDriver interface
*/
#define ICOM_INTERFACE IDsDriver
#define INTERFACE IDsDriver
#define IDsDriver_METHODS \
ICOM_METHOD1(HRESULT,GetDriverDesc, PDSDRIVERDESC,pDsDriverDesc) \
ICOM_METHOD (HRESULT,Open) \
ICOM_METHOD (HRESULT,Close) \
ICOM_METHOD1(HRESULT,GetCaps, PDSDRIVERCAPS,pDsDrvCaps) \
ICOM_METHOD6(HRESULT,CreateSoundBuffer, LPWAVEFORMATEX,pwfx,DWORD,dwFlags,DWORD,dwCardAddress,LPDWORD,pdwcbBufferSize,LPBYTE*,ppbBuffer,LPVOID*,ppvObj) \
ICOM_METHOD2(HRESULT,DuplicateSoundBuffer, PIDSDRIVERBUFFER,pIDsDriverBuffer,LPVOID*,ppvObj)
STDMETHOD(GetDriverDesc)(THIS_ PDSDRIVERDESC pDsDriverDesc) PURE; \
STDMETHOD(Open)(THIS) PURE; \
STDMETHOD(Close)(THIS) PURE; \
STDMETHOD(GetCaps)(THIS_ PDSDRIVERCAPS pDsDrvCaps) PURE; \
STDMETHOD(CreateSoundBuffer)(THIS_ LPWAVEFORMATEX pwfx,DWORD dwFlags,DWORD dwCardAddress,LPDWORD pdwcbBufferSize,LPBYTE *ppbBuffer,LPVOID *ppvObj) PURE; \
STDMETHOD(DuplicateSoundBuffer)(THIS_ PIDSDRIVERBUFFER pIDsDriverBuffer,LPVOID *ppvObj) PURE;
#define IDsDriver_IMETHODS \
IUnknown_METHODS \
IDsDriver_METHODS
ICOM_DEFINE(IDsDriver,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDsDriver_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -161,22 +161,22 @@ ICOM_DEFINE(IDsDriver,IUnknown)
/*****************************************************************************
* IDsDriverBuffer interface
*/
#define ICOM_INTERFACE IDsDriverBuffer
#define INTERFACE IDsDriverBuffer
#define IDsDriverBuffer_METHODS \
ICOM_METHOD7(HRESULT,Lock, LPVOID*,ppvAudio1,LPDWORD,pdwLen1,LPVOID*,pdwAudio2,LPDWORD,pdwLen2,DWORD,dwWritePosition,DWORD,dwWriteLen,DWORD,dwFlags) \
ICOM_METHOD4(HRESULT,Unlock, LPVOID,pvAudio1,DWORD,dwLen1,LPVOID,pvAudio2,DWORD,dwLen2) \
ICOM_METHOD1(HRESULT,SetFormat, LPWAVEFORMATEX,pwfxToSet) \
ICOM_METHOD1(HRESULT,SetFrequency, DWORD,dwFrequency) \
ICOM_METHOD1(HRESULT,SetVolumePan, PDSVOLUMEPAN,pDsVolumePan) \
ICOM_METHOD1(HRESULT,SetPosition, DWORD,dwNewPosition) \
ICOM_METHOD2(HRESULT,GetPosition, LPDWORD,lpdwCurrentPlayCursor,LPDWORD,lpdwCurrentWriteCursor) \
ICOM_METHOD3(HRESULT,Play, DWORD,dwReserved1,DWORD,dwReserved2,DWORD,dwFlags) \
ICOM_METHOD (HRESULT,Stop)
STDMETHOD(Lock)(THIS_ LPVOID *ppvAudio1,LPDWORD pdwLen1,LPVOID *pdwAudio2,LPDWORD pdwLen2,DWORD dwWritePosition,DWORD dwWriteLen,DWORD dwFlags) PURE; \
STDMETHOD(Unlock)(THIS_ LPVOID pvAudio1,DWORD dwLen1,LPVOID pvAudio2,DWORD dwLen2) PURE; \
STDMETHOD(SetFormat)(THIS_ LPWAVEFORMATEX pwfxToSet) PURE; \
STDMETHOD(SetFrequency)(THIS_ DWORD dwFrequency) PURE; \
STDMETHOD(SetVolumePan)(THIS_ PDSVOLUMEPAN pDsVolumePan) PURE; \
STDMETHOD(SetPosition)(THIS_ DWORD dwNewPosition) PURE; \
STDMETHOD(GetPosition)(THIS_ LPDWORD lpdwCurrentPlayCursor,LPDWORD lpdwCurrentWriteCursor) PURE; \
STDMETHOD(Play)(THIS_ DWORD dwReserved1,DWORD dwReserved2,DWORD dwFlags) PURE; \
STDMETHOD(Stop)(THIS) PURE;
#define IDsDriverBuffer_IMETHODS \
IUnknown_METHODS \
IDsDriverBuffer_METHODS
ICOM_DEFINE(IDsDriverBuffer,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDsDriverBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -196,16 +196,16 @@ ICOM_DEFINE(IDsDriverBuffer,IUnknown)
/*****************************************************************************
* IDsDriverPropertySet interface
*/
#define ICOM_INTERFACE IDsDriverPropertySet
#define INTERFACE IDsDriverPropertySet
#define IDsDriverPropertySet_METHODS \
ICOM_METHOD6(HRESULT,Get, PDSPROPERTY,pDsProperty,LPVOID,pPropertyParams,ULONG,cbPropertyParams,LPVOID,pPropertyData,ULONG,cbPropertyData,PULONG,pcbReturnedData) \
ICOM_METHOD5(HRESULT,Set, PDSPROPERTY,pDsProperty,LPVOID,pPropertyParams,ULONG,cbPropertyParams,LPVOID,pPropertyData,ULONG,cbPropertyData) \
ICOM_METHOD3(HRESULT,QuerySupport, REFGUID,PropertySetId,ULONG,PropertyId,PULONG,pSupport)
STDMETHOD(Get)(THIS_ PDSPROPERTY pDsProperty,LPVOID pPropertyParams,ULONG cbPropertyParams,LPVOID pPropertyData,ULONG cbPropertyData,PULONG pcbReturnedData) PURE; \
STDMETHOD(Set)(THIS_ PDSPROPERTY pDsProperty,LPVOID pPropertyParams,ULONG cbPropertyParams,LPVOID pPropertyData,ULONG cbPropertyData) PURE; \
STDMETHOD(QuerySupport)(THIS_ REFGUID PropertySetId,ULONG PropertyId,PULONG pSupport) PURE;
#define IDsDriverPropertySet_IMETHODS \
IUnknown_METHODS \
IDsDriverPropertySet_METHODS
ICOM_DEFINE(IDsDriverPropertySet,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDsDriverPropertySet_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -254,14 +254,14 @@ typedef enum
/*****************************************************************************
* IDsDriverNotify interface
*/
#define ICOM_INTERFACE IDsDriverNotify
#define INTERFACE IDsDriverNotify
#define IDsDriverNotify_METHODS \
ICOM_METHOD2(HRESULT,SetNotificationPositions, DWORD,dwPositionNotifies,LPCDSBPOSITIONNOTIFY,pcPositionNotifies)
STDMETHOD(SetNotificationPositions)(THIS_ DWORD dwPositionNotifies,LPCDSBPOSITIONNOTIFY pcPositionNotifies) PURE;
#define IDsDriverNotify_IMETHODS \
IUnknown_METHODS \
IDsDriverNotify_METHODS
ICOM_DEFINE(IDsDriverNotify,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDsDriverNotify_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -273,18 +273,18 @@ ICOM_DEFINE(IDsDriverNotify,IUnknown)
/*****************************************************************************
* IDsCaptureDriver interface
*/
#define ICOM_INTERFACE IDsCaptureDriver
#define INTERFACE IDsCaptureDriver
#define IDsCaptureDriver_METHODS \
ICOM_METHOD1(HRESULT,GetDriverDesc, PDSDRIVERDESC,pDsDriverDesc) \
ICOM_METHOD (HRESULT,Open) \
ICOM_METHOD (HRESULT,Close) \
ICOM_METHOD1(HRESULT,GetCaps, PDSCDRIVERCAPS,pDsDrvCaps) \
ICOM_METHOD6(HRESULT,CreateCaptureBuffer, LPWAVEFORMATEX,pwfx,DWORD,dwFlags,DWORD,dwCardAddress,LPDWORD,pdwcbBufferSize,LPBYTE*,ppbBuffer,LPVOID*,ppvObj)
STDMETHOD(GetDriverDesc)(THIS_ PDSDRIVERDESC pDsDriverDesc) PURE; \
STDMETHOD(Open)(THIS) PURE; \
STDMETHOD(Close)(THIS) PURE; \
STDMETHOD(GetCaps)(THIS_ PDSCDRIVERCAPS pDsDrvCaps) PURE; \
STDMETHOD(CreateCaptureBuffer)(THIS_ LPWAVEFORMATEX pwfx,DWORD dwFlags,DWORD dwCardAddress,LPDWORD pdwcbBufferSize,LPBYTE *ppbBuffer,LPVOID *ppvObj) PURE;
#define IDsCaptureDriver_IMETHODS \
IUnknown_METHODS \
IDsCaptureDriver_METHODS
ICOM_DEFINE(IDsCaptureDriver,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDsCaptureDriver_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -300,20 +300,20 @@ ICOM_DEFINE(IDsCaptureDriver,IUnknown)
/*****************************************************************************
* IDsCaptureDriverBuffer interface
*/
#define ICOM_INTERFACE IDsCaptureDriverBuffer
#define INTERFACE IDsCaptureDriverBuffer
#define IDsCaptureDriverBuffer_METHODS \
ICOM_METHOD7(HRESULT,Lock, LPVOID*,ppvAudio1,LPDWORD,pdwLen1,LPVOID*,ppvAudio2,LPDWORD,pdwLen2,DWORD,dwWritePosition,DWORD,dwWriteLen,DWORD,dwFlags) \
ICOM_METHOD4(HRESULT,Unlock, LPVOID,pvAudio1,DWORD,dwLen1,LPVOID,pvAudio2,DWORD,dwLen2) \
ICOM_METHOD1(HRESULT,SetFormat, LPWAVEFORMATEX,pwfxToSet) \
ICOM_METHOD2(HRESULT,GetPosition, LPDWORD,lpdwCurrentPlayCursor,LPDWORD,lpdwCurrentWriteCursor) \
ICOM_METHOD1(HRESULT,GetStatus, LPDWORD,lpdwStatus) \
ICOM_METHOD1(HRESULT,Start, DWORD,dwFlags) \
ICOM_METHOD (HRESULT,Stop)
STDMETHOD(Lock)(THIS_ LPVOID *ppvAudio1,LPDWORD pdwLen1,LPVOID *ppvAudio2,LPDWORD pdwLen2,DWORD dwWritePosition,DWORD dwWriteLen,DWORD dwFlags) PURE; \
STDMETHOD(Unlock)(THIS_ LPVOID pvAudio1,DWORD dwLen1,LPVOID pvAudio2,DWORD dwLen2) PURE; \
STDMETHOD(SetFormat)(THIS_ LPWAVEFORMATEX pwfxToSet) PURE; \
STDMETHOD(GetPosition)(THIS_ LPDWORD lpdwCurrentPlayCursor,LPDWORD lpdwCurrentWriteCursor) PURE; \
STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE; \
STDMETHOD(Start)(THIS_ DWORD dwFlags) PURE; \
STDMETHOD(Stop)(THIS) PURE;
#define IDsCaptureDriverBuffer_IMETHODS \
IUnknown_METHODS \
IDsCaptureDriverBuffer_METHODS
ICOM_DEFINE(IDsCaptureDriverBuffer,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDsCaptureDriverBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/oaidl.h
View file @ f00c46f0
This source diff could not be displayed because it is too large. You can view the blob instead.
include/objidl.h
View file @ f00c46f0
This source diff could not be displayed because it is too large. You can view the blob instead.
include/oledlg.h
View file @ f00c46f0
......@@ -640,53 +640,49 @@ DECL_WINELIB_TYPE_AW(LPOLEUICHANGESOURCE)
/*****************************************************************************
* IOleUILinkContainer interface
*/
#define ICOM_INTERFACE IOleUILinkContainerA
#define INTERFACE IOleUILinkContainerA
#define IOleUILinkContainerA_METHODS \
ICOM_METHOD1(DWORD,GetNextLink, DWORD,dwLink) \
ICOM_METHOD2(HRESULT,SetLinkUpdateOptions, DWORD,dwLink, DWORD,dwUpdateOpt) \
ICOM_METHOD2(HRESULT,GetLinkUpdateOptions, DWORD,dwLink, DWORD*,lpdwUpdateOpt) \
ICOM_METHOD5(HRESULT,SetLinkSource, DWORD,dwLink, LPSTR,lpszDisplayName, \
ULONG,lenFileName, ULONG*,pchEaten, BOOL,fValidateSource) \
ICOM_METHOD7(HRESULT,GetLinkSource, DWORD,dwLink, \
LPSTR*,lplpszDisplayName, ULONG*,lplenFileName, \
LPSTR*,lplpszFullLinkType, LPSTR*,lplpszShortLinkType, \
BOOL*,lpfSourceAvailable, BOOL*,lpfIsSelected) \
ICOM_METHOD1(HRESULT,OpenLinkSource, DWORD,dwLink) \
ICOM_METHOD3(HRESULT,UpdateLink, DWORD,dwLink, \
BOOL,fErrorMessage, BOOL,fReserved) \
ICOM_METHOD1(HRESULT,CancelLink, DWORD,dwLink)
STDMETHOD_(DWORD,GetNextLink)(THIS_ DWORD dwLink) PURE; \
STDMETHOD(SetLinkUpdateOptions)(THIS_ DWORD dwLink, DWORD dwUpdateOpt) PURE; \
STDMETHOD(GetLinkUpdateOptions)(THIS_ DWORD dwLink, DWORD *lpdwUpdateOpt) PURE; \
STDMETHOD(SetLinkSource)(THIS_ DWORD dwLink, LPSTR lpszDisplayName, \
ULONG lenFileName, ULONG *pchEaten, BOOL fValidateSource) PURE; \
STDMETHOD(GetLinkSource)(THIS_ DWORD dwLink, LPSTR *lplpszDisplayName, ULONG *lplenFileName, \
LPSTR *lplpszFullLinkType, LPSTR *lplpszShortLinkType, \
BOOL *lpfSourceAvailable, BOOL *lpfIsSelected) PURE; \
STDMETHOD(OpenLinkSource)(THIS_ DWORD dwLink) PURE; \
STDMETHOD(UpdateLink)(THIS_ DWORD dwLink, BOOL fErrorMessage, BOOL fReserved) PURE; \
STDMETHOD(CancelLink)(THIS_ DWORD dwLink) PURE;
#define IOleUILinkContainerA_IMETHODS \
IUnknown_IMETHODS \
IOleUILinkContainerA_METHODS
ICOM_DEFINE(IOleUILinkContainerA, IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#define ICOM_INTERFACE IOleUILinkContainerW
#define INTERFACE IOleUILinkContainerW
#define IOleUILinkContainerW_METHODS \
ICOM_METHOD1(DWORD,GetNextLink, DWORD,dwLink) \
ICOM_METHOD2(HRESULT,SetLinkUpdateOptions, DWORD,dwLink, DWORD,dwUpdateOpt) \
ICOM_METHOD2(HRESULT,GetLinkUpdateOptions, DWORD,dwLink, DWORD*,lpdwUpdateOpt) \
ICOM_METHOD5(HRESULT,SetLinkSource, DWORD,dwLink, LPWSTR,lpszDisplayName, \
ULONG,lenFileName, ULONG*,pchEaten, BOOL,fValidateSource) \
ICOM_METHOD7(HRESULT,GetLinkSource, DWORD,dwLink, \
LPWSTR*,lplpszDisplayName, ULONG*,lplenFileName, \
LPWSTR*,lplpszFullLinkType, LPWSTR*,lplpszShortLinkType, \
BOOL*,lpfSourceAvailable, BOOL*,lpfIsSelected) \
ICOM_METHOD1(HRESULT,OpenLinkSource, DWORD,dwLink) \
ICOM_METHOD3(HRESULT,UpdateLink, DWORD,dwLink, \
BOOL,fErrorMessage, BOOL,fReserved) \
ICOM_METHOD1(HRESULT,CancelLink, DWORD,dwLink)
STDMETHOD_(DWORD,GetNextLink)(THIS_ DWORD dwLink) PURE; \
STDMETHOD(SetLinkUpdateOptions)(THIS_ DWORD dwLink, DWORD dwUpdateOpt) PURE; \
STDMETHOD(GetLinkUpdateOptions)(THIS_ DWORD dwLink, DWORD *lpdwUpdateOpt) PURE; \
STDMETHOD(SetLinkSource)(THIS_ DWORD dwLink, LPWSTR lpszDisplayName, \
ULONG lenFileName, ULONG *pchEaten, BOOL fValidateSource) PURE; \
STDMETHOD(GetLinkSource)(THIS_ DWORD dwLink, LPWSTR *lplpszDisplayName, ULONG *lplenFileName, \
LPWSTR *lplpszFullLinkType, LPWSTR *lplpszShortLinkType, \
BOOL *lpfSourceAvailable, BOOL *lpfIsSelected) PURE; \
STDMETHOD(OpenLinkSource)(THIS_ DWORD dwLink) PURE; \
STDMETHOD(UpdateLink)(THIS_ DWORD dwLink, BOOL fErrorMessage, BOOL fReserved) PURE; \
STDMETHOD(CancelLink)(THIS_ DWORD dwLink) PURE;
#define IOleUILinkContainerW_IMETHODS \
IUnknown_IMETHODS \
IOleUILinkContainerW_METHODS
ICOM_DEFINE(IOleUILinkContainerW, IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
DECL_WINELIB_TYPE_AW(IOleUILinkContainer)
DECL_WINELIB_TYPE_AW(POLEUILINKCONTAINER)
DECL_WINELIB_TYPE_AW(LPOLEUILINKCONTAINER)
#if ICOM_INTERFACE
#if ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleUILinkContainer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleUILinkContainer_AddRef(p) ICOM_CALL (AddRef,p)
......@@ -706,23 +702,23 @@ DECL_WINELIB_TYPE_AW(LPOLEUILINKCONTAINER)
/*****************************************************************************
* IOleUILinkInfo interface
*/
#define ICOM_INTERFACE IOleUILinkInfoA
#define INTERFACE IOleUILinkInfoA
#define IOleUILinkInfoA_METHODS \
ICOM_METHOD2(HRESULT,GetLastUpdate, DWORD,dwLink, FILETIME*,lpLastUpdate)
STDMETHOD(GetLastUpdate)(THIS_ DWORD dwLink, FILETIME *lpLastUpdate) PURE;
#define IOleUILinkInfoA_IMETHODS \
IOleUILinkContainerA_IMETHODS \
IOleUILinkInfoA_METHODS
ICOM_DEFINE(IOleUILinkInfoA, IOleUILinkContainerA)
#undef ICOM_INTERFACE
#undef INTERFACE
#define ICOM_INTERFACE IOleUILinkInfoW
#define INTERFACE IOleUILinkInfoW
#define IOleUILinkInfoW_METHODS \
ICOM_METHOD2(HRESULT,GetLastUpdate, DWORD,dwLink, FILETIME*,lpLastUpdate)
STDMETHOD(GetLastUpdate)(THIS_ DWORD dwLink, FILETIME *lpLastUpdate) PURE;
#define IOleUILinkInfoW_IMETHODS \
IOleUILinkContainerW_IMETHODS \
IOleUILinkInfoW_METHODS
ICOM_DEFINE(IOleUILinkInfoW, IOleUILinkContainerW)
#undef ICOM_INTERFACE
#undef INTERFACE
DECL_WINELIB_TYPE_AW(IOleUILinkInfo)
DECL_WINELIB_TYPE_AW(POLEUILINKINFO)
......@@ -748,41 +744,37 @@ DECL_WINELIB_TYPE_AW(LPOLEUILINKINFO)
/*****************************************************************************
* IOleUIObjInfo interface
*/
#define ICOM_INTERFACE IOleUIObjInfoA
#define INTERFACE IOleUIObjInfoA
#define IOleUIObjInfoA_METHODS \
ICOM_METHOD6(HRESULT,GetObjectInfo, DWORD,dwObject, DWORD*,lpdwObjSize, LPSTR*,lplpszLabel, \
LPSTR*,lplpszType, LPSTR*,lplpszShortType, LPSTR*,lplpszLocation) \
ICOM_METHOD6(HRESULT,GetConvertInfo, DWORD,dwObject, CLSID*,lpClassID, WORD*,lpwFormat, \
CLSID*,lpConvertDefaultClassID, LPCLSID*,lplpClsidExclude, UINT*,lpcClsidExclude) \
ICOM_METHOD2(HRESULT,ConvertObject, DWORD,dwObject, REFCLSID,clsidNew) \
ICOM_METHOD4(HRESULT,GetViewInfo, DWORD,dwObject, \
HGLOBAL*,phMetaPict, DWORD*,pdvAspect, INT*,pnCurrentScale) \
ICOM_METHOD5(HRESULT,SetViewInfo, DWORD,dwObject, \
HGLOBAL,hMetaPict, DWORD,dvAspect, \
INT,nCurrentScale, BOOL,bRelativeToOrig)
STDMETHOD(GetObjectInfo)(THIS_ DWORD dwObject, DWORD *lpdwObjSize, LPSTR *lplpszLabel, \
LPSTR *lplpszType, LPSTR *lplpszShortType, LPSTR *lplpszLocation) PURE; \
STDMETHOD(GetConvertInfo)(THIS_ DWORD dwObject, CLSID *lpClassID, WORD *lpwFormat, \
CLSID *lpConvertDefaultClassID, LPCLSID *lplpClsidExclude, UINT *lpcClsidExclude) PURE; \
STDMETHOD(ConvertObject)(THIS_ DWORD dwObject, REFCLSID clsidNew) PURE; \
STDMETHOD(GetViewInfo)(THIS_ DWORD dwObject, HGLOBAL *phMetaPict, DWORD *pdvAspect, INT *pnCurrentScale) PURE; \
STDMETHOD(SetViewInfo)(THIS_ DWORD dwObject, HGLOBAL hMetaPict, DWORD dvAspect, \
INT nCurrentScale, BOOL bRelativeToOrig) PURE;
#define IOleUIObjInfoA_IMETHODS \
IUnknown_IMETHODS \
IOleUIObjInfoA_METHODS
ICOM_DEFINE(IOleUIObjInfoA, IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#define ICOM_INTERFACE IOleUIObjInfoW
#define INTERFACE IOleUIObjInfoW
#define IOleUIObjInfoW_METHODS \
ICOM_METHOD6(HRESULT,GetObjectInfo, DWORD,dwObject, DWORD*,lpdwObjSize, LPWSTR*,lplpszLabel, \
LPWSTR*,lplpszType, LPWSTR*,lplpszShortType, LPWSTR*,lplpszLocation) \
ICOM_METHOD6(HRESULT,GetConvertInfo, DWORD,dwObject, CLSID*,lpClassID, WORD*,lpwFormat, \
CLSID*,lpConvertDefaultClassID, LPCLSID*,lplpClsidExclude, UINT*,lpcClsidExclude) \
ICOM_METHOD2(HRESULT,ConvertObject, DWORD,dwObject, REFCLSID,clsidNew) \
ICOM_METHOD4(HRESULT,GetViewInfo, DWORD,dwObject, \
HGLOBAL*,phMetaPict, DWORD*,pdvAspect, INT*,pnCurrentScale) \
ICOM_METHOD5(HRESULT,SetViewInfo, DWORD,dwObject, \
HGLOBAL,hMetaPict, DWORD,dvAspect, \
INT,nCurrentScale, BOOL,bRelativeToOrig)
STDMETHOD(GetObjectInfo)(THIS_ DWORD dwObject, DWORD *lpdwObjSize, LPWSTR *lplpszLabel, \
LPWSTR *lplpszType, LPWSTR *lplpszShortType, LPWSTR *lplpszLocation) PURE; \
STDMETHOD(GetConvertInfo)(THIS_ DWORD dwObject, CLSID *lpClassID, WORD *lpwFormat, \
CLSID *lpConvertDefaultClassID, LPCLSID *lplpClsidExclude, UINT *lpcClsidExclude) PURE; \
STDMETHOD(ConvertObject)(THIS_ DWORD dwObject, REFCLSID clsidNew) PURE; \
STDMETHOD(GetViewInfo)(THIS_ DWORD dwObject, HGLOBAL *phMetaPict, DWORD *pdvAspect, INT *pnCurrentScale) PURE; \
STDMETHOD(SetViewInfo)(THIS_ DWORD dwObject, HGLOBAL hMetaPict, DWORD dvAspect, \
INT nCurrentScale, BOOL bRelativeToOrig) PURE;
#define IOleUIObjInfoW_IMETHODS \
IUnknown_IMETHODS \
IOleUIObjInfoW_METHODS
ICOM_DEFINE(IOleUIObjInfoW, IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
DECL_WINELIB_TYPE_AW(IOleUIObjInfo)
DECL_WINELIB_TYPE_AW(POLEUIOBJINFO)
......@@ -839,8 +831,3 @@ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial);
#endif /* __WINE_OLEDLG_H */
include/servprov.h
View file @ f00c46f0
......@@ -40,14 +40,14 @@ typedef struct IServiceProvider IServiceProvider,*LPSERVICEPROVIDER;
/*****************************************************************************
* IServiceProvider interface
*/
#define ICOM_INTERFACE IServiceProvider
#define INTERFACE IServiceProvider
#define IServiceProvider_METHODS \
ICOM_METHOD3(HRESULT,QueryService, REFGUID,guidService, REFIID,riid, void**,ppvObject)
STDMETHOD(QueryService)(THIS_ REFGUID guidService, REFIID riid, void **ppvObject) PURE;
#define IServiceProvider_IMETHODS \
IUnknown_IMETHODS \
IServiceProvider_METHODS
ICOM_DEFINE(IServiceProvider,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IServiceProvider_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/shlobj.h
View file @ f00c46f0
......@@ -122,14 +122,14 @@ typedef GUID SHELLVIEWID;
* IShellIcon interface
*/
#define ICOM_INTERFACE IShellIcon
#define INTERFACE IShellIcon
#define IShellIcon_METHODS \
ICOM_METHOD3(HRESULT, GetIconOf, LPCITEMIDLIST,pidl, UINT,flags, LPINT,lpIconIndex)
STDMETHOD(GetIconOf)(THIS_ LPCITEMIDLIST pidl, UINT flags, LPINT lpIconIndex) PURE;
#define IShellIcon_IMETHODS \
IUnknown_IMETHODS \
IShellIcon_METHODS
ICOM_DEFINE(IShellIcon, IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IShellIcon_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/shlwapi.h
View file @ f00c46f0
......@@ -243,18 +243,18 @@ typedef enum
typedef struct IQueryAssociations IQueryAssociations,*LPQUERYASSOCIATIONS;
#define ICOM_INTERFACE IQueryAssociations
#define INTERFACE IQueryAssociations
#define IQueryAssociations_METHODS \
ICOM_METHOD4 (HRESULT, Init, ASSOCF, flags, LPCWSTR, pszAssoc, HKEY, hkProgid, HWND, hwnd) \
ICOM_METHOD5 (HRESULT, GetString, ASSOCF, flags, ASSOCSTR, str, LPCWSTR, pszExtra, LPWSTR, pszOut, DWORD*, pcchOut) \
ICOM_METHOD4 (HRESULT, GetKey, ASSOCF, flags, ASSOCKEY, key, LPCWSTR, pszExtra, HKEY*, phkeyOut) \
ICOM_METHOD5 (HRESULT, GetData, ASSOCF, flags, ASSOCDATA, data, LPCWSTR, pszExtra, LPVOID, pvOut, DWORD*, pcbOut) \
ICOM_METHOD5 (HRESULT, GetEnum, ASSOCF, flags, ASSOCENUM, assocenum, LPCWSTR, pszExtra, REFIID, riid, LPVOID*, ppvOut)
STDMETHOD(Init)(THIS_ ASSOCF flags, LPCWSTR pszAssoc, HKEY hkProgid, HWND hwnd) PURE; \
STDMETHOD(GetString)(THIS_ ASSOCF flags, ASSOCSTR str, LPCWSTR pszExtra, LPWSTR pszOut, DWORD * pcchOut) PURE; \
STDMETHOD(GetKey)(THIS_ ASSOCF flags, ASSOCKEY key, LPCWSTR pszExtra, HKEY * phkeyOut) PURE; \
STDMETHOD(GetData)(THIS_ ASSOCF flags, ASSOCDATA data, LPCWSTR pszExtra, LPVOID pvOut, DWORD * pcbOut) PURE; \
STDMETHOD(GetEnum)(THIS_ ASSOCF flags, ASSOCENUM assocenum, LPCWSTR pszExtra, REFIID riid, LPVOID * ppvOut) PURE;
#define IQueryAssociations_IMETHODS \
IUnknown_IMETHODS \
IQueryAssociations_METHODS
ICOM_DEFINE(IQueryAssociations,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#define IQueryAssociations_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IQueryAssociations_AddRef(p) ICOM_CALL(AddRef,p)
......
include/unknwn.h
View file @ f00c46f0
......@@ -35,14 +35,14 @@ DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,
#if defined(__cplusplus) && !defined(CINTERFACE)
struct IUnknown {
virtual HRESULT CALLBACK QueryInterface(
virtual HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid,
void** ppvObject) = 0;
virtual ULONG CALLBACK AddRef(
virtual ULONG STDMETHODCALLTYPE AddRef(
) = 0;
virtual ULONG CALLBACK Release(
virtual ULONG STDMETHODCALLTYPE Release(
) = 0;
} ICOM_COM_INTERFACE_ATTRIBUTE;
......@@ -55,23 +55,24 @@ struct IUnknownVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
/*** IUnknown methods ***/
HRESULT (CALLBACK *QueryInterface)(
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IUnknown* This,
REFIID riid,
void** ppvObject);
ULONG (CALLBACK *AddRef)(
ULONG (STDMETHODCALLTYPE *AddRef)(
IUnknown* This);
ULONG (CALLBACK *Release)(
ULONG (STDMETHODCALLTYPE *Release)(
IUnknown* This);
};
#define IUnknown_IMETHODS \
ICOM_METHOD2 (HRESULT,QueryInterface,REFIID,riid,void**,ppvObject) \
ICOM_METHOD (ULONG,AddRef) \
ICOM_METHOD (ULONG,Release)
/*** IUnknown methods ***/ \
HRESULT (STDMETHODCALLTYPE *QueryInterface)(INTERFACE *This, REFIID riid, void** ppvObject); \
ULONG (STDMETHODCALLTYPE *AddRef)(INTERFACE *This); \
ULONG (STDMETHODCALLTYPE *Release)(INTERFACE *This);
/*** IUnknown methods ***/
#define IUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
......@@ -114,12 +115,12 @@ DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,
#if defined(__cplusplus) && !defined(CINTERFACE)
struct IClassFactory: IUnknown {
virtual HRESULT CALLBACK CreateInstance(
virtual HRESULT STDMETHODCALLTYPE CreateInstance(
IUnknown* pUnkOuter,
REFIID riid,
void** ppvObject) = 0;
virtual HRESULT CALLBACK LockServer(
virtual HRESULT STDMETHODCALLTYPE LockServer(
BOOL fLock) = 0;
} ICOM_COM_INTERFACE_ATTRIBUTE;
......@@ -132,34 +133,38 @@ struct IClassFactoryVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
/*** IUnknown methods ***/
HRESULT (CALLBACK *QueryInterface)(
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IClassFactory* This,
REFIID riid,
void** ppvObject);
ULONG (CALLBACK *AddRef)(
ULONG (STDMETHODCALLTYPE *AddRef)(
IClassFactory* This);
ULONG (CALLBACK *Release)(
ULONG (STDMETHODCALLTYPE *Release)(
IClassFactory* This);
/*** IClassFactory methods ***/
HRESULT (CALLBACK *CreateInstance)(
HRESULT (STDMETHODCALLTYPE *CreateInstance)(
IClassFactory* This,
IUnknown* pUnkOuter,
REFIID riid,
void** ppvObject);
HRESULT (CALLBACK *LockServer)(
HRESULT (STDMETHODCALLTYPE *LockServer)(
IClassFactory* This,
BOOL fLock);
};
#define IClassFactory_IMETHODS \
IUnknown_IMETHODS \
ICOM_METHOD3 (HRESULT,CreateInstance,IUnknown*,pUnkOuter,REFIID,riid,void**,ppvObject) \
ICOM_METHOD1 (HRESULT,LockServer,BOOL,fLock)
/*** IUnknown methods ***/ \
HRESULT (STDMETHODCALLTYPE *QueryInterface)(INTERFACE *This, REFIID riid, void** ppvObject); \
ULONG (STDMETHODCALLTYPE *AddRef)(INTERFACE *This); \
ULONG (STDMETHODCALLTYPE *Release)(INTERFACE *This); \
/*** IClassFactory methods ***/ \
HRESULT (STDMETHODCALLTYPE *CreateInstance)(INTERFACE *This, IUnknown* pUnkOuter, REFIID riid, void** ppvObject); \
HRESULT (STDMETHODCALLTYPE *LockServer)(INTERFACE *This, BOOL fLock);
/*** IUnknown methods ***/
#define IClassFactory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
......
include/urlmon.h
View file @ f00c46f0
......@@ -170,19 +170,19 @@ typedef enum BINDSTATUS {
/*****************************************************************************
* IBinding interface
*/
#define ICOM_INTERFACE IBinding
#define INTERFACE IBinding
#define IBinding_METHODS \
ICOM_METHOD (HRESULT,Abort) \
ICOM_METHOD (HRESULT,Suspend) \
ICOM_METHOD (HRESULT,Resume) \
ICOM_METHOD1 (HRESULT,SetPriority, LONG,nPriority) \
ICOM_METHOD1 (HRESULT,GetPriority, LONG*,pnPriority) \
ICOM_METHOD4 (HRESULT,GetBindResult, CLSID*,pclsidProtocol, DWORD*,pdwResult, LPOLESTR*,pszResult, DWORD*,pdwReserved)
STDMETHOD(Abort)(THIS) PURE; \
STDMETHOD(Suspend)(THIS) PURE; \
STDMETHOD(Resume)(THIS) PURE; \
STDMETHOD(SetPriority)(THIS_ LONG nPriority) PURE; \
STDMETHOD(GetPriority)(THIS_ LONG *pnPriority) PURE; \
STDMETHOD(GetBindResult)(THIS_ CLSID *pclsidProtocol, DWORD *pdwResult, LPOLESTR *pszResult, DWORD *pdwReserved) PURE;
#define IBinding_IMETHODS \
IUnknown_IMETHODS \
IBinding_METHODS
ICOM_DEFINE(IBinding,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IBinding_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -199,21 +199,21 @@ ICOM_DEFINE(IBinding,IUnknown)
/*****************************************************************************
* IBindStatusCallback interface
*/
#define ICOM_INTERFACE IBindStatusCallback
#define INTERFACE IBindStatusCallback
#define IBindStatusCallback_METHODS \
ICOM_METHOD2 (HRESULT,OnStartBinding, DWORD,dwReserved, IBinding*,pib) \
ICOM_METHOD1 (HRESULT,GetPriority, LONG*,pnPriority) \
ICOM_METHOD (HRESULT,OnLowResource) \
ICOM_METHOD4 (HRESULT,OnProgress, ULONG,ulProgress, ULONG,ulProgressMax, ULONG,ulStatusCode, LPCWSTR,szStatusText) \
ICOM_METHOD2 (HRESULT,OnStopBinding, HRESULT,hresult, LPCWSTR,szError) \
ICOM_METHOD2 (HRESULT,GetBindInfo, DWORD*,grfBINDF, BINDINFO*,pbindinfo) \
ICOM_METHOD4 (HRESULT,OnDataAvailable, DWORD,grfBSCF, DWORD,dwSize, FORMATETC*,pformatetc, STGMEDIUM*,pstgmed) \
ICOM_METHOD2 (HRESULT,OnObjectAvailable, REFIID,iid, IUnknown*,punk)
STDMETHOD(OnStartBinding)(THIS_ DWORD dwReserved, IBinding *pib) PURE; \
STDMETHOD(GetPriority)(THIS_ LONG *pnPriority) PURE; \
STDMETHOD(OnLowResource)(THIS) PURE; \
STDMETHOD(OnProgress)(THIS_ ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) PURE; \
STDMETHOD(OnStopBinding)(THIS_ HRESULT hresult, LPCWSTR szError) PURE; \
STDMETHOD(GetBindInfo)(THIS_ DWORD *grfBINDF, BINDINFO *pbindinfo) PURE; \
STDMETHOD(OnDataAvailable)(THIS_ DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) PURE; \
STDMETHOD(OnObjectAvailable)(THIS_ REFIID iid, IUnknown *punk) PURE;
#define IBindStatusCallback_IMETHODS \
IUnknown_IMETHODS \
IBindStatusCallback_METHODS
ICOM_DEFINE(IBindStatusCallback,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IBindStatusCallback_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -232,16 +232,16 @@ ICOM_DEFINE(IBindStatusCallback,IUnknown)
/*****************************************************************************
* IBindHost interface
*/
#define ICOM_INTERFACE IBindHost
#define INTERFACE IBindHost
#define IBindHost_METHODS \
ICOM_METHOD4 (HRESULT,CreateMoniker, LPOLESTR,szName, IBindCtx*,pBC, IMoniker**,ppmk, DWORD,dwReserved) \
ICOM_METHOD5 (HRESULT,MonikerBindToStorage, IMoniker*,pMk, IBindCtx*,pBC, IBindStatusCallback*,pBSC, REFIID,riid, LPVOID*,ppvObj) \
ICOM_METHOD5 (HRESULT,MonikerBindToObject, IMoniker*,pMk, IBindCtx*,pBC, IBindStatusCallback*,pBSC, REFIID,riid, LPVOID*,ppvObj)
STDMETHOD(CreateMoniker)(THIS_ LPOLESTR szName, IBindCtx *pBC, IMoniker **ppmk, DWORD dwReserved) PURE; \
STDMETHOD(MonikerBindToStorage)(THIS_ IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, REFIID riid, LPVOID *ppvObj) PURE; \
STDMETHOD(MonikerBindToObject)(THIS_ IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, REFIID riid, LPVOID *ppvObj) PURE;
#define IBindHost_IMETHODS \
IUnknown_IMETHODS \
IBindHost_METHODS
ICOM_DEFINE(IBindHost,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IBindHost_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -273,14 +273,14 @@ typedef enum _tagQUERYOPTION {
/*****************************************************************************
* IWinInetInfo interface
*/
#define ICOM_INTERFACE IWinInetInfo
#define INTERFACE IWinInetInfo
#define IWinInetInfo_METHODS \
ICOM_METHOD3 (HRESULT,QueryOption, DWORD,dwOption, LPVOID,pBuffer, DWORD*,pcbBuf)
STDMETHOD(QueryOption)(THIS_ DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf) PURE;
#define IWinInetInfo_IMETHODS \
IUnknown_IMETHODS \
IWinInetInfo_METHODS
ICOM_DEFINE(IWinInetInfo,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IWinInetInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -292,14 +292,14 @@ ICOM_DEFINE(IWinInetInfo,IUnknown)
/*****************************************************************************
* IWinInetHttpInfo interface
*/
#define ICOM_INTERFACE IWinInetHttpInfo
#define INTERFACE IWinInetHttpInfo
#define IWinInetHttpInfo_METHODS \
ICOM_METHOD5 (HRESULT,QueryInfo, DWORD,dwOption, LPVOID,pBuffer, DWORD*,pcbBuf, DWORD*,pdwFlags, DWORD*,pdwReserved)
STDMETHOD(QueryInfo)(THIS_ DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD *pdwReserved) PURE;
#define IWinInetHttpInfo_IMETHODS \
IWinInetInfo_IMETHODS \
IWinInetHttpInfo_METHODS
ICOM_DEFINE(IWinInetHttpInfo,IWinInetInfo)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IWinInetHttpInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/vfw.h
View file @ f00c46f0
......@@ -987,24 +987,24 @@ DEFINE_AVIGUID(CLSID_AVIFile, 0x00020000, 0, 0);
/*****************************************************************************
* IAVIStream interface
*/
#define ICOM_INTERFACE IAVIStream
#define INTERFACE IAVIStream
#define IAVIStream_METHODS \
ICOM_METHOD2(HRESULT,Create, LPARAM,lParam1, LPARAM,lParam2) \
ICOM_METHOD2(HRESULT,Info, AVISTREAMINFOW*,psi, LONG,lSize) \
ICOM_METHOD2(LONG, FindSample, LONG,lPos, LONG,lFlags) \
ICOM_METHOD3(HRESULT,ReadFormat, LONG,lPos, LPVOID,lpFormat, LONG*,lpcbFormat) \
ICOM_METHOD3(HRESULT,SetFormat, LONG,lPos, LPVOID,lpFormat, LONG,cbFormat) \
ICOM_METHOD6(HRESULT,Read, LONG,lStart, LONG,lSamples, LPVOID,lpBuffer, LONG,cbBuffer, LONG*,plBytes, LONG*,plSamples) \
ICOM_METHOD7(HRESULT,Write, LONG,lStart, LONG,lSamples, LPVOID,lpBuffer, LONG,cbBuffer, DWORD,dwFlags, LONG*,plSampWritten, LONG*,plBytesWritten) \
ICOM_METHOD2(HRESULT,Delete, LONG,lStart, LONG,lSamples) \
ICOM_METHOD3(HRESULT,ReadData, DWORD,fcc, LPVOID,lpBuffer, LONG*,lpcbBuffer) \
ICOM_METHOD3(HRESULT,WriteData, DWORD,fcc, LPVOID,lpBuffer, LONG,cbBuffer) \
ICOM_METHOD2(HRESULT,SetInfo, AVISTREAMINFOW*,plInfo, LONG,cbInfo)
STDMETHOD(Create)(THIS_ LPARAM lParam1, LPARAM lParam2) PURE; \
STDMETHOD(Info)(THIS_ AVISTREAMINFOW *psi, LONG lSize) PURE; \
STDMETHOD_(LONG,FindSample)(THIS_ LONG lPos, LONG lFlags) PURE; \
STDMETHOD(ReadFormat)(THIS_ LONG lPos, LPVOID lpFormat, LONG *lpcbFormat) PURE; \
STDMETHOD(SetFormat)(THIS_ LONG lPos, LPVOID lpFormat, LONG cbFormat) PURE; \
STDMETHOD(Read)(THIS_ LONG lStart, LONG lSamples, LPVOID lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples) PURE; \
STDMETHOD(Write)(THIS_ LONG lStart, LONG lSamples, LPVOID lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten) PURE; \
STDMETHOD(Delete)(THIS_ LONG lStart, LONG lSamples) PURE; \
STDMETHOD(ReadData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG *lpcbBuffer) PURE; \
STDMETHOD(WriteData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG cbBuffer) PURE; \
STDMETHOD(SetInfo)(THIS_ AVISTREAMINFOW *plInfo, LONG cbInfo) PURE;
#define IAVIStream_IMETHODS \
IUnknown_IMETHODS \
IAVIStream_METHODS
ICOM_DEFINE(IAVIStream, IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IAVIStream_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -1087,20 +1087,20 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime);
* IAVIFile interface
*/
/* In Win32 this interface uses UNICODE only */
#define ICOM_INTERFACE IAVIFile
#define INTERFACE IAVIFile
#define IAVIFile_METHODS \
ICOM_METHOD2(HRESULT,Info, AVIFILEINFOW*,pfi, LONG,lSize) \
ICOM_METHOD3(HRESULT,GetStream, PAVISTREAM*,ppStream, DWORD,fccType, LONG,lParam) \
ICOM_METHOD2(HRESULT,CreateStream, PAVISTREAM*,ppStream, AVISTREAMINFOW*,psi) \
ICOM_METHOD3(HRESULT,WriteData, DWORD,fcc, LPVOID,lpBuffer, LONG,cbBuffer) \
ICOM_METHOD3(HRESULT,ReadData, DWORD,fcc, LPVOID,lpBuffer, LONG*,lpcbBuffer) \
ICOM_METHOD (HRESULT,EndRecord) \
ICOM_METHOD2(HRESULT,DeleteStream, DWORD,fccType, LONG,lParam)
STDMETHOD(Info)(THIS_ AVIFILEINFOW *pfi, LONG lSize) PURE; \
STDMETHOD(GetStream)(THIS_ PAVISTREAM *ppStream, DWORD fccType, LONG lParam) PURE; \
STDMETHOD(CreateStream)(THIS_ PAVISTREAM *ppStream, AVISTREAMINFOW *psi) PURE; \
STDMETHOD(WriteData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG cbBuffer) PURE; \
STDMETHOD(ReadData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG *lpcbBuffer) PURE; \
STDMETHOD(EndRecord)(THIS) PURE; \
STDMETHOD(DeleteStream)(THIS_ DWORD fccType, LONG lParam) PURE;
#define IAVIFile_IMETHODS \
IUnknown_IMETHODS \
IAVIFile_METHODS
ICOM_DEFINE(IAVIFile,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IAVIFile_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -1138,17 +1138,17 @@ HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile);
/*****************************************************************************
* IGetFrame interface
*/
#define ICOM_INTERFACE IGetFrame
#define INTERFACE IGetFrame
#define IGetFrame_METHODS \
ICOM_METHOD1(LPVOID, GetFrame, LONG,lPos) \
ICOM_METHOD3(HRESULT,Begin, LONG,lStart, LONG,lEnd, LONG,lRate) \
ICOM_METHOD (HRESULT,End) \
ICOM_METHOD6(HRESULT,SetFormat, LPBITMAPINFOHEADER,lpbi, LPVOID,lpBits, INT,x, INT,y, INT,dx, INT,dy)
STDMETHOD_(LPVOID,GetFrame)(THIS_ LONG lPos) PURE; \
STDMETHOD(Begin)(THIS_ LONG lStart, LONG lEnd, LONG lRate) PURE; \
STDMETHOD(End)(THIS) PURE; \
STDMETHOD(SetFormat)(THIS_ LPBITMAPINFOHEADER lpbi, LPVOID lpBits, INT x, INT y, INT dx, INT dy) PURE;
#define IGetFrame_IMETHODS \
IUnknown_IMETHODS \
IGetFrame_METHODS
ICOM_DEFINE(IGetFrame,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IGetFrame_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_cache.h
View file @ f00c46f0
......@@ -48,18 +48,18 @@ typedef struct IOleCacheControl IOleCacheControl, *LPOLECACHECONTROL;
/*****************************************************************************
* IOleCache interface
*/
#define ICOM_INTERFACE IOleCache
#define INTERFACE IOleCache
#define IOleCache_METHODS \
ICOM_METHOD3(HRESULT,Cache, FORMATETC*,pformatetc, DWORD,advf, DWORD*, pdwConnection) \
ICOM_METHOD1(HRESULT,Uncache, DWORD,dwConnection) \
ICOM_METHOD1(HRESULT,EnumCache, IEnumSTATDATA**,ppenumSTATDATA) \
ICOM_METHOD1(HRESULT,InitCache, IDataObject*,pDataObject) \
ICOM_METHOD3(HRESULT,SetData, FORMATETC*,pformatetc, STGMEDIUM*,pmedium, BOOL,fRelease)
STDMETHOD(Cache)(THIS_ FORMATETC *pformatetc, DWORD advf, DWORD * pdwConnection) PURE; \
STDMETHOD(Uncache)(THIS_ DWORD dwConnection) PURE; \
STDMETHOD(EnumCache)(THIS_ IEnumSTATDATA **ppenumSTATDATA) PURE; \
STDMETHOD(InitCache)(THIS_ IDataObject *pDataObject) PURE; \
STDMETHOD(SetData)(THIS_ FORMATETC *pformatetc, STGMEDIUM *pmedium, BOOL fRelease) PURE;
#define IOleCache_IMETHODS \
IUnknown_IMETHODS \
IOleCache_METHODS
ICOM_DEFINE(IOleCache,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleCache_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -76,15 +76,15 @@ ICOM_DEFINE(IOleCache,IUnknown)
/*****************************************************************************
* IOleCache2 interface
*/
#define ICOM_INTERFACE IOleCache2
#define INTERFACE IOleCache2
#define IOleCache2_METHODS \
ICOM_METHOD3(HRESULT,UpdateCache, LPDATAOBJECT,pDataObject, DWORD,grfUpdf, LPVOID,pReserved) \
ICOM_METHOD1(HRESULT,DiscardCache, DWORD,dwDiscardOptions)
STDMETHOD(UpdateCache)(THIS_ LPDATAOBJECT pDataObject, DWORD grfUpdf, LPVOID pReserved) PURE; \
STDMETHOD(DiscardCache)(THIS_ DWORD dwDiscardOptions) PURE;
#define IOleCache2_IMETHODS \
IOleCache_IMETHODS \
IOleCache2_METHODS
ICOM_DEFINE(IOleCache2,IOleCache)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleCache2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -104,15 +104,15 @@ ICOM_DEFINE(IOleCache2,IOleCache)
/*****************************************************************************
* IOleCacheControl interface
*/
#define ICOM_INTERFACE IOleCacheControl
#define INTERFACE IOleCacheControl
#define IOleCacheControl_METHODS \
ICOM_METHOD1(HRESULT,OnRun, LPDATAOBJECT,pDataObject) \
ICOM_METHOD (HRESULT,OnStop)
STDMETHOD(OnRun)(THIS_ LPDATAOBJECT pDataObject) PURE; \
STDMETHOD(OnStop)(THIS) PURE;
#define IOleCacheControl_IMETHODS \
IUnknown_IMETHODS \
IOleCacheControl_METHODS
ICOM_DEFINE(IOleCacheControl,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleCacheControl_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -128,5 +128,3 @@ ICOM_DEFINE(IOleCacheControl,IUnknown)
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_CONTROL_H */
include/wine/obj_comcat.h
View file @ f00c46f0
......@@ -91,19 +91,19 @@ DEFINE_OLEGUID(CLSID_StdComponentCategoriesMgr, 0x0002E005L, 0, 0);
/*****************************************************************************
* ICatInformation
*/
#define ICOM_INTERFACE ICatInformation
#define INTERFACE ICatInformation
#define ICatInformation_METHODS \
ICOM_METHOD2(HRESULT, EnumCategories, LCID, lcid, IEnumCATEGORYINFO**, ppenumCatInfo) \
ICOM_METHOD3(HRESULT, GetCategoryDesc, REFCATID, rcatid, LCID, lcid, PWCHAR*, ppszDesc) \
ICOM_METHOD5(HRESULT, EnumClassesOfCategories, ULONG, cImplemented, CATID*, rgcatidImpl, ULONG, cRequired, CATID*, rgcatidReq, IEnumCLSID**, ppenumCLSID) \
ICOM_METHOD5(HRESULT, IsClassOfCategories, REFCLSID, rclsid, ULONG, cImplemented, CATID*, rgcatidImpl, ULONG, cRequired, CATID*, rgcatidReq) \
ICOM_METHOD2(HRESULT, EnumImplCategoriesOfClass, REFCLSID, rclsid, IEnumCATID**, ppenumCATID) \
ICOM_METHOD2(HRESULT, EnumReqCategoriesOfClass, REFCLSID, rclsid, IEnumCATID**, ppenumCATID)
STDMETHOD(EnumCategories)(THIS_ LCID lcid, IEnumCATEGORYINFO ** ppenumCatInfo) PURE; \
STDMETHOD(GetCategoryDesc)(THIS_ REFCATID rcatid, LCID lcid, PWCHAR * ppszDesc) PURE; \
STDMETHOD(EnumClassesOfCategories)(THIS_ ULONG cImplemented, CATID * rgcatidImpl, ULONG cRequired, CATID * rgcatidReq, IEnumCLSID ** ppenumCLSID) PURE; \
STDMETHOD(IsClassOfCategories)(THIS_ REFCLSID rclsid, ULONG cImplemented, CATID * rgcatidImpl, ULONG cRequired, CATID * rgcatidReq) PURE; \
STDMETHOD(EnumImplCategoriesOfClass)(THIS_ REFCLSID rclsid, IEnumCATID ** ppenumCATID) PURE; \
STDMETHOD(EnumReqCategoriesOfClass)(THIS_ REFCLSID rclsid, IEnumCATID ** ppenumCATID) PURE;
#define ICatInformation_IMETHODS \
IUnknown_IMETHODS \
ICatInformation_METHODS
ICOM_DEFINE(ICatInformation,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
......@@ -122,19 +122,19 @@ ICOM_DEFINE(ICatInformation,IUnknown)
/*****************************************************************************
* ICatRegister
*/
#define ICOM_INTERFACE ICatRegister
#define INTERFACE ICatRegister
#define ICatRegister_METHODS \
ICOM_METHOD2(HRESULT, RegisterCategories, ULONG, cCategories, CATEGORYINFO*, rgCategoryInfo) \
ICOM_METHOD2(HRESULT, UnRegisterCategories, ULONG, cCategories, CATID*, rgcatid) \
ICOM_METHOD3(HRESULT, RegisterClassImplCategories, REFCLSID, rclsid, ULONG, cCategories, CATID*, rgcatid) \
ICOM_METHOD3(HRESULT, UnRegisterClassImplCategories, REFCLSID, rclsid, ULONG, cCategories, CATID*, rgcatid) \
ICOM_METHOD3(HRESULT, RegisterClassReqCategories, REFCLSID, rclsid, ULONG, cCategories, CATID*, rgcatid) \
ICOM_METHOD3(HRESULT, UnRegisterClassReqCategories, REFCLSID, rclsid, ULONG, cCategories, CATID*, rgcatid)
STDMETHOD(RegisterCategories)(THIS_ ULONG cCategories, CATEGORYINFO * rgCategoryInfo) PURE; \
STDMETHOD(UnRegisterCategories)(THIS_ ULONG cCategories, CATID * rgcatid) PURE; \
STDMETHOD(RegisterClassImplCategories)(THIS_ REFCLSID rclsid, ULONG cCategories, CATID * rgcatid) PURE; \
STDMETHOD(UnRegisterClassImplCategories)(THIS_ REFCLSID rclsid, ULONG cCategories, CATID * rgcatid) PURE; \
STDMETHOD(RegisterClassReqCategories)(THIS_ REFCLSID rclsid, ULONG cCategories, CATID * rgcatid) PURE; \
STDMETHOD(UnRegisterClassReqCategories)(THIS_ REFCLSID rclsid, ULONG cCategories, CATID * rgcatid) PURE;
#define ICatRegister_IMETHODS \
IUnknown_IMETHODS \
ICatRegister_METHODS
ICOM_DEFINE(ICatRegister,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
......@@ -153,17 +153,17 @@ ICOM_DEFINE(ICatRegister,IUnknown)
/*****************************************************************************
* IEnumCATEGORYINFO
*/
#define ICOM_INTERFACE IEnumCATEGORYINFO
#define INTERFACE IEnumCATEGORYINFO
#define IEnumCATEGORYINFO_METHODS \
ICOM_METHOD3(HRESULT, Next, ULONG, celt, CATEGORYINFO*, rgelt, ULONG*, pceltFetched) \
ICOM_METHOD1(HRESULT, Skip, ULONG, celt) \
ICOM_METHOD (HRESULT, Reset) \
ICOM_METHOD1(HRESULT, Clone, IEnumCATEGORYINFO**, ppenum)
STDMETHOD(Next)(THIS_ ULONG celt, CATEGORYINFO * rgelt, ULONG * pceltFetched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG celt) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumCATEGORYINFO ** ppenum) PURE;
#define IEnumCATEGORYINFO_IMETHODS \
IUnknown_IMETHODS \
IEnumCATEGORYINFO_METHODS
ICOM_DEFINE(IEnumCATEGORYINFO,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
......
include/wine/obj_commdlgbrowser.h
View file @ f00c46f0
......@@ -34,16 +34,16 @@ typedef struct ICommDlgBrowser ICommDlgBrowser, *LPCOMMDLGBROWSER;
#define CDBOSC_RENAME 0x00000003
#define ICOM_INTERFACE ICommDlgBrowser
#define INTERFACE ICommDlgBrowser
#define ICommDlgBrowser_METHODS \
ICOM_METHOD1(HRESULT, OnDefaultCommand, IShellView*, IShellView) \
ICOM_METHOD2(HRESULT, OnStateChange, IShellView*, IShellView, ULONG, uChange) \
ICOM_METHOD2(HRESULT, IncludeObject, IShellView*, IShellView, LPCITEMIDLIST, pidl)
STDMETHOD(OnDefaultCommand)(THIS_ IShellView * IShellView) PURE; \
STDMETHOD(OnStateChange)(THIS_ IShellView * IShellView, ULONG uChange) PURE; \
STDMETHOD(IncludeObject)(THIS_ IShellView * IShellView, LPCITEMIDLIST pidl) PURE;
#define ICommDlgBrowser_IMETHODS \
IUnknown_IMETHODS \
ICommDlgBrowser_METHODS
ICOM_DEFINE(ICommDlgBrowser,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#define ICommDlgBrowser_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ICommDlgBrowser_AddRef(p) ICOM_CALL(AddRef,p)
......
include/wine/obj_connection.h
View file @ f00c46f0
......@@ -55,18 +55,18 @@ typedef struct IEnumConnectionPoints IEnumConnectionPoints, *LPENUMCONNECTIONPOI
/*****************************************************************************
* IConnectionPoint interface
*/
#define ICOM_INTERFACE IConnectionPoint
#define INTERFACE IConnectionPoint
#define IConnectionPoint_METHODS \
ICOM_METHOD1(HRESULT,GetConnectionInterface, IID*,pIID) \
ICOM_METHOD1(HRESULT,GetConnectionPointContainer, IConnectionPointContainer**,ppCPC) \
ICOM_METHOD2(HRESULT,Advise, IUnknown*,pUnkSink, DWORD*,pdwCookie) \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwCookie) \
ICOM_METHOD1(HRESULT,EnumConnections, IEnumConnections**,ppEnum)
STDMETHOD(GetConnectionInterface)(THIS_ IID *pIID) PURE; \
STDMETHOD(GetConnectionPointContainer)(THIS_ IConnectionPointContainer **ppCPC) PURE; \
STDMETHOD(Advise)(THIS_ IUnknown *pUnkSink, DWORD *pdwCookie) PURE; \
STDMETHOD(Unadvise)(THIS_ DWORD dwCookie) PURE; \
STDMETHOD(EnumConnections)(THIS_ IEnumConnections **ppEnum) PURE;
#define IConnectionPoint_IMETHODS \
IUnknown_IMETHODS \
IConnectionPoint_METHODS
ICOM_DEFINE(IConnectionPoint,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IConnectionPoint_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -83,15 +83,15 @@ ICOM_DEFINE(IConnectionPoint,IUnknown)
/*****************************************************************************
* IConnectionPointContainer interface
*/
#define ICOM_INTERFACE IConnectionPointContainer
#define INTERFACE IConnectionPointContainer
#define IConnectionPointContainer_METHODS \
ICOM_METHOD1(HRESULT,EnumConnectionPoints, IEnumConnectionPoints**,ppEnum) \
ICOM_METHOD2(HRESULT,FindConnectionPoint, REFIID,riid, IConnectionPoint**,ppCP)
STDMETHOD(EnumConnectionPoints)(THIS_ IEnumConnectionPoints **ppEnum) PURE; \
STDMETHOD(FindConnectionPoint)(THIS_ REFIID riid, IConnectionPoint **ppCP) PURE;
#define IConnectionPointContainer_IMETHODS \
IUnknown_IMETHODS \
IConnectionPointContainer_METHODS
ICOM_DEFINE(IConnectionPointContainer,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IConnectionPointContainer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -105,17 +105,17 @@ ICOM_DEFINE(IConnectionPointContainer,IUnknown)
/*****************************************************************************
* IEnumConnections interface
*/
#define ICOM_INTERFACE IEnumConnections
#define INTERFACE IEnumConnections
#define IEnumConnections_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,cConnections, LPCONNECTDATA,rgcd, ULONG*,pcFectched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,cConnections) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumConnections**,ppEnum)
STDMETHOD(Next)(THIS_ ULONG cConnections, LPCONNECTDATA rgcd, ULONG *pcFectched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG cConnections) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumConnections **ppEnum) PURE;
#define IEnumConnections_IMETHODS \
IUnknown_IMETHODS \
IEnumConnections_METHODS
ICOM_DEFINE(IEnumConnections,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IEnumConnections_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -130,17 +130,17 @@ ICOM_DEFINE(IEnumConnections,IUnknown)
/*****************************************************************************
* IEnumConnectionPoints interface
*/
#define ICOM_INTERFACE IEnumConnectionPoints
#define INTERFACE IEnumConnectionPoints
#define IEnumConnectionPoints_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,cConnections, LPCONNECTIONPOINT*,ppCP, ULONG*,pcFectched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,cConnections) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumConnections**,ppEnum)
STDMETHOD(Next)(THIS_ ULONG cConnections, LPCONNECTIONPOINT *ppCP, ULONG *pcFectched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG cConnections) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumConnections **ppEnum) PURE;
#define IEnumConnectionPoints_IMETHODS \
IUnknown_IMETHODS \
IEnumConnectionPoints_METHODS
ICOM_DEFINE(IEnumConnectionPoints,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IEnumConnectionPoints_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -157,5 +157,3 @@ ICOM_DEFINE(IEnumConnectionPoints,IUnknown)
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_CONTROL_H */
include/wine/obj_contextmenu.h
View file @ f00c46f0
......@@ -123,18 +123,18 @@ typedef struct tagCMInvokeCommandInfoEx
} CMINVOKECOMMANDINFOEX, *LPCMINVOKECOMMANDINFOEX;
#define ICOM_INTERFACE IContextMenu
#define INTERFACE IContextMenu
#define IContextMenu_METHODS \
ICOM_METHOD5(HRESULT, QueryContextMenu, HMENU, hmenu, UINT, indexMenu, UINT, idCmdFirst, UINT, idCmdLast, UINT, uFlags) \
ICOM_METHOD1(HRESULT, InvokeCommand, LPCMINVOKECOMMANDINFO, lpici) \
ICOM_METHOD5(HRESULT, GetCommandString, UINT, idCmd, UINT, uType, UINT*, pwReserved, LPSTR, pszName, UINT, cchMax) \
ICOM_METHOD3(HRESULT, HandleMenuMsg, UINT, uMsg, WPARAM, wParam, LPARAM, lParam) \
STDMETHOD(QueryContextMenu)(THIS_ HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) PURE; \
STDMETHOD(InvokeCommand)(THIS_ LPCMINVOKECOMMANDINFO lpici) PURE; \
STDMETHOD(GetCommandString)(THIS_ UINT idCmd, UINT uType, UINT * pwReserved, LPSTR pszName, UINT cchMax) PURE; \
STDMETHOD(HandleMenuMsg)(THIS_ UINT uMsg, WPARAM wParam, LPARAM lParam) PURE; \
void * guard; /*possibly another nasty entry from ContextMenu3 ?*/
#define IContextMenu_IMETHODS \
IUnknown_IMETHODS \
IContextMenu_METHODS
ICOM_DEFINE(IContextMenu,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#define IContextMenu_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IContextMenu_AddRef(p) ICOM_CALL(AddRef,p)
......
include/wine/obj_dockingwindowframe.h
View file @ f00c46f0
......@@ -32,16 +32,16 @@ DEFINE_GUID (IID_IDockingWindowFrame, 0x47D2657AL, 0x7B27, 0x11D0, 0x8C, 0xA9, 0
#define DWFRF_DELETECONFIGDATA 0x0001
#define DWFAF_HIDDEN 0x0001 /* add tolbar*/
#define ICOM_INTERFACE IDockingWindowFrame
#define INTERFACE IDockingWindowFrame
#define IDockingWindowFrame_METHODS \
ICOM_METHOD3(HRESULT, AddToolbar, IUnknown*, punkSrc, LPCWSTR, pwszItem, DWORD, dwAddFlags) \
ICOM_METHOD2(HRESULT, RemoveToolbar, IUnknown*, punkSrc, DWORD, dwRemoveFlags) \
ICOM_METHOD3(HRESULT, FindToolbar, LPCWSTR, pwszItem, REFIID, riid, LPVOID*, ppvObj)
STDMETHOD(AddToolbar)(THIS_ IUnknown * punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags) PURE; \
STDMETHOD(RemoveToolbar)(THIS_ IUnknown * punkSrc, DWORD dwRemoveFlags) PURE; \
STDMETHOD(FindToolbar)(THIS_ LPCWSTR pwszItem, REFIID riid, LPVOID * ppvObj) PURE;
#define IDockingWindowFrame_IMETHODS \
IOleWindow_IMETHODS \
IDockingWindowFrame_METHODS
ICOM_DEFINE(IDockingWindowFrame,IOleWindow)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDockingWindowFrame_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_dragdrop.h
View file @ f00c46f0
......@@ -52,15 +52,15 @@ typedef struct IDropTarget IDropTarget,*LPDROPTARGET;
/*****************************************************************************
* IDropSource interface
*/
#define ICOM_INTERFACE IDropSource
#define INTERFACE IDropSource
#define IDropSource_METHODS \
ICOM_METHOD2(HRESULT, QueryContinueDrag, BOOL, fEscapePressed, DWORD, grfKeyState) \
ICOM_METHOD1(HRESULT, GiveFeedback, DWORD, dwEffect)
STDMETHOD(QueryContinueDrag)(THIS_ BOOL fEscapePressed, DWORD grfKeyState) PURE; \
STDMETHOD(GiveFeedback)(THIS_ DWORD dwEffect) PURE;
#define IDropSource_IMETHODS \
IUnknown_IMETHODS \
IDropSource_METHODS
ICOM_DEFINE(IDropSource,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDropSource_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -73,17 +73,17 @@ ICOM_DEFINE(IDropSource,IUnknown)
/*****************************************************************************
* IDropTarget interface
*/
#define ICOM_INTERFACE IDropTarget
#define INTERFACE IDropTarget
#define IDropTarget_METHODS \
ICOM_METHOD4(HRESULT, DragEnter, IDataObject*, pDataObject, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect) \
ICOM_METHOD3(HRESULT, DragOver, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect) \
ICOM_METHOD(HRESULT, DragLeave) \
ICOM_METHOD4(HRESULT, Drop, IDataObject*, pDataObject, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect)
STDMETHOD(DragEnter)(THIS_ IDataObject * pDataObject, DWORD grfKeyState, POINTL pt, DWORD * pdwEffect) PURE; \
STDMETHOD(DragOver)(THIS_ DWORD grfKeyState, POINTL pt, DWORD * pdwEffect) PURE; \
STDMETHOD(DragLeave)(THIS) PURE; \
STDMETHOD(Drop)(THIS_ IDataObject * pDataObject, DWORD grfKeyState, POINTL pt, DWORD * pdwEffect) PURE;
#define IDropTarget_IMETHODS \
IUnknown_IMETHODS \
IDropTarget_METHODS
ICOM_DEFINE(IDropTarget,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDropTarget_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -100,8 +100,3 @@ ICOM_DEFINE(IDropTarget,IUnknown)
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_DRAGDROP_H */
include/wine/obj_dragdrophelper.h
View file @ f00c46f0
......@@ -46,15 +46,15 @@ typedef struct {
} SHDRAGIMAGE, *LPSHDRAGIMAGE;
#define ICOM_INTERFACE IDragSourceHelper
#define INTERFACE IDragSourceHelper
#define IDragSourceHelper_METHODS \
ICOM_METHOD2(HRESULT, InitializeFromBitmap, LPSHDRAGIMAGE, pshdi, IDataObject*, pDataObject) \
ICOM_METHOD3(HRESULT, InitializeFromWindow, HWND, hwnd, POINT*, ppt, IDataObject*, pDataObject)
STDMETHOD(InitializeFromBitmap)(THIS_ LPSHDRAGIMAGE pshdi, IDataObject * pDataObject) PURE; \
STDMETHOD(InitializeFromWindow)(THIS_ HWND hwnd, POINT * ppt, IDataObject * pDataObject) PURE;
#define IDragSourceHelper_IMETHODS \
IUnknown_IMETHODS \
IDragSourceHelper_METHODS
ICOM_DEFINE(IDragSourceHelper,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDragSourceHelper_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -68,18 +68,18 @@ ICOM_DEFINE(IDragSourceHelper,IUnknown)
/*****************************************************************************
* IDropTargetHelper interface
*/
#define ICOM_INTERFACE IDropTargetHelper
#define INTERFACE IDropTargetHelper
#define IDropTargetHelper_METHODS \
ICOM_METHOD4(HRESULT,DragEnter, HWND, hwndTarget, IDataObject*, pDataObject, POINT*, ppt, DWORD, dwEffect) \
ICOM_METHOD (HRESULT,DragLeave) \
ICOM_METHOD2(HRESULT,DragOver, POINT*, ppt, DWORD, dwEffect) \
ICOM_METHOD3(HRESULT,Drop, IDataObject*, pDataObject, POINT*, ppt,DWORD, dwEffect) \
ICOM_METHOD1(HRESULT,Show, BOOL, fShow)
STDMETHOD(DragEnter)(THIS_ HWND hwndTarget, IDataObject * pDataObject, POINT * ppt, DWORD dwEffect) PURE; \
STDMETHOD(DragLeave)(THIS) PURE; \
STDMETHOD(DragOver)(THIS_ POINT * ppt, DWORD dwEffect) PURE; \
STDMETHOD(Drop)(THIS_ IDataObject * pDataObject, POINT * ppt,DWORD dwEffect) PURE; \
STDMETHOD(Show)(THIS_ BOOL fShow) PURE;
#define IDropTargetHelper_IMETHODS \
IUnknown_IMETHODS \
IDropTargetHelper_METHODS
ICOM_DEFINE(IDropTargetHelper,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IDropTargetHelper_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_enumguid.h
View file @ f00c46f0
......@@ -36,17 +36,17 @@ typedef struct IEnumGUID IEnumGUID, *LPENUMGUID;
/*****************************************************************************
* IEnumGUID
*/
#define ICOM_INTERFACE IEnumGUID
#define INTERFACE IEnumGUID
#define IEnumGUID_METHODS \
ICOM_METHOD3(HRESULT, Next, ULONG, celt, GUID*, rgelt, ULONG*, pceltFetched) \
ICOM_METHOD1(HRESULT, Skip, ULONG, celt) \
ICOM_METHOD (HRESULT, Reset) \
ICOM_METHOD1(HRESULT, Clone, IEnumGUID**, ppenum)
STDMETHOD(Next)(THIS_ ULONG celt, GUID * rgelt, ULONG * pceltFetched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG celt) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumGUID ** ppenum) PURE;
#define IEnumGUID_IMETHODS \
IUnknown_IMETHODS \
IEnumGUID_METHODS
ICOM_DEFINE(IEnumGUID,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
......
include/wine/obj_enumidlist.h
View file @ f00c46f0
......@@ -32,17 +32,17 @@ extern "C" {
*/
typedef struct IEnumIDList IEnumIDList, *LPENUMIDLIST;
#define ICOM_INTERFACE IEnumIDList
#define INTERFACE IEnumIDList
#define IEnumIDList_METHODS \
ICOM_METHOD3(HRESULT, Next, ULONG, celt, LPITEMIDLIST*, rgelt, ULONG*, pceltFetched) \
ICOM_METHOD1(HRESULT, Skip, ULONG, celt) \
ICOM_METHOD (HRESULT, Reset) \
ICOM_METHOD1(HRESULT, Clone, IEnumIDList**, ppenum)
STDMETHOD(Next)(THIS_ ULONG celt, LPITEMIDLIST * rgelt, ULONG * pceltFetched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG celt) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumIDList ** ppenum) PURE;
#define IEnumIDList_IMETHODS \
IUnknown_IMETHODS \
IEnumIDList_METHODS
ICOM_DEFINE(IEnumIDList,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IEnumIDList_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_extracticon.h
View file @ f00c46f0
......@@ -44,15 +44,15 @@ typedef struct IExtractIconW IExtractIconW,*LPEXTRACTICONW;
#define GIL_DONTCACHE 0x0010 /* this icon should not be cached */
#define ICOM_INTERFACE IExtractIconA
#define INTERFACE IExtractIconA
#define IExtractIconA_METHODS \
ICOM_METHOD5(HRESULT, GetIconLocation, UINT, uFlags, LPSTR, szIconFile, UINT, cchMax, INT*, piIndex, UINT *, pwFlags) \
ICOM_METHOD5(HRESULT, Extract, LPCSTR, pszFile, UINT, nIconIndex, HICON*, phiconLarge, HICON*, phiconSmall, UINT, nIconSize)
STDMETHOD(GetIconLocation)(THIS_ UINT uFlags, LPSTR szIconFile, UINT cchMax, INT * piIndex, UINT * pwFlags) PURE; \
STDMETHOD(Extract)(THIS_ LPCSTR pszFile, UINT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIconSize) PURE;
#define IExtractIconA_IMETHODS \
IUnknown_IMETHODS \
IExtractIconA_METHODS
ICOM_DEFINE(IExtractIconA,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#define IExtractIconA_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IExtractIconA_AddRef(p) ICOM_CALL(AddRef,p)
......@@ -61,15 +61,15 @@ ICOM_DEFINE(IExtractIconA,IUnknown)
#define IExtractIconA_Extract(p,a,b,c,d,e) ICOM_CALL5(Extract,p,a,b,c,d,e)
#define ICOM_INTERFACE IExtractIconW
#define INTERFACE IExtractIconW
#define IExtractIconW_METHODS \
ICOM_METHOD5(HRESULT, GetIconLocation, UINT, uFlags, LPWSTR, szIconFile, UINT, cchMax, INT*, piIndex, UINT *, pwFlags) \
ICOM_METHOD5(HRESULT, Extract, LPCWSTR, pszFile, UINT, nIconIndex, HICON*, phiconLarge, HICON*, phiconSmall, UINT, nIconSize)
STDMETHOD(GetIconLocation)(THIS_ UINT uFlags, LPWSTR szIconFile, UINT cchMax, INT * piIndex, UINT * pwFlags) PURE; \
STDMETHOD(Extract)(THIS_ LPCWSTR pszFile, UINT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIconSize) PURE;
#define IExtractIconW_IMETHODS \
IUnknown_IMETHODS \
IExtractIconW_METHODS
ICOM_DEFINE(IExtractIconW,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
#define IExtractIconW_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IExtractIconW_AddRef(p) ICOM_CALL(AddRef,p)
......
include/wine/obj_olefont.h
View file @ f00c46f0
......@@ -41,37 +41,37 @@ typedef TEXTMETRICW TEXTMETRICOLE;
/*****************************************************************************
* IFont interface
*/
#define ICOM_INTERFACE IFont
#define INTERFACE IFont
#define IFont_METHODS \
ICOM_METHOD1(HRESULT, get_Name, BSTR*, pname) \
ICOM_METHOD1(HRESULT, put_Name, BSTR, name) \
ICOM_METHOD1(HRESULT, get_Size, CY*, psize) \
ICOM_METHOD1(HRESULT, put_Size, CY, size) \
ICOM_METHOD1(HRESULT, get_Bold, BOOL*, pbold) \
ICOM_METHOD1(HRESULT, put_Bold, BOOL, bold) \
ICOM_METHOD1(HRESULT, get_Italic, BOOL*, pitalic) \
ICOM_METHOD1(HRESULT, put_Italic, BOOL, italic) \
ICOM_METHOD1(HRESULT, get_Underline, BOOL*, punderline) \
ICOM_METHOD1(HRESULT, put_Underline, BOOL, underline) \
ICOM_METHOD1(HRESULT, get_Strikethrough, BOOL*, pstrikethrough) \
ICOM_METHOD1(HRESULT, put_Strikethrough, BOOL, strikethrough) \
ICOM_METHOD1(HRESULT, get_Weight, short*, pweight) \
ICOM_METHOD1(HRESULT, put_Weight, short, weight) \
ICOM_METHOD1(HRESULT, get_Charset, short*, pcharset) \
ICOM_METHOD1(HRESULT, put_Charset, short, charset) \
ICOM_METHOD1(HRESULT, get_hFont, HFONT*, phfont) \
ICOM_METHOD1(HRESULT, Clone, IFont**, ppfont) \
ICOM_METHOD1(HRESULT, IsEqual, IFont*, pFontOther) \
ICOM_METHOD2(HRESULT, SetRatio, long, cyLogical, long, cyHimetric) \
ICOM_METHOD1(HRESULT, QueryTextMetrics, TEXTMETRICOLE*, ptm) \
ICOM_METHOD1(HRESULT, AddRefHfont, HFONT, hfont) \
ICOM_METHOD1(HRESULT, ReleaseHfont, HFONT, hfont) \
ICOM_METHOD1(HRESULT, SetHdc, HDC, hdc)
STDMETHOD(get_Name)(THIS_ BSTR * pname) PURE; \
STDMETHOD(put_Name)(THIS_ BSTR name) PURE; \
STDMETHOD(get_Size)(THIS_ CY * psize) PURE; \
STDMETHOD(put_Size)(THIS_ CY size) PURE; \
STDMETHOD(get_Bold)(THIS_ BOOL * pbold) PURE; \
STDMETHOD(put_Bold)(THIS_ BOOL bold) PURE; \
STDMETHOD(get_Italic)(THIS_ BOOL * pitalic) PURE; \
STDMETHOD(put_Italic)(THIS_ BOOL italic) PURE; \
STDMETHOD(get_Underline)(THIS_ BOOL * punderline) PURE; \
STDMETHOD(put_Underline)(THIS_ BOOL underline) PURE; \
STDMETHOD(get_Strikethrough)(THIS_ BOOL * pstrikethrough) PURE; \
STDMETHOD(put_Strikethrough)(THIS_ BOOL strikethrough) PURE; \
STDMETHOD(get_Weight)(THIS_ short * pweight) PURE; \
STDMETHOD(put_Weight)(THIS_ short weight) PURE; \
STDMETHOD(get_Charset)(THIS_ short * pcharset) PURE; \
STDMETHOD(put_Charset)(THIS_ short charset) PURE; \
STDMETHOD(get_hFont)(THIS_ HFONT * phfont) PURE; \
STDMETHOD(Clone)(THIS_ IFont ** ppfont) PURE; \
STDMETHOD(IsEqual)(THIS_ IFont * pFontOther) PURE; \
STDMETHOD(SetRatio)(THIS_ long cyLogical, long cyHimetric) PURE; \
STDMETHOD(QueryTextMetrics)(THIS_ TEXTMETRICOLE * ptm) PURE; \
STDMETHOD(AddRefHfont)(THIS_ HFONT hfont) PURE; \
STDMETHOD(ReleaseHfont)(THIS_ HFONT hfont) PURE; \
STDMETHOD(SetHdc)(THIS_ HDC hdc) PURE;
#define IFont_IMETHODS \
IUnknown_IMEHTODS \
IFont_METHODS
ICOM_DEFINE(IFont,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IFont_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -107,13 +107,13 @@ ICOM_DEFINE(IFont,IUnknown)
/*****************************************************************************
* IFont interface
*/
#define ICOM_INTERFACE IFontDisp
#define INTERFACE IFontDisp
#define IFontDisp_METHODS
#define IFontDisp_IMETHODS \
IUnknown_IMETHODS \
IFontDisp_METHODS
ICOM_DEFINE(IFontDisp,IDispatch)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IFontDisp_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_oleobj.h
View file @ f00c46f0
......@@ -92,34 +92,34 @@ typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
/*****************************************************************************
* IOleObject interface
*/
#define ICOM_INTERFACE IOleObject
#define INTERFACE IOleObject
#define IOleObject_METHODS \
ICOM_METHOD1(HRESULT,SetClientSite, IOleClientSite*,pClientSite) \
ICOM_METHOD1(HRESULT,GetClientSite, IOleClientSite**,ppClientSite) \
ICOM_METHOD2(HRESULT,SetHostNames, LPCOLESTR,szContainerApp, LPCOLESTR,szContainerObj) \
ICOM_METHOD1(HRESULT,Close, DWORD,dwSaveOption) \
ICOM_METHOD2(HRESULT,SetMoniker, DWORD,dwWhichMoniker, IMoniker*,pmk) \
ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk) \
ICOM_METHOD3(HRESULT,InitFromData, IDataObject*,pDataObject, BOOL,fCreation, DWORD,dwReserved) \
ICOM_METHOD2(HRESULT,GetClipboardData, DWORD,dwReserved, IDataObject**,ppDataObject) \
ICOM_METHOD6(HRESULT,DoVerb, LONG,iVerb, struct tagMSG*,lpmsg, IOleClientSite*,pActiveSite, LONG,lindex, HWND,hwndParent, LPCRECT,lprcPosRect) \
ICOM_METHOD1(HRESULT,EnumVerbs, IEnumOLEVERB**,ppEnumOleVerb) \
ICOM_METHOD (HRESULT,Update) \
ICOM_METHOD (HRESULT,IsUpToDate) \
ICOM_METHOD1(HRESULT,GetUserClassID, CLSID*,pClsid) \
ICOM_METHOD2(HRESULT,GetUserType, DWORD,dwFormOfType, LPOLESTR*,pszUserType) \
ICOM_METHOD2(HRESULT,SetExtent, DWORD,dwDrawAspect, SIZEL*,psizel) \
ICOM_METHOD2(HRESULT,GetExtent, DWORD,dwDrawAspect, SIZEL*,psizel) \
ICOM_METHOD2(HRESULT,Advise, IAdviseSink*,pAdvSink, DWORD*,pdwConnection) \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection) \
ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise) \
ICOM_METHOD2(HRESULT,GetMiscStatus, DWORD,dwAspect, DWORD*,pdwStatus) \
ICOM_METHOD1(HRESULT,SetColorScheme, struct tagLOGPALETTE*,pLogpal)
STDMETHOD(SetClientSite)(THIS_ IOleClientSite *pClientSite) PURE; \
STDMETHOD(GetClientSite)(THIS_ IOleClientSite **ppClientSite) PURE; \
STDMETHOD(SetHostNames)(THIS_ LPCOLESTR szContainerApp, LPCOLESTR szContainerObj) PURE; \
STDMETHOD(Close)(THIS_ DWORD dwSaveOption) PURE; \
STDMETHOD(SetMoniker)(THIS_ DWORD dwWhichMoniker, IMoniker *pmk) PURE; \
STDMETHOD(GetMoniker)(THIS_ DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) PURE; \
STDMETHOD(InitFromData)(THIS_ IDataObject *pDataObject, BOOL fCreation, DWORD dwReserved) PURE; \
STDMETHOD(GetClipboardData)(THIS_ DWORD dwReserved, IDataObject **ppDataObject) PURE; \
STDMETHOD(DoVerb)(THIS_ LONG iVerb, struct tagMSG *lpmsg, IOleClientSite *pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) PURE; \
STDMETHOD(EnumVerbs)(THIS_ IEnumOLEVERB **ppEnumOleVerb) PURE; \
STDMETHOD(Update)(THIS) PURE; \
STDMETHOD(IsUpToDate)(THIS) PURE; \
STDMETHOD(GetUserClassID)(THIS_ CLSID *pClsid) PURE; \
STDMETHOD(GetUserType)(THIS_ DWORD dwFormOfType, LPOLESTR *pszUserType) PURE; \
STDMETHOD(SetExtent)(THIS_ DWORD dwDrawAspect, SIZEL *psizel) PURE; \
STDMETHOD(GetExtent)(THIS_ DWORD dwDrawAspect, SIZEL *psizel) PURE; \
STDMETHOD(Advise)(THIS_ IAdviseSink *pAdvSink, DWORD *pdwConnection) PURE; \
STDMETHOD(Unadvise)(THIS_ DWORD dwConnection) PURE; \
STDMETHOD(EnumAdvise)(THIS_ IEnumSTATDATA **ppenumAdvise) PURE; \
STDMETHOD(GetMiscStatus)(THIS_ DWORD dwAspect, DWORD *pdwStatus) PURE; \
STDMETHOD(SetColorScheme)(THIS_ struct tagLOGPALETTE *pLogpal) PURE;
#define IOleObject_IMETHODS \
IUnknown_IMETHODS \
IOleObject_METHODS
ICOM_DEFINE(IOleObject,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -152,19 +152,19 @@ ICOM_DEFINE(IOleObject,IUnknown)
/*****************************************************************************
* IOleAdviseHolder interface
*/
#define ICOM_INTERFACE IOleAdviseHolder
#define INTERFACE IOleAdviseHolder
#define IOleAdviseHolder_METHODS \
ICOM_METHOD2(HRESULT,Advise, IAdviseSink*,pAdvise, DWORD*,pdwConnection) \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection) \
ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise) \
ICOM_METHOD1(HRESULT,SendOnRename, IMoniker*,pmk) \
ICOM_METHOD (HRESULT,SendOnSave) \
ICOM_METHOD (HRESULT,SendOnClose)
STDMETHOD(Advise)(THIS_ IAdviseSink *pAdvise, DWORD *pdwConnection) PURE; \
STDMETHOD(Unadvise)(THIS_ DWORD dwConnection) PURE; \
STDMETHOD(EnumAdvise)(THIS_ IEnumSTATDATA **ppenumAdvise) PURE; \
STDMETHOD(SendOnRename)(THIS_ IMoniker *pmk) PURE; \
STDMETHOD(SendOnSave)(THIS) PURE; \
STDMETHOD(SendOnClose)(THIS) PURE;
#define IOleAdviseHolder_IMETHODS \
IUnknown_IMETHODS \
IOleAdviseHolder_METHODS
ICOM_DEFINE(IOleAdviseHolder,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleAdviseHolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -182,17 +182,17 @@ ICOM_DEFINE(IOleAdviseHolder,IUnknown)
/*****************************************************************************
* IEnumOLEVERB interface
*/
#define ICOM_INTERFACE IEnumOLEVERB
#define INTERFACE IEnumOLEVERB
#define IEnumOLEVERB_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,celt, LPOLEVERB,rgelt, ULONG*,pceltFetched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumOLEVERB**,ppenum)
STDMETHOD(Next)(THIS_ ULONG celt, LPOLEVERB rgelt, ULONG *pceltFetched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG celt) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumOLEVERB **ppenum) PURE;
#define IEnumOLEVERB_IMETHODS \
IUnknown_IMETHODS \
IEnumOLEVERB_METHODS
ICOM_DEFINE(IEnumOLEVERB,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IEnumOLEVERB_QueryInterface(p,a,b) ICOM_ICALL2(IUnknown,QueryInterface,p,a,b)
......@@ -209,4 +209,3 @@ ICOM_DEFINE(IEnumOLEVERB,IUnknown)
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_OLEOBJ_H */
include/wine/obj_oleundo.h
View file @ f00c46f0
......@@ -99,16 +99,16 @@ typedef struct tagQACONTAINER
/*****************************************************************************
* IQuickActivate interface
*/
#define ICOM_INTERFACE IQuickActivate
#define INTERFACE IQuickActivate
#define IQuickActivate_METHODS \
ICOM_METHOD2(HRESULT,QuickActivate, QACONTAINER*,pQaContainer, QACONTROL*,pQaControl) \
ICOM_METHOD1(HRESULT,SetContentExtent, LPSIZEL,pSizel) \
ICOM_METHOD1(HRESULT,GetContentExtent, LPSIZEL,pSizel)
STDMETHOD(QuickActivate)(THIS_ QACONTAINER *pQaContainer, QACONTROL *pQaControl) PURE; \
STDMETHOD(SetContentExtent)(THIS_ LPSIZEL pSizel) PURE; \
STDMETHOD(GetContentExtent)(THIS_ LPSIZEL pSizel) PURE;
#define IQuickActivate_IMETHODS \
IUnknown_IMETHODS \
IQuickActivate_METHODS
ICOM_DEFINE(IQuickActivate,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IQuickActivate_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -123,16 +123,16 @@ ICOM_DEFINE(IQuickActivate,IUnknown)
/*****************************************************************************
* IPointerInactive interface
*/
#define ICOM_INTERFACE IPointerInactive
#define INTERFACE IPointerInactive
#define IPointerInactive_METHODS \
ICOM_METHOD1(HRESULT,GetActivationPolicy, DWORD*,pdwPolicy) \
ICOM_METHOD4(HRESULT,OnInactiveMouseMove, LPCRECT,pRectBounds, LONG,x, LONG,y, DWORD,grfKeyState) \
ICOM_METHOD5(HRESULT,OnInactiveSetCursor, LPCRECT,pRectBounds, LONG,x, LONG,y, DWORD,dwMouseMsg, BOOL,fSetAlways)
STDMETHOD(GetActivationPolicy)(THIS_ DWORD *pdwPolicy) PURE; \
STDMETHOD(OnInactiveMouseMove)(THIS_ LPCRECT pRectBounds, LONG x, LONG y, DWORD grfKeyState) PURE; \
STDMETHOD(OnInactiveSetCursor)(THIS_ LPCRECT pRectBounds, LONG x, LONG y, DWORD dwMouseMsg, BOOL fSetAlways) PURE;
#define IPointerInactive_IMETHODS \
IUnknown_IMETHODS \
IPointerInactive_METHODS
ICOM_DEFINE(IPointerInactive,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IPointerInactive_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -147,14 +147,14 @@ ICOM_DEFINE(IPointerInactive,IUnknown)
/*****************************************************************************
* IAdviseSinkEx interface
*/
#define ICOM_INTERFACE IAdviseSinkEx
#define INTERFACE IAdviseSinkEx
#define IAdviseSinkEx_METHODS \
ICOM_METHOD1(HRESULT,OnViewStatusChange, DWORD,dwViewStatus)
STDMETHOD(OnViewStatusChange)(THIS_ DWORD dwViewStatus) PURE;
#define IAdviseSinkEx_IMETHODS \
IAdviseSink_IMETHODS \
IAdviseSinkEx_METHODS
ICOM_DEFINE(IAdviseSinkEx,IAdviseSink)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IAdviseSinkEx_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -173,25 +173,25 @@ ICOM_DEFINE(IAdviseSinkEx,IAdviseSink)
/*****************************************************************************
* IOleUndoManager interface
*/
#define ICOM_INTERFACE IOleUndoManager
#define INTERFACE IOleUndoManager
#define IOleUndoManager_METHODS \
ICOM_METHOD1(HRESULT,Open, IOleParentUndoUnit*,pPUU) \
ICOM_METHOD2(HRESULT,Close, IOleParentUndoUnit*,pPUU, BOOL,fCommit) \
ICOM_METHOD1(HRESULT,Add, IOleUndoUnit*,pUU) \
ICOM_METHOD1(HRESULT,GetOpenParentState, DWORD*,pdwState) \
ICOM_METHOD1(HRESULT,DiscardFrom, IOleUndoUnit*,pUU) \
ICOM_METHOD1(HRESULT,UndoTo, IOleUndoUnit*,pUU) \
ICOM_METHOD1(HRESULT,RedoTo, IOleUndoUnit*,pUU) \
ICOM_METHOD1(HRESULT,EnumUndoable, IEnumOleUndoUnits**,ppEnum) \
ICOM_METHOD1(HRESULT,EnumRedoable, IEnumOleUndoUnits**,ppEnum) \
ICOM_METHOD1(HRESULT,GetLastUndoDescription, BSTR*,pBstr) \
ICOM_METHOD1(HRESULT,GetLastRedoDescription, BSTR*,pBstr) \
ICOM_METHOD1(HRESULT,Enable, BOOL,fEnable)
STDMETHOD(Open)(THIS_ IOleParentUndoUnit *pPUU) PURE; \
STDMETHOD(Close)(THIS_ IOleParentUndoUnit *pPUU, BOOL fCommit) PURE; \
STDMETHOD(Add)(THIS_ IOleUndoUnit *pUU) PURE; \
STDMETHOD(GetOpenParentState)(THIS_ DWORD *pdwState) PURE; \
STDMETHOD(DiscardFrom)(THIS_ IOleUndoUnit *pUU) PURE; \
STDMETHOD(UndoTo)(THIS_ IOleUndoUnit *pUU) PURE; \
STDMETHOD(RedoTo)(THIS_ IOleUndoUnit *pUU) PURE; \
STDMETHOD(EnumUndoable)(THIS_ IEnumOleUndoUnits **ppEnum) PURE; \
STDMETHOD(EnumRedoable)(THIS_ IEnumOleUndoUnits **ppEnum) PURE; \
STDMETHOD(GetLastUndoDescription)(THIS_ BSTR *pBstr) PURE; \
STDMETHOD(GetLastRedoDescription)(THIS_ BSTR *pBstr) PURE; \
STDMETHOD(Enable)(THIS_ BOOL fEnable) PURE;
#define IOleUndoManager_IMETHODS \
IUnknown_IMETHODS \
IOleUndoManager_METHODS
ICOM_DEFINE(IOleUndoManager,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleUndoManager_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -215,17 +215,17 @@ ICOM_DEFINE(IOleUndoManager,IUnknown)
/*****************************************************************************
* IOleUndoUnit interface
*/
#define ICOM_INTERFACE IOleUndoUnit
#define INTERFACE IOleUndoUnit
#define IOleUndoUnit_METHODS \
ICOM_METHOD1(HRESULT,Do, IOleUndoManager*,pUndoManager) \
ICOM_METHOD1(HRESULT,GetDescription, BSTR*,pBstr) \
ICOM_METHOD2(HRESULT,GetUnitType, CLSID*,pClsid, LONG*,plID) \
ICOM_METHOD (HRESULT,OnNextAdd)
STDMETHOD(Do)(THIS_ IOleUndoManager *pUndoManager) PURE; \
STDMETHOD(GetDescription)(THIS_ BSTR *pBstr) PURE; \
STDMETHOD(GetUnitType)(THIS_ CLSID *pClsid, LONG *plID) PURE; \
STDMETHOD(OnNextAdd)(THIS) PURE;
#define IOleUndoUnit_IMETHODS \
IUnknown_IMETHODS \
IOleUndoUnit_METHODS
ICOM_DEFINE(IOleUndoUnit,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleUndoUnit_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -242,18 +242,18 @@ ICOM_DEFINE(IOleUndoUnit,IUnknown)
/*****************************************************************************
* IOleUndoUnit interface
*/
#define ICOM_INTERFACE IOleParentUndoUnit
#define INTERFACE IOleParentUndoUnit
#define IOleParentUndoUnit_METHODS \
ICOM_METHOD1(HRESULT,Open, IOleParentUndoUnit*,pPUU) \
ICOM_METHOD2(HRESULT,Close, IOleParentUndoUnit*,pPUU, BOOL,fCommit) \
ICOM_METHOD1(HRESULT,Add, IOleUndoUnit*,pUU) \
ICOM_METHOD1(HRESULT,FindUnit, IOleUndoUnit*,pUU) \
ICOM_METHOD1(HRESULT,GetParentState, DWORD*,pdwState)
STDMETHOD(Open)(THIS_ IOleParentUndoUnit *pPUU) PURE; \
STDMETHOD(Close)(THIS_ IOleParentUndoUnit *pPUU, BOOL fCommit) PURE; \
STDMETHOD(Add)(THIS_ IOleUndoUnit *pUU) PURE; \
STDMETHOD(FindUnit)(THIS_ IOleUndoUnit *pUU) PURE; \
STDMETHOD(GetParentState)(THIS_ DWORD *pdwState) PURE;
#define IOleParentUndoUnit_IMETHODS \
IOleUndoUnit_IMETHODS \
IOleParentUndoUnit_METHODS
ICOM_DEFINE(IOleParentUndoUnit,IOleUndoUnit)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IOleParentUndoUnit_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -275,17 +275,17 @@ ICOM_DEFINE(IOleParentUndoUnit,IOleUndoUnit)
/*****************************************************************************
* IEnumOleUndoUnits interface
*/
#define ICOM_INTERFACE IEnumOleUndoUnits
#define INTERFACE IEnumOleUndoUnits
#define IEnumOleUndoUnits_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,cElt, IOleUndoUnit**,rgElt, ULONG*,pcEltFetched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,cElt) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumOleUndoUnits**,ppEnum)
STDMETHOD(Next)(THIS_ ULONG cElt, IOleUndoUnit **rgElt, ULONG *pcEltFetched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG cElt) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumOleUndoUnits **ppEnum) PURE;
#define IEnumOleUndoUnits_IMETHODS \
IUnknown_IMETHODS \
IEnumOleUndoUnits_METHODS
ICOM_DEFINE(IEnumOleUndoUnits,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IEnumOleUndoUnits_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -302,4 +302,3 @@ ICOM_DEFINE(IEnumOleUndoUnits,IUnknown)
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_OLEUNDO_H */
include/wine/obj_oleview.h
View file @ f00c46f0
......@@ -47,19 +47,19 @@ typedef struct IViewObject2 IViewObject2, *LPVIEWOBJECT2;
*/
typedef BOOL (CALLBACK *IVO_ContCallback)(DWORD);
#define ICOM_INTERFACE IViewObject
#define INTERFACE IViewObject
#define IViewObject_METHODS \
ICOM_METHOD10(HRESULT,Draw, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hdcTargetDev, HDC,hdcDraw, LPCRECTL,lprcBounds, LPCRECTL,lprcWBounds, IVO_ContCallback, pfnContinue, DWORD,dwContinue) \
ICOM_METHOD6(HRESULT,GetColorSet, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hicTargetDevice, struct tagLOGPALETTE**,ppColorSet) \
ICOM_METHOD4(HRESULT,Freeze, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DWORD*,pdwFreeze) \
ICOM_METHOD1(HRESULT,Unfreeze, DWORD,dwFreeze) \
ICOM_METHOD3(HRESULT,SetAdvise, DWORD,aspects, DWORD,advf, IAdviseSink*,pAdvSink) \
ICOM_METHOD3(HRESULT,GetAdvise, DWORD*,pAspects, DWORD*,pAdvf, IAdviseSink**,ppAdvSink)
STDMETHOD(Draw)(THIS_ DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, IVO_ContCallback pfnContinue, DWORD dwContinue) PURE; \
STDMETHOD(GetColorSet)(THIS_ DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDevice, struct tagLOGPALETTE **ppColorSet) PURE; \
STDMETHOD(Freeze)(THIS_ DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) PURE; \
STDMETHOD(Unfreeze)(THIS_ DWORD dwFreeze) PURE; \
STDMETHOD(SetAdvise)(THIS_ DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) PURE; \
STDMETHOD(GetAdvise)(THIS_ DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) PURE;
#define IViewObject_IMETHODS \
IUnknown_IMETHODS \
IViewObject_METHODS
ICOM_DEFINE(IViewObject,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IViewObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -78,14 +78,14 @@ ICOM_DEFINE(IViewObject,IUnknown)
/*****************************************************************************
* IViewObject2 interface
*/
#define ICOM_INTERFACE IViewObject2
#define INTERFACE IViewObject2
#define IViewObject2_METHODS \
ICOM_METHOD4(HRESULT,GetExtent, DWORD,dwDrawAspect, LONG,lindex, DVTARGETDEVICE*,ptd, LPSIZEL,lpsizel)
STDMETHOD(GetExtent)(THIS_ DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE *ptd, LPSIZEL lpsizel) PURE;
#define IViewObject2_IMETHODS \
IViewObject_IMETHODS \
IViewObject2_METHODS
ICOM_DEFINE(IViewObject2,IViewObject)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IViewObject2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -106,4 +106,3 @@ ICOM_DEFINE(IViewObject2,IViewObject)
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_OLEVIEW_H */
include/wine/obj_picture.h
View file @ f00c46f0
......@@ -53,27 +53,27 @@ typedef struct IPictureDisp IPictureDisp, *LPPICTUREDISP;
/*****************************************************************************
* IPicture interface
*/
#define ICOM_INTERFACE IPicture
#define INTERFACE IPicture
#define IPicture_METHODS \
ICOM_METHOD1(HRESULT,get_Handle, OLE_HANDLE*,pHandle) \
ICOM_METHOD1(HRESULT,get_hPal, OLE_HANDLE*,phPal) \
ICOM_METHOD1(HRESULT,get_Type, SHORT*,pType) \
ICOM_METHOD1(HRESULT,get_Width, OLE_XSIZE_HIMETRIC*,pWidth) \
ICOM_METHOD1(HRESULT,get_Height, OLE_YSIZE_HIMETRIC*,pHeight) \
ICOM_METHOD10(HRESULT,Render, HDC,hdc, LONG,x, LONG,y, LONG,cx, LONG,cy, OLE_XPOS_HIMETRIC,xSrc, OLE_YPOS_HIMETRIC,ySrc, OLE_XSIZE_HIMETRIC,cxSrc, OLE_YSIZE_HIMETRIC,cySrc, LPCRECT,pRcWBounds) \
ICOM_METHOD1(HRESULT,set_hPal, OLE_HANDLE,hPal) \
ICOM_METHOD1(HRESULT,get_CurDC, HDC*,phDC) \
ICOM_METHOD3(HRESULT,SelectPicture, HDC,hDCIn, HDC*,phDCOut, OLE_HANDLE*,phBmpOut) \
ICOM_METHOD1(HRESULT,get_KeepOriginalFormat, BOOL*,pKeep) \
ICOM_METHOD1(HRESULT,put_KeepOriginalFormat, BOOL,Keep) \
ICOM_METHOD (HRESULT,PictureChanged) \
ICOM_METHOD3(HRESULT,SaveAsFile, LPSTREAM,pStream, BOOL,fSaveMemCopy, LONG*,pCbSize) \
ICOM_METHOD1(HRESULT,get_Attributes, DWORD*,pDwAttr)
STDMETHOD(get_Handle)(THIS_ OLE_HANDLE *pHandle) PURE; \
STDMETHOD(get_hPal)(THIS_ OLE_HANDLE *phPal) PURE; \
STDMETHOD(get_Type)(THIS_ SHORT *pType) PURE; \
STDMETHOD(get_Width)(THIS_ OLE_XSIZE_HIMETRIC *pWidth) PURE; \
STDMETHOD(get_Height)(THIS_ OLE_YSIZE_HIMETRIC *pHeight) PURE; \
STDMETHOD(Render)(THIS_ HDC hdc, LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, LPCRECT pRcWBounds) PURE; \
STDMETHOD(set_hPal)(THIS_ OLE_HANDLE hPal) PURE; \
STDMETHOD(get_CurDC)(THIS_ HDC *phDC) PURE; \
STDMETHOD(SelectPicture)(THIS_ HDC hDCIn, HDC *phDCOut, OLE_HANDLE *phBmpOut) PURE; \
STDMETHOD(get_KeepOriginalFormat)(THIS_ BOOL *pKeep) PURE; \
STDMETHOD(put_KeepOriginalFormat)(THIS_ BOOL Keep) PURE; \
STDMETHOD(PictureChanged)(THIS) PURE; \
STDMETHOD(SaveAsFile)(THIS_ LPSTREAM pStream, BOOL fSaveMemCopy, LONG *pCbSize) PURE; \
STDMETHOD(get_Attributes)(THIS_ DWORD *pDwAttr) PURE;
#define IPicture_IMETHODS \
IUnknown_IMETHODS \
IPicture_METHODS
ICOM_DEFINE(IPicture,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IPicture_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -99,13 +99,13 @@ ICOM_DEFINE(IPicture,IUnknown)
/*****************************************************************************
* IPictureDisp interface
*/
#define ICOM_INTERFACE IPictureDisp
#define INTERFACE IPictureDisp
#define IPictureDisp_METHODS
#define IPictureDisp_IMETHODS \
IDispatch_IMETHODS \
IPictureDisp_METHODS
ICOM_DEFINE(IPictureDisp,IDispatch)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IPictureDisp_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -123,5 +123,3 @@ ICOM_DEFINE(IPictureDisp,IDispatch)
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_PICTURE_H */
include/wine/obj_serviceprovider.h
View file @ f00c46f0
......@@ -40,14 +40,14 @@ typedef struct IServiceProvider IServiceProvider, *LPSERVICEPROVIDER;
/*****************************************************************************
* IServiceProvider interface
*/
#define ICOM_INTERFACE IServiceProvider
#define INTERFACE IServiceProvider
#define IServiceProvider_METHODS \
ICOM_METHOD3( HRESULT, QueryService, REFGUID, guidService, REFIID, riid, void**, ppv)
STDMETHOD(QueryService)(THIS_ REFGUID guidService, REFIID riid, void ** ppv) PURE;
#define IServiceProvider_IMETHODS \
IUnknown_IMETHODS \
IServiceProvider_METHODS
ICOM_DEFINE(IServiceProvider,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IServiceProvider_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_shellbrowser.h
View file @ f00c46f0
......@@ -66,26 +66,26 @@ DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00,
#define FCT_CONFIGABLE 0x0002
#define FCT_ADDTOEND 0x0004
#define ICOM_INTERFACE IShellBrowser
#define INTERFACE IShellBrowser
#define IShellBrowser_METHODS \
ICOM_METHOD2(HRESULT, InsertMenusSB, HMENU, hmenuShared, LPOLEMENUGROUPWIDTHS, lpMenuWidths) \
ICOM_METHOD3(HRESULT, SetMenuSB, HMENU, hmenuShared, HOLEMENU, holemenuReserved, HWND, hwndActiveObject) \
ICOM_METHOD1(HRESULT, RemoveMenusSB, HMENU, hmenuShared) \
ICOM_METHOD1(HRESULT, SetStatusTextSB, LPCOLESTR, lpszStatusText) \
ICOM_METHOD1(HRESULT, EnableModelessSB, BOOL, fEnable) \
ICOM_METHOD2(HRESULT, TranslateAcceleratorSB, LPMSG, lpmsg, WORD, wID) \
ICOM_METHOD2(HRESULT, BrowseObject, LPCITEMIDLIST, pidl, UINT, wFlags) \
ICOM_METHOD2(HRESULT, GetViewStateStream, DWORD, grfMode, LPSTREAM*, ppStrm) \
ICOM_METHOD2(HRESULT, GetControlWindow, UINT, id, HWND*, lphwnd) \
ICOM_METHOD5(HRESULT, SendControlMsg, UINT, id, UINT, uMsg, WPARAM, wParam, LPARAM, lParam, LRESULT*, pret) \
ICOM_METHOD1(HRESULT, QueryActiveShellView, IShellView**, IShellView) \
ICOM_METHOD1(HRESULT, OnViewWindowActive, IShellView*, IShellView) \
ICOM_METHOD3(HRESULT, SetToolbarItems, LPTBBUTTON, lpButtons, UINT, nButtons, UINT, uFlags)
STDMETHOD(InsertMenusSB)(THIS_ HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) PURE; \
STDMETHOD(SetMenuSB)(THIS_ HMENU hmenuShared, HOLEMENU holemenuReserved, HWND hwndActiveObject) PURE; \
STDMETHOD(RemoveMenusSB)(THIS_ HMENU hmenuShared) PURE; \
STDMETHOD(SetStatusTextSB)(THIS_ LPCOLESTR lpszStatusText) PURE; \
STDMETHOD(EnableModelessSB)(THIS_ BOOL fEnable) PURE; \
STDMETHOD(TranslateAcceleratorSB)(THIS_ LPMSG lpmsg, WORD wID) PURE; \
STDMETHOD(BrowseObject)(THIS_ LPCITEMIDLIST pidl, UINT wFlags) PURE; \
STDMETHOD(GetViewStateStream)(THIS_ DWORD grfMode, LPSTREAM * ppStrm) PURE; \
STDMETHOD(GetControlWindow)(THIS_ UINT id, HWND * lphwnd) PURE; \
STDMETHOD(SendControlMsg)(THIS_ UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT * pret) PURE; \
STDMETHOD(QueryActiveShellView)(THIS_ IShellView ** IShellView) PURE; \
STDMETHOD(OnViewWindowActive)(THIS_ IShellView * IShellView) PURE; \
STDMETHOD(SetToolbarItems)(THIS_ LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags) PURE;
#define IShellBrowser_IMETHODS \
IOleWindow_IMETHODS \
IShellBrowser_METHODS
ICOM_DEFINE(IShellBrowser,IOleWindow)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IShellBrowser_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_shellextinit.h
View file @ f00c46f0
......@@ -27,14 +27,14 @@ extern "C" {
typedef struct IShellExtInit IShellExtInit, *LPSHELLEXTINIT;
#define ICOM_INTERFACE IShellExtInit
#define INTERFACE IShellExtInit
#define IShellExtInit_METHODS \
ICOM_METHOD3(HRESULT, Initialize, LPCITEMIDLIST, pidlFolder, LPDATAOBJECT, lpdobj, HKEY, hkeyProgID)
STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST pidlFolder, LPDATAOBJECT lpdobj, HKEY hkeyProgID) PURE;
#define IShellExtInit_IMETHODS \
IUnknown_IMETHODS \
IShellExtInit_METHODS
ICOM_DEFINE(IShellExtInit,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IShellExtInit_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_shellfolder.h
View file @ f00c46f0
......@@ -78,17 +78,17 @@ typedef struct
WCHAR wszClrIcon[MAX_PATH+10];
} EXTRASEARCH,* LPEXTRASEARCH;
#define ICOM_INTERFACE IEnumExtraSearch
#define INTERFACE IEnumExtraSearch
#define IEnumExtraSearch_METHODS \
ICOM_METHOD3(HRESULT, Next, ULONG, celt, LPEXTRASEARCH*, rgelt, ULONG*, pceltFetched) \
ICOM_METHOD1(HRESULT, Skip, ULONG, celt) \
ICOM_METHOD (HRESULT, Reset) \
ICOM_METHOD1(HRESULT, Clone, IEnumExtraSearch**, ppenum)
STDMETHOD(Next)(THIS_ ULONG celt, LPEXTRASEARCH * rgelt, ULONG * pceltFetched) PURE; \
STDMETHOD(Skip)(THIS_ ULONG celt) PURE; \
STDMETHOD(Reset)(THIS) PURE; \
STDMETHOD(Clone)(THIS_ IEnumExtraSearch ** ppenum) PURE;
#define IEnumExtraSearch_IMETHODS \
IUnknown_IMETHODS \
IEnumExtraSearch_METHODS
ICOM_DEFINE(IEnumExtraSearch,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IEnumIDList_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -196,23 +196,23 @@ DWORD WINAPI SHGetDesktopFolder(IShellFolder * *);
/*****************************************************************************
* IShellFolder interface
*/
#define ICOM_INTERFACE IShellFolder
#define INTERFACE IShellFolder
#define IShellFolder_METHODS \
ICOM_METHOD6( HRESULT, ParseDisplayName, HWND, hwndOwner,LPBC, pbcReserved, LPOLESTR, lpszDisplayName, ULONG *, pchEaten, LPITEMIDLIST *, ppidl, ULONG *, pdwAttributes) \
ICOM_METHOD3( HRESULT, EnumObjects, HWND, hwndOwner, DWORD, grfFlags, LPENUMIDLIST *, ppenumIDList)\
ICOM_METHOD4( HRESULT, BindToObject, LPCITEMIDLIST, pidl, LPBC, pbcReserved, REFIID, riid, LPVOID *, ppvOut)\
ICOM_METHOD4( HRESULT, BindToStorage, LPCITEMIDLIST, pidl, LPBC, pbcReserved, REFIID, riid, LPVOID *, ppvObj)\
ICOM_METHOD3( HRESULT, CompareIDs, LPARAM, lParam, LPCITEMIDLIST, pidl1, LPCITEMIDLIST, pidl2)\
ICOM_METHOD3( HRESULT, CreateViewObject, HWND, hwndOwner, REFIID, riid, LPVOID *, ppvOut)\
ICOM_METHOD3( HRESULT, GetAttributesOf, UINT, cidl, LPCITEMIDLIST *, apidl, ULONG *, rgfInOut)\
ICOM_METHOD6( HRESULT, GetUIObjectOf, HWND, hwndOwner, UINT, cidl, LPCITEMIDLIST *, apidl, REFIID, riid, UINT *, prgfInOut, LPVOID *, ppvOut)\
ICOM_METHOD3( HRESULT, GetDisplayNameOf, LPCITEMIDLIST, pidl, DWORD, uFlags, LPSTRRET, lpName)\
ICOM_METHOD5( HRESULT, SetNameOf, HWND, hwndOwner, LPCITEMIDLIST, pidl,LPCOLESTR, lpszName, DWORD, uFlags,LPITEMIDLIST *, ppidlOut)
STDMETHOD(ParseDisplayName)(THIS_ HWND hwndOwner,LPBC pbcReserved, LPOLESTR lpszDisplayName, ULONG * pchEaten, LPITEMIDLIST * ppidl, ULONG * pdwAttributes) PURE; \
STDMETHOD(EnumObjects)(THIS_ HWND hwndOwner, DWORD grfFlags, LPENUMIDLIST * ppenumIDList) PURE;\
STDMETHOD(BindToObject)(THIS_ LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) PURE;\
STDMETHOD(BindToStorage)(THIS_ LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvObj) PURE;\
STDMETHOD(CompareIDs)(THIS_ LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) PURE;\
STDMETHOD(CreateViewObject)(THIS_ HWND hwndOwner, REFIID riid, LPVOID * ppvOut) PURE;\
STDMETHOD(GetAttributesOf)(THIS_ UINT cidl, LPCITEMIDLIST * apidl, ULONG * rgfInOut) PURE;\
STDMETHOD(GetUIObjectOf)(THIS_ HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) PURE;\
STDMETHOD(GetDisplayNameOf)(THIS_ LPCITEMIDLIST pidl, DWORD uFlags, LPSTRRET lpName) PURE;\
STDMETHOD(SetNameOf)(THIS_ HWND hwndOwner, LPCITEMIDLIST pidl,LPCOLESTR lpszName, DWORD uFlags,LPITEMIDLIST * ppidlOut) PURE;
#define IShellFolder_IMETHODS \
IUnknown_IMETHODS \
IShellFolder_METHODS
ICOM_DEFINE(IShellFolder,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IShellFolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -268,20 +268,20 @@ typedef struct
STRRET str;
} SHELLDETAILS, *LPSHELLDETAILS;
#define ICOM_INTERFACE IShellFolder2
#define INTERFACE IShellFolder2
#define IShellFolder2_METHODS \
ICOM_METHOD1( HRESULT, GetDefaultSearchGUID, LPGUID, lpguid)\
ICOM_METHOD1( HRESULT, EnumSearches, LPENUMEXTRASEARCH *, ppEnum) \
ICOM_METHOD3( HRESULT, GetDefaultColumn, DWORD, dwReserved, ULONG *, pSort, ULONG *, pDisplay)\
ICOM_METHOD2( HRESULT, GetDefaultColumnState, UINT, iColumn, DWORD *, pcsFlags)\
ICOM_METHOD3( HRESULT, GetDetailsEx, LPCITEMIDLIST, pidl, const SHCOLUMNID *, pscid, VARIANT *, pv)\
ICOM_METHOD3( HRESULT, GetDetailsOf, LPCITEMIDLIST, pidl, UINT, iColumn, LPSHELLDETAILS, pDetails)\
ICOM_METHOD2( HRESULT, MapNameToSCID, LPCWSTR, pwszName, SHCOLUMNID *, pscid)
STDMETHOD(GetDefaultSearchGUID)(THIS_ LPGUID lpguid) PURE;\
STDMETHOD(EnumSearches)(THIS_ LPENUMEXTRASEARCH * ppEnum) PURE; \
STDMETHOD(GetDefaultColumn)(THIS_ DWORD dwReserved, ULONG * pSort, ULONG * pDisplay) PURE;\
STDMETHOD(GetDefaultColumnState)(THIS_ UINT iColumn, DWORD * pcsFlags) PURE;\
STDMETHOD(GetDetailsEx)(THIS_ LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) PURE;\
STDMETHOD(GetDetailsOf)(THIS_ LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) PURE;\
STDMETHOD(MapNameToSCID)(THIS_ LPCWSTR pwszName, SHCOLUMNID * pscid) PURE;
#define IShellFolder2_IMETHODS \
IShellFolder_METHODS \
IShellFolder2_METHODS
ICOM_DEFINE(IShellFolder2, IShellFolder)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IShellFolder2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -311,14 +311,14 @@ ICOM_DEFINE(IShellFolder2, IShellFolder)
* IPersistFolder interface
*/
#define ICOM_INTERFACE IPersistFolder
#define INTERFACE IPersistFolder
#define IPersistFolder_METHODS \
ICOM_METHOD1( HRESULT, Initialize, LPCITEMIDLIST, pidl)
STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST pidl) PURE;
#define IPersistFolder_IMETHODS \
IPersist_IMETHODS \
IPersistFolder_METHODS
ICOM_DEFINE(IPersistFolder, IPersist)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IPersistFolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -333,15 +333,15 @@ ICOM_DEFINE(IPersistFolder, IPersist)
* IPersistFolder2 interface
*/
#define ICOM_INTERFACE IPersistFolder2
#define INTERFACE IPersistFolder2
#define IPersistFolder2_METHODS \
ICOM_METHOD1( HRESULT, GetCurFolder, LPITEMIDLIST*, pidl)
STDMETHOD(GetCurFolder)(THIS_ LPITEMIDLIST * pidl) PURE;
#define IPersistFolder2_IMETHODS \
IPersist_IMETHODS \
IPersistFolder_METHODS \
IPersistFolder2_METHODS
ICOM_DEFINE(IPersistFolder2, IPersistFolder)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IPersistFolder2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -367,17 +367,17 @@ typedef struct {
int csidl;
} PERSIST_FOLDER_TARGET_INFO;
#define ICOM_INTERFACE IPersistFolder3
#define INTERFACE IPersistFolder3
#define IPersistFolder3_METHODS \
ICOM_METHOD3( HRESULT, InitializeEx, IBindCtx*, pbc, LPCITEMIDLIST, pidlRoot, const PERSIST_FOLDER_TARGET_INFO*, ppfti)\
ICOM_METHOD1( HRESULT, GetFolderTargetInfo, PERSIST_FOLDER_TARGET_INFO*, ppfti)
STDMETHOD(InitializeEx)(THIS_ IBindCtx * pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO * ppfti) PURE;\
STDMETHOD(GetFolderTargetInfo)(THIS_ PERSIST_FOLDER_TARGET_INFO * ppfti) PURE;
#define IPersistFolder3_IMETHODS \
IPersist_IMETHODS \
IPersistFolder_METHODS \
IPersistFolder2_METHODS \
IPersistFolder3_METHODS
ICOM_DEFINE(IPersistFolder3, IPersistFolder2)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IPersistFolder3_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_shelllink.h
View file @ f00c46f0
......@@ -52,31 +52,31 @@ typedef enum
/*****************************************************************************
* IShellLink interface
*/
#define ICOM_INTERFACE IShellLinkA
#define INTERFACE IShellLinkA
#define IShellLinkA_METHODS \
ICOM_METHOD4( HRESULT, GetPath, LPSTR, pszFile, INT, cchMaxPath, WIN32_FIND_DATAA *, pfd, DWORD, fFlags) \
ICOM_METHOD1( HRESULT, GetIDList, LPITEMIDLIST *, ppidl) \
ICOM_METHOD1( HRESULT, SetIDList, LPCITEMIDLIST, pidl) \
ICOM_METHOD2( HRESULT, GetDescription, LPSTR, pszName, INT, cchMaxName) \
ICOM_METHOD1( HRESULT, SetDescription, LPCSTR, pszName) \
ICOM_METHOD2( HRESULT, GetWorkingDirectory, LPSTR, pszDir,INT, cchMaxPath) \
ICOM_METHOD1( HRESULT, SetWorkingDirectory, LPCSTR, pszDir) \
ICOM_METHOD2( HRESULT, GetArguments, LPSTR, pszArgs, INT, cchMaxPath) \
ICOM_METHOD1( HRESULT, SetArguments, LPCSTR, pszArgs) \
ICOM_METHOD1( HRESULT, GetHotkey, WORD*, pwHotkey) \
ICOM_METHOD1( HRESULT, SetHotkey, WORD, wHotkey) \
ICOM_METHOD1( HRESULT, GetShowCmd, INT*, piShowCmd) \
ICOM_METHOD1( HRESULT, SetShowCmd, INT, iShowCmd) \
ICOM_METHOD3( HRESULT, GetIconLocation, LPSTR, pszIconPath, INT, cchIconPath,INT *, piIcon) \
ICOM_METHOD2( HRESULT, SetIconLocation, LPCSTR, pszIconPath,INT, iIcon) \
ICOM_METHOD2( HRESULT, SetRelativePath, LPCSTR, pszPathRel, DWORD, dwReserved) \
ICOM_METHOD2( HRESULT, Resolve, HWND, hwnd, DWORD, fFlags) \
ICOM_METHOD1( HRESULT, SetPath, LPCSTR, pszFile)
STDMETHOD(GetPath)(THIS_ LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA * pfd, DWORD fFlags) PURE; \
STDMETHOD(GetIDList)(THIS_ LPITEMIDLIST * ppidl) PURE; \
STDMETHOD(SetIDList)(THIS_ LPCITEMIDLIST pidl) PURE; \
STDMETHOD(GetDescription)(THIS_ LPSTR pszName, INT cchMaxName) PURE; \
STDMETHOD(SetDescription)(THIS_ LPCSTR pszName) PURE; \
STDMETHOD(GetWorkingDirectory)(THIS_ LPSTR pszDir,INT cchMaxPath) PURE; \
STDMETHOD(SetWorkingDirectory)(THIS_ LPCSTR pszDir) PURE; \
STDMETHOD(GetArguments)(THIS_ LPSTR pszArgs, INT cchMaxPath) PURE; \
STDMETHOD(SetArguments)(THIS_ LPCSTR pszArgs) PURE; \
STDMETHOD(GetHotkey)(THIS_ WORD * pwHotkey) PURE; \
STDMETHOD(SetHotkey)(THIS_ WORD wHotkey) PURE; \
STDMETHOD(GetShowCmd)(THIS_ INT * piShowCmd) PURE; \
STDMETHOD(SetShowCmd)(THIS_ INT iShowCmd) PURE; \
STDMETHOD(GetIconLocation)(THIS_ LPSTR pszIconPath, INT cchIconPath,INT * piIcon) PURE; \
STDMETHOD(SetIconLocation)(THIS_ LPCSTR pszIconPath,INT iIcon) PURE; \
STDMETHOD(SetRelativePath)(THIS_ LPCSTR pszPathRel, DWORD dwReserved) PURE; \
STDMETHOD(Resolve)(THIS_ HWND hwnd, DWORD fFlags) PURE; \
STDMETHOD(SetPath)(THIS_ LPCSTR pszFile) PURE;
#define IShellLinkA_IMETHODS \
IUnknown_IMETHODS \
IShellLinkA_METHODS
ICOM_DEFINE(IShellLinkA,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IShellLinkA_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -105,31 +105,31 @@ ICOM_DEFINE(IShellLinkA,IUnknown)
/*****************************************************************************
* IShellLinkW interface
*/
#define ICOM_INTERFACE IShellLinkW
#define INTERFACE IShellLinkW
#define IShellLinkW_METHODS \
ICOM_METHOD4( HRESULT, GetPath, LPWSTR, pszFile, INT, cchMaxPath, WIN32_FIND_DATAA *, pfd, DWORD, fFlags) \
ICOM_METHOD1( HRESULT, GetIDList, LPITEMIDLIST *, ppidl) \
ICOM_METHOD1( HRESULT, SetIDList, LPCITEMIDLIST, pidl) \
ICOM_METHOD2( HRESULT, GetDescription, LPWSTR, pszName, INT, cchMaxName) \
ICOM_METHOD1( HRESULT, SetDescription, LPCWSTR, pszName) \
ICOM_METHOD2( HRESULT, GetWorkingDirectory, LPWSTR, pszDir,INT, cchMaxPath) \
ICOM_METHOD1( HRESULT, SetWorkingDirectory, LPCWSTR, pszDir) \
ICOM_METHOD2( HRESULT, GetArguments, LPWSTR, pszArgs, INT, cchMaxPath) \
ICOM_METHOD1( HRESULT, SetArguments, LPCWSTR, pszArgs) \
ICOM_METHOD1( HRESULT, GetHotkey, WORD*, pwHotkey) \
ICOM_METHOD1( HRESULT, SetHotkey, WORD, wHotkey) \
ICOM_METHOD1( HRESULT, GetShowCmd, INT*, piShowCmd) \
ICOM_METHOD1( HRESULT, SetShowCmd, INT, iShowCmd) \
ICOM_METHOD3( HRESULT, GetIconLocation, LPWSTR, pszIconPath, INT, cchIconPath,INT *, piIcon) \
ICOM_METHOD2( HRESULT, SetIconLocation, LPCWSTR, pszIconPath,INT, iIcon) \
ICOM_METHOD2( HRESULT, SetRelativePath, LPCWSTR, pszPathRel, DWORD, dwReserved) \
ICOM_METHOD2( HRESULT, Resolve, HWND, hwnd, DWORD, fFlags) \
ICOM_METHOD1( HRESULT, SetPath, LPCWSTR, pszFile)
STDMETHOD(GetPath)(THIS_ LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA * pfd, DWORD fFlags) PURE; \
STDMETHOD(GetIDList)(THIS_ LPITEMIDLIST * ppidl) PURE; \
STDMETHOD(SetIDList)(THIS_ LPCITEMIDLIST pidl) PURE; \
STDMETHOD(GetDescription)(THIS_ LPWSTR pszName, INT cchMaxName) PURE; \
STDMETHOD(SetDescription)(THIS_ LPCWSTR pszName) PURE; \
STDMETHOD(GetWorkingDirectory)(THIS_ LPWSTR pszDir,INT cchMaxPath) PURE; \
STDMETHOD(SetWorkingDirectory)(THIS_ LPCWSTR pszDir) PURE; \
STDMETHOD(GetArguments)(THIS_ LPWSTR pszArgs, INT cchMaxPath) PURE; \
STDMETHOD(SetArguments)(THIS_ LPCWSTR pszArgs) PURE; \
STDMETHOD(GetHotkey)(THIS_ WORD * pwHotkey) PURE; \
STDMETHOD(SetHotkey)(THIS_ WORD wHotkey) PURE; \
STDMETHOD(GetShowCmd)(THIS_ INT * piShowCmd) PURE; \
STDMETHOD(SetShowCmd)(THIS_ INT iShowCmd) PURE; \
STDMETHOD(GetIconLocation)(THIS_ LPWSTR pszIconPath, INT cchIconPath,INT * piIcon) PURE; \
STDMETHOD(SetIconLocation)(THIS_ LPCWSTR pszIconPath,INT iIcon) PURE; \
STDMETHOD(SetRelativePath)(THIS_ LPCWSTR pszPathRel, DWORD dwReserved) PURE; \
STDMETHOD(Resolve)(THIS_ HWND hwnd, DWORD fFlags) PURE; \
STDMETHOD(SetPath)(THIS_ LPCWSTR pszFile) PURE;
#define IShellLinkW_IMETHODS \
IUnknown_IMETHODS \
IShellLinkW_METHODS
ICOM_DEFINE(IShellLinkW,IUnknown)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IShellLinkW_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_shellview.h
View file @ f00c46f0
......@@ -127,25 +127,25 @@ typedef enum
SVUIA_INPLACEACTIVATE = 3 /* new flag for IShellView2 */
} SVUIA_STATUS;
#define ICOM_INTERFACE IShellView
#define INTERFACE IShellView
#define IShellView_METHODS \
ICOM_METHOD1(HRESULT, TranslateAccelerator, LPMSG, lpmsg) \
ICOM_METHOD1(HRESULT, EnableModeless, BOOL, fEnable) \
ICOM_METHOD1(HRESULT, UIActivate, UINT, uState) \
ICOM_METHOD(HRESULT, Refresh) \
ICOM_METHOD5(HRESULT, CreateViewWindow, IShellView*, lpPrevView, LPCFOLDERSETTINGS, lpfs, IShellBrowser*, psb, RECT*, prcView, HWND*, phWnd) \
ICOM_METHOD(HRESULT, DestroyViewWindow) \
ICOM_METHOD1(HRESULT, GetCurrentInfo, LPFOLDERSETTINGS, lpfs) \
ICOM_METHOD3(HRESULT, AddPropertySheetPages, DWORD, dwReserved, LPFNADDPROPSHEETPAGE, lpfn, LPARAM, lparam) \
ICOM_METHOD (HRESULT, SaveViewState) \
ICOM_METHOD2(HRESULT, SelectItem, LPCITEMIDLIST, pidlItem, UINT, uFlags) \
ICOM_METHOD3(HRESULT, GetItemObject, UINT, uItem, REFIID, riid, LPVOID*, ppv) \
ICOM_METHOD1(HRESULT, EditItem, LPCITEMIDLIST, pidlItem)
STDMETHOD(TranslateAccelerator)(THIS_ LPMSG lpmsg) PURE; \
STDMETHOD(EnableModeless)(THIS_ BOOL fEnable) PURE; \
STDMETHOD(UIActivate)(THIS_ UINT uState) PURE; \
STDMETHOD(Refresh)(THIS) PURE; \
STDMETHOD(CreateViewWindow)(THIS_ IShellView * lpPrevView, LPCFOLDERSETTINGS lpfs, IShellBrowser * psb, RECT * prcView, HWND * phWnd) PURE; \
STDMETHOD(DestroyViewWindow)(THIS) PURE; \
STDMETHOD(GetCurrentInfo)(THIS_ LPFOLDERSETTINGS lpfs) PURE; \
STDMETHOD(AddPropertySheetPages)(THIS_ DWORD dwReserved, LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam) PURE; \
STDMETHOD(SaveViewState)(THIS) PURE; \
STDMETHOD(SelectItem)(THIS_ LPCITEMIDLIST pidlItem, UINT uFlags) PURE; \
STDMETHOD(GetItemObject)(THIS_ UINT uItem, REFIID riid, LPVOID * ppv) PURE; \
STDMETHOD(EditItem)(THIS_ LPCITEMIDLIST pidlItem) PURE;
#define IShellView_IMETHODS \
IOleWindow_IMETHODS \
IShellView_METHODS
ICOM_DEFINE(IShellView,IOleWindow)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IShellView_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/wine/obj_webbrowser.h
View file @ f00c46f0
......@@ -63,39 +63,39 @@ typedef enum RefreshConstants
/*****************************************************************************
* IWebBrowser interface
*/
#define ICOM_INTERFACE IWebBrowser
#define INTERFACE IWebBrowser
#define IWebBrowser_METHODS \
ICOM_METHOD(HRESULT,GoBack) \
ICOM_METHOD(HRESULT,GoForward) \
ICOM_METHOD(HRESULT,GoHome) \
ICOM_METHOD(HRESULT,GoSearch) \
ICOM_METHOD5(HRESULT,Navigate, BSTR,URL, VARIANT*,Flags, VARIANT*,TargetFrameName, \
VARIANT*,PostData, VARIANT*,Headers) \
ICOM_METHOD(HRESULT,Refresh) \
ICOM_METHOD1(HRESULT,Refresh2, VARIANT*,Level) \
ICOM_METHOD(HRESULT,Stop) \
ICOM_METHOD1(HRESULT,get_Application, void**,ppDisp) \
ICOM_METHOD1(HRESULT,get_Parent, void**,ppDisp) \
ICOM_METHOD1(HRESULT,get_Container, void**,ppDisp) \
ICOM_METHOD1(HRESULT,get_Document, void**,ppDisp) \
ICOM_METHOD1(HRESULT,get_TopLevelContainer, VARIANT*,pBool) \
ICOM_METHOD1(HRESULT,get_Type, BSTR*,Type) \
ICOM_METHOD1(HRESULT,get_Left, long*,pl) \
ICOM_METHOD1(HRESULT,put_Left, long,Left) \
ICOM_METHOD1(HRESULT,get_Top, long*,pl) \
ICOM_METHOD1(HRESULT,put_Top, long,Top) \
ICOM_METHOD1(HRESULT,get_Width, long*,pl) \
ICOM_METHOD1(HRESULT,put_Width, long,Width) \
ICOM_METHOD1(HRESULT,get_Height, long*,pl) \
ICOM_METHOD1(HRESULT,put_Height, long,Height) \
ICOM_METHOD1(HRESULT,get_LocationName, BSTR*,LocationName) \
ICOM_METHOD1(HRESULT,get_LocationURL, BSTR*,LocationURL) \
ICOM_METHOD1(HRESULT,get_Busy, VARIANT*,pBool)
STDMETHOD(GoBack)(THIS) PURE; \
STDMETHOD(GoForward)(THIS) PURE; \
STDMETHOD(GoHome)(THIS) PURE; \
STDMETHOD(GoSearch)(THIS) PURE; \
STDMETHOD(Navigate)(THIS_ BSTR URL, VARIANT *Flags, VARIANT *TargetFrameName, \
VARIANT *PostData, VARIANT *Headers) PURE; \
STDMETHOD(Refresh)(THIS) PURE; \
STDMETHOD(Refresh2)(THIS_ VARIANT *Level) PURE; \
STDMETHOD(Stop)(THIS) PURE; \
STDMETHOD(get_Application)(THIS_ void **ppDisp) PURE; \
STDMETHOD(get_Parent)(THIS_ void **ppDisp) PURE; \
STDMETHOD(get_Container)(THIS_ void **ppDisp) PURE; \
STDMETHOD(get_Document)(THIS_ void **ppDisp) PURE; \
STDMETHOD(get_TopLevelContainer)(THIS_ VARIANT *pBool) PURE; \
STDMETHOD(get_Type)(THIS_ BSTR *Type) PURE; \
STDMETHOD(get_Left)(THIS_ long *pl) PURE; \
STDMETHOD(put_Left)(THIS_ long Left) PURE; \
STDMETHOD(get_Top)(THIS_ long *pl) PURE; \
STDMETHOD(put_Top)(THIS_ long Top) PURE; \
STDMETHOD(get_Width)(THIS_ long *pl) PURE; \
STDMETHOD(put_Width)(THIS_ long Width) PURE; \
STDMETHOD(get_Height)(THIS_ long *pl) PURE; \
STDMETHOD(put_Height)(THIS_ long Height) PURE; \
STDMETHOD(get_LocationName)(THIS_ BSTR *LocationName) PURE; \
STDMETHOD(get_LocationURL)(THIS_ BSTR *LocationURL) PURE; \
STDMETHOD(get_Busy)(THIS_ VARIANT *pBool) PURE;
#define IWebBrowser_IMETHODS \
IDispatch_IMETHODS \
IWebBrowser_METHODS
ICOM_DEFINE(IWebBrowser,IDispatch)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IWebBrowser_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......@@ -133,34 +133,34 @@ ICOM_DEFINE(IWebBrowser,IDispatch)
#define IWebBrowser_get_LocationURL(p,a) ICOM_CALL1(get_LocationURL,p,a)
#define IWebBrowser_get_Busy(p,a) ICOM_CALL1(get_Busy,p,a)
#define ICOM_INTERFACE IWebBrowserApp
#define INTERFACE IWebBrowserApp
#define IWebBrowserApp_METHODS \
ICOM_METHOD(HRESULT,Quit) \
ICOM_METHOD2(HRESULT,ClientToWindow,int*,pcx,int*,pcy) \
ICOM_METHOD2(HRESULT,PutProperty,BSTR,szProperty,VARIANT,vtValue) \
ICOM_METHOD2(HRESULT,GetProperty,BSTR,szProperty,VARIANT*,pvtValue) \
ICOM_METHOD1(HRESULT,get_Name,BSTR*,Name) \
ICOM_METHOD1(HRESULT,get_HWND,long*,pHWND) \
ICOM_METHOD1(HRESULT,get_FullName,BSTR*,FullName) \
ICOM_METHOD1(HRESULT,get_Path,BSTR*,Path) \
ICOM_METHOD1(HRESULT,get_Visible,VARIANT_BOOL*,pBool) \
ICOM_METHOD1(HRESULT,put_Visible,VARIANT_BOOL,Value) \
ICOM_METHOD1(HRESULT,get_StatusBar,VARIANT_BOOL*,pBool) \
ICOM_METHOD1(HRESULT,put_StatusBar,VARIANT_BOOL,Value) \
ICOM_METHOD1(HRESULT,get_StatusText,BSTR*,StatusText) \
ICOM_METHOD1(HRESULT,put_StatusText,BSTR,StatusText) \
ICOM_METHOD1(HRESULT,get_ToolBar,int*,Value) \
ICOM_METHOD1(HRESULT,put_ToolBar,int,Value) \
ICOM_METHOD1(HRESULT,get_MenuBar,VARIANT_BOOL*,Value) \
ICOM_METHOD1(HRESULT,put_MenuBar,VARIANT_BOOL,Value) \
ICOM_METHOD1(HRESULT,get_FullScreen,VARIANT_BOOL*,pbFullScreen) \
ICOM_METHOD1(HRESULT,put_FullScreen,VARIANT_BOOL,bFullScreen)
STDMETHOD(Quit)(THIS) PURE; \
STDMETHOD(ClientToWindow)(THIS_ int *pcx,int *pcy) PURE; \
STDMETHOD(PutProperty)(THIS_ BSTR szProperty,VARIANT vtValue) PURE; \
STDMETHOD(GetProperty)(THIS_ BSTR szProperty,VARIANT *pvtValue) PURE; \
STDMETHOD(get_Name)(THIS_ BSTR *Name) PURE; \
STDMETHOD(get_HWND)(THIS_ long *pHWND) PURE; \
STDMETHOD(get_FullName)(THIS_ BSTR *FullName) PURE; \
STDMETHOD(get_Path)(THIS_ BSTR *Path) PURE; \
STDMETHOD(get_Visible)(THIS_ VARIANT_BOOL *pBool) PURE; \
STDMETHOD(put_Visible)(THIS_ VARIANT_BOOL Value) PURE; \
STDMETHOD(get_StatusBar)(THIS_ VARIANT_BOOL *pBool) PURE; \
STDMETHOD(put_StatusBar)(THIS_ VARIANT_BOOL Value) PURE; \
STDMETHOD(get_StatusText)(THIS_ BSTR *StatusText) PURE; \
STDMETHOD(put_StatusText)(THIS_ BSTR StatusText) PURE; \
STDMETHOD(get_ToolBar)(THIS_ int *Value) PURE; \
STDMETHOD(put_ToolBar)(THIS_ int Value) PURE; \
STDMETHOD(get_MenuBar)(THIS_ VARIANT_BOOL *Value) PURE; \
STDMETHOD(put_MenuBar)(THIS_ VARIANT_BOOL Value) PURE; \
STDMETHOD(get_FullScreen)(THIS_ VARIANT_BOOL *pbFullScreen) PURE; \
STDMETHOD(put_FullScreen)(THIS_ VARIANT_BOOL bFullScreen) PURE;
#define IWebBrowserApp_IMETHODS \
IDispatch_IMETHODS \
IWebBrowser_METHODS \
IWebBrowserApp_METHODS
ICOM_DEFINE(IWebBrowserApp,IWebBrowser)
#undef ICOM_INTERFACE
#undef INTERFACE
/*** IUnknown methods ***/
#define IWebBrowserApp_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
......
include/winnt.h
View file @ f00c46f0
......@@ -274,7 +274,6 @@
# define EXTERN_C extern
#endif
#ifndef __WINESRC__
#define STDMETHODCALLTYPE __stdcall
#define STDMETHODVCALLTYPE __cdecl
#define STDAPICALLTYPE __stdcall
......@@ -288,7 +287,6 @@
#define STDAPIV_(type) EXTERN_C type STDAPIVCALLTYPE
#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE
#define STDMETHODIMPV_(type) type STDMETHODVCALLTYPE
#endif
/* Define the basic types */
#ifndef VOID
......
tools/widl/header.c
View file @ f00c46f0
......@@ -425,48 +425,36 @@ var_t *is_callas(attr_t *a)
static void write_icom_method_def(type_t *iface)
{
func_t *cur = iface->funcs;
if (iface->ref) write_icom_method_def( iface->ref );
while (NEXT_LINK(cur)) cur = NEXT_LINK(cur);
if (cur) fprintf( header, " \\\n /*** %s methods ***/", iface->name );
while (cur) {
var_t *def = cur->def;
if (!is_callas(def->attrs)) {
var_t *arg = cur->args;
int argc = 0;
if (arg) {
argc++;
while (NEXT_LINK(arg)) {
arg = NEXT_LINK(arg);
argc++;
}
}
fprintf(header, " \\\n");
if (!is_void(def->type, def)) {
if (argc)
fprintf(header, " ICOM_METHOD%d (", argc);
else
fprintf(header, " ICOM_METHOD (");
write_type(header, def->type, def, def->tname);
fprintf(header, ",");
} else
if (argc)
fprintf(header, " ICOM_VMETHOD%d(", argc);
else
fprintf(header, " ICOM_VMETHOD (");
fprintf(header, " \\\n ");
write_type(header, def->type, def, def->tname);
fprintf(header, " (STDMETHODCALLTYPE *");
write_name(header, def);
fprintf(header, ")(INTERFACE *This");
while (arg) {
fprintf(header, ",");
fprintf(header, ", ");
write_type(header, arg->type, arg, arg->tname);
/* since the ICOM macros can't express arrays,
* we have to pretend they're pointers instead */
if (arg->array) fprintf(header, "*");
fprintf(header, ",");
fprintf(header, " ");
write_name(header,arg);
write_array(header, arg->array, 0);
arg = PREV_LINK(arg);
}
fprintf(header, ")");
fprintf(header, ");");
}
cur = PREV_LINK(cur);
}
fprintf(header, "\n");
}
static int write_method_macro(type_t *iface, char *name)
......@@ -543,10 +531,9 @@ void write_args(FILE *h, var_t *arg, char *name, int method)
else fprintf(h, " ");
}
write_type(h, arg->type, arg, arg->tname);
if (method && use_icom && arg->array) fprintf(h, "*"); /* as write_icom_method_def */
fprintf(h, " ");
write_name(h, arg);
if (!(method && use_icom)) write_array(h, arg->array, 0);
write_array(h, arg->array, 0);
arg = PREV_LINK(arg);
count++;
}
......@@ -563,7 +550,7 @@ static void write_cpp_method_def(type_t *iface)
indent(0);
fprintf(header, "virtual ");
write_type(header, def->type, def, def->tname);
fprintf(header, " CALLBACK ");
fprintf(header, " STDMETHODCALLTYPE ");
write_name(header, def);
fprintf(header, "(\n");
write_args(header, cur->args, iface->name, 2);
......@@ -587,7 +574,7 @@ static void do_write_c_method_def(type_t *iface, char *name)
if (!is_callas(def->attrs)) {
indent(0);
write_type(header, def->type, def, def->tname);
fprintf(header, " (CALLBACK *");
fprintf(header, " (STDMETHODCALLTYPE *");
write_name(header, def);
fprintf(header, ")(\n");
write_args(header, cur->args, name, 1);
......@@ -709,59 +696,39 @@ void write_com_interface(type_t *iface)
fprintf(header, " */\n");
write_guid(iface);
write_forward(iface);
if (use_icom) {
fprintf(header, "#define ICOM_INTERFACE %s\n", iface->name);
fprintf(header, "#define %s_METHODS", iface->name);
write_icom_method_def(iface);
fprintf(header, "#define %s_IMETHODS \\\n", iface->name);
if (iface->ref)
fprintf(header, " %s_IMETHODS \\\n", iface->ref->name);
fprintf(header, " %s_METHODS\n", iface->name);
if (iface->ref)
fprintf(header, "ICOM_DEFINE(%s,%s)\n", iface->name, iface->ref->name);
else
fprintf(header, "ICOM_DEFINE1(%s)\n", iface->name);
fprintf(header, "#undef ICOM_INTERFACE\n");
fprintf(header, "\n");
write_method_macro(iface, iface->name);
}
else {
/* C++ interface */
fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n");
fprintf(header, "struct %s", iface->name);
if (iface->ref)
/* C++ interface */
fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n");
fprintf(header, "struct %s", iface->name);
if (iface->ref)
fprintf(header, ": %s", iface->ref->name);
fprintf(header, " {\n");
indentation++;
fprintf(header, "\n");
write_cpp_method_def(iface);
indentation--;
fprintf(header, "} ICOM_COM_INTERFACE_ATTRIBUTE;\n");
fprintf(header, "#else\n");
/* C interface */
fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name);
fprintf(header, "struct %s {\n", iface->name);
fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name);
fprintf(header, "};\n");
fprintf(header, "struct %sVtbl {\n", iface->name);
indentation++;
fprintf(header, " ICOM_MSVTABLE_COMPAT_FIELDS\n");
fprintf(header, "\n");
write_c_method_def(iface);
indentation--;
fprintf(header, "};\n");
fprintf(header, "\n");
if (compat_icom) {
fprintf(header, " {\n");
indentation++;
fprintf(header, "\n");
write_cpp_method_def(iface);
indentation--;
fprintf(header, "} ICOM_COM_INTERFACE_ATTRIBUTE;\n");
fprintf(header, "#else\n");
/* C interface */
fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name);
fprintf(header, "struct %s {\n", iface->name);
fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name);
fprintf(header, "};\n");
fprintf(header, "struct %sVtbl {\n", iface->name);
indentation++;
fprintf(header, " ICOM_MSVTABLE_COMPAT_FIELDS\n");
fprintf(header, "\n");
write_c_method_def(iface);
indentation--;
fprintf(header, "};\n");
fprintf(header, "\n");
if (compat_icom) {
fprintf(header, "#define %s_IMETHODS", iface->name);
if (iface->ref)
fprintf(header, " \\\n %s_IMETHODS", iface->ref->name);
write_icom_method_def(iface);
fprintf(header, "\n");
}
write_method_macro(iface, iface->name);
fprintf(header, "\n");
fprintf(header, "#endif\n");
fprintf(header, "\n\n");
}
write_method_macro(iface, iface->name);
fprintf(header, "\n");
fprintf(header, "#endif\n");
fprintf(header, "\n");
write_method_proto(iface);
fprintf(header, "\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment