diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 856f4ca5cb5..5028345f11c 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -52,7 +52,7 @@ typedef struct _EditStreamTable { #define IEditStreamInternal_METHODS \ IUnknown_METHODS \ STDMETHOD(GetEditStreamImpl)(THIS_ LPVOID*) PURE; -ICOM_DEFINE(IEditStreamInternal, IUnknown) +DECLARE_INTERFACE_(IEditStreamInternal, IUnknown) { IEditStreamInternal_METHODS }; #undef INTERFACE #define EditStreamEnd(This,streamNr) ((This)->pStreams[streamNr].dwStart + \ diff --git a/dlls/dplayx/dplaysp.h b/dlls/dplayx/dplaysp.h index 9e4ec4f72b1..1af02bebcde 100644 --- a/dlls/dplayx/dplaysp.h +++ b/dlls/dplayx/dplaysp.h @@ -71,7 +71,7 @@ typedef BOOL (CALLBACK *LPENUMMRUCALLBACK)( LPCVOID lpData, 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; -ICOM_DEFINE(IDirectPlaySP,IUnknown) +DECLARE_INTERFACE_(IDirectPlaySP,IUnknown) { IDirectPlaySP_METHODS }; #undef INTERFACE diff --git a/dlls/dplayx/lobbysp.h b/dlls/dplayx/lobbysp.h index 40b276656ff..cd93887c5a6 100644 --- a/dlls/dplayx/lobbysp.h +++ b/dlls/dplayx/lobbysp.h @@ -480,7 +480,7 @@ HRESULT WINAPI DPLSPInit(LPSPDATA_INIT); STDMETHOD(SetSessionDesc)(THIS_ LPSPDATA_SETSESSIONDESC ssd ) PURE; \ STDMETHOD(SetSPDataPointer)(THIS_ LPVOID lpData ) PURE; \ STDMETHOD(StartSession)(THIS_ LPSPDATA_STARTSESSIONCOMMAND ssc ) PURE; -ICOM_DEFINE(IDPLobbySP,IUnknown) +DECLARE_INTERFACE_(IDPLobbySP,IUnknown) { IDPLobbySP_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/dlls/ole32/ifs.h b/dlls/ole32/ifs.h index 02f2e54d64a..bdeb35c6888 100644 --- a/dlls/ole32/ifs.h +++ b/dlls/ole32/ifs.h @@ -44,7 +44,7 @@ typedef struct IMalloc16 IMalloc16, *LPMALLOC16; STDMETHOD_(DWORD,GetSize)(THIS_ LPVOID pv) PURE; \ STDMETHOD_(INT16,DidAlloc)(THIS_ LPVOID pv) PURE; \ STDMETHOD_(LPVOID,HeapMinimize)(THIS) PURE; -ICOM_DEFINE(IMalloc16,IUnknown) +DECLARE_INTERFACE_(IMalloc16,IUnknown) { IMalloc16_METHODS }; #undef INTERFACE /**********************************************************************/ @@ -65,7 +65,7 @@ typedef struct ILockBytes16 *LPLOCKBYTES16, ILockBytes16; 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; -ICOM_DEFINE(ILockBytes16,IUnknown) +DECLARE_INTERFACE_(ILockBytes16,IUnknown) { ILockBytes16_METHODS }; #undef INTERFACE /**********************************************************************/ @@ -99,7 +99,7 @@ typedef struct IStream16 IStream16, *LPSTREAM16; STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE; \ STDMETHOD(Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE; \ STDMETHOD(Clone)(THIS_ IStream16** ppstm) PURE; -ICOM_DEFINE(IStream16,ISequentialStream) +DECLARE_INTERFACE_(IStream16,ISequentialStream) { IStream16_METHODS }; #undef INTERFACE /**********************************************************************/ @@ -126,7 +126,7 @@ typedef struct IStorage16 IStorage16, *LPSTORAGE16; STDMETHOD_(HRESULT,SetClass)(THIS_ REFCLSID clsid) PURE; \ STDMETHOD_(HRESULT,SetStateBits)(THIS_ DWORD grfStateBits, DWORD grfMask) PURE; \ STDMETHOD_(HRESULT,Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE; -ICOM_DEFINE(IStorage16,IUnknown) +DECLARE_INTERFACE_(IStorage16,IUnknown) { IStorage16_METHODS }; #undef INTERFACE #endif /* __WINE_OLE_IFS_H */ diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h index 8c8901e4c57..4c35096b2a1 100644 --- a/dlls/shell32/shellfolder.h +++ b/dlls/shell32/shellfolder.h @@ -46,7 +46,7 @@ typedef struct ISFHelper ISFHelper, *LPISFHELPER; 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; -ICOM_DEFINE(ISFHelper, IUnknown) +DECLARE_INTERFACE_(ISFHelper, IUnknown) { ISFHelper_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/control.h b/include/control.h index 01cf987a2f1..2aa3a732437 100644 --- a/include/control.h +++ b/include/control.h @@ -42,7 +42,7 @@ typedef LONG_PTR OAEVENT; STDMETHOD(get_FilterCollection)(THIS_ IDispatch ** ppUnk) PURE; \ STDMETHOD(get_RegFilterCollection)(THIS_ IDispatch ** ppUnk) PURE; \ STDMETHOD(StopWhenReady)(THIS) PURE; -ICOM_DEFINE(IMediaControl,IDispatch) +DECLARE_INTERFACE_(IMediaControl,IDispatch) { IMediaControl_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -74,7 +74,7 @@ ICOM_DEFINE(IMediaControl,IDispatch) STDMETHOD(get_Volume)(THIS_ long * plVolume) PURE; \ STDMETHOD(put_Balance)(THIS_ long lBalance) PURE; \ STDMETHOD(get_Balance)(THIS_ long * plBalance) PURE; -ICOM_DEFINE(IBasicAudio,IDispatch) +DECLARE_INTERFACE_(IBasicAudio,IDispatch) { IBasicAudio_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -129,7 +129,7 @@ ICOM_DEFINE(IBasicAudio,IDispatch) STDMETHOD(GetCurrentImage)(THIS_ long * pBufferSize, long * pDIBImage) PURE; \ STDMETHOD(IsUsingDefaultSource)(THIS) PURE; \ STDMETHOD(IsUsingDefaultDestination)(THIS) PURE; -ICOM_DEFINE(IBasicVideo,IDispatch) +DECLARE_INTERFACE_(IBasicVideo,IDispatch) { IBasicVideo_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -219,7 +219,7 @@ ICOM_DEFINE(IBasicVideo,IDispatch) STDMETHOD(GetRestorePosition)(THIS_ long * pLeft, long * pTop, long * pWidth, long * pHeight) PURE; \ STDMETHOD(HideCursor)(THIS_ long HideCursor) PURE; \ STDMETHOD(IsCursorHidden)(THIS_ long * CursorHidden) PURE; -ICOM_DEFINE(IVideoWindow,IDispatch) +DECLARE_INTERFACE_(IVideoWindow,IDispatch) { IVideoWindow_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -283,7 +283,7 @@ ICOM_DEFINE(IVideoWindow,IDispatch) STDMETHOD(CancelDefaultHandling)(THIS_ long lEvCode) PURE; \ STDMETHOD(RestoreDefaultHandling)(THIS_ long lEvCode) PURE; \ STDMETHOD(FreeEventParams)(THIS_ long lEvCode, LONG_PTR lParam1, LONG_PTR lParam2) PURE; -ICOM_DEFINE(IMediaEvent,IDispatch) +DECLARE_INTERFACE_(IMediaEvent,IDispatch) { IMediaEvent_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -311,7 +311,7 @@ ICOM_DEFINE(IMediaEvent,IDispatch) STDMETHOD(SetNotifyWindow)(THIS_ OAHWND hwnd, long lMsg, LONG_PTR lInstanceData) PURE; \ STDMETHOD(SetNotifyFlags)(THIS_ long lNoNotifyFlags) PURE; \ STDMETHOD(GetNotifyFlags)(THIS_ long * lplNoNotifyFlags) PURE; -ICOM_DEFINE(IMediaEventEx,IMediaEvent) +DECLARE_INTERFACE_(IMediaEventEx,IMediaEvent) { IMediaEventEx_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/d3d.h b/include/d3d.h index a5418bb893a..5916916a754 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -208,7 +208,7 @@ typedef DWORD D3DVIEWPORTHANDLE, *LPD3DVIEWPORTHANDLE; STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL *lplpDirect3DMaterial, IUnknown *pUnkOuter) PURE; \ STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT *lplpD3DViewport, IUnknown *pUnkOuter) PURE; \ STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE; -ICOM_DEFINE(IDirect3D,IUnknown) +DECLARE_INTERFACE_(IDirect3D,IUnknown) { IDirect3D_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -238,7 +238,7 @@ ICOM_DEFINE(IDirect3D,IUnknown) STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter) PURE; \ STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; \ STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, LPDIRECTDRAWSURFACE lpDDS, LPDIRECT3DDEVICE2 *lplpD3DDevice2) PURE; -ICOM_DEFINE(IDirect3D2,IUnknown) +DECLARE_INTERFACE_(IDirect3D2,IUnknown) { IDirect3D2_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -271,7 +271,7 @@ ICOM_DEFINE(IDirect3D2,IUnknown) STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk) PURE; \ STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE; \ STDMETHOD(EvictManagedTextures)(THIS) PURE; -ICOM_DEFINE(IDirect3D3,IUnknown) +DECLARE_INTERFACE_(IDirect3D3,IUnknown) { IDirect3D3_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -302,7 +302,7 @@ ICOM_DEFINE(IDirect3D3,IUnknown) STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER7 *lplpD3DVertBuf,DWORD dwFlags) PURE; \ STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE; \ STDMETHOD(EvictManagedTextures)(THIS) PURE; -ICOM_DEFINE(IDirect3D7,IUnknown) +DECLARE_INTERFACE_(IDirect3D7,IUnknown) { IDirect3D7_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -328,7 +328,7 @@ ICOM_DEFINE(IDirect3D7,IUnknown) STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; \ STDMETHOD(SetLight)(THIS_ LPD3DLIGHT lpLight) PURE; \ STDMETHOD(GetLight)(THIS_ LPD3DLIGHT lpLight) PURE; -ICOM_DEFINE(IDirect3DLight,IUnknown) +DECLARE_INTERFACE_(IDirect3DLight,IUnknown) { IDirect3DLight_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -355,7 +355,7 @@ ICOM_DEFINE(IDirect3DLight,IUnknown) STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DMATERIALHANDLE lpHandle) PURE; \ STDMETHOD(Reserve)(THIS) PURE; \ STDMETHOD(Unreserve)(THIS) PURE; -ICOM_DEFINE(IDirect3DMaterial,IUnknown) +DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown) { IDirect3DMaterial_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -382,7 +382,7 @@ ICOM_DEFINE(IDirect3DMaterial,IUnknown) STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; \ STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; \ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DMATERIALHANDLE lpHandle) PURE; -ICOM_DEFINE(IDirect3DMaterial2,IUnknown) +DECLARE_INTERFACE_(IDirect3DMaterial2,IUnknown) { IDirect3DMaterial2_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -406,7 +406,7 @@ ICOM_DEFINE(IDirect3DMaterial2,IUnknown) STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; \ STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; \ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE3 lpDirect3DDevice3, LPD3DMATERIALHANDLE lpHandle) PURE; -ICOM_DEFINE(IDirect3DMaterial3,IUnknown) +DECLARE_INTERFACE_(IDirect3DMaterial3,IUnknown) { IDirect3DMaterial3_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -432,7 +432,7 @@ ICOM_DEFINE(IDirect3DMaterial3,IUnknown) STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; \ STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE lpD3DTexture) PURE; \ STDMETHOD(Unload)(THIS) PURE; -ICOM_DEFINE(IDirect3DTexture,IUnknown) +DECLARE_INTERFACE_(IDirect3DTexture,IUnknown) { IDirect3DTexture_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -458,7 +458,7 @@ ICOM_DEFINE(IDirect3DTexture,IUnknown) STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DTEXTUREHANDLE lpHandle) PURE; \ STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; \ STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE2 lpD3DTexture2) PURE; -ICOM_DEFINE(IDirect3DTexture2,IUnknown) +DECLARE_INTERFACE_(IDirect3DTexture2,IUnknown) { IDirect3DTexture2_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -492,7 +492,7 @@ ICOM_DEFINE(IDirect3DTexture2,IUnknown) STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; \ STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; \ STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; -ICOM_DEFINE(IDirect3DViewport,IUnknown) +DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) { IDirect3DViewport_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -525,7 +525,7 @@ ICOM_DEFINE(IDirect3DViewport,IUnknown) IDirect3DViewport_METHODS \ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; \ STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; -ICOM_DEFINE(IDirect3DViewport2,IDirect3DViewport) +DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) { IDirect3DViewport2_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -561,7 +561,7 @@ ICOM_DEFINE(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(SetBackgroundDepth2)(THIS_ LPDIRECTDRAWSURFACE4 lpDDS) PURE; \ STDMETHOD(GetBackgroundDepth2)(THIS_ LPDIRECTDRAWSURFACE4 *lplpDDS,LPBOOL lpValid) PURE; \ STDMETHOD(Clear2)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,DWORD dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; -ICOM_DEFINE(IDirect3DViewport3,IDirect3DViewport2) +DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) { IDirect3DViewport3_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -607,7 +607,7 @@ ICOM_DEFINE(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(GetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE; \ STDMETHOD(Validate)(THIS_ LPDWORD lpdwOffset, LPD3DVALIDATECALLBACK lpFunc, LPVOID lpUserArg, DWORD dwReserved) PURE; \ STDMETHOD(Optimize)(THIS_ DWORD dwDummy) PURE; -ICOM_DEFINE(IDirect3DExecuteBuffer,IUnknown) +DECLARE_INTERFACE_(IDirect3DExecuteBuffer,IUnknown) { IDirect3DExecuteBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -651,7 +651,7 @@ ICOM_DEFINE(IDirect3DExecuteBuffer,IUnknown) STDMETHOD(BeginScene)(THIS) PURE; \ STDMETHOD(EndScene)(THIS) PURE; \ STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D *lplpDirect3D) PURE; -ICOM_DEFINE(IDirect3DDevice,IUnknown) +DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) { IDirect3DDevice_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -719,7 +719,7 @@ ICOM_DEFINE(IDirect3DDevice,IUnknown) STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; \ STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; \ STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; -ICOM_DEFINE(IDirect3DDevice2,IUnknown) +DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) { IDirect3DDevice2_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -806,7 +806,7 @@ ICOM_DEFINE(IDirect3DDevice2,IUnknown) STDMETHOD(GetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,LPDWORD lpdwState) PURE; \ STDMETHOD(SetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,DWORD dwState) PURE; \ STDMETHOD(ValidateDevice)(THIS_ LPDWORD lpdwPasses) PURE; -ICOM_DEFINE(IDirect3DDevice3,IUnknown) +DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) { IDirect3DDevice3_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -908,7 +908,7 @@ ICOM_DEFINE(IDirect3DDevice3,IUnknown) STDMETHOD(SetClipPlane)(THIS_ DWORD dwIndex,D3DVALUE *pPlaneEquation) PURE; \ STDMETHOD(GetClipPlane)(THIS_ DWORD dwIndex,D3DVALUE *pPlaneEquation) PURE; \ STDMETHOD(GetInfo)(THIS_ DWORD dwDevInfoID,LPVOID pDevInfoStruct,DWORD dwSize) PURE; -ICOM_DEFINE(IDirect3DDevice7,IUnknown) +DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) { IDirect3DDevice7_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -976,7 +976,7 @@ ICOM_DEFINE(IDirect3DDevice7,IUnknown) STDMETHOD(ProcessVertices)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPDIRECT3DVERTEXBUFFER lpSrcBuffer,DWORD dwSrcIndex,LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE; \ STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; \ STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE; -ICOM_DEFINE(IDirect3DVertexBuffer,IUnknown) +DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown) { IDirect3DVertexBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1004,7 +1004,7 @@ ICOM_DEFINE(IDirect3DVertexBuffer,IUnknown) STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; \ STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE; \ STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPD3DDRAWPRIMITIVESTRIDEDDATA lpStrideData,DWORD dwVertexTypeDesc,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE; -ICOM_DEFINE(IDirect3DVertexBuffer7,IUnknown) +DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown) { IDirect3DVertexBuffer7_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/d3d8.h b/include/d3d8.h index 30c70d5f00a..9772acced84 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -132,7 +132,7 @@ typedef struct IDirect3DVolumeTexture8 IDirect3DVolumeTexture8, *LPDIRECT3DVOL STDMETHOD(GetDeviceCaps)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS8 * pCaps) PURE; \ STDMETHOD_(HMONITOR,GetAdapterMonitor)(THIS_ UINT Adapter) PURE; \ STDMETHOD(CreateDevice)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType,HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS * pPresentationParameters, IDirect3DDevice8 ** ppReturnedDeviceInterface) PURE; -ICOM_DEFINE(IDirect3D8,IUnknown) +DECLARE_INTERFACE_(IDirect3D8,IUnknown) { IDirect3D8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -256,7 +256,7 @@ ICOM_DEFINE(IDirect3D8,IUnknown) STDMETHOD(DrawRectPatch)(THIS_ UINT Handle,CONST float * pNumSegs,CONST D3DRECTPATCH_INFO * pRectPatchInfo) PURE; \ STDMETHOD(DrawTriPatch)(THIS_ UINT Handle,CONST float * pNumSegs,CONST D3DTRIPATCH_INFO * pTriPatchInfo) PURE; \ STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; -ICOM_DEFINE(IDirect3DDevice8,IUnknown) +DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) { IDirect3DDevice8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -375,7 +375,7 @@ ICOM_DEFINE(IDirect3DDevice8,IUnknown) STDMETHOD(GetDesc)(THIS_ D3DVOLUME_DESC * pDesc) PURE; \ STDMETHOD(LockBox)(THIS_ D3DLOCKED_BOX * pLockedVolume,CONST D3DBOX * pBox, DWORD Flags) PURE; \ STDMETHOD(UnlockBox)(THIS) PURE; -ICOM_DEFINE(IDirect3DVolume8,IUnknown) +DECLARE_INTERFACE_(IDirect3DVolume8,IUnknown) { IDirect3DVolume8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -402,7 +402,7 @@ ICOM_DEFINE(IDirect3DVolume8,IUnknown) IUnknown_METHODS \ STDMETHOD(Present)(THIS_ CONST RECT * pSourceRect, CONST RECT * pDestRect, HWND hDestWindowOverride,CONST RGNDATA * pDirtyRegion) PURE; \ STDMETHOD(GetBackBuffer)(THIS_ UINT BackBuffer, D3DBACKBUFFER_TYPE Type,IDirect3DSurface8 ** ppBackBuffer) PURE; -ICOM_DEFINE(IDirect3DSwapChain8,IUnknown) +DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) { IDirect3DSwapChain8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -429,7 +429,7 @@ ICOM_DEFINE(IDirect3DSwapChain8,IUnknown) STDMETHOD(GetDesc)(THIS_ D3DSURFACE_DESC * pDesc) PURE; \ STDMETHOD(LockRect)(THIS_ D3DLOCKED_RECT * pLockedRect, CONST RECT * pRect,DWORD Flags) PURE; \ STDMETHOD(UnlockRect)(THIS) PURE; -ICOM_DEFINE(IDirect3DSurface8,IUnknown) +DECLARE_INTERFACE_(IDirect3DSurface8,IUnknown) { IDirect3DSurface8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -462,7 +462,7 @@ ICOM_DEFINE(IDirect3DSurface8,IUnknown) STDMETHOD_(DWORD,GetPriority)(THIS) PURE; \ STDMETHOD_(void,PreLoad)(THIS) PURE; \ STDMETHOD_(D3DRESOURCETYPE,GetType)(THIS) PURE; -ICOM_DEFINE(IDirect3DResource8,IUnknown) +DECLARE_INTERFACE_(IDirect3DResource8,IUnknown) { IDirect3DResource8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -490,7 +490,7 @@ ICOM_DEFINE(IDirect3DResource8,IUnknown) STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, BYTE ** ppbData, DWORD Flags) PURE; \ STDMETHOD(Unlock)(THIS) PURE; \ STDMETHOD(GetDesc)(THIS_ D3DVERTEXBUFFER_DESC * pDesc) PURE; -ICOM_DEFINE(IDirect3DVertexBuffer8,IDirect3DResource8) +DECLARE_INTERFACE_(IDirect3DVertexBuffer8,IDirect3DResource8) { IDirect3DVertexBuffer8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -522,7 +522,7 @@ ICOM_DEFINE(IDirect3DVertexBuffer8,IDirect3DResource8) STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, BYTE ** ppbData, DWORD Flags) PURE; \ STDMETHOD(Unlock)(THIS) PURE; \ STDMETHOD(GetDesc)(THIS_ D3DINDEXBUFFER_DESC * pDesc) PURE; -ICOM_DEFINE(IDirect3DIndexBuffer8,IDirect3DResource8) +DECLARE_INTERFACE_(IDirect3DIndexBuffer8,IDirect3DResource8) { IDirect3DIndexBuffer8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -554,7 +554,7 @@ ICOM_DEFINE(IDirect3DIndexBuffer8,IDirect3DResource8) STDMETHOD_(DWORD,SetLOD)(THIS_ DWORD LODNew) PURE; \ STDMETHOD_(DWORD,GetLOD)(THIS) PURE; \ STDMETHOD_(DWORD,GetLevelCount)(THIS) PURE; -ICOM_DEFINE(IDirect3DBaseTexture8,IDirect3DResource8) +DECLARE_INTERFACE_(IDirect3DBaseTexture8,IDirect3DResource8) { IDirect3DBaseTexture8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -588,7 +588,7 @@ ICOM_DEFINE(IDirect3DBaseTexture8,IDirect3DResource8) STDMETHOD(LockRect)(THIS_ D3DCUBEMAP_FACES FaceType,UINT Level,D3DLOCKED_RECT * pLockedRect,CONST RECT * pRect,DWORD Flags) PURE; \ STDMETHOD(UnlockRect)(THIS_ D3DCUBEMAP_FACES FaceType,UINT Level) PURE; \ STDMETHOD(AddDirtyRect)(THIS_ D3DCUBEMAP_FACES FaceType,CONST RECT * pDirtyRect) PURE; -ICOM_DEFINE(IDirect3DCubeTexture8,IDirect3DBaseTexture8) +DECLARE_INTERFACE_(IDirect3DCubeTexture8,IDirect3DBaseTexture8) { IDirect3DCubeTexture8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -628,7 +628,7 @@ ICOM_DEFINE(IDirect3DCubeTexture8,IDirect3DBaseTexture8) STDMETHOD(LockRect)(THIS_ UINT Level,D3DLOCKED_RECT * pLockedRect,CONST RECT * pRect,DWORD Flags) PURE; \ STDMETHOD(UnlockRect)(THIS_ UINT Level) PURE; \ STDMETHOD(AddDirtyRect)(THIS_ CONST RECT * pDirtyRect) PURE; -ICOM_DEFINE(IDirect3DTexture8,IDirect3DBaseTexture8) +DECLARE_INTERFACE_(IDirect3DTexture8,IDirect3DBaseTexture8) { IDirect3DTexture8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -668,7 +668,7 @@ ICOM_DEFINE(IDirect3DTexture8,IDirect3DBaseTexture8) STDMETHOD(LockBox)(THIS_ UINT Level,D3DLOCKED_BOX * pLockedVolume,CONST D3DBOX * pBox,DWORD Flags) PURE; \ STDMETHOD(UnlockBox)(THIS_ UINT Level) PURE; \ STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX * pDirtyBox) PURE; -ICOM_DEFINE(IDirect3DVolumeTexture8,IDirect3DBaseTexture8) +DECLARE_INTERFACE_(IDirect3DVolumeTexture8,IDirect3DBaseTexture8) { IDirect3DVolumeTexture8_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/d3d9.h b/include/d3d9.h index 1ac4c512239..1fa04b6d4d0 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -163,7 +163,7 @@ typedef struct IDirect3DQuery9 IDirect3DQuery9, *LPDIRECT3DQUERY9 STDMETHOD(GetDeviceCaps)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) PURE; \ STDMETHOD_(HMONITOR, GetAdapterMonitor)(THIS_ UINT Adapter) PURE; \ STDMETHOD(CreateDevice)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DDevice9** ppReturnedDeviceInterface) PURE; -ICOM_DEFINE(IDirect3D9,IUnknown) +DECLARE_INTERFACE_(IDirect3D9,IUnknown) { IDirect3D9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -310,7 +310,7 @@ ICOM_DEFINE(IDirect3D9,IUnknown) STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) PURE; \ STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; \ STDMETHOD(CreateQuery)(THIS_ D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) PURE; -ICOM_DEFINE(IDirect3DDevice9, IUnknown) +DECLARE_INTERFACE_(IDirect3DDevice9, IUnknown) { IDirect3DDevice9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -451,7 +451,7 @@ ICOM_DEFINE(IDirect3DDevice9, IUnknown) STDMETHOD(GetDesc)(THIS_ D3DVOLUME_DESC* pDesc) PURE; \ STDMETHOD(LockBox)(THIS_ D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; \ STDMETHOD(UnlockBox)(THIS) PURE; -ICOM_DEFINE(IDirect3DVolume9,IUnknown) +DECLARE_INTERFACE_(IDirect3DVolume9,IUnknown) { IDirect3DVolume9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -483,7 +483,7 @@ ICOM_DEFINE(IDirect3DVolume9,IUnknown) STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE* pMode) PURE; \ STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE; \ STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS* pPresentationParameters) PURE; -ICOM_DEFINE(IDirect3DSwapChain9,IUnknown) +DECLARE_INTERFACE_(IDirect3DSwapChain9,IUnknown) { IDirect3DSwapChain9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -515,7 +515,7 @@ ICOM_DEFINE(IDirect3DSwapChain9,IUnknown) STDMETHOD_(DWORD, GetPriority)(THIS) PURE; \ STDMETHOD_(void, PreLoad)(THIS) PURE; \ STDMETHOD_(D3DRESOURCETYPE, GetType)(THIS) PURE; -ICOM_DEFINE(IDirect3DResource9,IUnknown) +DECLARE_INTERFACE_(IDirect3DResource9,IUnknown) { IDirect3DResource9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -546,7 +546,7 @@ ICOM_DEFINE(IDirect3DResource9,IUnknown) STDMETHOD(UnlockRect)(THIS) PURE; \ STDMETHOD(GetDC)(THIS_ HDC* phdc) PURE; \ STDMETHOD(ReleaseDC)(THIS_ HDC hdc) PURE; -ICOM_DEFINE(IDirect3DSurface9,IDirect3DResource9) +DECLARE_INTERFACE_(IDirect3DSurface9,IDirect3DResource9) { IDirect3DSurface9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -581,7 +581,7 @@ ICOM_DEFINE(IDirect3DSurface9,IDirect3DResource9) STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags) PURE; \ STDMETHOD(Unlock)(THIS) PURE; \ STDMETHOD(GetDesc)(THIS_ D3DVERTEXBUFFER_DESC* pDesc) PURE; -ICOM_DEFINE(IDirect3DVertexBuffer9,IDirect3DResource9) +DECLARE_INTERFACE_(IDirect3DVertexBuffer9,IDirect3DResource9) { IDirect3DVertexBuffer9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -613,7 +613,7 @@ ICOM_DEFINE(IDirect3DVertexBuffer9,IDirect3DResource9) STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags) PURE; \ STDMETHOD(Unlock)(THIS) PURE; \ STDMETHOD(GetDesc)(THIS_ D3DINDEXBUFFER_DESC* pDesc) PURE; -ICOM_DEFINE(IDirect3DIndexBuffer9,IDirect3DResource9) +DECLARE_INTERFACE_(IDirect3DIndexBuffer9,IDirect3DResource9) { IDirect3DIndexBuffer9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -648,7 +648,7 @@ ICOM_DEFINE(IDirect3DIndexBuffer9,IDirect3DResource9) STDMETHOD(SetAutoGenFilterType)(THIS_ D3DTEXTUREFILTERTYPE FilterType) PURE; \ STDMETHOD_(D3DTEXTUREFILTERTYPE, GetAutoGenFilterType)(THIS) PURE; \ STDMETHOD_(void, GenerateMipSubLevels)(THIS) PURE; -ICOM_DEFINE(IDirect3DBaseTexture9,IDirect3DResource9) +DECLARE_INTERFACE_(IDirect3DBaseTexture9,IDirect3DResource9) { IDirect3DBaseTexture9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -685,7 +685,7 @@ ICOM_DEFINE(IDirect3DBaseTexture9,IDirect3DResource9) STDMETHOD(LockRect)(THIS_ D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) PURE; \ STDMETHOD(UnlockRect)(THIS_ D3DCUBEMAP_FACES FaceType, UINT Level) PURE; \ STDMETHOD(AddDirtyRect)(THIS_ D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) PURE; -ICOM_DEFINE(IDirect3DCubeTexture9,IDirect3DBaseTexture9) +DECLARE_INTERFACE_(IDirect3DCubeTexture9,IDirect3DBaseTexture9) { IDirect3DCubeTexture9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -728,7 +728,7 @@ ICOM_DEFINE(IDirect3DCubeTexture9,IDirect3DBaseTexture9) STDMETHOD(LockRect)(THIS_ UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) PURE; \ STDMETHOD(UnlockRect)(THIS_ UINT Level) PURE; \ STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pDirtyRect) PURE; -ICOM_DEFINE(IDirect3DTexture9,IDirect3DBaseTexture9) +DECLARE_INTERFACE_(IDirect3DTexture9,IDirect3DBaseTexture9) { IDirect3DTexture9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -771,7 +771,7 @@ ICOM_DEFINE(IDirect3DTexture9,IDirect3DBaseTexture9) STDMETHOD(LockBox)(THIS_ UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; \ STDMETHOD(UnlockBox)(THIS_ UINT Level) PURE; \ STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE; -ICOM_DEFINE(IDirect3DVolumeTexture9,IDirect3DBaseTexture9) +DECLARE_INTERFACE_(IDirect3DVolumeTexture9,IDirect3DBaseTexture9) { IDirect3DVolumeTexture9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -811,7 +811,7 @@ ICOM_DEFINE(IDirect3DVolumeTexture9,IDirect3DBaseTexture9) IUnknown_METHODS \ STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE; \ STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9*, UINT* pNumElements) PURE; -ICOM_DEFINE(IDirect3DVertexDeclaration9, IUnknown) +DECLARE_INTERFACE_(IDirect3DVertexDeclaration9, IUnknown) { IDirect3DVertexDeclaration9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -832,7 +832,7 @@ ICOM_DEFINE(IDirect3DVertexDeclaration9, IUnknown) IUnknown_METHODS \ STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE; \ STDMETHOD(GetFunction)(THIS_ void*, UINT* pSizeOfData) PURE; -ICOM_DEFINE(IDirect3DVertexShader9,IUnknown) +DECLARE_INTERFACE_(IDirect3DVertexShader9,IUnknown) { IDirect3DVertexShader9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -853,7 +853,7 @@ ICOM_DEFINE(IDirect3DVertexShader9,IUnknown) IUnknown_METHODS \ STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE; \ STDMETHOD(GetFunction)(THIS_ void*, UINT* pSizeOfData) PURE; -ICOM_DEFINE(IDirect3DPixelShader9,IUnknown) +DECLARE_INTERFACE_(IDirect3DPixelShader9,IUnknown) { IDirect3DPixelShader9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -875,7 +875,7 @@ ICOM_DEFINE(IDirect3DPixelShader9,IUnknown) STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE; \ STDMETHOD(Capture)(THIS) PURE; \ STDMETHOD(Apply)(THIS) PURE; -ICOM_DEFINE(IDirect3DStateBlock9,IUnknown) +DECLARE_INTERFACE_(IDirect3DStateBlock9,IUnknown) { IDirect3DStateBlock9_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -900,7 +900,7 @@ ICOM_DEFINE(IDirect3DStateBlock9,IUnknown) STDMETHOD_(DWORD, GetDataSize)(THIS) PURE; \ STDMETHOD(Issue)(THIS_ DWORD dwIssueFlags) PURE; \ STDMETHOD(GetData)(THIS_ void* pData, DWORD dwSize, DWORD dwGetDataFlags) PURE; -ICOM_DEFINE(IDirect3DQuery9,IUnknown) +DECLARE_INTERFACE_(IDirect3DQuery9,IUnknown) { IDirect3DQuery9_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/d3dx8core.h b/include/d3dx8core.h index a5eb5b06626..9011757625f 100644 --- a/include/d3dx8core.h +++ b/include/d3dx8core.h @@ -61,7 +61,7 @@ typedef struct ID3DXFont ID3DXFont, *LPD3DXFONT; IUnknown_METHODS \ STDMETHOD_(LPVOID,GetBufferPointer)(THIS) PURE; \ STDMETHOD_(DWORD,GetBufferSize)(THIS) PURE; -ICOM_DEFINE(ID3DXBuffer,IUnknown) +DECLARE_INTERFACE_(ID3DXBuffer,IUnknown) { ID3DXBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -84,7 +84,7 @@ ICOM_DEFINE(ID3DXBuffer,IUnknown) STDMETHOD(Begin)(THIS) PURE; \ STDMETHOD(DrawTextA)(THIS) PURE; \ STDMETHOD(End)(THIS) PURE; -ICOM_DEFINE(ID3DXFont,IUnknown) +DECLARE_INTERFACE_(ID3DXFont,IUnknown) { ID3DXFont_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/ddraw.h b/include/ddraw.h index 5a63d7a625c..80f615f4cdc 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1208,7 +1208,7 @@ typedef struct tagDDDEVICEIDENTIFIER2 { STDMETHOD(GetEntries)(THIS_ DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries) PURE; \ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags, LPPALETTEENTRY lpDDColorTable) PURE; \ STDMETHOD(SetEntries)(THIS_ DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries) PURE; -ICOM_DEFINE(IDirectDrawPalette,IUnknown) +DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown) { IDirectDrawPalette_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1236,7 +1236,7 @@ ICOM_DEFINE(IDirectDrawPalette,IUnknown) STDMETHOD(IsClipListChanged)(THIS_ BOOL *lpbChanged) PURE; \ STDMETHOD(SetClipList)(THIS_ LPRGNDATA lpClipList, DWORD dwFlags) PURE; \ STDMETHOD(SetHWnd)(THIS_ DWORD dwFlags, HWND hWnd) PURE; -ICOM_DEFINE(IDirectDrawClipper,IUnknown) +DECLARE_INTERFACE_(IDirectDrawClipper,IUnknown) { IDirectDrawClipper_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1280,7 +1280,7 @@ ICOM_DEFINE(IDirectDrawClipper,IUnknown) STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; \ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) PURE; \ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; -ICOM_DEFINE(IDirectDraw,IUnknown) +DECLARE_INTERFACE_(IDirectDraw,IUnknown) { IDirectDraw_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1354,7 +1354,7 @@ ICOM_DEFINE(IDirectDraw,IUnknown) /*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; \ /* added in v2 */ \ /*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; -ICOM_DEFINE(IDirectDraw2,IUnknown) +DECLARE_INTERFACE_(IDirectDraw2,IUnknown) { IDirectDraw2_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1421,7 +1421,7 @@ ICOM_DEFINE(IDirectDraw2,IUnknown) /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; \ /*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE; \ /*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectDraw4,IUnknown) +DECLARE_INTERFACE_(IDirectDraw4,IUnknown) { IDirectDraw4_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1499,7 +1499,7 @@ ICOM_DEFINE(IDirectDraw4,IUnknown) /* added in v7 */ \ /*70*/ STDMETHOD(StartModeTest)(THIS_ LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) PURE; \ /*74*/ STDMETHOD(EvaluateMode)(THIS_ DWORD dwFlags, DWORD *pTimeout) PURE; -ICOM_DEFINE(IDirectDraw7,IUnknown) +DECLARE_INTERFACE_(IDirectDraw7,IUnknown) { IDirectDraw7_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1580,7 +1580,7 @@ ICOM_DEFINE(IDirectDraw7,IUnknown) /*84*/ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; \ /*88*/ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; \ /*8c*/ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSReference) PURE; -ICOM_DEFINE(IDirectDrawSurface,IUnknown) +DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) { IDirectDrawSurface_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1671,7 +1671,7 @@ ICOM_DEFINE(IDirectDrawSurface,IUnknown) STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE; \ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; \ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectDrawSurface2,IUnknown) +DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) { IDirectDrawSurface2_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1768,7 +1768,7 @@ ICOM_DEFINE(IDirectDrawSurface2,IUnknown) STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; \ /* added in v3 */ \ STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSD, DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectDrawSurface3,IUnknown) +DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) { IDirectDrawSurface3_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1872,7 +1872,7 @@ ICOM_DEFINE(IDirectDrawSurface3,IUnknown) STDMETHOD(FreePrivateData)(THIS_ REFGUID tag) PURE; \ STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD pValue) PURE; \ STDMETHOD(ChangeUniquenessValue)(THIS) PURE; -ICOM_DEFINE(IDirectDrawSurface4,IUnknown) +DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) { IDirectDrawSurface4_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1985,7 +1985,7 @@ ICOM_DEFINE(IDirectDrawSurface4,IUnknown) STDMETHOD(GetPriority)(THIS_ LPDWORD prio) PURE; \ STDMETHOD(SetLOD)(THIS_ DWORD lod) PURE; \ STDMETHOD(GetLOD)(THIS_ LPDWORD lod) PURE; -ICOM_DEFINE(IDirectDrawSurface7,IUnknown) +DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) { IDirectDrawSurface7_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -2054,7 +2054,7 @@ ICOM_DEFINE(IDirectDrawSurface7,IUnknown) IUnknown_METHODS \ STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE; \ STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE; -ICOM_DEFINE(IDirectDrawColorControl,IUnknown) +DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown) { IDirectDrawColorControl_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -2075,7 +2075,7 @@ ICOM_DEFINE(IDirectDrawColorControl,IUnknown) IUnknown_METHODS \ STDMETHOD(GetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE; \ STDMETHOD(SetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE; -ICOM_DEFINE(IDirectDrawGammaControl,IUnknown) +DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown) { IDirectDrawGammaControl_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dinput.h b/include/dinput.h index 468b5d2a4da..8d1e8eef0ad 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -1149,7 +1149,7 @@ DECL_WINELIB_TYPE_AW(LPCDIDEVICEIMAGEINFOHEADER) STDMETHOD(Download)(THIS) PURE; \ STDMETHOD(Unload)(THIS) PURE; \ STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE) PURE; -ICOM_DEFINE(IDirectInputEffect,IUnknown) +DECLARE_INTERFACE_(IDirectInputEffect,IUnknown) { IDirectInputEffect_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1192,7 +1192,7 @@ ICOM_DEFINE(IDirectInputEffect,IUnknown) STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEA pdidi) PURE; \ STDMETHOD(RunControlPanel)(THIS_ HWND hwndOwner, DWORD dwFlags) PURE; \ STDMETHOD(Initialize)(THIS_ HINSTANCE hinst, DWORD dwVersion, REFGUID rguid) PURE; -ICOM_DEFINE(IDirectInputDeviceA,IUnknown) +DECLARE_INTERFACE_(IDirectInputDeviceA,IUnknown) { IDirectInputDeviceA_METHODS }; #undef INTERFACE /***************************************************************************** @@ -1216,7 +1216,7 @@ ICOM_DEFINE(IDirectInputDeviceA,IUnknown) STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEW pdidi) PURE; \ STDMETHOD(RunControlPanel)(THIS_ HWND hwndOwner, DWORD dwFlags) PURE; \ STDMETHOD(Initialize)(THIS_ HINSTANCE hinst, DWORD dwVersion, REFGUID rguid) PURE; -ICOM_DEFINE(IDirectInputDeviceW,IUnknown) +DECLARE_INTERFACE_(IDirectInputDeviceW,IUnknown) { IDirectInputDeviceW_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1258,7 +1258,7 @@ ICOM_DEFINE(IDirectInputDeviceW,IUnknown) STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE pesc) PURE; \ STDMETHOD(Poll)(THIS) PURE; \ STDMETHOD(SendDeviceData)(THIS_ DWORD cbObjectData, LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD fl) PURE; -ICOM_DEFINE(IDirectInputDevice2A,IDirectInputDeviceA) +DECLARE_INTERFACE_(IDirectInputDevice2A,IDirectInputDeviceA) { IDirectInputDevice2A_METHODS }; #undef INTERFACE /***************************************************************************** @@ -1276,7 +1276,7 @@ ICOM_DEFINE(IDirectInputDevice2A,IDirectInputDeviceA) STDMETHOD(Escape)(THIS_ LPDIEFFESCAPE pesc) PURE; \ STDMETHOD(Poll)(THIS) PURE; \ STDMETHOD(SendDeviceData)(THIS_ DWORD cbObjectData, LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD fl) PURE; -ICOM_DEFINE(IDirectInputDevice2W,IDirectInputDeviceW) +DECLARE_INTERFACE_(IDirectInputDevice2W,IDirectInputDeviceW) { IDirectInputDevice2W_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1321,7 +1321,7 @@ ICOM_DEFINE(IDirectInputDevice2W,IDirectInputDeviceW) IDirectInputDevice2A_METHODS \ STDMETHOD(EnumEffectsInFile)(THIS_ LPCSTR lpszFileName,LPDIENUMEFFECTSINFILECALLBACK pec,LPVOID pvRef,DWORD dwFlags) PURE; \ STDMETHOD(WriteEffectToFile)(THIS_ LPCSTR lpszFileName,DWORD dwEntries,LPDIFILEEFFECT rgDiFileEft,DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectInputDevice7A,IDirectInputDevice2A) +DECLARE_INTERFACE_(IDirectInputDevice7A,IDirectInputDevice2A) { IDirectInputDevice7A_METHODS }; #undef INTERFACE /***************************************************************************** @@ -1332,7 +1332,7 @@ ICOM_DEFINE(IDirectInputDevice7A,IDirectInputDevice2A) IDirectInputDevice2W_METHODS \ STDMETHOD(EnumEffectsInFile)(THIS_ LPCWSTR lpszFileName,LPDIENUMEFFECTSINFILECALLBACK pec,LPVOID pvRef,DWORD dwFlags) PURE; \ STDMETHOD(WriteEffectToFile)(THIS_ LPCWSTR lpszFileName,DWORD dwEntries,LPDIFILEEFFECT rgDiFileEft,DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectInputDevice7W,IDirectInputDevice2W) +DECLARE_INTERFACE_(IDirectInputDevice7W,IDirectInputDevice2W) { IDirectInputDevice7W_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1383,7 +1383,7 @@ ICOM_DEFINE(IDirectInputDevice7W,IDirectInputDevice2W) STDMETHOD(BuildActionMap)(THIS_ LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) PURE; \ STDMETHOD(SetActionMap)(THIS_ LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) PURE; \ STDMETHOD(GetImageInfo)(THIS_ LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader) PURE; -ICOM_DEFINE(IDirectInputDevice8A,IDirectInputDevice7A) +DECLARE_INTERFACE_(IDirectInputDevice8A,IDirectInputDevice7A) { IDirectInputDevice8A_METHODS }; #undef INTERFACE /***************************************************************************** @@ -1395,7 +1395,7 @@ ICOM_DEFINE(IDirectInputDevice8A,IDirectInputDevice7A) STDMETHOD(BuildActionMap)(THIS_ LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) PURE; \ STDMETHOD(SetActionMap)(THIS_ LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) PURE; \ STDMETHOD(GetImageInfo)(THIS_ LPDIDEVICEIMAGEINFOHEADERW lpdiDevImageInfoHeader) PURE; -ICOM_DEFINE(IDirectInputDevice8W,IDirectInputDevice7W) +DECLARE_INTERFACE_(IDirectInputDevice8W,IDirectInputDevice7W) { IDirectInputDevice8W_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1487,7 +1487,7 @@ extern const DIDATAFORMAT c_dfDIJoystick2; STDMETHOD(GetDeviceStatus)(THIS_ REFGUID rguidInstance) PURE; \ STDMETHOD(RunControlPanel)(THIS_ HWND hwndOwner, DWORD dwFlags) PURE; \ STDMETHOD(Initialize)(THIS_ HINSTANCE hinst, DWORD dwVersion) PURE; -ICOM_DEFINE(IDirectInputA,IUnknown) +DECLARE_INTERFACE_(IDirectInputA,IUnknown) { IDirectInputA_METHODS }; #undef INTERFACE /***************************************************************************** @@ -1501,7 +1501,7 @@ ICOM_DEFINE(IDirectInputA,IUnknown) STDMETHOD(GetDeviceStatus)(THIS_ REFGUID rguidInstance) PURE; \ STDMETHOD(RunControlPanel)(THIS_ HWND hwndOwner, DWORD dwFlags) PURE; \ STDMETHOD(Initialize)(THIS_ HINSTANCE hinst, DWORD dwVersion) PURE; -ICOM_DEFINE(IDirectInputW,IUnknown) +DECLARE_INTERFACE_(IDirectInputW,IUnknown) { IDirectInputW_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1524,7 +1524,7 @@ ICOM_DEFINE(IDirectInputW,IUnknown) #define IDirectInput2A_METHODS \ IDirectInputA_METHODS \ STDMETHOD(FindDevice)(THIS_ REFGUID rguid, LPCSTR pszName, LPGUID pguidInstance) PURE; -ICOM_DEFINE(IDirectInput2A,IDirectInputA) +DECLARE_INTERFACE_(IDirectInput2A,IDirectInputA) { IDirectInput2A_METHODS }; #undef INTERFACE /***************************************************************************** @@ -1534,7 +1534,7 @@ ICOM_DEFINE(IDirectInput2A,IDirectInputA) #define IDirectInput2W_METHODS \ IDirectInputW_METHODS \ STDMETHOD(FindDevice)(THIS_ REFGUID rguid, LPCWSTR pszName, LPGUID pguidInstance) PURE; -ICOM_DEFINE(IDirectInput2W,IDirectInputW) +DECLARE_INTERFACE_(IDirectInput2W,IDirectInputW) { IDirectInput2W_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1560,7 +1560,7 @@ ICOM_DEFINE(IDirectInput2W,IDirectInputW) #define IDirectInput7A_METHODS \ IDirectInput2A_METHODS \ STDMETHOD(CreateDeviceEx)(THIS_ REFGUID rguid, REFIID riid, LPVOID *pvOut, LPUNKNOWN lpUnknownOuter) PURE; -ICOM_DEFINE(IDirectInput7A,IDirectInput2A) +DECLARE_INTERFACE_(IDirectInput7A,IDirectInput2A) { IDirectInput7A_METHODS }; #undef INTERFACE /***************************************************************************** @@ -1570,7 +1570,7 @@ ICOM_DEFINE(IDirectInput7A,IDirectInput2A) #define IDirectInput7W_METHODS \ IDirectInput2W_METHODS \ STDMETHOD(CreateDeviceEx)(THIS_ REFGUID rguid, REFIID riid, LPVOID *pvOut, LPUNKNOWN lpUnknownOuter) PURE; -ICOM_DEFINE(IDirectInput7W,IDirectInput2W) +DECLARE_INTERFACE_(IDirectInput7W,IDirectInput2W) { IDirectInput7W_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1607,7 +1607,7 @@ ICOM_DEFINE(IDirectInput7W,IDirectInput2W) STDMETHOD(FindDevice)(THIS_ REFGUID rguid, LPCSTR pszName, LPGUID pguidInstance) PURE; \ STDMETHOD(EnumDevicesBySemantics)(THIS_ LPCSTR ptszUserName, LPDIACTIONFORMATA lpdiActionFormat, LPDIENUMDEVICESBYSEMANTICSCBA lpCallback, LPVOID pvRef, DWORD dwFlags) PURE; \ STDMETHOD(ConfigureDevices)(THIS_ LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSA lpdiCDParams, DWORD dwFlags, LPVOID pvRefData) PURE; -ICOM_DEFINE(IDirectInput8A,IUnknown) +DECLARE_INTERFACE_(IDirectInput8A,IUnknown) { IDirectInput8A_METHODS }; #undef INTERFACE /***************************************************************************** @@ -1624,7 +1624,7 @@ ICOM_DEFINE(IDirectInput8A,IUnknown) STDMETHOD(FindDevice)(THIS_ REFGUID rguid, LPCWSTR pszName, LPGUID pguidInstance) PURE; \ STDMETHOD(EnumDevicesBySemantics)(THIS_ LPCWSTR ptszUserName, LPDIACTIONFORMATW lpdiActionFormat, LPDIENUMDEVICESBYSEMANTICSCBW lpCallback, LPVOID pvRef, DWORD dwFlags) PURE; \ STDMETHOD(ConfigureDevices)(THIS_ LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData) PURE; -ICOM_DEFINE(IDirectInput8W,IUnknown) +DECLARE_INTERFACE_(IDirectInput8W,IUnknown) { IDirectInput8W_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dmplugin.h b/include/dmplugin.h index 94925ec3a43..06575c0f9e4 100644 --- a/include/dmplugin.h +++ b/include/dmplugin.h @@ -133,7 +133,7 @@ enum enumDMUS_TRACKF_FLAGS { 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; -ICOM_DEFINE(IDirectMusicTool,IUnknown) +DECLARE_INTERFACE_(IDirectMusicTool,IUnknown) { IDirectMusicTool_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -159,7 +159,7 @@ ICOM_DEFINE(IDirectMusicTool,IUnknown) #define IDirectMusicTool8_METHODS \ IDirectMusicTool_METHODS \ STDMETHOD(Clone)(THIS_ IDirectMusicTool **ppTool) PURE; -ICOM_DEFINE(IDirectMusicTool8,IDirectMusicTool) +DECLARE_INTERFACE_(IDirectMusicTool8,IDirectMusicTool) { IDirectMusicTool8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -196,7 +196,7 @@ ICOM_DEFINE(IDirectMusicTool8,IDirectMusicTool) STDMETHOD(AddNotificationType)(THIS_ REFGUID rguidNotificationType) PURE; \ STDMETHOD(RemoveNotificationType)(THIS_ REFGUID rguidNotificationType) PURE; \ STDMETHOD(Clone)(THIS_ MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) PURE; -ICOM_DEFINE(IDirectMusicTrack,IUnknown) +DECLARE_INTERFACE_(IDirectMusicTrack,IUnknown) { IDirectMusicTrack_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -230,7 +230,7 @@ ICOM_DEFINE(IDirectMusicTrack,IUnknown) 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; -ICOM_DEFINE(IDirectMusicTrack8,IDirectMusicTrack) +DECLARE_INTERFACE_(IDirectMusicTrack8,IDirectMusicTrack) { IDirectMusicTrack8_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dmusicc.h b/include/dmusicc.h index 24f786d977b..8deef39ea0b 100644 --- a/include/dmusicc.h +++ b/include/dmusicc.h @@ -383,7 +383,7 @@ struct _DMUS_CLOCKINFO8 { STDMETHOD(Activate)(THIS_ BOOL fEnable) PURE; \ STDMETHOD(GetDefaultPort)(THIS_ LPGUID pguidPort) PURE; \ STDMETHOD(SetDirectSound)(THIS_ LPDIRECTSOUND pDirectSound, HWND hWnd) PURE; -ICOM_DEFINE(IDirectMusic,IUnknown) +DECLARE_INTERFACE_(IDirectMusic,IUnknown) { IDirectMusic_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -412,7 +412,7 @@ ICOM_DEFINE(IDirectMusic,IUnknown) #define IDirectMusic8_METHODS \ IDirectMusic_METHODS \ STDMETHOD(SetExternalMasterClock)(THIS_ IReferenceClock *pClock) PURE; -ICOM_DEFINE(IDirectMusic8,IDirectMusic) +DECLARE_INTERFACE_(IDirectMusic8,IDirectMusic) { IDirectMusic8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -455,7 +455,7 @@ ICOM_DEFINE(IDirectMusic8,IDirectMusic) STDMETHOD(GetBufferFormat)(THIS_ LPGUID pGuidFormat) PURE; \ STDMETHOD(SetStartTime)(THIS_ REFERENCE_TIME rt) PURE; \ STDMETHOD(SetUsedBytes)(THIS_ DWORD cb) PURE; -ICOM_DEFINE(IDirectMusicBuffer,IUnknown) +DECLARE_INTERFACE_(IDirectMusicBuffer,IUnknown) { IDirectMusicBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -489,7 +489,7 @@ ICOM_DEFINE(IDirectMusicBuffer,IUnknown) IUnknown_METHODS \ STDMETHOD(GetPatch)(THIS_ DWORD *pdwPatch) PURE; \ STDMETHOD(SetPatch)(THIS_ DWORD dwPatch) PURE; -ICOM_DEFINE(IDirectMusicInstrument,IUnknown) +DECLARE_INTERFACE_(IDirectMusicInstrument,IUnknown) { IDirectMusicInstrument_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -511,7 +511,7 @@ ICOM_DEFINE(IDirectMusicInstrument,IUnknown) #define IDirectMusicDownloadedInstrument_METHODS \ IUnknown_METHODS \ /* no IDirectMusicDownloadedInstrument methods at this time */ -ICOM_DEFINE(IDirectMusicDownloadedInstrument,IUnknown) +DECLARE_INTERFACE_(IDirectMusicDownloadedInstrument,IUnknown) { IDirectMusicDownloadedInstrument_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -533,7 +533,7 @@ ICOM_DEFINE(IDirectMusicDownloadedInstrument,IUnknown) IUnknown_METHODS \ STDMETHOD(GetInstrument)(THIS_ DWORD dwPatch, IDirectMusicInstrument **ppInstrument) PURE; \ STDMETHOD(EnumInstrument)(THIS_ DWORD dwIndex, DWORD *pdwPatch, LPWSTR pwszName, DWORD dwNameLen) PURE; -ICOM_DEFINE(IDirectMusicCollection,IUnknown) +DECLARE_INTERFACE_(IDirectMusicCollection,IUnknown) { IDirectMusicCollection_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -555,7 +555,7 @@ ICOM_DEFINE(IDirectMusicCollection,IUnknown) #define IDirectMusicDownload_METHODS \ IUnknown_METHODS \ STDMETHOD(GetBuffer)(THIS_ void **ppvBuffer, DWORD *pdwSize) PURE; -ICOM_DEFINE(IDirectMusicDownload,IUnknown) +DECLARE_INTERFACE_(IDirectMusicDownload,IUnknown) { IDirectMusicDownload_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -581,7 +581,7 @@ ICOM_DEFINE(IDirectMusicDownload,IUnknown) STDMETHOD(GetAppend)(THIS_ DWORD *pdwAppend) PURE; \ STDMETHOD(Download)(THIS_ IDirectMusicDownload *pIDMDownload) PURE; \ STDMETHOD(Unload)(THIS_ IDirectMusicDownload *pIDMDownload) PURE; -ICOM_DEFINE(IDirectMusicPortDownload,IUnknown) +DECLARE_INTERFACE_(IDirectMusicPortDownload,IUnknown) { IDirectMusicPortDownload_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -623,7 +623,7 @@ ICOM_DEFINE(IDirectMusicPortDownload,IUnknown) STDMETHOD(GetChannelPriority)(THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) PURE; \ STDMETHOD(SetDirectSound)(THIS_ LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE; \ STDMETHOD(GetFormat)(THIS_ LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) PURE; -ICOM_DEFINE(IDirectMusicPort,IUnknown) +DECLARE_INTERFACE_(IDirectMusicPort,IUnknown) { IDirectMusicPort_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -660,7 +660,7 @@ ICOM_DEFINE(IDirectMusicPort,IUnknown) #define IDirectMusicThru_METHODS \ IUnknown_METHODS \ STDMETHOD(ThruChannel)(THIS_ DWORD dwSourceChannelGroup, DWORD dwSourceChannel, DWORD dwDestinationChannelGroup, DWORD dwDestinationChannel, LPDIRECTMUSICPORT pDestinationPort) PURE; -ICOM_DEFINE(IDirectMusicThru,IUnknown) +DECLARE_INTERFACE_(IDirectMusicThru,IUnknown) { IDirectMusicThru_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -688,7 +688,7 @@ ICOM_DEFINE(IDirectMusicThru,IUnknown) STDMETHOD(AdviseTime)(THIS_ REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD *pdwAdviseCookie) PURE; \ STDMETHOD(AdvisePeriodic)(THIS_ REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD *pdwAdviseCookie) PURE; \ STDMETHOD(Unadvise)(THIS_ DWORD dwAdviseCookie) PURE; - ICOM_DEFINE(IReferenceClock,IUnknown) + DECLARE_INTERFACE_(IReferenceClock,IUnknown) { IReferenceClock_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dmusici.h b/include/dmusici.h index f9d737f3b39..764191ca002 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -796,7 +796,7 @@ struct _DMUS_VARIATIONS_PARAM { STDMETHOD(CreateSegment)(THIS_ IDirectMusicSegment **ppSegment) PURE; \ STDMETHOD(Download)(THIS_ IDirectMusicPerformance *pPerformance) PURE; \ STDMETHOD(Unload)(THIS_ IDirectMusicPerformance *pPerformance) PURE; -ICOM_DEFINE(IDirectMusicBand,IUnknown) +DECLARE_INTERFACE_(IDirectMusicBand,IUnknown) { IDirectMusicBand_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -821,7 +821,7 @@ ICOM_DEFINE(IDirectMusicBand,IUnknown) STDMETHOD(GetDescriptor)(THIS_ LPDMUS_OBJECTDESC pDesc) PURE; \ STDMETHOD(SetDescriptor)(THIS_ LPDMUS_OBJECTDESC pDesc) PURE; \ STDMETHOD(ParseDescriptor)(THIS_ LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) PURE; -ICOM_DEFINE(IDirectMusicObject,IUnknown) +DECLARE_INTERFACE_(IDirectMusicObject,IUnknown) { IDirectMusicObject_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -852,7 +852,7 @@ ICOM_DEFINE(IDirectMusicObject,IUnknown) STDMETHOD(ClearCache)(THIS_ REFGUID rguidClass) PURE; \ STDMETHOD(EnableCache)(THIS_ REFGUID rguidClass, BOOL fEnable) PURE; \ STDMETHOD(EnumObject)(THIS_ REFGUID rguidClass, DWORD dwIndex, LPDMUS_OBJECTDESC pDesc) PURE; -ICOM_DEFINE(IDirectMusicLoader,IUnknown) +DECLARE_INTERFACE_(IDirectMusicLoader,IUnknown) { IDirectMusicLoader_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -883,7 +883,7 @@ ICOM_DEFINE(IDirectMusicLoader,IUnknown) STDMETHOD_(void,CollectGarbage)(THIS) PURE; \ STDMETHOD(ReleaseObjectByUnknown)(THIS_ IUnknown *pObject) PURE; \ STDMETHOD(LoadObjectFromFile)(THIS_ REFGUID rguidClassID, REFIID iidInterfaceID, WCHAR *pwzFilePath, void **ppObject) PURE; -ICOM_DEFINE(IDirectMusicLoader8,IDirectMusicLoader) +DECLARE_INTERFACE_(IDirectMusicLoader8,IDirectMusicLoader) { IDirectMusicLoader8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -916,7 +916,7 @@ ICOM_DEFINE(IDirectMusicLoader8,IDirectMusicLoader) #define IDirectMusicGetLoader_METHODS \ IUnknown_METHODS \ STDMETHOD(GetLoader)(THIS_ IDirectMusicLoader **ppLoader) PURE; -ICOM_DEFINE(IDirectMusicGetLoader,IUnknown) +DECLARE_INTERFACE_(IDirectMusicGetLoader,IUnknown) { IDirectMusicGetLoader_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -959,7 +959,7 @@ ICOM_DEFINE(IDirectMusicGetLoader,IUnknown) STDMETHOD(SetLoopPoints)(THIS_ MUSIC_TIME mtStart, MUSIC_TIME mtEnd) PURE; \ STDMETHOD(GetLoopPoints)(THIS_ MUSIC_TIME *pmtStart, MUSIC_TIME *pmtEnd) PURE; \ STDMETHOD(SetPChannelsUsed)(THIS_ DWORD dwNumPChannels, DWORD *paPChannels) PURE; -ICOM_DEFINE(IDirectMusicSegment,IUnknown) +DECLARE_INTERFACE_(IDirectMusicSegment,IUnknown) { IDirectMusicSegment_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1006,7 +1006,7 @@ ICOM_DEFINE(IDirectMusicSegment,IUnknown) STDMETHOD(Compose)(THIS_ MUSIC_TIME mtTime, IDirectMusicSegment *pFromSegment, IDirectMusicSegment *pToSegment, IDirectMusicSegment **ppComposedSegment) PURE; \ STDMETHOD(Download)(THIS_ IUnknown *pAudioPath) PURE; \ STDMETHOD(Unload)(THIS_ IUnknown *pAudioPath) PURE; -ICOM_DEFINE(IDirectMusicSegment8,IDirectMusicSegment) +DECLARE_INTERFACE_(IDirectMusicSegment8,IDirectMusicSegment) { IDirectMusicSegment8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1059,7 +1059,7 @@ ICOM_DEFINE(IDirectMusicSegment8,IDirectMusicSegment) STDMETHOD(GetStartTime)(THIS_ MUSIC_TIME *pmtStart) PURE; \ STDMETHOD(GetSeek)(THIS_ MUSIC_TIME *pmtSeek) PURE; \ STDMETHOD(GetStartPoint)(THIS_ MUSIC_TIME *pmtStart) PURE; -ICOM_DEFINE(IDirectMusicSegmentState,IUnknown) +DECLARE_INTERFACE_(IDirectMusicSegmentState,IUnknown) { IDirectMusicSegmentState_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1085,7 +1085,7 @@ ICOM_DEFINE(IDirectMusicSegmentState,IUnknown) IDirectMusicSegmentState_METHODS \ STDMETHOD(SetTrackConfig)(THIS_ REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) PURE; \ STDMETHOD(GetObjectInPath)(THIS_ DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void **ppObject) PURE; -ICOM_DEFINE(IDirectMusicSegmentState8,IDirectMusicSegmentState) +DECLARE_INTERFACE_(IDirectMusicSegmentState8,IDirectMusicSegmentState) { IDirectMusicSegmentState8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1116,7 +1116,7 @@ ICOM_DEFINE(IDirectMusicSegmentState8,IDirectMusicSegmentState) STDMETHOD(Activate)(THIS_ BOOL fActivate) PURE; \ STDMETHOD(SetVolume)(THIS_ long lVolume, DWORD dwDuration) PURE; \ STDMETHOD(ConvertPChannel)(THIS_ DWORD dwPChannelIn, DWORD *pdwPChannelOut) PURE; -ICOM_DEFINE(IDirectMusicAudioPath,IUnknown) +DECLARE_INTERFACE_(IDirectMusicAudioPath,IUnknown) { IDirectMusicAudioPath_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1180,7 +1180,7 @@ ICOM_DEFINE(IDirectMusicAudioPath,IUnknown) STDMETHOD(MusicToMIDI)(THIS_ WORD wMusicValue, DMUS_CHORD_KEY *pChord, BYTE bPlayMode, BYTE bChordLevel, BYTE *pbMIDIValue) PURE; \ STDMETHOD(TimeToRhythm)(THIS_ MUSIC_TIME mtTime, DMUS_TIMESIGNATURE *pTimeSig, WORD *pwMeasure, BYTE *pbBeat, BYTE *pbGrid, short *pnOffset) PURE; \ STDMETHOD(RhythmToTime)(THIS_ WORD wMeasure, BYTE bBeat, BYTE bGrid, short nOffset, DMUS_TIMESIGNATURE *pTimeSig, MUSIC_TIME *pmtTime) PURE; -ICOM_DEFINE(IDirectMusicPerformance,IUnknown) +DECLARE_INTERFACE_(IDirectMusicPerformance,IUnknown) { IDirectMusicPerformance_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1249,7 +1249,7 @@ ICOM_DEFINE(IDirectMusicPerformance,IUnknown) STDMETHOD(SetDefaultAudioPath)(THIS_ IDirectMusicAudioPath *pAudioPath) PURE; \ STDMETHOD(GetDefaultAudioPath)(THIS_ IDirectMusicAudioPath **ppAudioPath) PURE; \ STDMETHOD(GetParamEx)(THIS_ REFGUID rguidType, DWORD dwTrackID, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) PURE; -ICOM_DEFINE(IDirectMusicPerformance8,IDirectMusicPerformance) +DECLARE_INTERFACE_(IDirectMusicPerformance8,IDirectMusicPerformance) { IDirectMusicPerformance8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1323,7 +1323,7 @@ ICOM_DEFINE(IDirectMusicPerformance8,IDirectMusicPerformance) STDMETHOD(InsertTool)(THIS_ IDirectMusicTool *pTool, DWORD *pdwPChannels, DWORD cPChannels, LONG lIndex) PURE; \ STDMETHOD(GetTool)(THIS_ DWORD dwIndex, IDirectMusicTool **ppTool) PURE; \ STDMETHOD(RemoveTool)(THIS_ IDirectMusicTool *pTool) PURE; -ICOM_DEFINE(IDirectMusicGraph,IUnknown) +DECLARE_INTERFACE_(IDirectMusicGraph,IUnknown) { IDirectMusicGraph_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1357,7 +1357,7 @@ ICOM_DEFINE(IDirectMusicGraph,IUnknown) STDMETHOD(GetTimeSignature)(THIS_ DMUS_TIMESIGNATURE *pTimeSig) PURE; \ STDMETHOD(GetEmbellishmentLength)(THIS_ DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax) PURE; \ STDMETHOD(GetTempo)(THIS_ double *pTempo) PURE; -ICOM_DEFINE(IDirectMusicStyle,IUnknown) +DECLARE_INTERFACE_(IDirectMusicStyle,IUnknown) { IDirectMusicStyle_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1388,7 +1388,7 @@ ICOM_DEFINE(IDirectMusicStyle,IUnknown) #define IDirectMusicStyle8_METHODS \ IDirectMusicStyle_METHODS \ STDMETHOD(EnumPattern)(THIS_ DWORD dwIndex, DWORD dwPatternType, WCHAR *pwszName) PURE; -ICOM_DEFINE(IDirectMusicStyle8,IDirectMusicStyle) +DECLARE_INTERFACE_(IDirectMusicStyle8,IDirectMusicStyle) { IDirectMusicStyle8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1421,7 +1421,7 @@ ICOM_DEFINE(IDirectMusicStyle8,IDirectMusicStyle) #define IDirectMusicChordMap_METHODS \ IUnknown_METHODS \ STDMETHOD(GetScale)(THIS_ DWORD *pdwScale) PURE; -ICOM_DEFINE(IDirectMusicChordMap,IUnknown) +DECLARE_INTERFACE_(IDirectMusicChordMap,IUnknown) { IDirectMusicChordMap_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1447,7 +1447,7 @@ ICOM_DEFINE(IDirectMusicChordMap,IUnknown) STDMETHOD(AutoTransition)(THIS_ IDirectMusicPerformance *pPerformance, IDirectMusicSegment *pToSeg, WORD wCommand, DWORD dwFlags, IDirectMusicChordMap *pChordMap, IDirectMusicSegment **ppTransSeg, IDirectMusicSegmentState **ppToSegState, IDirectMusicSegmentState **ppTransSegState) PURE; \ STDMETHOD(ComposeTemplateFromShape)(THIS_ WORD wNumMeasures, WORD wShape, BOOL fIntro, BOOL fEnd, WORD wEndLength, IDirectMusicSegment **ppTemplate) PURE; \ STDMETHOD(ChangeChordMap)(THIS_ IDirectMusicSegment *pSegment, BOOL fTrackScale, IDirectMusicChordMap *pChordMap) PURE; -ICOM_DEFINE(IDirectMusicComposer,IUnknown) +DECLARE_INTERFACE_(IDirectMusicComposer,IUnknown) { IDirectMusicComposer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1475,7 +1475,7 @@ ICOM_DEFINE(IDirectMusicComposer,IUnknown) STDMETHOD(CreateSegment)(THIS_ IDirectMusicStyle *pStyle, IDirectMusicSegment **ppSegment) PURE; \ STDMETHOD(SetVariation)(THIS_ IDirectMusicSegmentState *pSegState, DWORD dwVariationFlags, DWORD dwPart) PURE; \ STDMETHOD(SetPatternByName)(THIS_ IDirectMusicSegmentState *pSegState, WCHAR *wszName, IDirectMusicStyle *pStyle, DWORD dwPatternType, DWORD *pdwLength) PURE; -ICOM_DEFINE(IDirectMusicPatternTrack,IUnknown) +DECLARE_INTERFACE_(IDirectMusicPatternTrack,IUnknown) { IDirectMusicPatternTrack_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1507,7 +1507,7 @@ ICOM_DEFINE(IDirectMusicPatternTrack,IUnknown) STDMETHOD(GetVariableObject)(THIS_ WCHAR *pwszVariableName, REFIID riid, LPVOID *ppv, DMUS_SCRIPT_ERRORINFO *pErrorInfo) PURE; \ STDMETHOD(EnumRoutine)(THIS_ DWORD dwIndex, WCHAR *pwszName) PURE; \ STDMETHOD(EnumVariable)(THIS_ DWORD dwIndex, WCHAR *pwszName) PURE; -ICOM_DEFINE(IDirectMusicScript,IUnknown) +DECLARE_INTERFACE_(IDirectMusicScript,IUnknown) { IDirectMusicScript_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1537,7 +1537,7 @@ ICOM_DEFINE(IDirectMusicScript,IUnknown) #define IDirectMusicContainer_METHODS \ IUnknown_METHODS \ STDMETHOD(EnumObject)(THIS_ REFGUID rguidClass, DWORD dwIndex, LPDMUS_OBJECTDESC pDesc, WCHAR *pwszAlias) PURE; -ICOM_DEFINE(IDirectMusicContainer,IUnknown) +DECLARE_INTERFACE_(IDirectMusicContainer,IUnknown) { IDirectMusicContainer_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dmusics.h b/include/dmusics.h index 457dee29fbf..9ba78b3ad2a 100644 --- a/include/dmusics.h +++ b/include/dmusics.h @@ -94,7 +94,7 @@ struct _DMUS_VOICE_STATE { STDMETHOD(GetChannelPriority)(THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) PURE; \ STDMETHOD(GetFormat)(THIS_ LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSiz) PURE; \ STDMETHOD(GetAppend)(THIS_ DWORD *pdwAppend) PURE; -ICOM_DEFINE(IDirectMusicSynth,IUnknown) +DECLARE_INTERFACE_(IDirectMusicSynth,IUnknown) { IDirectMusicSynth_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -135,7 +135,7 @@ ICOM_DEFINE(IDirectMusicSynth,IUnknown) 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; -ICOM_DEFINE(IDirectMusicSynth8,IDirectMusicSynth) +DECLARE_INTERFACE_(IDirectMusicSynth8,IDirectMusicSynth) { IDirectMusicSynth8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -185,7 +185,7 @@ ICOM_DEFINE(IDirectMusicSynth8,IDirectMusicSynth) STDMETHOD(RefTimeToSample)(THIS_ REFERENCE_TIME rfTime, LONGLONG *pllSampleTime) PURE; \ STDMETHOD(SetDirectSound)(THIS_ LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE; \ STDMETHOD(GetDesiredBufferSize)(THIS_ LPDWORD pdwBufferSizeInSamples) PURE; -ICOM_DEFINE(IDirectMusicSynthSink,IUnknown) +DECLARE_INTERFACE_(IDirectMusicSynthSink,IUnknown) { IDirectMusicSynthSink_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dpaddr.h b/include/dpaddr.h index 1e71fd06eb5..f9ea96e2d7d 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -223,7 +223,7 @@ typedef struct IDirectPlay8AddressIP IDirectPlay8AddressIP, *PDIRECTPLAY8A STDMETHOD(GetDevice)(THIS_ GUID* pDevGuid) PURE; \ STDMETHOD(SetDevice)(THIS_ CONST GUID* CONST devGuid) PURE; \ STDMETHOD(BuildFromDirectPlay4Address)(THIS_ LPVOID pvAddress, DWORD dwDataSize) PURE; -ICOM_DEFINE(IDirectPlay8Address,IUnknown) +DECLARE_INTERFACE_(IDirectPlay8Address,IUnknown) { IDirectPlay8Address_METHODS }; #undef INTERFACE @@ -266,7 +266,7 @@ ICOM_DEFINE(IDirectPlay8Address,IUnknown) STDMETHOD(GetSockAddress)(THIS_ SOCKADDR* pSockAddr, PDWORD) PURE; \ STDMETHOD(GetLocalAddress)(THIS_ GUID* pguidAdapter, USHORT* pusPort) PURE; \ STDMETHOD(GetAddress)(THIS_ WCHAR* wszAddress, PDWORD pdwAddressLength, USHORT* psPort) PURE; -ICOM_DEFINE(IDirectPlay8AddressIP,IUnknown) +DECLARE_INTERFACE_(IDirectPlay8AddressIP,IUnknown) { IDirectPlay8AddressIP_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dplay.h b/include/dplay.h index 3956e05b2a9..6523b36d828 100644 --- a/include/dplay.h +++ b/include/dplay.h @@ -444,7 +444,7 @@ typedef BOOL (CALLBACK *LPDPENUMSESSIONSCALLBACK2)( STDMETHOD(SaveSession)(THIS_ LPSTR) PURE; \ STDMETHOD(Send)(THIS_ DPID idFrom, DPID idTo, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize) PURE; \ STDMETHOD(SetPlayerName)(THIS_ DPID idPlayer, LPSTR lpPlayerName, LPSTR) PURE; -ICOM_DEFINE(IDirectPlay,IUnknown) +DECLARE_INTERFACE_(IDirectPlay,IUnknown) { IDirectPlay_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -513,7 +513,7 @@ ICOM_DEFINE(IDirectPlay,IUnknown) STDMETHOD(SetPlayerData)(THIS_ DPID idPlayer, LPVOID lpData, DWORD dwDataSize, DWORD dwFlags) PURE; \ STDMETHOD(SetPlayerName)(THIS_ DPID idPlayer, LPDPNAME lpPlayerName, DWORD dwFlags) PURE; \ STDMETHOD(SetSessionDesc)(THIS_ LPDPSESSIONDESC2 lpSessDesc, DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectPlay2,IUnknown) +DECLARE_INTERFACE_(IDirectPlay2,IUnknown) { IDirectPlay2_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -575,7 +575,7 @@ ICOM_DEFINE(IDirectPlay2,IUnknown) STDMETHOD(GetGroupParent)(THIS_ DPID idGroup, LPDPID lpidParent) PURE; \ STDMETHOD(GetPlayerAccount)(THIS_ DPID idPlayer, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize) PURE; \ STDMETHOD(GetPlayerFlags)(THIS_ DPID idPlayer, LPDWORD lpdwFlags) PURE; -ICOM_DEFINE(IDirectPlay3,IDirectPlay2) +DECLARE_INTERFACE_(IDirectPlay3,IDirectPlay2) { IDirectPlay3_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -643,7 +643,7 @@ ICOM_DEFINE(IDirectPlay3,IDirectPlay2) STDMETHOD(GetMessageQueue)(THIS_ DPID , DPID , DWORD , LPDWORD , LPDWORD ) PURE; \ STDMETHOD(CancelMessage)(THIS_ DWORD , DWORD ) PURE; \ STDMETHOD(CancelPriority)(THIS_ DWORD , DWORD , DWORD ) PURE; -ICOM_DEFINE(IDirectPlay4,IDirectPlay3) +DECLARE_INTERFACE_(IDirectPlay4,IDirectPlay3) { IDirectPlay4_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dplay8.h b/include/dplay8.h index 7da3d76d203..e70784b4ecf 100644 --- a/include/dplay8.h +++ b/include/dplay8.h @@ -502,7 +502,7 @@ typedef struct IDirectPlay8LobbiedApplication *PIDirectPlay8LobbiedApplication, STDMETHOD(GetSPCaps)(THIS_ CONST GUID * CONST pguidSP, DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags) PURE; \ STDMETHOD(GetConnectionInfo)(THIS_ DPN_CONNECTION_INFO * CONST pdpConnectionInfo, CONST DWORD dwFlags) PURE; \ STDMETHOD(RegisterLobby)(THIS_ CONST DPNHANDLE dpnHandle, struct IDirectPlay8LobbiedApplication * CONST pIDP8LobbiedApplication, CONST DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectPlay8Client,IUnknown) +DECLARE_INTERFACE_(IDirectPlay8Client,IUnknown) { IDirectPlay8Client_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -569,7 +569,7 @@ ICOM_DEFINE(IDirectPlay8Client,IUnknown) STDMETHOD(GetSPCaps)(THIS_ CONST GUID * CONST pguidSP, DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags) PURE; \ STDMETHOD(GetConnectionInfo)(THIS_ CONST DPNID dpnid, DPN_CONNECTION_INFO * CONST pdpConnectionInfo, CONST DWORD dwFlags) PURE; \ STDMETHOD(RegisterLobby)(THIS_ CONST DPNHANDLE dpnHandle, struct IDirectPlay8LobbiedApplication * CONST pIDP8LobbiedApplication, CONST DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectPlay8Server,IUnknown) +DECLARE_INTERFACE_(IDirectPlay8Server,IUnknown) { IDirectPlay8Server_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -651,7 +651,7 @@ ICOM_DEFINE(IDirectPlay8Server,IUnknown) STDMETHOD(GetConnectionInfo)(THIS_ CONST DPNID dpnid, DPN_CONNECTION_INFO* CONST pdpConnectionInfo, CONST DWORD dwFlags) PURE; \ STDMETHOD(RegisterLobby)(THIS_ CONST DPNHANDLE dpnHandle, struct IDirectPlay8LobbiedApplication* CONST pIDP8LobbiedApplication, CONST DWORD dwFlags) PURE; \ STDMETHOD(TerminateSession)(THIS_ void* CONST pvTerminateData, CONST DWORD dwTerminateDataSize, CONST DWORD dwFlags) PURE; -ICOM_DEFINE(IDirectPlay8Peer, IUnknown) +DECLARE_INTERFACE_(IDirectPlay8Peer, IUnknown) { IDirectPlay8Peer_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dplobby.h b/include/dplobby.h index 103f5b66d30..17ec98e5bac 100644 --- a/include/dplobby.h +++ b/include/dplobby.h @@ -382,7 +382,7 @@ typedef BOOL (CALLBACK *LPDPLENUMLOCALAPPLICATIONSCALLBACK)( STDMETHOD(SendLobbyMessage)(THIS_ DWORD, DWORD, LPVOID, DWORD) PURE; \ STDMETHOD(SetConnectionSettings)(THIS_ DWORD, DWORD, LPDPLCONNECTION) PURE; \ STDMETHOD(SetLobbyMessageEvent)(THIS_ DWORD, DWORD, HANDLE) PURE; -ICOM_DEFINE(IDirectPlayLobby,IUnknown) +DECLARE_INTERFACE_(IDirectPlayLobby,IUnknown) { IDirectPlayLobby_METHODS }; #undef INTERFACE /***************************************************************************** @@ -392,7 +392,7 @@ ICOM_DEFINE(IDirectPlayLobby,IUnknown) #define IDirectPlayLobby2_METHODS \ IDirectPlayLobby_METHODS \ STDMETHOD(CreateCompoundAddress)(THIS_ LPCDPCOMPOUNDADDRESSELEMENT, DWORD, LPVOID, LPDWORD) PURE; -ICOM_DEFINE(IDirectPlayLobby2,IDirectPlayLobby) +DECLARE_INTERFACE_(IDirectPlayLobby2,IDirectPlayLobby) { IDirectPlayLobby2_METHODS }; #undef INTERFACE /***************************************************************************** @@ -405,7 +405,7 @@ ICOM_DEFINE(IDirectPlayLobby2,IDirectPlayLobby) STDMETHOD(RegisterApplication)(THIS_ DWORD, LPDPAPPLICATIONDESC) PURE; \ STDMETHOD(UnregisterApplication)(THIS_ DWORD, REFGUID) PURE; \ STDMETHOD(WaitForConnectionSettings)(THIS_ DWORD) PURE; -ICOM_DEFINE(IDirectPlayLobby3,IDirectPlayLobby2) +DECLARE_INTERFACE_(IDirectPlayLobby3,IDirectPlayLobby2) { IDirectPlayLobby3_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dsdriver.h b/include/dsdriver.h index 00d5e464848..34f8679095c 100644 --- a/include/dsdriver.h +++ b/include/dsdriver.h @@ -141,7 +141,7 @@ typedef struct _DSCDRIVERCAPS 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; -ICOM_DEFINE(IDsDriver,IUnknown) +DECLARE_INTERFACE_(IDsDriver,IUnknown) { IDsDriver_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -173,7 +173,7 @@ ICOM_DEFINE(IDsDriver,IUnknown) STDMETHOD(GetPosition)(THIS_ LPDWORD lpdwCurrentPlayCursor,LPDWORD lpdwCurrentWriteCursor) PURE; \ STDMETHOD(Play)(THIS_ DWORD dwReserved1,DWORD dwReserved2,DWORD dwFlags) PURE; \ STDMETHOD(Stop)(THIS) PURE; -ICOM_DEFINE(IDsDriverBuffer,IUnknown) +DECLARE_INTERFACE_(IDsDriverBuffer,IUnknown) { IDsDriverBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -202,7 +202,7 @@ ICOM_DEFINE(IDsDriverBuffer,IUnknown) 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; -ICOM_DEFINE(IDsDriverPropertySet,IUnknown) +DECLARE_INTERFACE_(IDsDriverPropertySet,IUnknown) { IDsDriverPropertySet_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -258,7 +258,7 @@ typedef enum #define IDsDriverNotify_METHODS \ IUnknown_METHODS \ STDMETHOD(SetNotificationPositions)(THIS_ DWORD dwPositionNotifies,LPCDSBPOSITIONNOTIFY pcPositionNotifies) PURE; -ICOM_DEFINE(IDsDriverNotify,IUnknown) +DECLARE_INTERFACE_(IDsDriverNotify,IUnknown) { IDsDriverNotify_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -281,7 +281,7 @@ ICOM_DEFINE(IDsDriverNotify,IUnknown) 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; -ICOM_DEFINE(IDsCaptureDriver,IUnknown) +DECLARE_INTERFACE_(IDsCaptureDriver,IUnknown) { IDsCaptureDriver_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -310,7 +310,7 @@ ICOM_DEFINE(IDsCaptureDriver,IUnknown) STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE; \ STDMETHOD(Start)(THIS_ DWORD dwFlags) PURE; \ STDMETHOD(Stop)(THIS) PURE; -ICOM_DEFINE(IDsCaptureDriverBuffer,IUnknown) +DECLARE_INTERFACE_(IDsCaptureDriverBuffer,IUnknown) { IDsCaptureDriverBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dsound.h b/include/dsound.h index e7f366e1277..ed457603bc2 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -430,7 +430,7 @@ extern HRESULT WINAPI GetDeviceID(LPCGUID lpGuidSrc, LPGUID lpGuidDest); STDMETHOD(GetSpeakerConfig)(THIS_ LPDWORD lpdwSpeakerConfig) PURE; \ STDMETHOD(SetSpeakerConfig)(THIS_ DWORD dwSpeakerConfig) PURE; \ STDMETHOD(Initialize)(THIS_ LPCGUID lpcGuid) PURE; -ICOM_DEFINE(IDirectSound,IUnknown) +DECLARE_INTERFACE_(IDirectSound,IUnknown) { IDirectSound_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -465,7 +465,7 @@ ICOM_DEFINE(IDirectSound,IUnknown) STDMETHOD(SetSpeakerConfig)(THIS_ DWORD dwSpeakerConfig) PURE; \ STDMETHOD(Initialize)(THIS_ LPCGUID lpcGuid) PURE; \ STDMETHOD(VerifyCertification)(THIS_ LPDWORD pdwCertified) PURE; -ICOM_DEFINE(IDirectSound8,IUnknown) +DECLARE_INTERFACE_(IDirectSound8,IUnknown) { IDirectSound8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -511,7 +511,7 @@ ICOM_DEFINE(IDirectSound8,IUnknown) STDMETHOD(Stop)(THIS) PURE; \ STDMETHOD(Unlock)(THIS_ LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioPtr2) PURE; \ STDMETHOD(Restore)(THIS) PURE; -ICOM_DEFINE(IDirectSoundBuffer,IUnknown) +DECLARE_INTERFACE_(IDirectSoundBuffer,IUnknown) { IDirectSoundBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -568,7 +568,7 @@ ICOM_DEFINE(IDirectSoundBuffer,IUnknown) STDMETHOD(SetFX)(THIS_ DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, LPDWORD pdwResultCodes) PURE; \ STDMETHOD(AcquireResources)(THIS_ DWORD dwFlags, DWORD dwEffectsCount, LPDWORD pdwResultCodes) PURE; \ STDMETHOD(GetObjectInPath)(THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE; -ICOM_DEFINE(IDirectSoundBuffer8,IUnknown) +DECLARE_INTERFACE_(IDirectSoundBuffer8,IUnknown) { IDirectSoundBuffer8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -611,7 +611,7 @@ ICOM_DEFINE(IDirectSoundBuffer8,IUnknown) STDMETHOD(CreateCaptureBuffer)(THIS_ LPCDSCBUFFERDESC lpcDSCBufferDesc,LPDIRECTSOUNDCAPTUREBUFFER *lplpDSCaptureBuffer, LPUNKNOWN pUnk) PURE; \ STDMETHOD(GetCaps)(THIS_ LPDSCCAPS lpDSCCaps) PURE; \ STDMETHOD(Initialize)(THIS_ LPCGUID lpcGUID) PURE; -ICOM_DEFINE(IDirectSoundCapture,IUnknown) +DECLARE_INTERFACE_(IDirectSoundCapture,IUnknown) { IDirectSoundCapture_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -638,7 +638,7 @@ ICOM_DEFINE(IDirectSoundCapture,IUnknown) STDMETHOD(Start)(THIS_ DWORD dwFlags) PURE; \ STDMETHOD(Stop)(THIS) PURE; \ STDMETHOD(Unlock)(THIS_ LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioBytes2) PURE; -ICOM_DEFINE(IDirectSoundCaptureBuffer,IUnknown) +DECLARE_INTERFACE_(IDirectSoundCaptureBuffer,IUnknown) { IDirectSoundCaptureBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -664,7 +664,7 @@ ICOM_DEFINE(IDirectSoundCaptureBuffer,IUnknown) IDirectSoundCaptureBuffer_METHODS \ STDMETHOD(GetObjectInPath)(THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE; \ STDMETHOD(GetFXStatus)(THIS_ DWORD dwFXCount, LPDWORD pdwFXStatus) PURE; -ICOM_DEFINE(IDirectSoundCaptureBuffer8,IDirectSoundCaptureBuffer) +DECLARE_INTERFACE_(IDirectSoundCaptureBuffer8,IDirectSoundCaptureBuffer) { IDirectSoundCaptureBuffer8_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -695,7 +695,7 @@ ICOM_DEFINE(IDirectSoundCaptureBuffer8,IDirectSoundCaptureBuffer) #define IDirectSoundNotify_METHODS \ IUnknown_METHODS \ STDMETHOD(SetNotificationPositions)(THIS_ DWORD cPositionNotifies, LPCDSBPOSITIONNOTIFY lpcPositionNotifies) PURE; -ICOM_DEFINE(IDirectSoundNotify,IUnknown) +DECLARE_INTERFACE_(IDirectSoundNotify,IUnknown) { IDirectSoundNotify_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -770,7 +770,7 @@ typedef const DS3DLISTENER *LPCDS3DLISTENER; STDMETHOD(SetRolloffFactor)(THIS_ D3DVALUE flRolloffFactor, DWORD dwApply) PURE; \ STDMETHOD(SetVelocity)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE; \ STDMETHOD(CommitDeferredSettings)(THIS) PURE; -ICOM_DEFINE(IDirectSound3DListener,IUnknown) +DECLARE_INTERFACE_(IDirectSound3DListener,IUnknown) { IDirectSound3DListener_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -836,7 +836,7 @@ typedef const DS3DBUFFER *LPCDS3DBUFFER; STDMETHOD(SetMode)(THIS_ DWORD dwMode, DWORD dwApply) PURE; \ STDMETHOD(SetPosition)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE; \ STDMETHOD(SetVelocity)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE; -ICOM_DEFINE(IDirectSound3DBuffer,IUnknown) +DECLARE_INTERFACE_(IDirectSound3DBuffer,IUnknown) { IDirectSound3DBuffer_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -884,7 +884,7 @@ DEFINE_GUID(IID_IKsPropertySet,0x31EFAC30,0x515C,0x11D0,0xA9,0xAA,0x00,0xAA,0x00 STDMETHOD(Get)(THIS_ REFGUID rgid,ULONG x1,LPVOID p1,ULONG x2,LPVOID p2,ULONG x3,ULONG *px4) PURE;\ STDMETHOD(Set)(THIS_ REFGUID rgid,ULONG x1,LPVOID p1,ULONG x2,LPVOID p2,ULONG x3) PURE;\ STDMETHOD(QuerySupport)(THIS_ REFGUID rgid,ULONG x1,ULONG *px2) PURE; -ICOM_DEFINE(IKsPropertySet,IUnknown) +DECLARE_INTERFACE_(IKsPropertySet,IUnknown) { IKsPropertySet_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -905,7 +905,7 @@ ICOM_DEFINE(IKsPropertySet,IUnknown) #define IDirectSoundFullDuplex_METHODS \ IUnknown_METHODS \ STDMETHOD(Initialize)(THIS_ LPCGUID pCaptureGuid,LPCGUID pRendererGuid,LPCDSCBUFFERDESC lpDscBufferDesc,LPCDSBUFFERDESC lpDsBufferDesc,HWND hWnd,DWORD dwLevel,LPLPDIRECTSOUNDCAPTUREBUFFER8 lplpDirectSoundCaptureBuffer8,LPLPDIRECTSOUNDBUFFER8 lplpDirectSoundBuffer8) PURE; -ICOM_DEFINE(IDirectSoundFullDuplex,IUnknown) +DECLARE_INTERFACE_(IDirectSoundFullDuplex,IUnknown) { IDirectSoundFullDuplex_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dxdiag.h b/include/dxdiag.h index 8563a473f40..0d0bd62d265 100644 --- a/include/dxdiag.h +++ b/include/dxdiag.h @@ -72,7 +72,7 @@ typedef struct IDxDiagContainer IDxDiagContainer, *LPDXDIAGCONTAINER, *PDX IUnknown_METHODS \ STDMETHOD(Initialize)(THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; \ STDMETHOD(GetRootContainer)(THIS_ IDxDiagContainer** ppInstance) PURE; -ICOM_DEFINE(IDxDiagProvider,IUnknown) +DECLARE_INTERFACE_(IDxDiagProvider,IUnknown) { IDxDiagProvider_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -101,7 +101,7 @@ ICOM_DEFINE(IDxDiagProvider,IUnknown) STDMETHOD(GetNumberOfProps)(THIS_ DWORD* pdwCount) PURE; \ STDMETHOD(EnumPropNames)(THIS_ DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) PURE; \ STDMETHOD(GetProp)(THIS_ LPCWSTR pwszPropName, VARIANT* pvarProp) PURE; -ICOM_DEFINE(IDxDiagContainer,IUnknown) +DECLARE_INTERFACE_(IDxDiagContainer,IUnknown) { IDxDiagContainer_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dxfile.h b/include/dxfile.h index 73535c47d1f..6c830071ba9 100644 --- a/include/dxfile.h +++ b/include/dxfile.h @@ -67,7 +67,7 @@ STDAPI DirectXFileCreate(LPDIRECTXFILE *lplpDirectXFile); STDMETHOD(CreateEnumObject) (THIS_ LPVOID, DXFILELOADOPTIONS, LPDIRECTXFILEENUMOBJECT *) PURE; \ STDMETHOD(CreateSaveObject) (THIS_ LPCSTR, DXFILEFORMAT, LPDIRECTXFILESAVEOBJECT *) PURE; \ STDMETHOD(RegisterTemplates) (THIS_ LPVOID, DWORD) PURE; -ICOM_DEFINE(IDirectXFile,IUnknown) +DECLARE_INTERFACE_(IDirectXFile,IUnknown) { IDirectXFile_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -87,7 +87,7 @@ ICOM_DEFINE(IDirectXFile,IUnknown) STDMETHOD(GetNextDataObject) (THIS_ LPDIRECTXFILEDATA *) PURE; \ STDMETHOD(GetDataObjectById) (THIS_ REFGUID, LPDIRECTXFILEDATA *) PURE; \ STDMETHOD(GetDataObjectByName) (THIS_ LPCSTR, LPDIRECTXFILEDATA *) PURE; -ICOM_DEFINE(IDirectXFileEnumObject,IUnknown) +DECLARE_INTERFACE_(IDirectXFileEnumObject,IUnknown) { IDirectXFileEnumObject_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -107,7 +107,7 @@ ICOM_DEFINE(IDirectXFileEnumObject,IUnknown) STDMETHOD(SaveTemplates) (THIS_ DWORD, const GUID **) PURE; \ STDMETHOD(CreateDataObject) (THIS_ REFGUID, LPCSTR, const GUID *, DWORD, LPVOID, LPDIRECTXFILEDATA *) PURE; \ STDMETHOD(SaveData) (THIS_ LPDIRECTXFILEDATA) PURE; -ICOM_DEFINE(IDirectXFileSaveObject,IUnknown) +DECLARE_INTERFACE_(IDirectXFileSaveObject,IUnknown) { IDirectXFileSaveObject_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -129,7 +129,7 @@ ICOM_DEFINE(IDirectXFileSaveObject,IUnknown) #define IDirectXFileObject_METHODS \ IUnknown_METHODS \ IDIRECTXFILEOBJECT_METHODS -ICOM_DEFINE(IDirectXFileObject,IUnknown) +DECLARE_INTERFACE_(IDirectXFileObject,IUnknown) { IDirectXFileObject_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -152,7 +152,7 @@ ICOM_DEFINE(IDirectXFileObject,IUnknown) STDMETHOD(AddDataObject) (THIS_ LPDIRECTXFILEDATA) PURE; \ STDMETHOD(AddDataReference) (THIS_ LPCSTR, const GUID *) PURE; \ STDMETHOD(AddBinaryObject) (THIS_ LPCSTR, const GUID *, LPCSTR, LPVOID, DWORD) PURE; -ICOM_DEFINE(IDirectXFileData,IDirectXFileObject) +DECLARE_INTERFACE_(IDirectXFileData,IDirectXFileObject) { IDirectXFileData_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -177,7 +177,7 @@ ICOM_DEFINE(IDirectXFileData,IDirectXFileObject) IUnknown_METHODS \ IDIRECTXFILEOBJECT_METHODS \ STDMETHOD(Resolve) (THIS_ LPDIRECTXFILEDATA *) PURE; -ICOM_DEFINE(IDirectXFileDataReference,IDirectXFileObject) +DECLARE_INTERFACE_(IDirectXFileDataReference,IDirectXFileObject) { IDirectXFileDataReference_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -199,7 +199,7 @@ ICOM_DEFINE(IDirectXFileDataReference,IDirectXFileObject) STDMETHOD(GetSize) (THIS_ DWORD *) PURE; \ STDMETHOD(GetMimeType) (THIS_ LPCSTR *) PURE; \ STDMETHOD(Read) (THIS_ LPVOID, DWORD, LPDWORD) PURE; -ICOM_DEFINE(IDirectXFileBinary,IDirectXFileObject) +DECLARE_INTERFACE_(IDirectXFileBinary,IDirectXFileObject) { IDirectXFileBinary_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/mapidefs.h b/include/mapidefs.h index 3fea75aefd6..1f4313cd973 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -796,7 +796,7 @@ typedef NOTIFCALLBACK *LPNOTIFCALLBACK; ULONG *lpStateLen, LPBYTE *lpState) PURE; \ STDMETHOD(SetCollapseState)(THIS_ ULONG ulFlags, ULONG ulLen, \ LPBYTE lpStart, BOOKMARK *lppWhere) PURE; -ICOM_DEFINE(IMAPITable,IUnknown) +DECLARE_INTERFACE_(IMAPITable,IUnknown) { IMAPITable_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -837,7 +837,7 @@ ICOM_DEFINE(IMAPITable,IUnknown) #define IMAPIAdviseSink_METHODS \ IUnknown_METHODS \ STDMETHOD(OnNotify)(THIS_ ULONG NumNotif, LPNOTIFICATION lpNotif) PURE; -ICOM_DEFINE(IMAPIAdviseSink,IUnknown) +DECLARE_INTERFACE_(IMAPIAdviseSink,IUnknown) { IMAPIAdviseSink_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -870,7 +870,7 @@ ICOM_DEFINE(IMAPIAdviseSink,IUnknown) STDMETHOD(GetNamesFromIDs)(THIS_ LPSPropTagArray *lppPropTags, LPGUID lpIid, ULONG ulFlags, ULONG *lpCount, \ LPMAPINAMEID **lpppNames) PURE; \ STDMETHOD(GetIDsFromNames)(THIS_ ULONG cPropNames, LPMAPINAMEID *lppNames, ULONG ulFlags, LPSPropTagArray *lppPropTags) PURE; -ICOM_DEFINE(IMAPIProp,IUnknown) +DECLARE_INTERFACE_(IMAPIProp,IUnknown) { IMAPIProp_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/mapiutil.h b/include/mapiutil.h index 600bfa2bf9a..86983b5ef3d 100644 --- a/include/mapiutil.h +++ b/include/mapiutil.h @@ -136,7 +136,7 @@ typedef void (WINAPI CALLERRELEASE)(ULONG,LPTABLEDATA,LPMAPITABLE); STDMETHOD(HrInsertRow)(THIS_ ULONG ulRow, LPSRow lpRow) PURE; \ STDMETHOD(HrModifyRows)(THIS_ ULONG ulFlags, LPSRowSet lpRows) PURE; \ STDMETHOD(HrDeleteRows)(THIS_ ULONG ulFlags, LPSRowSet lpRows, ULONG *lpCount) PURE; -ICOM_DEFINE(ITableData,IUnknown) +DECLARE_INTERFACE_(ITableData,IUnknown) { ITableData_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -220,7 +220,7 @@ static inline FILETIME FtMulDwDw(DWORD dwLeft, DWORD dwRight) STDMETHOD(HrSetPropAccess)(THIS_ LPSPropTagArray lpPropTags, ULONG *lpAccess) PURE; \ STDMETHOD(HrGetPropAccess)(THIS_ LPSPropTagArray *lppPropTags, ULONG **lppAccess) PURE; \ STDMETHOD(HrAddObjProps)(THIS_ LPSPropTagArray lppPropTags, LPSPropProblemArray *lppProbs) PURE; -ICOM_DEFINE(IPropData,IMAPIProp) +DECLARE_INTERFACE_(IPropData,IMAPIProp) { IPropData_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/mapix.h b/include/mapix.h index 4d086934084..189c1590526 100644 --- a/include/mapix.h +++ b/include/mapix.h @@ -132,7 +132,7 @@ MAPIFREEBUFFER MAPIFreeBuffer; LPMESSAGE lpSent, ULONG ulFlags, ULONG ulStatus, \ ULONG ulMsgFlags, ULONG ulAccess, LPSTR lpszClass) PURE; \ STDMETHOD(PrepareForm)(THIS_ LPCIID lpIFace, LPMESSAGE lpMsg, ULONG *lpToken) PURE; -ICOM_DEFINE(IMAPISession,IUnknown) +DECLARE_INTERFACE_(IMAPISession,IUnknown) { IMAPISession_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/mediaobj.h b/include/mediaobj.h index 4c219902383..cc191bc9b80 100644 --- a/include/mediaobj.h +++ b/include/mediaobj.h @@ -57,7 +57,7 @@ typedef struct _DMOMediaType STDMETHOD(Skip)(THIS_ DWORD cItemsToSkip) PURE; \ STDMETHOD(Reset)(THIS) PURE; \ STDMETHOD(Clone)(THIS_ IEnumDMO ** ppEnum) PURE; -ICOM_DEFINE(IEnumDMO,IUnknown) +DECLARE_INTERFACE_(IEnumDMO,IUnknown) { IEnumDMO_METHODS }; #undef INTERFACE #endif /* __mediaobj_h__ */ diff --git a/include/objbase.h b/include/objbase.h index d761e14907e..2f9f0d8d72b 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -82,7 +82,7 @@ * STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL*, IUnknown*) PURE; \ * STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT*, IUnknown*) PURE; \ * STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH, LPD3DFINDDEVICERESULT) PURE; - * ICOM_DEFINE(IDirect3D,IUnknown) + * DECLARE_INTERFACE_(IDirect3D,IUnknown) { IDirect3D_METHODS }; * #undef INTERFACE * * #ifdef COBJMACROS @@ -109,8 +109,8 @@ * be written manually (rather than using a macro to generate the equivalent code) to avoid * macro recursion (which compilers don't like). It must start with the METHODS definition * of the parent interface so that method inheritance works properly. - * - The ICOM_DEFINE finally declares all the structures necessary for the interface. We have to - * explicitly use the interface name for macro expansion reasons again. + * - The DECLARE_INTERFACE finally declares all the structures necessary for the interface. We have + * to explicitly use the interface name for macro expansion reasons again. * - The 'undef INTERFACE' is here to remind you that using INTERFACE in the following macros * will not work. * - Finally the set of 'IDirect3D_Xxx' macros is a standard set of macros defined to ease access @@ -159,8 +159,8 @@ * - IDirect3D only contains a pointer to the IDirect3D virtual/jump table. This is the only thing * the user needs to know to use the interface. Of course the structure we will define to * implement this interface will have more fields but the first one will match this pointer. - * - The code generated by ICOM_DEFINE defines both the structure representing the interface and - * the structure for the jump table. ICOM_DEFINE uses the parent's Xxx_METHODS macro to + * - The code generated by DECLARE_INTERFACE defines both the structure representing the interface and + * the structure for the jump table. DECLARE_INTERFACE uses the parent's Xxx_METHODS macro to * automatically repeat the prototypes of all the inherited methods and then uses IDirect3D_METHODS * to define the IDirect3D methods. * - Each method is declared as a pointer to function field in the jump table. The implementation @@ -297,7 +297,6 @@ /* Wine-specific macros */ -#define ICOM_DEFINE(iface,ibase) DECLARE_INTERFACE_(iface,ibase) { iface##_METHODS }; #define ICOM_VTABLE(iface) iface##Vtbl #define ICOM_VFIELD(iface) ICOM_VTABLE(iface)* lpVtbl #define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface) diff --git a/include/oledlg.h b/include/oledlg.h index a2367235a51..c5a88e5d8bd 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -672,7 +672,7 @@ DECL_WINELIB_TYPE_AW(LPOLEUICHANGESOURCE) STDMETHOD(OpenLinkSource)(THIS_ DWORD dwLink) PURE; \ STDMETHOD(UpdateLink)(THIS_ DWORD dwLink, BOOL fErrorMessage, BOOL fReserved) PURE; \ STDMETHOD(CancelLink)(THIS_ DWORD dwLink) PURE; -ICOM_DEFINE(IOleUILinkContainerA, IUnknown) +DECLARE_INTERFACE_(IOleUILinkContainerA, IUnknown) { IOleUILinkContainerA_METHODS }; #undef INTERFACE #define INTERFACE IOleUILinkContainerW @@ -689,7 +689,7 @@ ICOM_DEFINE(IOleUILinkContainerA, IUnknown) STDMETHOD(OpenLinkSource)(THIS_ DWORD dwLink) PURE; \ STDMETHOD(UpdateLink)(THIS_ DWORD dwLink, BOOL fErrorMessage, BOOL fReserved) PURE; \ STDMETHOD(CancelLink)(THIS_ DWORD dwLink) PURE; -ICOM_DEFINE(IOleUILinkContainerW, IUnknown) +DECLARE_INTERFACE_(IOleUILinkContainerW, IUnknown) { IOleUILinkContainerW_METHODS }; #undef INTERFACE DECL_WINELIB_TYPE_AW(IOleUILinkContainer) @@ -720,14 +720,14 @@ DECL_WINELIB_TYPE_AW(LPOLEUILINKCONTAINER) #define IOleUILinkInfoA_METHODS \ IOleUILinkContainerA_METHODS \ STDMETHOD(GetLastUpdate)(THIS_ DWORD dwLink, FILETIME *lpLastUpdate) PURE; -ICOM_DEFINE(IOleUILinkInfoA, IOleUILinkContainerA) +DECLARE_INTERFACE_(IOleUILinkInfoA, IOleUILinkContainerA) { IOleUILinkInfoA_METHODS }; #undef INTERFACE #define INTERFACE IOleUILinkInfoW #define IOleUILinkInfoW_METHODS \ IOleUILinkContainerW_METHODS \ STDMETHOD(GetLastUpdate)(THIS_ DWORD dwLink, FILETIME *lpLastUpdate) PURE; -ICOM_DEFINE(IOleUILinkInfoW, IOleUILinkContainerW) +DECLARE_INTERFACE_(IOleUILinkInfoW, IOleUILinkContainerW) { IOleUILinkInfoW_METHODS }; #undef INTERFACE DECL_WINELIB_TYPE_AW(IOleUILinkInfo) @@ -767,7 +767,7 @@ DECL_WINELIB_TYPE_AW(LPOLEUILINKINFO) 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; -ICOM_DEFINE(IOleUIObjInfoA, IUnknown) +DECLARE_INTERFACE_(IOleUIObjInfoA, IUnknown) { IOleUIObjInfoA_METHODS }; #undef INTERFACE #define INTERFACE IOleUIObjInfoW @@ -781,7 +781,7 @@ ICOM_DEFINE(IOleUIObjInfoA, IUnknown) 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; -ICOM_DEFINE(IOleUIObjInfoW, IUnknown) +DECLARE_INTERFACE_(IOleUIObjInfoW, IUnknown) { IOleUIObjInfoW_METHODS }; #undef INTERFACE DECL_WINELIB_TYPE_AW(IOleUIObjInfo) diff --git a/include/shlobj.h b/include/shlobj.h index 00b097c6798..6e6eb7e7b1f 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -183,7 +183,7 @@ typedef GUID SHELLVIEWID; #define IShellIcon_METHODS \ IUnknown_METHODS \ STDMETHOD(GetIconOf)(THIS_ LPCITEMIDLIST pidl, UINT flags, LPINT lpIconIndex) PURE; -ICOM_DEFINE(IShellIcon, IUnknown) +DECLARE_INTERFACE_(IShellIcon, IUnknown) { IShellIcon_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -666,7 +666,7 @@ typedef struct IShellChangeNotify IShellChangeNotify, *LPSHELLCHANGENOTIFY; IUnknown_METHODS \ STDMETHOD(OnChange)(THIS_ LONG lEvent, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) PURE; -ICOM_DEFINE(IShellChangeNotify, IUnknown) +DECLARE_INTERFACE_(IShellChangeNotify, IUnknown) { IShellChangeNotify_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/shlwapi.h b/include/shlwapi.h index d6e21a7041d..47328a6520a 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -252,7 +252,7 @@ typedef struct IQueryAssociations IQueryAssociations,*LPQUERYASSOCIATIONS; 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; -ICOM_DEFINE(IQueryAssociations,IUnknown) +DECLARE_INTERFACE_(IQueryAssociations,IUnknown) { IQueryAssociations_METHODS }; #undef INTERFACE #ifdef COBJMACROS diff --git a/include/vfw.h b/include/vfw.h index b16074210c9..6e62f378f58 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -1004,7 +1004,7 @@ DEFINE_AVIGUID(CLSID_AVIFile, 0x00020000, 0, 0); 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; -ICOM_DEFINE(IAVIStream, IUnknown) +DECLARE_INTERFACE_(IAVIStream, IUnknown) { IAVIStream_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1118,7 +1118,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime); IUnknown_METHODS \ STDMETHOD(Begin)(IAVIStreaming*iface,LONG lStart,LONG lEnd,LONG lRate) PURE; \ STDMETHOD(End)(IAVIStreaming*iface) PURE; -ICOM_DEFINE(IAVIStreaming, IUnknown) +DECLARE_INTERFACE_(IAVIStreaming, IUnknown) { IAVIStreaming_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1142,7 +1142,7 @@ ICOM_DEFINE(IAVIStreaming, IUnknown) STDMETHOD(Paste)(IAVIEditStream*iface,LONG*plStart,LONG*plLength,PAVISTREAM pSource,LONG lStart,LONG lEnd) PURE; \ STDMETHOD(Clone)(IAVIEditStream*iface,PAVISTREAM*ppResult) PURE; \ STDMETHOD(SetInfo)(IAVIEditStream*iface,LPAVISTREAMINFOW asi, LONG size) PURE; -ICOM_DEFINE(IAVIEditStream,IUnknown) +DECLARE_INTERFACE_(IAVIEditStream,IUnknown) { IAVIEditStream_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1191,7 +1191,7 @@ HRESULT WINAPI EditStreamSetNameW(PAVISTREAM pstream, LPCWSTR szName); STDMETHOD(ReadData)(THIS_ DWORD fcc, LPVOID lpBuffer, LONG *lpcbBuffer) PURE; \ STDMETHOD(EndRecord)(THIS) PURE; \ STDMETHOD(DeleteStream)(THIS_ DWORD fccType, LONG lParam) PURE; -ICOM_DEFINE(IAVIFile,IUnknown) +DECLARE_INTERFACE_(IAVIFile,IUnknown) { IAVIFile_METHODS }; #undef INTERFACE #ifdef COBJMACROS @@ -1239,7 +1239,7 @@ HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile); 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; -ICOM_DEFINE(IGetFrame,IUnknown) +DECLARE_INTERFACE_(IGetFrame,IUnknown) { IGetFrame_METHODS }; #undef INTERFACE #ifdef COBJMACROS