ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Define the COM macros even in C++.

This commit is contained in:
Francois Gouget 1999-10-23 20:09:05 +00:00 committed by Alexandre Julliard
parent 891d4d22a7
commit be9fd31b92
42 changed files with 25 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/d3d.h
View File

@ -1219,7 +1219,6 @@ typedef enum _D3DTEXTURESTAGESTATETYPE {
ICOM_DEFINE(IDirect3D,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3D_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3D_AddRef(p) ICOM_CALL (AddRef,p)
@ -1231,7 +1230,6 @@ ICOM_DEFINE(IDirect3D,IUnknown)
#define IDirect3D_CreateMaterial(p,a,b) ICOM_CALL2(CreateMaterial,p,a,b)
#define IDirect3D_CreateViewport(p,a,b) ICOM_CALL2(CreateViewport,p,a,b)
#define IDirect3D_FindDevice(p,a,b) ICOM_CALL2(FindDevice,p,a,b)
#endif
/*****************************************************************************
@ -1251,7 +1249,6 @@ ICOM_DEFINE(IDirect3D,IUnknown)
ICOM_DEFINE(IDirect3D2,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3D2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3D2_AddRef(p) ICOM_CALL (AddRef,p)
@ -1263,7 +1260,6 @@ ICOM_DEFINE(IDirect3D2,IUnknown)
#define IDirect3D2_CreateViewport(p,a,b) ICOM_CALL2(CreateViewport,p,a,b)
#define IDirect3D2_FindDevice(p,a,b) ICOM_CALL2(FindDevice,p,a,b)
#define IDirect3D2_CreateDevice(p,a,b,c) ICOM_CALL3(CreateDevice,p,a,b,c)
#endif
/*****************************************************************************
@ -1286,7 +1282,6 @@ ICOM_DEFINE(IDirect3D2,IUnknown)
ICOM_DEFINE(IDirect3D3,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3D3_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3D3_AddRef(p) ICOM_CALL (AddRef,p)
@ -1301,7 +1296,6 @@ ICOM_DEFINE(IDirect3D3,IUnknown)
#define IDirect3D3_CreateVertexBuffer(p,a,b,c,d) ICOM_CALL4(CreateVertexBuffer,p,a,b,c,d)
#define IDirect3D3_EnumZBufferFormats(p,a,b,c) ICOM_CALL3(EnumZBufferFormats,p,a,b,c)
#define IDirect3D3_EvictManagedTextures(p) ICOM_CALL0(EvictManagedTextures,p)
#endif
/*****************************************************************************
@ -1318,7 +1312,6 @@ ICOM_DEFINE(IDirect3D3,IUnknown)
ICOM_DEFINE(IDirect3DLight,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DLight_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DLight_AddRef(p) ICOM_CALL (AddRef,p)
@ -1327,7 +1320,6 @@ ICOM_DEFINE(IDirect3DLight,IUnknown)
#define IDirect3DLight_Initialize(p,a) ICOM_CALL1(Initialize,p,a)
#define IDirect3DLight_SetLight(p,a) ICOM_CALL1(SetLight,p,a)
#define IDirect3DLight_GetLight(p,a) ICOM_CALL1(GetLight,p,a)
#endif
/*****************************************************************************
@ -1347,7 +1339,6 @@ ICOM_DEFINE(IDirect3DLight,IUnknown)
ICOM_DEFINE(IDirect3DMaterial,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DMaterial_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DMaterial_AddRef(p) ICOM_CALL (AddRef,p)
@ -1359,7 +1350,6 @@ ICOM_DEFINE(IDirect3DMaterial,IUnknown)
#define IDirect3DMaterial_GetHandle(p,a,b) ICOM_CALL2(GetHandle,p,a,b)
#define IDirect3DMaterial_Reserve(p) ICOM_CALL (Reserve,p)
#define IDirect3DMaterial_Unreserve(p) ICOM_CALL (Unreserve,p)
#endif
/*****************************************************************************
@ -1376,7 +1366,6 @@ ICOM_DEFINE(IDirect3DMaterial,IUnknown)
ICOM_DEFINE(IDirect3DMaterial2,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DMaterial2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DMaterial2_AddRef(p) ICOM_CALL (AddRef,p)
@ -1385,7 +1374,6 @@ ICOM_DEFINE(IDirect3DMaterial2,IUnknown)
#define IDirect3DMaterial2_SetMaterial(p,a) ICOM_CALL1(SetMaterial,p,a)
#define IDirect3DMaterial2_GetMaterial(p,a) ICOM_CALL1(GetMaterial,p,a)
#define IDirect3DMaterial2_GetHandle(p,a,b) ICOM_CALL2(GetHandle,p,a,b)
#endif
/*****************************************************************************
@ -1402,7 +1390,6 @@ ICOM_DEFINE(IDirect3DMaterial2,IUnknown)
ICOM_DEFINE(IDirect3DMaterial3,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DMaterial3_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DMaterial3_AddRef(p) ICOM_CALL (AddRef,p)
@ -1411,7 +1398,6 @@ ICOM_DEFINE(IDirect3DMaterial3,IUnknown)
#define IDirect3DMaterial3_SetMaterial(p,a) ICOM_CALL1(SetMaterial,p,a)
#define IDirect3DMaterial3_GetMaterial(p,a) ICOM_CALL1(GetMaterial,p,a)
#define IDirect3DMaterial3_GetHandle(p,a,b) ICOM_CALL2(GetHandle,p,a,b)
#endif
/*****************************************************************************
@ -1430,7 +1416,6 @@ ICOM_DEFINE(IDirect3DMaterial3,IUnknown)
ICOM_DEFINE(IDirect3DTexture,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DTexture_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DTexture_AddRef(p) ICOM_CALL (AddRef,p)
@ -1441,7 +1426,6 @@ ICOM_DEFINE(IDirect3DTexture,IUnknown)
#define IDirect3DTexture_PaletteChanged(p,a,b,c) ICOM_CALL(PaletteChanged,p,a,b,c)
#define IDirect3DTexture_Load(p,a,b,c) ICOM_CALL(Load,p,a,b,c)
#define IDirect3DTexture_Unload(p,a,b,c) ICOM_CALL(Unload,p,a,b,c)
#endif
/*****************************************************************************
@ -1458,7 +1442,6 @@ ICOM_DEFINE(IDirect3DTexture,IUnknown)
ICOM_DEFINE(IDirect3DTexture2,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DTexture2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DTexture2_AddRef(p) ICOM_CALL (AddRef,p)
@ -1467,7 +1450,6 @@ ICOM_DEFINE(IDirect3DTexture2,IUnknown)
#define IDirect3DTexture2_GetHandle(p,a,b) ICOM_CALL2(GetHandle,p,a,b)
#define IDirect3DTexture2_PaletteChanged(p,a,b) ICOM_CALL2(PaletteChanged,p,a,b)
#define IDirect3DTexture2_Load(p,a) ICOM_CALL1(Load,p,a)
#endif
/*****************************************************************************
@ -1494,7 +1476,6 @@ ICOM_DEFINE(IDirect3DTexture2,IUnknown)
ICOM_DEFINE(IDirect3DViewport,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DViewport_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DViewport_AddRef(p) ICOM_CALL (AddRef,p)
@ -1513,7 +1494,6 @@ ICOM_DEFINE(IDirect3DViewport,IUnknown)
#define IDirect3DViewport_AddLight(p,a) ICOM_CALL1(AddLight,p,a)
#define IDirect3DViewport_DeleteLight(p,a) ICOM_CALL1(DeleteLight,p,a)
#define IDirect3DViewport_NextLight(p,a,b,c) ICOM_CALL3(NextLight,p,a,b,c)
#endif
/*****************************************************************************
@ -1529,7 +1509,6 @@ ICOM_DEFINE(IDirect3DViewport,IUnknown)
ICOM_DEFINE(IDirect3DViewport2,IDirect3DViewport)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DViewport2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DViewport2_AddRef(p) ICOM_CALL (AddRef,p)
@ -1551,7 +1530,6 @@ ICOM_DEFINE(IDirect3DViewport2,IDirect3DViewport)
/*** IDirect3DViewport2 methods ***/
#define IDirect3DViewport2_GetViewport2(p,a) ICOM_CALL1(GetViewport2,p,a)
#define IDirect3DViewport2_SetViewport2(p,a) ICOM_CALL1(SetViewport2,p,a)
#endif
/*****************************************************************************
* IDirect3DViewport3 interface
@ -1567,7 +1545,6 @@ ICOM_DEFINE(IDirect3DViewport2,IDirect3DViewport)
ICOM_DEFINE(IDirect3DViewport3,IDirect3DViewport)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DViewport3_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DViewport3_AddRef(p) ICOM_CALL (AddRef,p)
@ -1593,7 +1570,6 @@ ICOM_DEFINE(IDirect3DViewport3,IDirect3DViewport)
#define IDirect3DViewport3_SetBackgroundDepth2(p,a) ICOM_CALL1(SetBackgroundDepth2,p,a)
#define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) ICOM_CALL2(GetBackgroundDepth2,p,a,b)
#define IDirect3DViewport3_Clear2(p,a,b,c,d,e,f) ICOM_CALL7(Clear2,p,a,b,c,d,e,f)
#endif
@ -1615,7 +1591,6 @@ ICOM_DEFINE(IDirect3DViewport3,IDirect3DViewport)
ICOM_DEFINE(IDirect3DExecuteBuffer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DExecuteBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DExecuteBuffer_AddRef(p) ICOM_CALL (AddRef,p)
@ -1628,7 +1603,6 @@ ICOM_DEFINE(IDirect3DExecuteBuffer,IUnknown)
#define IDirect3DExecuteBuffer_GetExecuteData(p,a) ICOM_CALL1(GetExecuteData,p,a)
#define IDirect3DExecuteBuffer_Validate(p,a,b,c,d) ICOM_CALL4(Validate,p,a,b,c,d)
#define IDirect3DExecuteBuffer_Optimize(p,a) ICOM_CALL1(Optimize,p,a)
#endif
/*****************************************************************************
@ -1661,7 +1635,6 @@ ICOM_DEFINE(IDirect3DExecuteBuffer,IUnknown)
ICOM_DEFINE(IDirect3DDevice,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DDevice_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DDevice_AddRef(p) ICOM_CALL (AddRef,p)
@ -1686,7 +1659,6 @@ ICOM_DEFINE(IDirect3DDevice,IUnknown)
#define IDirect3DDevice_BeginScene(p) ICOM_CALL (BeginScene,p)
#define IDirect3DDevice_EndScene(p) ICOM_CALL (EndScene,p)
#define IDirect3DDevice_GetDirect3D(p,a) ICOM_CALL1(GetDirect3D,p,a)
#endif
/*****************************************************************************
@ -1731,7 +1703,6 @@ ICOM_DEFINE(IDirect3DDevice,IUnknown)
ICOM_DEFINE(IDirect3DDevice2,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DDevice2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DDevice2_AddRef(p) ICOM_CALL (AddRef,p)
@ -1767,7 +1738,6 @@ ICOM_DEFINE(IDirect3DDevice2,IUnknown)
#define IDirect3DDevice2_DrawIndexedPrimitive(p,a,b,c,d,e,f,g) ICOM_CALL7(DrawIndexedPrimitive,p,a,b,c,d,e,f,g)
#define IDirect3DDevice2_SetClipStatus(p,a) ICOM_CALL1(SetClipStatus,p,a)
#define IDirect3DDevice2_GetClipStatus(p,a) ICOM_CALL1(GetClipStatus,p,a)
#endif
/*****************************************************************************
* IDirect3DDevice3 interface
@ -1820,7 +1790,6 @@ ICOM_DEFINE(IDirect3DDevice2,IUnknown)
ICOM_DEFINE(IDirect3DDevice3,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DDevice3_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DDevice3_AddRef(p) ICOM_CALL (AddRef,p)
@ -1865,7 +1834,6 @@ ICOM_DEFINE(IDirect3DDevice3,IUnknown)
#define IDirect3DDevice3_GetTextureStageState(p,a,b,c) ICOM_CALL3(GetTextureStageState,p,a,b,c)
#define IDirect3DDevice3_SetTextureStageState(p,a,b,c) ICOM_CALL3(SetTextureStageState,p,a,b,c)
#define IDirect3DDevice3_ValidateDevice(p,a) ICOM_CALL1(ValidateDevice,p,a)
#endif
/*****************************************************************************
@ -1884,7 +1852,6 @@ ICOM_DEFINE(IDirect3DDevice3,IUnknown)
ICOM_DEFINE(IDirect3DVertexBuffer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirect3DVertexBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirect3DVertexBuffer_AddRef(p) ICOM_CALL (AddRef,p)
@ -1895,7 +1862,6 @@ ICOM_DEFINE(IDirect3DVertexBuffer,IUnknown)
#define IDirect3DVertexBuffer_ProcessVertices(p,a,b,c,d,e,f,g) ICOM_CALL7(ProcessVertices,p,a,b,c,d,e,f,g)
#define IDirect3DVertexBuffer_GetVertexBufferDesc(p,a) ICOM_CALL1(GetVertexBufferDesc,p,a)
#define IDirect3DVertexBuffer_Optimize(p,a,b) ICOM_CALL2(Optimize,p,a,b)
#endif
#endif /* __WINE_D3D_H */

20
include/ddraw.h
View File

@ -850,7 +850,6 @@ typedef struct tagDDDEVICEIDENTIFIER {
ICOM_DEFINE(IDirectDrawPalette,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDrawPalette_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDrawPalette_AddRef(p) ICOM_CALL (AddRef,p)
@ -860,7 +859,6 @@ ICOM_DEFINE(IDirectDrawPalette,IUnknown)
#define IDirectDrawPalette_GetEntries(p,a,b,c,d) ICOM_CALL4(GetEntries,p,a,b,c,d)
#define IDirectDrawPalette_Initialize(p,a,b,c) ICOM_CALL3(Initialize,p,a,b,c)
#define IDirectDrawPalette_SetEntries(p,a,b,c,d) ICOM_CALL4(SetEntries,p,a,b,c,d)
#endif
/*****************************************************************************
@ -880,7 +878,6 @@ ICOM_DEFINE(IDirectDrawPalette,IUnknown)
ICOM_DEFINE(IDirectDrawClipper,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDrawClipper_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDrawClipper_AddRef(p) ICOM_CALL (AddRef,p)
@ -892,7 +889,6 @@ ICOM_DEFINE(IDirectDrawClipper,IUnknown)
#define IDirectDrawClipper_IsClipListChanged(p,a) ICOM_CALL1(IsClipListChanged,p,a)
#define IDirectDrawClipper_SetClipList(p,a,b) ICOM_CALL2(SetClipList,p,a,b)
#define IDirectDrawClipper_SetHWnd(p,a,b) ICOM_CALL2(SetHWnd,p,a,b)
#endif
/*****************************************************************************
@ -926,7 +922,6 @@ ICOM_DEFINE(IDirectDrawClipper,IUnknown)
ICOM_DEFINE(IDirectDraw,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDraw_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDraw_AddRef(p) ICOM_CALL (AddRef,p)
@ -952,7 +947,6 @@ ICOM_DEFINE(IDirectDraw,IUnknown)
#define IDirectDraw_SetCooperativeLevel(p,a,b) ICOM_CALL2(SetCooperativeLevel,p,a,b)
#define IDirectDraw_SetDisplayMode(p,a,b,c) ICOM_CALL3(SetDisplayMode,p,a,b,c)
#define IDirectDraw_WaitForVerticalBlank(p,a,b) ICOM_CALL2(WaitForVerticalBlank,p,a,b)
#endif
/* flags for Lock() */
@ -1000,7 +994,6 @@ ICOM_DEFINE(IDirectDraw,IUnknown)
ICOM_DEFINE(IDirectDraw2,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDraw2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDraw2_AddRef(p) ICOM_CALL (AddRef,p)
@ -1028,7 +1021,6 @@ ICOM_DEFINE(IDirectDraw2,IUnknown)
#define IDirectDraw2_WaitForVerticalBlank(p,a,b) ICOM_CALL2(WaitForVerticalBlank,p,a,b)
/*** IDirectDraw2 methods ***/
#define IDirectDraw2_GetAvailableVidMem(p,a,b,c) ICOM_CALL3(GetAvailableVidMem,p,a,b,c)
#endif
/*****************************************************************************
@ -1046,7 +1038,6 @@ ICOM_DEFINE(IDirectDraw2,IUnknown)
ICOM_DEFINE(IDirectDraw4,IDirectDraw2)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDraw4_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDraw4_AddRef(p) ICOM_CALL (AddRef,p)
@ -1079,7 +1070,6 @@ ICOM_DEFINE(IDirectDraw4,IDirectDraw2)
#define IDirectDraw4_RestoreAllSurfaces(pc) ICOM_CALL (RestoreAllSurfaces,p)
#define IDirectDraw4_TestCooperativeLevel(p) ICOM_CALL (TestCooperativeLevel,p)
#define IDirectDraw4_GetDeviceIdentifier(p,a,b) ICOM_CALL2(GetDeviceIdentifier,p,a,b)
#endif
/*****************************************************************************
@ -1126,7 +1116,6 @@ ICOM_DEFINE(IDirectDraw4,IDirectDraw2)
ICOM_DEFINE(IDirectDrawSurface,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDrawSurface_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDrawSurface_AddRef(p) ICOM_CALL (AddRef,p)
@ -1165,7 +1154,6 @@ ICOM_DEFINE(IDirectDrawSurface,IUnknown)
#define IDirectDrawSurface_UpdateOverlay(p,a,b,c,d,e) ICOM_CALL5(UpdateOverlay,p,a,b,c,d,e)
#define IDirectDrawSurface_UpdateOverlayDisplay(p,a) ICOM_CALL1(UpdateOverlayDisplay,p,a)
#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b) ICOM_CALL2(UpdateOverlayZOrder,p,a,b)
#endif
/*****************************************************************************
@ -1219,7 +1207,6 @@ ICOM_DEFINE(IDirectDrawSurface,IUnknown)
ICOM_DEFINE(IDirectDrawSurface2,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDrawSurface2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDrawSurface2_AddRef(p) ICOM_CALL (AddRef,p)
@ -1262,7 +1249,6 @@ ICOM_DEFINE(IDirectDrawSurface2,IUnknown)
#define IDirectDrawSurface2_GetDDInterface(p,a) ICOM_CALL1(GetDDInterface,p,a)
#define IDirectDrawSurface2_PageLock(p,a) ICOM_CALL1(PageLock,p,a)
#define IDirectDrawSurface2_PageUnlock(p,a) ICOM_CALL1(PageUnlock,p,a)
#endif
/*****************************************************************************
@ -1318,7 +1304,6 @@ ICOM_DEFINE(IDirectDrawSurface2,IUnknown)
ICOM_DEFINE(IDirectDrawSurface3,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDrawSurface3_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDrawSurface3_AddRef(p) ICOM_CALL (AddRef,p)
@ -1363,7 +1348,6 @@ ICOM_DEFINE(IDirectDrawSurface3,IUnknown)
#define IDirectDrawSurface3_PageUnlock(p,a) ICOM_CALL1(PageUnlock,p,a)
/*** IDirectDrawSurface3 methods ***/
#define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) ICOM_CALL2(SetSurfaceDesc,p,a,b)
#endif
/*****************************************************************************
@ -1429,7 +1413,6 @@ ICOM_DEFINE(IDirectDrawSurface3,IUnknown)
ICOM_DEFINE(IDirectDrawSurface4,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDrawSurface4_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDrawSurface4_AddRef(p) ICOM_CALL (AddRef,p)
@ -1480,7 +1463,6 @@ ICOM_DEFINE(IDirectDrawSurface4,IUnknown)
#define IDirectDrawSurface4_FreePrivateData(p,a) ICOM_CALL1(FreePrivateData,p,a)
#define IDirectDrawSurface4_GetUniquenessValue(p,a) ICOM_CALL1(GetUniquenessValue,p,a)
#define IDirectDrawSurface4_ChangeUniquenessValue(p) ICOM_CALL (ChangeUniquenessValue,p)
#endif
/*****************************************************************************
@ -1496,7 +1478,6 @@ ICOM_DEFINE(IDirectDrawSurface4,IUnknown)
ICOM_DEFINE(IDirectDrawColorControl,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectDrawColorControl_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectDrawColorControl_AddRef(p) ICOM_CALL (AddRef,p)
@ -1504,7 +1485,6 @@ ICOM_DEFINE(IDirectDrawColorControl,IUnknown)
/*** IDirectDrawColorControl methods ***/
#define IDirectDrawColorControl_GetColorControls(p,a) ICOM_CALL(GetColorControls,p,a)
#define IDirectDrawColorControl_SetColorControls(p,a) ICOM_CALL(SetColorControls,p,a)
#endif
HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);

8
include/dinput.h
View File

@ -753,7 +753,6 @@ typedef struct DIJOYSTATE2 {
ICOM_DEFINE(IDirectInputEffect,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectInputEffect_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectInputEffect_AddRef(p) ICOM_CALL (AddRef,p)
@ -769,7 +768,6 @@ ICOM_DEFINE(IDirectInputEffect,IUnknown)
#define IDirectInputEffect_Download(p) ICOM_CALL (Download,p)
#define IDirectInputEffect_Unload(p) ICOM_CALL (Unload,p)
#define IDirectInputEffect_Escape(p,a) ICOM_CALL1(Escape,p,a)
#endif
/*****************************************************************************
@ -798,7 +796,6 @@ ICOM_DEFINE(IDirectInputEffect,IUnknown)
ICOM_DEFINE(IDirectInputDeviceA,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectInputDevice_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectInputDevice_AddRef(p) ICOM_CALL (AddRef,p)
@ -819,7 +816,6 @@ ICOM_DEFINE(IDirectInputDeviceA,IUnknown)
#define IDirectInputDevice_GetDeviceInfo(p,a) ICOM_CALL1(GetDeviceInfo,p,a)
#define IDirectInputDevice_RunControlPanel(p,a,b) ICOM_CALL2(RunControlPanel,p,a,b)
#define IDirectInputDevice_Initialize(p,a,b,c) ICOM_CALL3(Initialize,p,a,b,c)
#endif
/*****************************************************************************
@ -842,7 +838,6 @@ ICOM_DEFINE(IDirectInputDeviceA,IUnknown)
ICOM_DEFINE(IDirectInputDevice2A,IDirectInputDeviceA)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectInputDevice2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectInputDevice2_AddRef(p) ICOM_CALL (AddRef,p)
@ -873,7 +868,6 @@ ICOM_DEFINE(IDirectInputDevice2A,IDirectInputDeviceA)
#define IDirectInputDevice2_Escape(p,a) ICOM_CALL1(Escape,p,a)
#define IDirectInputDevice2_Poll(p) ICOM_CALL (Poll,p)
#define IDirectInputDevice2_SendDeviceData(p,a,b,c,d) ICOM_CALL4(SendDeviceData,p,a,b,c,d)
#endif
/* "Standard" Mouse report... */
typedef struct DIMOUSESTATE {
@ -908,7 +902,6 @@ typedef struct DIMOUSESTATE {
ICOM_DEFINE(IDirectInputA,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectInputA_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectInputA_AddRef(p) ICOM_CALL (AddRef,p)
@ -919,7 +912,6 @@ ICOM_DEFINE(IDirectInputA,IUnknown)
#define IDirectInputA_GetDeviceStatus(p,a) ICOM_CALL1(GetDeviceStatus,p,a)
#define IDirectInputA_RunControlPanel(p,a,b) ICOM_CALL2(RunControlPanel,p,a,b)
#define IDirectInputA_Initialize(p,a,b) ICOM_CALL2(Initialize,p,a,b)
#endif
/* Export functions */

14
include/docobj.h
View File

@ -162,7 +162,6 @@ typedef struct IPrint IPrint, *LPPRINT;
ICOM_DEFINE(IOleDocument,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleDocument_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleDocument_AddRef(p) ICOM_CALL (AddRef,p)
@ -171,7 +170,6 @@ ICOM_DEFINE(IOleDocument,IUnknown)
#define IOleDocument_CreateView(p,a,b,c,d) ICOM_CALL4(CreateView,p,a,b,c,d)
#define IOleDocument_GetDocMiscStatus(p,a) ICOM_CALL1(GetDocMiscStatus,p,a)
#define IOleDocument_EnumViews(p,a,b) ICOM_CALL2(EnumViews,p,a,b)
#endif
/*****************************************************************************
@ -186,14 +184,12 @@ ICOM_DEFINE(IOleDocument,IUnknown)
ICOM_DEFINE(IOleDocumentSite,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleDocumentSite_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleDocumentSite_AddRef(p) ICOM_CALL (AddRef,p)
#define IOleDocumentSite_Release(p) ICOM_CALL (Release,p)
/*** IOleDocumentSite methods ***/
#define IOleDocumentSite_ActivateMe(p,a) ICOM_CALL4(ActivateMe,p,a)
#endif
/*****************************************************************************
@ -220,7 +216,6 @@ ICOM_DEFINE(IOleDocumentSite,IUnknown)
ICOM_DEFINE(IOleDocumentView,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleDocumentView_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleDocumentView_AddRef(p) ICOM_CALL (AddRef,p)
@ -239,7 +234,6 @@ ICOM_DEFINE(IOleDocumentView,IUnknown)
#define IOleDocumentView_SaveViewState(p,a) ICOM_CALL1(SaveViewState,p,a)
#define IOleDocumentView_ApplyViewState(p,a) ICOM_CALL1(ApplyViewState,p,a)
#define IOleDocumentView_Clone(p,a,b) ICOM_CALL2(Clone,p,a,b)
#endif
/*****************************************************************************
@ -257,7 +251,6 @@ ICOM_DEFINE(IOleDocumentView,IUnknown)
ICOM_DEFINE(IEnumOleDocumentViews,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumOleDocumentViews_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumOleDocumentViews_AddRef(p) ICOM_CALL (AddRef,p)
@ -267,7 +260,6 @@ ICOM_DEFINE(IEnumOleDocumentViews,IUnknown)
#define IEnumOleDocumentViews_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumOleDocumentViews_Reset(p) ICOM_CALL (Reset,p)
#define IEnumOleDocumentViews_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************
@ -283,7 +275,6 @@ ICOM_DEFINE(IEnumOleDocumentViews,IUnknown)
ICOM_DEFINE(IOleCommandTarget,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleCommandTarget_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleCommandTarget_AddRef(p) ICOM_CALL (AddRef,p)
@ -291,7 +282,6 @@ ICOM_DEFINE(IOleCommandTarget,IUnknown)
/*** IOleCommandTarget methods ***/
#define IOleCommandTarget_QueryStatus(p,a,b,c,d) ICOM_CALL4(QueryStatus,p,a,b,c,d)
#define IOleCommandTarget_Exec(p,a,b,c,d,e) ICOM_CALL5(Exec,p,a,b,c,d,e)
#endif
/*****************************************************************************
@ -307,7 +297,6 @@ ICOM_DEFINE(IOleCommandTarget,IUnknown)
ICOM_DEFINE(IContinueCallback,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IContinueCallback_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IContinueCallback_AddRef(p) ICOM_CALL (AddRef,p)
@ -315,7 +304,6 @@ ICOM_DEFINE(IContinueCallback,IUnknown)
/*** IContinueCallback methods ***/
#define IContinueCallback_FContinue(p) ICOM_CALL (FContinue,p)
#define IContinueCallback_FContinuePrinting(p,a,b,c) ICOM_CALL3(FContinuePrinting,p,a,b,c)
#endif
/*****************************************************************************
@ -332,7 +320,6 @@ ICOM_DEFINE(IContinueCallback,IUnknown)
ICOM_DEFINE(IPrint,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPrint_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPrint_AddRef(p) ICOM_CALL (AddRef,p)
@ -341,7 +328,6 @@ ICOM_DEFINE(IPrint,IUnknown)
#define IPrint_SetInitialPageNum(p,a) ICOM_CALL1(SetInitialPageNum,p,a)
#define IPrint_GetPageInfo(p,a,b) ICOM_CALL2(GetPageInfo,p,a,b)
#define IPrint_Print(p,a,b,c,d,e,f,g) ICOM_CALL7(Print,p,a,b,c,d,e,f,g)
#endif
#define LPMSODOCUMENT LPOLEDOCUMENT

9
include/dplay.h
View File

@ -419,7 +419,6 @@ typedef BOOL (CALLBACK* LPDPENUMSESSIONSCALLBACK2)(
ICOM_DEFINE(IDirectPlay,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectPlay_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectPlay_AddRef(p) ICOM_CALL (AddRef,p)
@ -447,7 +446,6 @@ ICOM_DEFINE(IDirectPlay,IUnknown)
#define IDirectPlay_SaveSession(p,a) ICOM_CALL1(SaveSession,p,a)
#define IDirectPlay_Send(p,a,b,c,d,e) ICOM_CALL5(Send,p,a,b,c,d,e)
#define IDirectPlay_SetPlayerName(p,a,b,c) ICOM_CALL3(SetPlayerName,p,a,b,c)
#endif
/*****************************************************************************
@ -490,7 +488,6 @@ ICOM_DEFINE(IDirectPlay,IUnknown)
ICOM_DEFINE(IDirectPlay2,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectPlay2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectPlay2_AddRef(p) ICOM_CALL (AddRef,p)
@ -525,7 +522,6 @@ ICOM_DEFINE(IDirectPlay2,IUnknown)
#define IDirectPlay2_SetPlayerData(p,a,b,c,d) ICOM_CALL4(SetPlayerData,p,a,b,c,d)
#define IDirectPlay2_SetPlayerName(p,a,b,c) ICOM_CALL3(SetPlayerName,p,a,b,c)
#define IDirectPlay2_SetSessionDesc(p,a,b) ICOM_CALL2(SetSessionDesc,p,a,b)
#endif
/*****************************************************************************
@ -554,7 +550,6 @@ ICOM_DEFINE(IDirectPlay2,IUnknown)
ICOM_DEFINE(IDirectPlay3,IDirectPlay2)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectPlay3_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectPlay3_AddRef(p) ICOM_CALL (AddRef,p)
@ -605,7 +600,6 @@ ICOM_DEFINE(IDirectPlay3,IDirectPlay2)
#define IDirectPlay3_GetGroupParent(p,a,b) ICOM_CALL2(GetGroupParent,p,a,b)
#define IDirectPlay3_GetPlayerAccount(p,a,b,c,d) ICOM_CALL4(GetPlayerAccount,p,a,b,c,d)
#define IDirectPlay3_GetPlayerFlags(p,a,b) ICOM_CALL2(GetPlayerFlags,p,a,b)
#endif
/*****************************************************************************
* IDirectPlay4 interface - this is also known as IDirectPlayX. Apparently people
@ -630,7 +624,6 @@ ICOM_DEFINE(IDirectPlay4,IDirectPlay3)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectPlayX_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectPlayX_AddRef(p) ICOM_CALL (AddRef,p)
@ -689,8 +682,6 @@ ICOM_DEFINE(IDirectPlay4,IDirectPlay3)
#define IDirectPlayX_CancelMessage(p,a,b) ICOM_CALL2(CancelMessage,a,b)
#define IDirectPlayX_CancelPriority(p,a,b,c) ICOM_CALL3(CancelPriority,a,b,c)
#endif
/* For DirectPlay::EnumConnections */
#define DPCONNECTION_DIRECTPLAY 0x00000001
#define DPCONNECTION_DIRECTPLAYLOBBY 0x00000002

6
include/dplobby.h
View File

@ -405,11 +405,11 @@ ICOM_DEFINE(IDirectPlayLobby2,IDirectPlayLobby)
ICOM_DEFINE(IDirectPlayLobby3,IDirectPlayLobby2)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectPlayLobby_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectPlayLobby_AddRef(p) ICOM_CALL (AddRef,p)
#define IDirectPlayLobby_Release(p) ICOM_CALL (Release,p)
/*** IDirectPlayLobby methods ***/
#define IDirectPlayLobby_Connect(p,a,b,c) ICOM_CALL3(Connect,p,a,b,c)
#define IDirectPlayLobby_ConnectEx(p,a,b,c,d) ICOM_CALL4(ConnectEx,p,a,b,c,d)
#define IDirectPlayLobby_CreateAddress(p,a,b,c,d,e,f) ICOM_CALL6(CreateAddress,p,a,b,c,d,e,f)
@ -427,8 +427,6 @@ ICOM_DEFINE(IDirectPlayLobby3,IDirectPlayLobby2)
#define IDirectPlayLobby_UnregisterApplication(p,a,b) ICOM_CALL2(UnregisterApplication,p,a,b)
#define IDirectPlayLobby_WaitForConnectionSettings(p,a) ICOM_CALL1(WaitForConnectionSettings,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */

10
include/dsound.h
View File

@ -207,7 +207,6 @@ extern HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND * ppDS,IUnk
ICOM_DEFINE(IDirectSound,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectSound_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectSound_AddRef(p) ICOM_CALL (AddRef,p)
@ -221,7 +220,6 @@ ICOM_DEFINE(IDirectSound,IUnknown)
#define IDirectSound_GetSpeakerConfig(p,a) ICOM_CALL1(GetSpeakerConfig,p,a)
#define IDirectSound_SetSpeakerConfig(p,a) ICOM_CALL1(SetSpeakerConfig,p,a)
#define IDirectSound_Initialize(p,a) ICOM_CALL1(Initialize,p,a)
#endif
/*****************************************************************************
@ -253,7 +251,6 @@ ICOM_DEFINE(IDirectSound,IUnknown)
ICOM_DEFINE(IDirectSoundBuffer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectSoundBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectSoundBuffer_AddRef(p) ICOM_CALL (AddRef,p)
@ -277,7 +274,6 @@ ICOM_DEFINE(IDirectSoundBuffer,IUnknown)
#define IDirectSoundBuffer_Stop(p) ICOM_CALL (Stop,p)
#define IDirectSoundBuffer_Unlock(p,a,b,c,d) ICOM_CALL4(Unlock,p,a,b,c,)
#define IDirectSoundBuffer_Restore(p) ICOM_CALL (Restore,p)
#endif
/*****************************************************************************
@ -308,14 +304,12 @@ ICOM_DEFINE(IDirectSoundBuffer,IUnknown)
ICOM_DEFINE(IDirectSoundNotify,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectSoundNotify_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectSoundNotify_AddRef(p) ICOM_CALL (AddRef,p)
#define IDirectSoundNotify_Release(p) ICOM_CALL (Release,p)
/*** IDirectSoundNotify methods ***/
#define IDirectSoundNotify_SetNotificationPositions(p,a,b) ICOM_CALL2(SetNotificationPositions,p,a,b)
#endif
/*****************************************************************************
@ -385,7 +379,6 @@ typedef const DS3DLISTENER *LPCDS3DLISTENER;
ICOM_DEFINE(IDirectSound3DListener,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectSound3DListener_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectSound3DListener_AddRef(p) ICOM_CALL (AddRef,p)
@ -406,7 +399,6 @@ ICOM_DEFINE(IDirectSound3DListener,IUnknown)
#define IDirectSound3DListener_SetRolloffFactor(p,a,b) ICOM_CALL2(SetRolloffFactor,p,a,b)
#define IDirectSound3DListener_SetVelocity(p,a,b,c,d) ICOM_CALL4(SetVelocity,p,a,b,c,d)
#define IDirectSound3DListener_CommitDeferredSettings(p) ICOM_CALL (CommitDeferredSettings,p)
#endif
/*****************************************************************************
@ -453,7 +445,6 @@ typedef const DS3DBUFFER *LPCDS3DBUFFER;
ICOM_DEFINE(IDirectSound3DBuffer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDirectSound3DBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDirectSound3DBuffer_AddRef(p) ICOM_CALL (AddRef,p)
@ -477,7 +468,6 @@ ICOM_DEFINE(IDirectSound3DBuffer,IUnknown)
#define IDirectSound3DBuffer_SetMode(p,a,b) ICOM_CALL2(SetMode,p,a,b)
#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d) ICOM_CALL4(SetPosition,p,a,b,c,d)
#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d) ICOM_CALL4(SetVelocity,p,a,b,c,d)
#endif
/*****************************************************************************

4
include/oledlg.h
View File

@ -712,7 +712,6 @@ DECL_WINELIB_TYPE_AW(IOleUILinkInfo)
DECL_WINELIB_TYPE_AW(POLEUILINKINFO)
DECL_WINELIB_TYPE_AW(LPOLEUILINKINFO)
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleUILinkInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleUILinkInfo_AddRef(p) ICOM_CALL (AddRef,p)
@ -728,7 +727,6 @@ DECL_WINELIB_TYPE_AW(LPOLEUILINKINFO)
#define IOleUILinkInfo_CancelLink(p,a) ICOM_CALL1(CancelLink,p,a)
/*** IOleUILinkInfo methods ***/
#define IOleUILinkInfo_GetLastUpdate(p,a,b) ICOM_CALL2(GetLastUpdate,p,a,b)
#endif
/*****************************************************************************
@ -774,7 +772,6 @@ DECL_WINELIB_TYPE_AW(IOleUIObjInfo)
DECL_WINELIB_TYPE_AW(POLEUIOBJINFO)
DECL_WINELIB_TYPE_AW(LPOLEUIOBJINFO)
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleUIObjInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleUIObjInfo_AddRef(p) ICOM_CALL (AddRef,p)
@ -785,7 +782,6 @@ DECL_WINELIB_TYPE_AW(LPOLEUIOBJINFO)
#define IOleUIObjInfo_ConvertObject(p,a,b) ICOM_CALL2(ConvertObject,p,a,b)
#define IOleUIObjInfo_GetViewInfo(p,a,b,c,d) ICOM_CALL4(GetViewInfo,p,a,b,c,d)
#define IOleUIObjInfo_SetViewInfo(p,a,b,c,d,e) ICOM_CALL5(SetViewInfo,p,a,b,c,d,e)
#endif
UINT WINAPI OleUIInsertObjectW(LPOLEUIINSERTOBJECTW);
UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA);

2
include/servprov.h
View File

@ -24,14 +24,12 @@ typedef struct IServiceProvider IServiceProvider,*LPSERVICEPROVIDER;
ICOM_DEFINE(IServiceProvider,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IServiceProvider_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IServiceProvider_AddRef(p) ICOM_CALL (AddRef,p)
#define IServiceProvider_Release(p) ICOM_CALL (Release,p)
/*** IServiceProvider methods ***/
#define IServiceProvider_QueryService(p,a,b,c) ICOM_CALL3(QueryService,p,a,b,c)
#endif
#endif /* __WINE_SERVPROV_H */

2
include/shlobj.h
View File

@ -92,14 +92,12 @@ UINT WINAPI SHMapPIDLToSystemImageListIndex(LPSHELLFOLDER sh, LPITEMIDLIST pidl,
ICOM_DEFINE(IShellIcon, IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IShellIcon_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IShellIcon_AddRef(p) ICOM_CALL (AddRef,p)
#define IShellIcon_Release(p) ICOM_CALL (Release,p)
/*** IShellIcon methods ***/
#define IShellIcon_GetIconOf(p,a,b,c) ICOM_CALL3(GetIconOf,p,a,b,c)
#endif
/****************************************************************************
* Shell Execute API

6
include/vfw.h
View File

@ -670,7 +670,6 @@ DEFINE_AVIGUID(CLSID_AVIFile, 0x00020000, 0, 0);
ICOM_DEFINE(IAVIStream, IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IAVIStream_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IAVIStream_AddRef(p) ICOM_CALL (AddRef,p)
@ -687,7 +686,6 @@ ICOM_DEFINE(IAVIStream, IUnknown)
#define IAVIStream_ReadData(p,a,b,c) ICOM_CALL3(ReadData,p,a,b,c)
#define IAVIStream_WriteData(p,a,b,c) ICOM_CALL3(WriteData,p,a,b,c)
#define IAVIStream_SetInfo(p,a,b) ICOM_CALL2(SetInfo,p,a,b)
#endif
HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM*ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *lpOptions,CLSID*pclsidHandler);
@ -727,7 +725,6 @@ HRESULT WINAPI AVIStreamWriteData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG size
ICOM_DEFINE(IAVIFile,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IAVIFile_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IAVIFile_AddRef(p) ICOM_CALL (AddRef,p)
@ -740,7 +737,6 @@ ICOM_DEFINE(IAVIFile,IUnknown)
#define IAVIFile_ReadData(p,a,b,c) ICOM_CALL3(ReadData,p,a,b,c)
#define IAVIFile_EndRecord(p) ICOM_CALL (EndRecord,p)
#define IAVIFile_DeleteStream(p,a,b) ICOM_CALL2(DeleteStream,p,a,b)
#endif
HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE pfile,PAVISTREAM* ppavi,AVISTREAMINFOA* psi);
HRESULT WINAPI AVIFileCreateStreamW(PAVIFILE pfile,PAVISTREAM* ppavi,AVISTREAMINFOW* psi);
@ -772,7 +768,6 @@ ULONG WINAPI AVIFileRelease(PAVIFILE iface);
ICOM_DEFINE(IGetFrame,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IGetFrame_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IGetFrame_AddRef(p) ICOM_CALL (AddRef,p)
@ -782,7 +777,6 @@ ICOM_DEFINE(IGetFrame,IUnknown)
#define IGetFrame_Begin(p,a,b,c) ICOM_CALL3(Begin,p,a,b,c)
#define IGetFrame_End(p) ICOM_CALL (End,p)
#define IGetFrame_SetFormat(p,a,b,c,d,e,f) ICOM_CALL6(SetFormat,p,a,b,c,d,e,f)
#endif
#define AVIERR_OK 0
#define MAKE_AVIERR(error) MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x4000+error)

26
include/wine/obj_base.h
View File

@ -463,15 +463,15 @@ inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther)
#endif /* ICOM_USE_COM_INTERFACE_ATTRIBUTE */
#define ICOM_CALL(xfn, p) this_is_a_syntax_error
#define ICOM_CALL1(xfn, p,a) this_is_a_syntax_error
#define ICOM_CALL2(xfn, p,a,b) this_is_a_syntax_error
#define ICOM_CALL3(xfn, p,a,b,c) this_is_a_syntax_error
#define ICOM_CALL4(xfn, p,a,b,c,d) this_is_a_syntax_error
#define ICOM_CALL5(xfn, p,a,b,c,d,e) this_is_a_syntax_error
#define ICOM_CALL6(xfn, p,a,b,c,d,e,f) this_is_a_syntax_error
#define ICOM_CALL7(xfn, p,a,b,c,d,e,f,g) this_is_a_syntax_error
#define ICOM_CALL8(xfn, p,a,b,c,d,e,f,g,h) this_is_a_syntax_error
#define ICOM_CALL(xfn, p) (p)->fn##xfn()
#define ICOM_CALL1(xfn, p,a) (p)->fn##xfn(a)
#define ICOM_CALL2(xfn, p,a,b) (p)->fn##xfn(a,b)
#define ICOM_CALL3(xfn, p,a,b,c) (p)->fn##xfn(a,b,c)
#define ICOM_CALL4(xfn, p,a,b,c,d) (p)->fn##xfn(a,b,c,d)
#define ICOM_CALL5(xfn, p,a,b,c,d,e) (p)->fn##xfn(a,b,c,d,e)
#define ICOM_CALL6(xfn, p,a,b,c,d,e,f) (p)->fn##xfn(a,b,c,d,e,f)
#define ICOM_CALL7(xfn, p,a,b,c,d,e,f,g) (p)->fn##xfn(a,b,c,d,e,f,g)
#define ICOM_CALL8(xfn, p,a,b,c,d,e,f,g,h) (p)->fn##xfn(a,b,c,d,e,f,g,h)
#else
@ -692,12 +692,10 @@ struct IUnknown {
};
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IUnknown_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IUnknown_AddRef(p) ICOM_CALL (AddRef,p)
#define IUnknown_Release(p) ICOM_CALL (Release,p)
#endif
/*****************************************************************************
* IClassFactory interface
@ -712,7 +710,6 @@ struct IUnknown {
ICOM_DEFINE(IClassFactory,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IClassFactory_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IClassFactory_AddRef(p) ICOM_CALL (AddRef,p)
@ -720,7 +717,6 @@ ICOM_DEFINE(IClassFactory,IUnknown)
/*** IClassFactory methods ***/
#define IClassFactory_CreateInstance(p,a,b,c) ICOM_CALL3(CreateInstance,p,a,b,c)
#define IClassFactory_LockServer(p,a) ICOM_CALL1(LockServer,p,a)
#endif
/*****************************************************************************
@ -740,7 +736,6 @@ ICOM_DEFINE(IClassFactory,IUnknown)
ICOM_DEFINE(IMalloc16,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IMalloc16_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMalloc16_AddRef(p) ICOM_CALL (AddRef,p)
@ -752,7 +747,6 @@ ICOM_DEFINE(IMalloc16,IUnknown)
#define IMalloc16_GetSize(p,a) ICOM_CALL1(GetSize,p,a)
#define IMalloc16_DidAlloc(p,a) ICOM_CALL1(DidAlloc,p,a)
#define IMalloc16_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
#endif
#define ICOM_INTERFACE IMalloc
@ -769,7 +763,6 @@ ICOM_DEFINE(IMalloc16,IUnknown)
ICOM_DEFINE(IMalloc,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IMalloc_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMalloc_AddRef(p) ICOM_CALL (AddRef,p)
@ -781,7 +774,6 @@ ICOM_DEFINE(IMalloc,IUnknown)
#define IMalloc_GetSize(p,a) ICOM_CALL1(GetSize,p,a)
#define IMalloc_DidAlloc(p,a) ICOM_CALL1(DidAlloc,p,a)
#define IMalloc_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
#endif
HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext, LPMALLOC16* lpMalloc);

6
include/wine/obj_cache.h
View File

@ -50,7 +50,6 @@ typedef struct IOleCacheControl IOleCacheControl, *LPOLECACHECONTROL;
ICOM_DEFINE(IOleCache,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IOleCache_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleCache_AddRef(p) ICOM_CALL (AddRef,p)
@ -61,7 +60,6 @@ ICOM_DEFINE(IOleCache,IUnknown)
#define IOleCache_EnumCache(p,a) ICOM_CALL1(EnumCache,p,a)
#define IOleCache_InitCache(p,a) ICOM_CALL1(InitCache,p,a)
#define IOleCache_SetData(p,a,b,c) ICOM_CALL3(SetData,p,a,b,c)
#endif
/*****************************************************************************
@ -77,7 +75,6 @@ ICOM_DEFINE(IOleCache,IUnknown)
ICOM_DEFINE(IOleCache2,IOleCache)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IOleCache2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleCache2_AddRef(p) ICOM_CALL (AddRef,p)
@ -91,7 +88,6 @@ ICOM_DEFINE(IOleCache2,IOleCache)
/*** IOleCache2 methods ***/
#define IOleCache2_UpdateCache(p,a,b,c) ICOM_CALL3(UpdateCache,p,a,b,c)
#define IOleCache2_DiscardCache(p,a) ICOM_CALL1(DiscardCache,p,a)
#endif
/*****************************************************************************
@ -107,7 +103,6 @@ ICOM_DEFINE(IOleCache2,IOleCache)
ICOM_DEFINE(IOleCacheControl,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IOleCacheControl_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleCacheControl_AddRef(p) ICOM_CALL (AddRef,p)
@ -115,7 +110,6 @@ ICOM_DEFINE(IOleCacheControl,IUnknown)
/*** IOleCacheControl methods ***/
#define IOleCacheControl_OnRun(p,a) ICOM_CALL1(UpdateCache,p,a)
#define IOleCacheControl_OnStop(p) ICOM_CALL (OnStop,p)
#endif
#ifdef __cplusplus

10
include/wine/obj_channel.h
View File

@ -47,7 +47,6 @@ typedef struct IRpcStubBuffer IRpcStubBuffer,*LPRPCSTUBBUFFER;
ICOM_DEFINE(IChannelHook,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IChannelHook_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IChannelHook_AddRef(p) ICOM_CALL (AddRef,p)
@ -59,7 +58,6 @@ ICOM_DEFINE(IChannelHook,IUnknown)
#define IChannelHook_ServerNotify(p,a,b,c,d,e) ICOM_CALL(ServerNotify,p,a,b,c,d,e)
#define IChannelHook_ServerGetSize(p,a,b,c,d) ICOM_CALL(ServerGetSize,p,a,b,c,d)
#define IChannelHook_ServerFillBuffer(p,a,b,c,d,e) ICOM_CALL(ServerFillBuffer,p,a,b,c,d,e)
#endif
/*****************************************************************************
@ -75,7 +73,6 @@ ICOM_DEFINE(IChannelHook,IUnknown)
ICOM_DEFINE(IPSFactoryBuffer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPSFactoryBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPSFactoryBuffer_AddRef(p) ICOM_CALL (AddRef,p)
@ -83,7 +80,6 @@ ICOM_DEFINE(IPSFactoryBuffer,IUnknown)
/*** IPSFactoryBuffer methods ***/
#define IPSFactoryBuffer_CreateProxy(p,a,b,c,d) ICOM_CALL4(CreateProxy,p,a,b,c,d)
#define IPSFactoryBuffer_CreateStub(p,a,b,c) ICOM_CALL3(CreateStub,p,a,b,c)
#endif
/*****************************************************************************
@ -115,7 +111,6 @@ typedef struct tagRPCOLEMESSAGE
ICOM_DEFINE(IRpcChannelBuffer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IRpcChannelBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IRpcChannelBuffer_AddRef(p) ICOM_CALL (AddRef,p)
@ -126,7 +121,6 @@ ICOM_DEFINE(IRpcChannelBuffer,IUnknown)
#define IRpcChannelBuffer_FreeBuffer(p,a) ICOM_CALL1(FreeBuffer,p,a)
#define IRpcChannelBuffer_GetDestCtx(p,a,b) ICOM_CALL2(GetDestCtx,p,a,b)
#define IRpcChannelBuffer_IsConnected(p) ICOM_CALL (IsConnected,p)
#endif
/*****************************************************************************
@ -142,7 +136,6 @@ ICOM_DEFINE(IRpcChannelBuffer,IUnknown)
ICOM_DEFINE(IRpcProxyBuffer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IRpcProxyBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IRpcProxyBuffer_AddRef(p) ICOM_CALL (AddRef,p)
@ -150,7 +143,6 @@ ICOM_DEFINE(IRpcProxyBuffer,IUnknown)
/*** IRpcProxyBuffer methods ***/
#define IRpcProxyBuffer_Connect(p,a) ICOM_CALL2(Connect,p,a)
#define IRpcProxyBuffer_Disconnect(p) ICOM_CALL (Disconnect,p)
#endif
/*****************************************************************************
@ -171,7 +163,6 @@ ICOM_DEFINE(IRpcProxyBuffer,IUnknown)
ICOM_DEFINE(IRpcStubBuffer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IRpcStubBuffer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IRpcStubBuffer_AddRef(p) ICOM_CALL (AddRef,p)
@ -184,7 +175,6 @@ ICOM_DEFINE(IRpcStubBuffer,IUnknown)
#define IRpcStubBuffer_CountRefs(p) ICOM_CALL (CountRefs,p)
#define IRpcStubBuffer_DebugServerQueryInterface(p,a) ICOM_CALL1(DebugServerQueryInterface,p,a)
#define IRpcStubBuffer_DebugServerRelease(p,a) ICOM_CALL1(DebugServerRelease,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

8
include/wine/obj_clientserver.h
View File

@ -57,7 +57,6 @@ typedef enum tagEOLE_AUTHENTICATION_CAPABILITIES
ICOM_DEFINE(IClientSecurity,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IClientSecurity_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IClientSecurity_AddRef(p) ICOM_CALL (AddRef,p)
@ -66,7 +65,6 @@ ICOM_DEFINE(IClientSecurity,IUnknown)
#define IClientSecurity_QueryBlanket(p,a,b,c,d,e,f,g,h) ICOM_CALL8(QueryBlanket,p,a,b,c,d,e,f,g,h)
#define IClientSecurity_SetBlanket(p,a,b,c,d,e,f,g,h) ICOM_CALL8(SetBlanket,p,a,b,c,d,e,f,g,h)
#define IClientSecurity_CopyProxy(p,a,b) ICOM_CALL2(CopyProxy,p,a,b)
#endif
/*****************************************************************************
@ -89,7 +87,6 @@ typedef enum tagEXTCONN
ICOM_DEFINE(IExternalConnection,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IExternalConnection_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IExternalConnection_AddRef(p) ICOM_CALL (AddRef,p)
@ -97,7 +94,6 @@ ICOM_DEFINE(IExternalConnection,IUnknown)
/*** IExternalConnection methods ***/
#define IExternalConnection_AddConnection(p,a,b) ICOM_CALL8(AddConnection,p,a,b)
#define IExternalConnection_ReleaseConnection(p,a,b,c) ICOM_CALL8(ReleaseConnection,p,a,b,c)
#endif
HRESULT WINAPI CoDisconnectObject(LPUNKNOWN lpUnk, DWORD reserved);
@ -153,7 +149,6 @@ typedef struct tagINTERFACEINFO
ICOM_DEFINE(IMessageFilter,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IMessageFilter_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMessageFilter_AddRef(p) ICOM_CALL (AddRef,p)
@ -162,7 +157,6 @@ ICOM_DEFINE(IMessageFilter,IUnknown)
#define IMessageFilter_HandleInComingCall(p,a,b,c,d) ICOM_CALL4(HandleInComingCall,p,a,b,c,d)
#define IMessageFilter_RetryRejectedCall(p,a,b,c) ICOM_CALL3(RetryRejectedCall,p,a,b,c)
#define IMessageFilter_MessagePending(p,a,b,c) ICOM_CALL3(MessagePending,p,a,b,c)
#endif
HRESULT WINAPI CoRegisterMessageFilter16(LPMESSAGEFILTER lpMessageFilter,LPMESSAGEFILTER *lplpMessageFilter);
@ -184,7 +178,6 @@ HRESULT WINAPI CoRegisterMessageFilter(LPMESSAGEFILTER lpMessageFilter,LPMESSAGE
ICOM_DEFINE(IServerSecurity,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IServerSecurity_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IServerSecurity_AddRef(p) ICOM_CALL (AddRef,p)
@ -194,7 +187,6 @@ ICOM_DEFINE(IServerSecurity,IUnknown)
#define IServerSecurity_ImpersonateClient(p) ICOM_CALL (ImpersonateClient,p)
#define IServerSecurity_RevertToSelf(p) ICOM_CALL (RevertToSelf,p)
#define IServerSecurity_IsImpersonating(p) ICOM_CALL (IsImpersonating,p)
#endif
/*****************************************************************************

2
include/wine/obj_commdlgbrowser.h
View File

@ -35,14 +35,12 @@ typedef struct ICommDlgBrowser ICommDlgBrowser, *LPCOMMDLGBROWSER;
ICOM_DEFINE(ICommDlgBrowser,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
#define ICommDlgBrowser_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ICommDlgBrowser_AddRef(p) ICOM_CALL(AddRef,p)
#define ICommDlgBrowser_Release(p) ICOM_CALL(Release,p)
#define ICommDlgBrowser_OnDefaultCommand(p,a) ICOM_CALL1(OnDefaultCommand,p,a)
#define ICommDlgBrowser_OnStateChange(p,a,b) ICOM_CALL2(OnStateChange,p,a,b)
#define ICommDlgBrowser_IncludeObject(p,a,b) ICOM_CALL2(IncludeObject,p,a,b)
#endif
#ifdef __cplusplus
} /* extern "C" */

8
include/wine/obj_connection.h
View File

@ -55,7 +55,6 @@ typedef struct IEnumConnectionPoints IEnumConnectionPoints, *LPENUMCONNECTIONPOI
ICOM_DEFINE(IConnectionPoint,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IConnectionPoint_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IConnectionPoint_AddRef(p) ICOM_CALL (AddRef,p)
@ -66,7 +65,6 @@ ICOM_DEFINE(IConnectionPoint,IUnknown)
#define IConnectionPoint_Advise(p,a,b) ICOM_CALL2(Advise,p,a,b)
#define IConnectionPoint_Unadvise(p,a) ICOM_CALL1(Unadvise,p,a)
#define IConnectionPoint_EnumConnections(p,a) ICOM_CALL1(EnumConnections,p,a)
#endif
/*****************************************************************************
@ -82,7 +80,6 @@ ICOM_DEFINE(IConnectionPoint,IUnknown)
ICOM_DEFINE(IConnectionPointContainer,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IConnectionPointContainer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IConnectionPointContainer_AddRef(p) ICOM_CALL (AddRef,p)
@ -90,7 +87,6 @@ ICOM_DEFINE(IConnectionPointContainer,IUnknown)
/*** IConnectionPointContainer methods ***/
#define IConnectionPointContainer_EnumConnectionPoints(p,a) ICOM_CALL1(CreateInstance,p,a)
#define IConnectionPointContainer_FindConnectionPoint(p,a,b) ICOM_CALL2(LockServer,p,a,b)
#endif
/*****************************************************************************
@ -108,7 +104,6 @@ ICOM_DEFINE(IConnectionPointContainer,IUnknown)
ICOM_DEFINE(IEnumConnections,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IEnumConnections_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumConnections_AddRef(p) ICOM_CALL (AddRef,p)
@ -118,7 +113,6 @@ ICOM_DEFINE(IEnumConnections,IUnknown)
#define IEnumConnections_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumConnections_Reset(p) ICOM_CALL (Reset,p)
#define IEnumConnections_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************
* IEnumConnectionPoints interface
@ -135,7 +129,6 @@ ICOM_DEFINE(IEnumConnections,IUnknown)
ICOM_DEFINE(IEnumConnectionPoints,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IEnumConnectionPoints_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumConnectionPoints_AddRef(p) ICOM_CALL (AddRef,p)
@ -145,7 +138,6 @@ ICOM_DEFINE(IEnumConnectionPoints,IUnknown)
#define IEnumConnectionPoints_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumConnectionPoints_Reset(p) ICOM_CALL (Reset,p)
#define IEnumConnectionPoints_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

2
include/wine/obj_contextmenu.h
View File

@ -118,7 +118,6 @@ typedef struct tagCMInvokeCommandInfoEx
ICOM_DEFINE(IContextMenu,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
#define IContextMenu_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IContextMenu_AddRef(p) ICOM_CALL(AddRef,p)
#define IContextMenu_Release(p) ICOM_CALL(Release,p)
@ -126,7 +125,6 @@ ICOM_DEFINE(IContextMenu,IUnknown)
#define IContextMenu_InvokeCommand(p,a) ICOM_CALL1(InvokeCommand,p,a)
#define IContextMenu_GetCommandString(p,a,b,c,d,e) ICOM_CALL5(GetCommandString,p,a,b,c,d,e)
#define IContextMenu_HandleMenuMsg(p,a,b,c) ICOM_CALL3(HandleMenuMsg,p,a,b,c)
#endif
#ifdef __cplusplus
} /* extern "C" */

30
include/wine/obj_control.h
View File

@ -181,8 +181,7 @@ typedef struct IProvideClassInfo2 IProvideClassInfo2, *LPPROVIDECLASSINFO2;
ICOM_DEFINE(IOleControl,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
/*** IUnknown methods ***/
#define IOleControl_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleControl_AddRef(p) ICOM_CALL (AddRef,p)
#define IOleControl_Release(p) ICOM_CALL (Release,p)
@ -191,7 +190,6 @@ ICOM_DEFINE(IOleControl,IUnknown)
#define IOleControl_OnMnemonic(p,a) ICOM_CALL1(OnMnemonic,p,a)
#define IOleControl_OnAmbientPropertyChange(p,a) ICOM_CALL1(OnAmbientPropertyChange,p,a)
#define IOleControl_FreezeEvents(p,a) ICOM_CALL1(FreezeEvents,p,a)
#endif
/*****************************************************************************
@ -212,8 +210,7 @@ ICOM_DEFINE(IOleControl,IUnknown)
ICOM_DEFINE(IOleControlSite,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
/*** IUnknown methods ***/
#define IOleControlSite_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleControlSite_AddRef(p) ICOM_CALL (AddRef,p)
#define IOleControlSite_Release(p) ICOM_CALL (Release,p)
@ -225,7 +222,6 @@ ICOM_DEFINE(IOleControlSite,IUnknown)
#define IOleControlSite_TranslateAccelerator(p,a,b) ICOM_CALL1(TranslateAccelerator,p,a,b)
#define IOleControlSite_OnFocus(p,a) ICOM_CALL1(OnFocus,p,a)
#define IOleControlSite_ShowPropertyFrame(p) ICOM_CALL1(ShowPropertyFrame,p)
#endif
/*****************************************************************************
@ -242,7 +238,6 @@ ICOM_DEFINE(IOleControlSite,IUnknown)
ICOM_DEFINE(IOleInPlaceSiteEx,IOleInPlaceSite)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleInPlaceSiteEx_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleInPlaceSiteEx_AddRef(p) ICOM_CALL (AddRef,p)
@ -265,7 +260,6 @@ ICOM_DEFINE(IOleInPlaceSiteEx,IOleInPlaceSite)
#define IOleInPlaceSiteEx_OnInPlaceActivateEx(p,a,b) ICOM_CALL2(OnInPlaceActivateEx,p,a,b)
#define IOleInPlaceSiteEx_OnInPlaceDeactivateEx(p,a) ICOM_CALL1(OnInPlaceDeactivateEx,p,a)
#define IOleInPlaceSiteEx_RequestUIActivate(p) ICOM_CALL (RequestUIActivate,p)
#endif
/*****************************************************************************
@ -291,7 +285,6 @@ ICOM_DEFINE(IOleInPlaceSiteEx,IOleInPlaceSite)
ICOM_DEFINE(IOleInPlaceSiteWindowless,IOleInPlaceSite)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleInPlaceSiteWindowless_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleInPlaceSiteWindowless_AddRef(p) ICOM_CALL (AddRef,p)
@ -323,7 +316,6 @@ ICOM_DEFINE(IOleInPlaceSiteWindowless,IOleInPlaceSite)
#define IOleInPlaceSiteWindowless_ScrollRect(p,a,b,c,d) ICOM_CALL4(OnPosRectChange,p,a,b,c,d)
#define IOleInPlaceSiteWindowless_AdjustRect(p,a) ICOM_CALL1(OnPosRectChange,p,a)
#define IOleInPlaceSiteWindowless_OnDefWindowMessage(p,a,b,c,d) ICOM_CALL4(OnPosRectChange,p,a,b,c,d)
#endif
/*****************************************************************************
@ -339,7 +331,6 @@ ICOM_DEFINE(IOleInPlaceSiteWindowless,IOleInPlaceSite)
ICOM_DEFINE(IOleInPlaceObjectWindowless,IOleInPlaceObject)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleInPlaceObjectWindowless_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleInPlaceObjectWindowless_AddRef(p) ICOM_CALL (AddRef,p)
@ -355,7 +346,6 @@ ICOM_DEFINE(IOleInPlaceObjectWindowless,IOleInPlaceObject)
/*** IOleInPlaceObjectWindowless methods ***/
#define IOleInPlaceObjectWindowless_OnWindowMessage(p,a,b,c,d) ICOM_CALL4(OnWindowMessage,p,a,b,c,d)
#define IOleInPlaceObjectWindowless_GetDropTarget(p,a) ICOM_CALL1(GetDropTarget,p,a)
#endif
/*****************************************************************************
@ -372,8 +362,7 @@ ICOM_DEFINE(IOleInPlaceObjectWindowless,IOleInPlaceObject)
ICOM_DEFINE(IClassFactory2,IClassFactory)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
/*** IUnknown methods ***/
#define IClassFactory2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IClassFactory2_AddRef(p) ICOM_CALL (AddRef,p)
#define IClassFactory2_Release(p) ICOM_CALL (Release,p)
@ -384,7 +373,6 @@ ICOM_DEFINE(IClassFactory2,IClassFactory)
#define IClassFactory2_GetLicInfo(p,a) ICOM_CALL1(GetLicInfo,p,a)
#define IClassFactory2_RequestLicKey(p,a,b) ICOM_CALL2(RequestLicKey,p,a,b)
#define IClassFactory2_CreateInstanceLic(p,a,b,c,d,e) ICOM_CALL5(CreateInstanceLic,p,a,b,c,d,e)
#endif
/*****************************************************************************
@ -403,8 +391,7 @@ ICOM_DEFINE(IClassFactory2,IClassFactory)
ICOM_DEFINE(IViewObjectEx,IViewObject2)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
/*** IUnknown methods ***/
#define IViewObjectEx_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IViewObjectEx_AddRef(p) ICOM_CALL (AddRef,p)
#define IViewObjectEx_Release(p) ICOM_CALL (Release,p)
@ -423,7 +410,6 @@ ICOM_DEFINE(IViewObjectEx,IViewObject2)
#define IViewObjectEx_QueryHitPoint(p,a,b,c,d,e) ICOM_CALL5(QueryHitPoint,p,a,b,c,d,e)
#define IViewObjectEx_QueryHitRect(p,a,b,c,d,e) ICOM_CALL5(QueryHitRect,p,a,b,c,d,e)
#define IViewObjectEx_GetNaturalExtent(p,a,b,c,d,e,f) ICOM_CALL6(GetNaturalExtent,p,a,b,c,d,e,f)
#endif
/*****************************************************************************
@ -438,14 +424,12 @@ ICOM_DEFINE(IViewObjectEx,IViewObject2)
ICOM_DEFINE(IProvideClassInfo,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
/*** IUnknown methods ***/
#define IProvideClassInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IProvideClassInfo_AddRef(p) ICOM_CALL (AddRef,p)
#define IProvideClassInfo_Release(p) ICOM_CALL (Release,p)
/*** IProvideClassInfo methods ***/
#define IProvideClassInfo_GetClassInfo(p,a) ICOM_CALL1(GetClassInfo,p,a)
#endif
@ -461,8 +445,7 @@ ICOM_DEFINE(IProvideClassInfo,IUnknown)
ICOM_DEFINE(IProvideClassInfo2,IProvideClassInfo)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
/*** IUnknown methods ***/
#define IProvideClassInfo2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IProvideClassInfo2_AddRef(p) ICOM_CALL (AddRef,p)
#define IProvideClassInfo2_Release(p) ICOM_CALL (Release,p)
@ -470,7 +453,6 @@ ICOM_DEFINE(IProvideClassInfo2,IProvideClassInfo)
#define IProvideClassInfo2_GetClassInfo(p,a) ICOM_CALL1(GetClassInfo,p,a)
/*** IProvideClassInfo2 methods ***/
#define IProvideClassInfo2_GetGUID(p,a,b) ICOM_CALL2(GetGUID,p,a,b)
#endif
#ifdef __cplusplus
} /* extern "C" */

12
include/wine/obj_dataobject.h
View File

@ -158,7 +158,6 @@ typedef struct tagSTATDATA
ICOM_DEFINE(IAdviseSink,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IAdviseSink_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IAdviseSink_AddRef(p) ICOM_CALL (AddRef,p)
@ -169,7 +168,6 @@ ICOM_DEFINE(IAdviseSink,IUnknown)
#define IAdviseSink_OnRename(p,a) ICOM_CALL1(OnRename,p,a)
#define IAdviseSink_OnSave(p) ICOM_CALL (OnSave,p)
#define IAdviseSink_OnClose(p) ICOM_CALL (OnClose,p)
#endif
/*****************************************************************************
@ -184,7 +182,6 @@ ICOM_DEFINE(IAdviseSink,IUnknown)
ICOM_DEFINE(IAdviseSink2,IAdviseSink)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IAdviseSink2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IAdviseSink2_AddRef(p) ICOM_CALL (AddRef,p)
@ -197,7 +194,6 @@ ICOM_DEFINE(IAdviseSink2,IAdviseSink)
#define IAdviseSink2_OnClose(p) ICOM_CALL (IAdviseSink,OnClose,p)
/*** IAdviseSink2 methods ***/
#define IAdviseSink2_OnLinkSrcChange(p,a) ICOM_CALL(OnLinkSrcChange,p,a)
#endif
/*****************************************************************************
@ -215,7 +211,6 @@ ICOM_DEFINE(IAdviseSink2,IAdviseSink)
ICOM_DEFINE(IDataAdviseHolder,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDataAdviseHolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDataAdviseHolder_AddRef(p) ICOM_CALL (AddRef,p)
@ -225,7 +220,6 @@ ICOM_DEFINE(IDataAdviseHolder,IUnknown)
#define IDataAdviseHolder_Unadvise(p,a) ICOM_CALL1(Unadvise,p,a)
#define IDataAdviseHolder_EnumAdvise(p,a) ICOM_CALL1(EnumAdvise,p,a)
#define IDataAdviseHolder_SendOnDataChange(p,a,b,c) ICOM_CALL3(SendOnDataChange,p,a,b,c)
#endif
/* FIXME: not implemented */
HRESULT WINAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER* ppDAHolder);
@ -251,7 +245,6 @@ HRESULT WINAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER* ppDAHolder);
ICOM_DEFINE(IDataObject,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDataObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDataObject_AddRef(p) ICOM_CALL (AddRef,p)
@ -266,7 +259,6 @@ ICOM_DEFINE(IDataObject,IUnknown)
#define IDataObject_DAdvise(p,a,b,c,d) ICOM_CALL4(DAdvise,p,a,b,c,d)
#define IDataObject_DUnadvise(p,a) ICOM_CALL1(DUnadvise,p,a)
#define IDataObject_EnumDAdvise(p,a) ICOM_CALL1(EnumDAdvise,p,a)
#endif
/*****************************************************************************
@ -284,7 +276,6 @@ ICOM_DEFINE(IDataObject,IUnknown)
ICOM_DEFINE(IEnumFORMATETC,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumFORMATETC_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumFORMATETC_AddRef(p) ICOM_CALL (AddRef,p)
@ -294,7 +285,6 @@ ICOM_DEFINE(IEnumFORMATETC,IUnknown)
#define IEnumFORMATETC_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumFORMATETC_Reset(p) ICOM_CALL (Reset,p)
#define IEnumFORMATETC_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************
@ -312,7 +302,6 @@ ICOM_DEFINE(IEnumFORMATETC,IUnknown)
ICOM_DEFINE(IEnumSTATDATA,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumSTATDATA_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumSTATDATA_AddRef(p) ICOM_CALL (AddRef,p)
@ -322,7 +311,6 @@ ICOM_DEFINE(IEnumSTATDATA,IUnknown)
#define IEnumSTATDATA_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumSTATDATA_Reset(p) ICOM_CALL (Reset,p)
#define IEnumSTATDATA_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************

4
include/wine/obj_dockingwindowframe.h
View File

@ -32,16 +32,16 @@ DEFINE_GUID (IID_IDockingWindowFrame, 0x47D2657AL, 0x7B27, 0x11D0, 0x8C, 0xA9, 0
ICOM_DEFINE(IDockingWindowFrame,IOleWindow)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDockingWindowFrame_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDockingWindowFrame_AddRef(p) ICOM_CALL(AddRef,p)
#define IDockingWindowFrame_Release(p) ICOM_CALL(Release,p)
/*** IDockingWindowFrame methods ***/
#define IDockingWindowFrame_GetWindow(p,a) ICOM_CALL1(GetWindow,p,a)
#define IDockingWindowFrame_ContextSensitiveHelp(p,a) ICOM_CALL1(ContextSensitiveHelp,p,a)
#define IDockingWindowFrame_AddToolbar(p,a,b,c) ICOM_CALL3(AddToolbar,p,a,b,c)
#define IDockingWindowFrame_RemoveToolbar(p,a,b) ICOM_CALL2(RemoveToolbar,p,a,b)
#define IDockingWindowFrame_FindToolbar(p,a,b,c) ICOM_CALL3(FindToolbar,p,a,b,c)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_dragdrop.h
View File

@ -51,7 +51,6 @@ typedef struct IDropTarget IDropTarget,*LPDROPTARGET;
ICOM_DEFINE(IDropSource,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDropSource_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDropSource_AddRef(p) ICOM_CALL (AddRef,p)
@ -59,7 +58,6 @@ ICOM_DEFINE(IDropSource,IUnknown)
/*** IDropSource methods ***/
#define IDropSource_QueryContinueDrag(p,a,b) ICOM_CALL2(QueryContinueDrag,p,a,b)
#define IDropSource_GiveFeedback(p,a) ICOM_CALL1(GiveFeedback,p,a)
#endif
/*****************************************************************************
* IDropTarget interface
@ -76,7 +74,6 @@ ICOM_DEFINE(IDropSource,IUnknown)
ICOM_DEFINE(IDropTarget,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDropTarget_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDropTarget_AddRef(p) ICOM_CALL (AddRef,p)
@ -86,7 +83,6 @@ ICOM_DEFINE(IDropTarget,IUnknown)
#define IDropTarget_DragOver(p,a,b,c) ICOM_CALL3(DragOver,p,a,b,c)
#define IDropTarget_DragLeave(p) ICOM_CALL(DragLeave,p)
#define IDropTarget_Drop(p,a,b,c,d) ICOM_CALL4(Drop,p,a,b,c,d)
#endif
#ifdef __cplusplus
} /* extern "C" */

2
include/wine/obj_enumidlist.h
View File

@ -33,7 +33,6 @@ typedef struct IEnumIDList IEnumIDList, *LPENUMIDLIST;
ICOM_DEFINE(IEnumIDList,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumIDList_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumIDList_AddRef(p) ICOM_CALL (AddRef,p)
@ -43,7 +42,6 @@ ICOM_DEFINE(IEnumIDList,IUnknown)
#define IEnumIDList_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumIDList_Reset(p) ICOM_CALL(Reset,p)
#define IEnumIDList_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

2
include/wine/obj_extracticon.h
View File

@ -40,13 +40,11 @@ typedef struct IExtractIconA IExtractIconA,*LPEXTRACTICONA;
ICOM_DEFINE(IExtractIconA,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
#define IExtractIconA_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IExtractIconA_AddRef(p) ICOM_CALL(AddRef,p)
#define IExtractIconA_Release(p) ICOM_CALL(Release,p)
#define IExtractIconA_GetIconLocation(p,a,b,c,d,e) ICOM_CALL5(GetIconLocation,p,a,b,c,d,e)
#define IExtractIconA_Extract(p,a,b,c,d,e) ICOM_CALL5(Extract,p,a,b,c,d,e)
#endif
#define IExtractIcon IExtractIconA

22
include/wine/obj_inplace.h
View File

@ -159,7 +159,6 @@ typedef struct IOleLink IOleLink, *LPOLELINK;
ICOM_DEFINE(IOleWindow,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleWindow_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleWindow_AddRef(p) ICOM_CALL (AddRef,p)
@ -167,7 +166,6 @@ ICOM_DEFINE(IOleWindow,IUnknown)
/*** IOleWindow methods ***/
#define IOleWindow_GetWindow(p,a) ICOM_CALL1(GetWindow,p,a)
#define IOleWindow_ContextSensitiveHelp(p,a) ICOM_CALL1(ContextSensitiveHelp,p,a)
#endif
/*****************************************************************************
@ -185,7 +183,6 @@ ICOM_DEFINE(IOleWindow,IUnknown)
ICOM_DEFINE(IOleInPlaceObject,IOleWindow)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleInPlaceObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleInPlaceObject_AddRef(p) ICOM_CALL (AddRef,p)
@ -198,7 +195,6 @@ ICOM_DEFINE(IOleInPlaceObject,IOleWindow)
#define IOleInPlaceObject_UIDeactivate(p) ICOM_CALL (UIDeactivate,p)
#define IOleInPlaceObject_SetObjectRects(p,a,b) ICOM_CALL2(SetObjectRects,p,a,b)
#define IOleInPlaceObject_ReactivateAndUndo(p) ICOM_CALL (ReactivateAndUndo,p)
#endif
/*****************************************************************************
* IOleInPlaceActiveObject interface
@ -216,7 +212,6 @@ ICOM_DEFINE(IOleInPlaceObject,IOleWindow)
ICOM_DEFINE(IOleInPlaceActiveObject,IOleWindow)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleInPlaceActiveObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleInPlaceActiveObject_AddRef(p) ICOM_CALL (AddRef,p)
@ -230,7 +225,6 @@ ICOM_DEFINE(IOleInPlaceActiveObject,IOleWindow)
#define IOleInPlaceActiveObject_OnDocWindowActivate(p,a) ICOM_CALL1(OnDocWindowActivate,p,a)
#define IOleInPlaceActiveObject_ResizeBorder(p,a,b,c) ICOM_CALL3(ResizeBorder,p,a,b,c)
#define IOleInPlaceActiveObject_EnableModeless(p,a) ICOM_CALL1(EnableModeless,p,a)
#endif
/*****************************************************************************
* IOleInPlaceUIWindow interface
@ -247,7 +241,6 @@ ICOM_DEFINE(IOleInPlaceActiveObject,IOleWindow)
ICOM_DEFINE(IOleInPlaceUIWindow,IOleWindow)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleInPlaceUIWindow_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleInPlaceUIWindow_AddRef(p) ICOM_CALL (AddRef,p)
@ -260,7 +253,6 @@ ICOM_DEFINE(IOleInPlaceUIWindow,IOleWindow)
#define IOleInPlaceUIWindow_RequestBorderSpace(p,a) ICOM_CALL1(RequestBorderSpace,p,a)
#define IOleInPlaceUIWindow_SetBorderSpace(p,a) ICOM_CALL1(SetBorderSpace,p,a)
#define IOleInPlaceUIWindow_SetActiveObject(p,a,b) ICOM_CALL2(SetActiveObject,p,a,b)
#endif
/*****************************************************************************
@ -280,7 +272,6 @@ ICOM_DEFINE(IOleInPlaceUIWindow,IOleWindow)
ICOM_DEFINE(IOleInPlaceFrame,IOleInPlaceUIWindow)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleInPlaceFrame_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleInPlaceFrame_AddRef(p) ICOM_CALL (AddRef,p)
@ -300,7 +291,6 @@ ICOM_DEFINE(IOleInPlaceFrame,IOleInPlaceUIWindow)
#define IOleInPlaceFrame_SetStatusText ICOM_CALL1(SetStatusText,p,a)
#define IOleInPlaceFrame_EnableModeless ICOM_CALL1(EnableModeless,p,a)
#define IOleInPlaceFrame_TranslateAccelerator ICOM_CALL2(TranslateAccelerator,p,a,b)
#endif
/*****************************************************************************
@ -324,7 +314,6 @@ ICOM_DEFINE(IOleInPlaceFrame,IOleInPlaceUIWindow)
ICOM_DEFINE(IOleInPlaceSite,IOleWindow)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleInPlaceSite_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleInPlaceSite_AddRef(p) ICOM_CALL (AddRef,p)
@ -343,7 +332,6 @@ ICOM_DEFINE(IOleInPlaceSite,IOleWindow)
#define IOleInPlaceSite_DiscardUndoState(p) ICOM_CALL (DiscardUndoState,p)
#define IOleInPlaceSite_DeactivateAndUndo(p) ICOM_CALL (DeactivateAndUndo,p)
#define IOleInPlaceSite_OnPosRectChange(p,a) ICOM_CALL1(OnPosRectChange,p,a)
#endif
/*****************************************************************************
@ -363,7 +351,6 @@ ICOM_DEFINE(IOleInPlaceSite,IOleWindow)
ICOM_DEFINE(IOleClientSite,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleClientSite_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleClientSite_AddRef(p) ICOM_CALL (AddRef,p)
@ -375,7 +362,6 @@ ICOM_DEFINE(IOleClientSite,IUnknown)
#define IOleClientSite_ShowObject(p) ICOM_CALL (ShowObject,p)
#define IOleClientSite_OnShowWindow(p,a) ICOM_CALL1(OnShowWindow,p,a)
#define IOleClientSite_RequestNewObjectLayout(p) ICOM_CALL (RequestNewObjectLayout(p)
#endif
/*****************************************************************************
@ -390,14 +376,12 @@ ICOM_DEFINE(IOleClientSite,IUnknown)
ICOM_DEFINE(IParseDisplayName,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IParseDisplayName_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IParseDisplayName_AddRef(p) ICOM_CALL (AddRef,p)
#define IParseDisplayName_Release(p) ICOM_CALL (Release,p)
/*** IParseDisplayName methods ***/
#define IParseDisplayName_ParseDisplayName(p,a,b,c,d) ICOM_CALL4(ParseDisplayName,p,a,b,c,d)
#endif
/*****************************************************************************
@ -413,7 +397,6 @@ ICOM_DEFINE(IParseDisplayName,IUnknown)
ICOM_DEFINE(IOleContainer,IParseDisplayName)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleContainer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleContainer_AddRef(p) ICOM_CALL (AddRef,p)
@ -423,7 +406,6 @@ ICOM_DEFINE(IOleContainer,IParseDisplayName)
/*** IOleClientSite methods ***/
#define IOleContainer_EnumObjects(p,a,b) ICOM_CALL (EnumObjects,p,a,b)
#define IOleContainer_LockContainer(p,a) ICOM_CALL3(LockContainer,p,a)
#endif
/*****************************************************************************
@ -440,7 +422,6 @@ ICOM_DEFINE(IOleContainer,IParseDisplayName)
ICOM_DEFINE(IOleItemContainer,IOleContainer)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleItemContainer_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleItemContainer_AddRef(p) ICOM_CALL (AddRef,p)
@ -449,7 +430,6 @@ ICOM_DEFINE(IOleItemContainer,IOleContainer)
#define IOleItemContainer_GetObject(p,a,b,c,d,e) ICOM_CALL5(GetObject,p,a,b,c,d,e)
#define IOleItemContainer_GetObjectStorage(p,a,b,c,d) ICOM_CALL4(GetObjectStorage,p,a,b,c,d)
#define IOleItemContainer_IsRunning(p,a) ICOM_CALL1(IsRunning,p,a)
#endif
/*****************************************************************************
@ -474,7 +454,6 @@ ICOM_DEFINE(IOleItemContainer,IOleContainer)
ICOM_DEFINE(IOleLink,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleLink_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleLink_AddRef(p) ICOM_CALL (AddRef,p)
@ -491,7 +470,6 @@ ICOM_DEFINE(IOleLink,IUnknown)
#define IOleLink_GetBoundSource(p,a) ICOM_CALL1(GetBoundSource,p,a)
#define IOleLink_UnBindSource(p) ICOM_CALL (UnBindSource,p)
#define IOleLink_Update(p,a) ICOM_CALL1(Update,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_marshal.h
View File

@ -40,7 +40,6 @@ typedef struct IStdMarshalInfo IStdMarshalInfo,*LPSTDMARSHALINFO;
ICOM_DEFINE(IMarshal,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IMarshal_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMarshal_AddRef(p) ICOM_CALL (AddRef,p)
@ -52,7 +51,6 @@ ICOM_DEFINE(IMarshal,IUnknown)
#define IMarshal_UnmarshalInterface(p,a,b,c) ICOM_CALL3(UnmarshalInterface,p,a,b,c)
#define IMarshal_ReleaseMarshalData(p,a) ICOM_CALL1(ReleaseMarshalData,p,a)
#define IMarshal_DisconnectObject(p,a) ICOM_CALL1(DisconnectObject,p,a)
#endif
/*****************************************************************************
@ -67,14 +65,12 @@ ICOM_DEFINE(IMarshal,IUnknown)
ICOM_DEFINE(IStdMarshalInfo,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IStdMarshalInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IStdMarshalInfo_AddRef(p) ICOM_CALL (AddRef,p)
#define IStdMarshalInfo_Release(p) ICOM_CALL (Release,p)
/*** IStdMarshalInfo methods ***/
#define IStdMarshalInfo_GetClassForHandler(p,a,b,c) ICOM_CALL3(GetClassForHandler,p,a,b,c)
#endif
/*****************************************************************************

8
include/wine/obj_misc.h
View File

@ -45,7 +45,6 @@ typedef struct IMultiQI IMultiQI,*LPMULTIQI;
ICOM_DEFINE(IEnumString,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumString_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumString_AddRef(p) ICOM_CALL (AddRef,p)
@ -55,7 +54,6 @@ ICOM_DEFINE(IEnumString,IUnknown)
#define IEnumString_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumString_Reset(p) ICOM_CALL (Reset,p)
#define IEnumString_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
@ -74,7 +72,6 @@ ICOM_DEFINE(IEnumString,IUnknown)
ICOM_DEFINE(IEnumUnknown,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumUnknown_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumUnknown_AddRef(p) ICOM_CALL (AddRef,p)
@ -84,7 +81,6 @@ ICOM_DEFINE(IEnumUnknown,IUnknown)
#define IEnumUnknown_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumUnknown_Reset(p) ICOM_CALL (Reset,p)
#define IEnumUnknown_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************
@ -110,7 +106,6 @@ ICOM_DEFINE(IEnumUnknown,IUnknown)
ICOM_DEFINE(IMallocSpy,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IMallocSpy_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMallocSpy_AddRef(p) ICOM_CALL (AddRef,p)
@ -128,7 +123,6 @@ ICOM_DEFINE(IMallocSpy,IUnknown)
#define IMallocSpy_PostDidAlloc(p,a,b,c) ICOM_CALL3(PostDidAlloc,p,a,b,c)
#define IMallocSpy_PreHeapMinimize(p) ICOM_CALL (PreHeapMinimize,p)
#define IMallocSpy_PostHeapMinimize(p) ICOM_CALL (PostHeapMinimize,p)
#endif
/* FIXME: not implemented */
HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy);
@ -158,14 +152,12 @@ typedef struct tagMULTI_QI
ICOM_DEFINE(IMultiQI,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IMultiQI_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMultiQI_AddRef(p) ICOM_CALL (AddRef,p)
#define IMultiQI_Release(p) ICOM_CALL (Release,p)
/*** IMultiQI methods ***/
#define IMultiQI_QueryMultipleInterfaces(p,a,b) ICOM_CALL2(QueryMultipleInterfaces,p,a,b)
#endif
/*****************************************************************************

14
include/wine/obj_moniker.h
View File

@ -90,7 +90,6 @@ typedef struct tagBIND_OPTS2
ICOM_DEFINE(IBindCtx,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IBindCtx_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IBindCtxr_AddRef(p) ICOM_CALL (AddRef,p)
@ -106,7 +105,6 @@ ICOM_DEFINE(IBindCtx,IUnknown)
#define IBindCtx_GetObjectParam(p,a,b) ICOM_CALL2(GetObjectParam,p,a,b)
#define IBindCtx_EnumObjectParam(p,a) ICOM_CALL1(EnumObjectParam,p,a)
#define IBindCtx_RevokeObjectParam(p,a) ICOM_CALL1(RevokeObjectParam,p,a)
#endif
HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC* ppbc);
HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC* ppbc);
@ -123,14 +121,12 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC* ppbc);
ICOM_DEFINE(IClassActivator,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IClassActivator_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IClassActivator_AddRef(p) ICOM_CALL (AddRef,p)
#define IClassActivator_Release(p) ICOM_CALL (Release,p)
/*** IClassActivator methods ***/
#define IClassActivator_GetClassObject(p,a,b,c,d,e) ICOM_CALL5(GetClassObject,p,a,b,c,d,e)
#endif
/*****************************************************************************
@ -148,7 +144,6 @@ ICOM_DEFINE(IClassActivator,IUnknown)
ICOM_DEFINE(IEnumMoniker,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumMoniker_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumMoniker_AddRef(p) ICOM_CALL (AddRef,p)
@ -158,7 +153,6 @@ ICOM_DEFINE(IEnumMoniker,IUnknown)
#define IEnumMoniker_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumMoniker_Reset(p) ICOM_CALL (Reset,p)
#define IEnumMoniker_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************
* IMoniker interface
@ -206,7 +200,6 @@ typedef enum tagMKREDUCE
ICOM_DEFINE(IMoniker,IPersistStream)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IMoniker_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMoniker_AddRef(p) ICOM_CALL (AddRef,p)
@ -235,7 +228,6 @@ ICOM_DEFINE(IMoniker,IPersistStream)
#define IMoniker_GetDisplayName(p,a,b,c) ICOM_CALL3(GetDisplayName,p,a,b,c)
#define IMoniker_ParseDisplayName(p,a,b,c,d,e) ICOM_CALL5(ParseDisplayName,p,a,b,c,d,e)
#define IMoniker_IsSystemMoniker(p,a) ICOM_CALL1(IsSystemMoniker,p,a)
#endif
HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName, LPMONIKER* ppmk);
HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER* ppmk);
@ -270,14 +262,12 @@ HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMon
ICOM_DEFINE(IROTData,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IROTData_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IROTData_AddRef(p) ICOM_CALL (AddRef,p)
#define IROTData_Release(p) ICOM_CALL (Release,p)
/*** IROTData methods ***/
#define IROTData_GetComparisonData(p,a,b,c) ICOM_CALL3(GetComparisonData,p,a,b,c)
#endif
#define ICOM_THIS_From_IROTData(class, name) class* This = (class*)(((char*)name)-sizeof(void*))
@ -297,7 +287,6 @@ ICOM_DEFINE(IROTData,IUnknown)
ICOM_DEFINE(IRunnableObject,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IRunnableObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IRunnableObject_AddRef(p) ICOM_CALL (AddRef,p)
@ -308,7 +297,6 @@ ICOM_DEFINE(IRunnableObject,IUnknown)
#define IRunnableObject_IsRunning(p) ICOM_CALL (IsRunning,p)
#define IRunnableObject_LockRunning(p,a,b) ICOM_CALL2(LockRunning,p,a,b)
#define IRunnableObject_SetContainedObject(p,a) ICOM_CALL1(SetContainedObject,p,a)
#endif
/*****************************************************************************
@ -329,7 +317,6 @@ ICOM_DEFINE(IRunnableObject,IUnknown)
ICOM_DEFINE(IRunningObjectTable,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IRunningObjectTable_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IRunningObjectTable_AddRef(p) ICOM_CALL (AddRef,p)
@ -342,7 +329,6 @@ ICOM_DEFINE(IRunningObjectTable,IUnknown)
#define IRunningObjectTable_NoteChangeTime(p,a,b) ICOM_CALL2(NoteChangeTime,p,a,b)
#define IRunningObjectTable_GetTimeOfLastChange(p,a,b) ICOM_CALL2(GetTimeOfLastChange,p,a,b)
#define IRunningObjectTable_EnumRunning(p,a) ICOM_CALL1(EnumRunning,p,a)
#endif
HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);

10
include/wine/obj_oleaut.h
View File

@ -537,7 +537,6 @@ typedef struct tagCUSTDATA {
ICOM_DEFINE(IDispatch,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IDispatch_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDispatch_AddRef(p) ICOM_CALL (AddRef,p)
@ -547,7 +546,6 @@ ICOM_DEFINE(IDispatch,IUnknown)
#define IDispatch_GetTypeInfo(p,a,b,c) ICOM_CALL3 (GetTypeInfo,p,b,c)
#define IDispatch_GetIDsOfNames(p,a,b,c,d,e) ICOM_CALL5 (GetIDsOfNames,p,a,b,c,d,e)
#define IDispatch_Invoke(p,a,b,c,d,e,f,g,h) ICOM_CALL8 (Invoke,p,a,b,c,d,e,f,g,h)
#endif
/*****************************************************************************
@ -611,7 +609,6 @@ ICOM_DEFINE(IDispatch,IUnknown)
ICOM_DEFINE(ITypeInfo,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define ITypeInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ITypeInfo_AddRef(p) ICOM_CALL (AddRef,p)
@ -636,7 +633,6 @@ ICOM_DEFINE(ITypeInfo,IUnknown)
#define ITypeInfo_ReleaseTypeAttr(p,a) ICOM_CALL1(ReleaseTypeAttr,p,a)
#define ITypeInfo_ReleaseFuncDesc(p,a) ICOM_CALL1(ReleaseFuncDesc,p,a)
#define ITypeInfo_ReleaseVarDesc(p,a) ICOM_CALL1(ReleaseVarDesc,p,a)
#endif
/*****************************************************************************
@ -669,7 +665,6 @@ ICOM_DEFINE(ITypeInfo,IUnknown)
ICOM_DEFINE(ITypeLib,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define ITypeLib_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ITypeLib_AddRef(p) ICOM_CALL (AddRef,p)
@ -685,7 +680,6 @@ ICOM_DEFINE(ITypeLib,IUnknown)
#define ITypeLib_IsName(p,a,b,c) ICOM_CALL3(IsName,p,a,b,c)
#define ITypeLib_FindName(p,a,b,c,d,e) ICOM_CALL5(FindName,p,a,b,c,d,e)
#define ITypeLib_ReleaseTLibAttr(p,a) ICOM_CALL1(ReleaseTLibAttr,p,a)
#endif
/*****************************************************************************
@ -701,7 +695,6 @@ ICOM_DEFINE(ITypeLib,IUnknown)
ICOM_DEFINE(ITypeComp,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define ITypeComp_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ITypeComp_AddRef(p) ICOM_CALL (AddRef,p)
@ -709,7 +702,6 @@ ICOM_DEFINE(ITypeComp,IUnknown)
/*** ITypeComp methods ***/
#define ITypeComp_Bind(p,a,b,c,d,e,f) ICOM_CALL6(Bind,p,a,b,c,d,e,f)
#define ITypeComp_BindType(p,a,b,c,d) ICOM_CALL4(BindType,p,a,b,c,d)
#endif
/*****************************************************************************
* IEnumVARIANT interface
@ -726,7 +718,6 @@ ICOM_DEFINE(ITypeComp,IUnknown)
ICOM_DEFINE(IEnumVARIANT,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumVARIANT_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumVARIANT_AddRef(p) ICOM_CALL (AddRef,p)
@ -736,7 +727,6 @@ ICOM_DEFINE(IEnumVARIANT,IUnknown)
#define IEnumVARIANT_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumVARIANT_Reset(p) ICOM_CALL (Reset,p)
#define IEnumVARIANT_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
#endif /* __WINE_WINE_OBJ_OLEAUT_H */

4
include/wine/obj_olefont.h
View File

@ -61,7 +61,6 @@ typedef TEXTMETRICW TEXTMETRICOLE;
ICOM_DEFINE(IFont,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IFont_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IFont_AddRef(p) ICOM_CALL (AddRef,p)
@ -92,7 +91,6 @@ ICOM_DEFINE(IFont,IUnknown)
#define IFont_AddRefHfont(p,a) ICOM_CALL1(AddRefHfont,a)
#define IFont_ReleaseHfont(p,a) ICOM_CALL1(ReleaseHfont,a)
#define IFont_SetHdc(p,a) ICOM_CALL1(SetHdc,a)
#endif
/*****************************************************************************
* IFont interface
@ -105,7 +103,6 @@ ICOM_DEFINE(IFont,IUnknown)
ICOM_DEFINE(IFontDisp,IDispatch)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IFontDisp_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IFontDisp_AddRef(p) ICOM_CALL (AddRef,p)
@ -116,7 +113,6 @@ ICOM_DEFINE(IFontDisp,IDispatch)
#define IFontDisp_GetIDsOfNames(p,a,b,c,d,e) ICOM_CALL5 (GetIDsOfNames,p,a,b,c,d,e)
#define IFontDisp_Invoke(p,a,b,c,d,e,f,g,h) ICOM_CALL8 (Invoke,p,a,b,c,d,e,f,g,h)
/*** IFontDisp methods ***/
#endif
#ifdef __cplusplus
} /* extern "C" */

6
include/wine/obj_oleobj.h
View File

@ -110,7 +110,6 @@ typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
ICOM_DEFINE(IOleObject,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IOleObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleObject_AddRef(p) ICOM_CALL (AddRef,p)
@ -137,7 +136,6 @@ ICOM_DEFINE(IOleObject,IUnknown)
#define IOleObject_EnumAdvise(p,a,b) ICOM_CALL1(EnumAdvise,p,a)
#define IOleObject_GetMiscStatus(p,a,b) ICOM_CALL2(GetMiscStatus,p,a,b)
#define IOleObject_SetColorScheme(p,a,b) ICOM_CALL1(SetColorScheme,p,a)
#endif
/*****************************************************************************
@ -157,7 +155,6 @@ ICOM_DEFINE(IOleObject,IUnknown)
ICOM_DEFINE(IOleAdviseHolder,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IOleAdviseHolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleAdviseHolder_AddRef(p) ICOM_CALL (AddRef,p)
@ -169,7 +166,6 @@ ICOM_DEFINE(IOleAdviseHolder,IUnknown)
#define IOleAdviseHolder_SendOnRename(p,a) ICOM_CALL1(SendOnRename,p,a)
#define IOleAdviseHolder_SendOnSave(p) ICOM_CALL (SendOnSave,p)
#define IOleAdviseHolder_SendOnClose(p) ICOM_CALL (SendOnClose,p)
#endif
/*****************************************************************************
@ -187,7 +183,6 @@ ICOM_DEFINE(IOleAdviseHolder,IUnknown)
ICOM_DEFINE(IEnumOLEVERB,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumOLEVERB_QueryInterface(p,a,b) ICOM_ICALL2(IUnknown,QueryInterface,p,a,b)
#define IEnumOLEVERB_AddRef(p) ICOM_ICALL (IUnknown,AddRef,p)
@ -197,7 +192,6 @@ ICOM_DEFINE(IEnumOLEVERB,IUnknown)
#define IEnumOLEVERB_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumOLEVERB_Reset(p,a) ICOM_CALL (Reset,p)
#define IEnumOLEVERB_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

14
include/wine/obj_oleundo.h
View File

@ -97,7 +97,6 @@ typedef struct tagQACONTAINER
ICOM_DEFINE(IQuickActivate,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IQuickActivate_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IQuickActivate_AddRef(p) ICOM_CALL (AddRef,p)
@ -106,7 +105,6 @@ ICOM_DEFINE(IQuickActivate,IUnknown)
#define IQuickActivate_QuickActivate(p,a,b) ICOM_CALL2(QuickActivate,p,a,b)
#define IQuickActivate_SetContentExtent(p,a) ICOM_CALL1(SetContentExtent,p,a)
#define IQuickActivate_GetContentExtent(p,a) ICOM_CALL1(GetContentExtent,p,a)
#endif
/*****************************************************************************
@ -123,7 +121,6 @@ ICOM_DEFINE(IQuickActivate,IUnknown)
ICOM_DEFINE(IPointerInactive,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPointerInactive_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPointerInactive_AddRef(p) ICOM_CALL (AddRef,p)
@ -132,7 +129,6 @@ ICOM_DEFINE(IPointerInactive,IUnknown)
#define IPointerInactive_GetActivationPolicy(p,a) ICOM_CALL1(GetActivationPolicy,p,a)
#define IPointerInactive_OnInactiveMoveMouse(p,a,b,c,d) ICOM_CALL4(OnInactiveMoveMouse,p,a,b,c,d)
#define IPointerInactive_OnInactiveSetCursor(p,a,b,c,d,e) ICOM_CALL5(OnInactiveSetCursor,p,a,b,d,e)
#endif
/*****************************************************************************
@ -147,7 +143,6 @@ ICOM_DEFINE(IPointerInactive,IUnknown)
ICOM_DEFINE(IAdviseSinkEx,IAdviseSink)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IAdviseSinkEx_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IAdviseSinkEx_AddRef(p) ICOM_CALL (AddRef,p)
@ -160,7 +155,6 @@ ICOM_DEFINE(IAdviseSinkEx,IAdviseSink)
#define IAdviseSinkEx_OnClose(p) ICOM_CALL (OnClose,p)
/*** IAdviseSinkEx methods ***/
#define IAdviseSinkEx_OnViewStatusChange(p,a) ICOM_CALL1(OnViewStatusChange,p,a)
#endif
/*****************************************************************************
@ -186,7 +180,6 @@ ICOM_DEFINE(IAdviseSinkEx,IAdviseSink)
ICOM_DEFINE(IOleUndoManager,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleUndoManager_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleUndoManager_AddRef(p) ICOM_CALL (AddRef,p)
@ -204,7 +197,6 @@ ICOM_DEFINE(IOleUndoManager,IUnknown)
#define IOleUndoManager_GetLastUndoDescription(p,a) ICOM_CALL1(GetLastUndoDescription,p,a)
#define IOleUndoManager_GetLastRedoDescription(p,a) ICOM_CALL1(GetLastRedoDescription,p,a)
#define IOleUndoManager_Enable(p,a) ICOM_CALL1(Enable,p,a)
#endif
/*****************************************************************************
@ -222,7 +214,6 @@ ICOM_DEFINE(IOleUndoManager,IUnknown)
ICOM_DEFINE(IOleUndoUnit,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleUndoUnit_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleUndoUnit_AddRef(p) ICOM_CALL (AddRef,p)
@ -232,7 +223,6 @@ ICOM_DEFINE(IOleUndoUnit,IUnknown)
#define IOleUndoUnit_GetDescription(p,a) ICOM_CALL1(GetDescription,p,a)
#define IOleUndoUnit_GetUnitType(p,a,b) ICOM_CALL2(GetUnitType,p,a,b)
#define IOleUndoUnit_OnNextAdd(p) ICOM_CALL (OnNextAdd,p)
#endif
@ -252,7 +242,6 @@ ICOM_DEFINE(IOleUndoUnit,IUnknown)
ICOM_DEFINE(IOleParentUndoUnit,IOleUndoUnit)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IOleParentUndoUnit_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IOleParentUndoUnit_AddRef(p) ICOM_CALL (AddRef,p)
@ -268,7 +257,6 @@ ICOM_DEFINE(IOleParentUndoUnit,IOleUndoUnit)
#define IOleParentUndoUnit_Add(p,a) ICOM_CALL1(Add,p,a)
#define IOleParentUndoUnit_FindUnit(p,a) ICOM_CALL1(FindUnit,p,a)
#define IOleParentUndoUnit_GetParentState(p,a,b) ICOM_CALL1(GetParentState,p,a)
#endif
/*****************************************************************************
@ -286,7 +274,6 @@ ICOM_DEFINE(IOleParentUndoUnit,IOleUndoUnit)
ICOM_DEFINE(IEnumOleUndoUnits,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumOleUndoUnits_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumOleUndoUnits_AddRef(p) ICOM_CALL (AddRef,p)
@ -296,7 +283,6 @@ ICOM_DEFINE(IEnumOleUndoUnits,IUnknown)
#define IEnumOleUndoUnits_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumOleUndoUnits_Reset(p,a) ICOM_CALL (Reset,p,a)
#define IEnumOleUndoUnits_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_oleview.h
View File

@ -50,7 +50,6 @@ typedef BOOL (CALLBACK* IVO_ContCallback)(DWORD);
ICOM_DEFINE(IViewObject,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IViewObject_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IViewObject_AddRef(p) ICOM_CALL (AddRef,p)
@ -62,7 +61,6 @@ ICOM_DEFINE(IViewObject,IUnknown)
#define IViewObject_Unfreeze(p,a) ICOM_CALL1(Unfreeze,p,a)
#define IViewObject_SetAdvise(p,a,b,c) ICOM_CALL3(SetAdvise,p,a,b,c)
#define IViewObject_GetAdvise(p,a,b,c) ICOM_CALL3(GetAdvise,p,a,b,c)
#endif
@ -78,7 +76,6 @@ ICOM_DEFINE(IViewObject,IUnknown)
ICOM_DEFINE(IViewObject2,IViewObject)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknwon methods ***/
#define IViewObject2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IViewObject2_AddRef(p) ICOM_CALL (AddRef,p)
@ -92,7 +89,6 @@ ICOM_DEFINE(IViewObject2,IViewObject)
#define IViewObject2_GetAdvise(p,a,b,c) ICOM_CALL3(GetAdvise,p,a,b,c)
/*** IViewObject2 methods ***/
#define IViewObject2_GetExtent(p,a,b,c,d) ICOM_CALL4(GetExtent,p,a,b,c,d)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_picture.h
View File

@ -59,7 +59,6 @@ typedef struct IPictureDisp IPictureDisp, *LPPICTUREDISP;
ICOM_DEFINE(IPicture,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPicture_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPicture_AddRef(p) ICOM_CALL (AddRef,p)
@ -79,7 +78,6 @@ ICOM_DEFINE(IPicture,IUnknown)
#define IPicture_PictureChanged(p) ICOM_CALL (PictureChanged,p)
#define IPicture_SaveAsFile(p,a,b,c) ICOM_CALL3(SaveAsFile,p,a,b,c)
#define IPicture_get_Attributes(p,a) ICOM_CALL1(get_Attributes,p,a)
#endif
/*****************************************************************************
@ -93,7 +91,6 @@ ICOM_DEFINE(IPicture,IUnknown)
ICOM_DEFINE(IPictureDisp,IDispatch)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPictureDisp_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPictureDisp_AddRef(p) ICOM_CALL (AddRef,p)
@ -104,7 +101,6 @@ ICOM_DEFINE(IPictureDisp,IDispatch)
#define IPictureDisp_GetIDsOfNames(p,a,b,c,d,e) ICOM_CALL5 (GetIDsOfNames,p,a,b,c,d,e)
#define IPictureDisp_Invoke(p,a,b,c,d,e,f,g,h) ICOM_CALL8 (Invoke,p,a,b,c,d,e,f,g,h)
/*** IPictureDisp methods ***/
#endif
#ifdef __cplusplus
} /* extern "C" */

24
include/wine/obj_property.h
View File

@ -116,7 +116,6 @@ typedef struct IPerPropertyBrowsing IPerPropertyBrowsing,*LPPERPROPERTYBROWSING;
ICOM_DEFINE(IPropertyPage,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPropertyPage_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPropertyPage_AddRef(p) ICOM_CALL (AddRef,p)
@ -133,7 +132,6 @@ ICOM_DEFINE(IPropertyPage,IUnknown)
#define IPropertyPage_Apply(p) ICOM_CALL (Apply,p)
#define IPropertyPage_Help(p,a) ICOM_CALL1(Help,p,a)
#define IPropertyPage_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
#endif
/*****************************************************************************
@ -148,7 +146,6 @@ ICOM_DEFINE(IPropertyPage,IUnknown)
ICOM_DEFINE(IPropertyPage2,IPropertyPage)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPropertyPage2_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPropertyPage2_AddRef(p) ICOM_CALL (AddRef,p)
@ -167,7 +164,6 @@ ICOM_DEFINE(IPropertyPage2,IPropertyPage)
#define IPropertyPage2_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
/*** IPropertyPage2 methods ***/
#define IPropertyPage2_EditProperty(p,a) ICOM_CALL1(EditProperty,p,a)
#endif
/*****************************************************************************
@ -185,7 +181,6 @@ ICOM_DEFINE(IPropertyPage2,IPropertyPage)
ICOM_DEFINE(IPropertyPageSite,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPropertyPageSite_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPropertyPageSite_AddRef(p) ICOM_CALL (AddRef,p)
@ -195,7 +190,6 @@ ICOM_DEFINE(IPropertyPageSite,IUnknown)
#define IPropertyPageSite_GetLocaleID(p,a) ICOM_CALL1(GetLocaleID,p,a)
#define IPropertyPageSite_GetPageContainer(p,a) ICOM_CALL1(GetPageContainer,p,a)
#define IPropertyPageSite_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
#endif
/*****************************************************************************
@ -211,7 +205,6 @@ ICOM_DEFINE(IPropertyPageSite,IUnknown)
ICOM_DEFINE(IPropertyNotifySink,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPropertyNotifySink_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPropertyNotifySink_AddRef(p) ICOM_CALL (AddRef,p)
@ -219,7 +212,6 @@ ICOM_DEFINE(IPropertyNotifySink,IUnknown)
/*** IPropertyNotifySink methods ***/
#define IPropertyNotifySink_OnChanged(p,a) ICOM_CALL1(OnChanged,p,a)
#define IPropertyNotifySink_OnRequestEdit(p,a) ICOM_CALL1(OnRequestEdit,p,a)
#endif
/*****************************************************************************
@ -235,7 +227,6 @@ ICOM_DEFINE(IPropertyNotifySink,IUnknown)
ICOM_DEFINE(ISimpleFrameSite,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define ISimpleFrameSite_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ISimpleFrameSite_AddRef(p) ICOM_CALL (AddRef,p)
@ -243,7 +234,6 @@ ICOM_DEFINE(ISimpleFrameSite,IUnknown)
/*** IPropertyNotifySink methods ***/
#define ISimpleFrameSite_PreMessageFilter(p,a,b,c,d,e,f) ICOM_CALL1(PreMessageFilter,p,a,b,c,d,e,f)
#define ISimpleFrameSite_PostMessageFilter(p,a,b,c,d,e,f) ICOM_CALL1(PostMessageFilter,p,a,b,c,d,e,f)
#endif
/*****************************************************************************
@ -262,7 +252,6 @@ ICOM_DEFINE(ISimpleFrameSite,IUnknown)
ICOM_DEFINE(IPersistStreamInit,IPersist)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPersistStreamInit_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistStreamInit_AddRef(p) ICOM_CALL (AddRef,p)
@ -275,7 +264,6 @@ ICOM_DEFINE(IPersistStreamInit,IPersist)
#define IPersistStreamInit_Save(p,a,b) ICOM_CALL2(Save,p,a,b)
#define IPersistStreamInit_GetSizeMax(p,a) ICOM_CALL1(GetSizeMax,p,a)
#define IPersistStreamInit_InitNew(p) ICOM_CALL (InitNew,p)
#endif
/*****************************************************************************
@ -294,7 +282,6 @@ ICOM_DEFINE(IPersistStreamInit,IPersist)
ICOM_DEFINE(IPersistMemory,IPersist)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPersistMemory_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistMemory_AddRef(p) ICOM_CALL (AddRef,p)
@ -307,7 +294,6 @@ ICOM_DEFINE(IPersistMemory,IPersist)
#define IPersistMemory_Save(p,a,b,c) ICOM_CALL3(Save,p,a,b,c)
#define IPersistMemory_GetSizeMax(p,a) ICOM_CALL1(GetSizeMax,p,a)
#define IPersistMemory_InitNew(p) ICOM_CALL (InitNew,p)
#endif
/*****************************************************************************
@ -324,7 +310,6 @@ ICOM_DEFINE(IPersistMemory,IPersist)
ICOM_DEFINE(IPersistPropertyBag,IPersist)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPersistPropertyBag_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistPropertyBag_AddRef(p) ICOM_CALL (AddRef,p)
@ -335,7 +320,6 @@ ICOM_DEFINE(IPersistPropertyBag,IPersist)
#define IPersistPropertyBag_InitNew(p) ICOM_CALL (InitNew,p)
#define IPersistPropertyBag_Load(p,a,b) ICOM_CALL2(Load,p,a,b)
#define IPersistPropertyBag_Save(p,a,b,c) ICOM_CALL3(Save,p,a,b,c)
#endif
/*****************************************************************************
@ -350,14 +334,12 @@ ICOM_DEFINE(IPersistPropertyBag,IPersist)
ICOM_DEFINE(IErrorLog,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IErrorLog_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IErrorLog_AddRef(p) ICOM_CALL (AddRef,p)
#define IErrorLog_Release(p) ICOM_CALL (Release,p)
/*** IErrorLog methods ***/
#define IErrorLog_AddError(p,a,b) ICOM_CALL2(GetClassID,p,a,b)
#endif
/*****************************************************************************
@ -373,7 +355,6 @@ ICOM_DEFINE(IErrorLog,IUnknown)
ICOM_DEFINE(IPropertyBag,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPropertyBag_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPropertyBag_AddRef(p) ICOM_CALL (AddRef,p)
@ -381,7 +362,6 @@ ICOM_DEFINE(IPropertyBag,IUnknown)
/*** IPropertyBag methods ***/
#define IPropertyBag_Read(p,a,b,c) ICOM_CALL3(Read,p,a,b,c)
#define IPropertyBag_Write(p,a,b) ICOM_CALL2(Write,p,a,b)
#endif
/*****************************************************************************
@ -396,14 +376,12 @@ ICOM_DEFINE(IPropertyBag,IUnknown)
ICOM_DEFINE(ISpecifyPropertyPages,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define ISpecifyPropertyPages_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ISpecifyPropertyPages_AddRef(p) ICOM_CALL (AddRef,p)
#define ISpecifyPropertyPages_Release(p) ICOM_CALL (Release,p)
/*** ISpecifyPropertyPages methods ***/
#define ISpecifyPropertyPages_GetPages(p,a) ICOM_CALL3(GetPages,p,a)
#endif
/*****************************************************************************
@ -421,7 +399,6 @@ ICOM_DEFINE(ISpecifyPropertyPages,IUnknown)
ICOM_DEFINE(IPerPropertyBrowsing,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPerPropertyBrowsing_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPerPropertyBrowsing_AddRef(p) ICOM_CALL (AddRef,p)
@ -431,7 +408,6 @@ ICOM_DEFINE(IPerPropertyBrowsing,IUnknown)
#define IPerPropertyBrowsing_MapPropertyToPage(p,a,b) ICOM_CALL2(MapPropertyToPage,p,a,b)
#define IPerPropertyBrowsing_GetPredefinedStrings(p,a,b,c) ICOM_CALL3(GetPredefinedStrings,p,a,b,c)
#define IPerPropertyBrowsing_GetPredefinedValue(p,a,b,c) ICOM_CALL3(GetPredefinedValue,p,a,b,c)
#endif
#ifdef __cplusplus
} /* extern "C" */

8
include/wine/obj_propertystorage.h
View File

@ -144,7 +144,6 @@ struct tagSTATPROPSTG
ICOM_DEFINE(IEnumSTATPROPSETSTG,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumSTATPROPSETSTG_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumSTATPROPSETSTG_AddRef(p) ICOM_CALL (AddRef,p)
@ -154,7 +153,6 @@ ICOM_DEFINE(IEnumSTATPROPSETSTG,IUnknown)
#define IEnumSTATPROPSETSTG_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumSTATPROPSETSTG_Reset(p) ICOM_CALL (Reset,p)
#define IEnumSTATPROPSETSTG_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************
@ -172,7 +170,6 @@ ICOM_DEFINE(IEnumSTATPROPSETSTG,IUnknown)
ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumSTATPROPSTG_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumSTATPROPSTG_AddRef(p) ICOM_CALL (AddRef,p)
@ -182,7 +179,6 @@ ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
#define IEnumSTATPROPSTG_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumSTATPROPSTG_Reset(p) ICOM_CALL (Reset,p)
#define IEnumSTATPROPSTG_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************
@ -200,7 +196,6 @@ ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
ICOM_DEFINE(IPropertySetStorage,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPropertySetStorage_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPropertySetStorage_AddRef(p) ICOM_CALL (AddRef,p)
@ -210,7 +205,6 @@ ICOM_DEFINE(IPropertySetStorage,IUnknown)
#define IPropertySetStorage_Open(p,a,b,c) ICOM_CALL3(Open,p,a,b,c)
#define IPropertySetStorage_Delete(p,a) ICOM_CALL1(Delete,p,a)
#define IPropertySetStorage_Enum(p,a) ICOM_CALL1(Enum,p,a)
#endif
/*****************************************************************************
@ -422,7 +416,6 @@ struct tagPROPVARIANT
ICOM_DEFINE(IPropertyStorage,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPropertyStorage_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPropertyStorage_AddRef(p) ICOM_CALL (AddRef,p)
@ -440,7 +433,6 @@ ICOM_DEFINE(IPropertyStorage,IUnknown)
#define IPropertyStorage_SetTimes(p,a,b,c) ICOM_CALL3(SetTimes,p,a,b,c)
#define IPropertyStorage_SetClass(p,a) ICOM_CALL1(SetClass,p,a)
#define IPropertyStorage_Stat(p,a) ICOM_CALL1(Stat,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_shellbrowser.h
View File

@ -85,10 +85,11 @@ DEFINE_SHLGUID(IID_IShellBrowser, 0x000214E2L, 0, 0);
ICOM_DEFINE(IShellBrowser,IOleWindow)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IShellBrowser_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IShellBrowser_AddRef(p) ICOM_CALL(AddRef,p)
#define IShellBrowser_Release(p) ICOM_CALL(Release,p)
/*** IShellBrowser methods ***/
#define IShellBrowser_GetWindow(p,a) ICOM_CALL1(GetWindow,p,a)
#define IShellBrowser_ContextSensitiveHelp(p,a) ICOM_CALL1(ContextSensitiveHelp,p,a)
#define IShellBrowser_InsertMenusSB(p,a,b) ICOM_CALL2(InsertMenusSB,p,a,b)
@ -104,7 +105,6 @@ ICOM_DEFINE(IShellBrowser,IOleWindow)
#define IShellBrowser_QueryActiveShellView(p,a) ICOM_CALL1(QueryActiveShellView,p,a)
#define IShellBrowser_OnViewWindowActive(p,a) ICOM_CALL1(OnViewWindowActive,p,a)
#define IShellBrowser_SetToolbarItems(p,a,b,c) ICOM_CALL3(SetToolbarItems,p,a,b,c)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_shellextinit.h
View File

@ -26,12 +26,12 @@ DEFINE_SHLGUID(IID_IShellExtInit, 0x000214E8L, 0, 0);
ICOM_DEFINE(IShellExtInit,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IShellExtInit_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IShellExtInit_AddRef(p) ICOM_CALL(AddRef,p)
#define IShellExtInit_Release(p) ICOM_CALL(Release,p)
/*** IShellExtInit methods ***/
#define IShellExtInit_Initialize(p,a,b,c) ICOM_CALL3(Initialize,p,a,b,c)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_shellfolder.h
View File

@ -164,7 +164,6 @@ DWORD WINAPI SHGetDesktopFolder(IShellFolder * *);
ICOM_DEFINE(IShellFolder,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IShellFolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IShellFolder_AddRef(p) ICOM_CALL (AddRef,p)
@ -181,7 +180,6 @@ ICOM_DEFINE(IShellFolder,IUnknown)
#define IShellFolder_GetDisplayNameOf(p,a,b,c) ICOM_CALL3(GetDisplayNameOf,p,a,b,c)
#define IShellFolder_SetNameOf(p,a,b,c,d,e) ICOM_CALL5(SetNameOf,p,a,b,c,d,e)
#define IShellFolder_GetFolderPath(p,a,b) ICOM_CALL2(GetFolderPath,p,a,b)
#endif
/*****************************************************************************
* IPersistFolder interface
@ -200,7 +198,6 @@ DEFINE_GUID (CLSID_SFFile, 0xF3364BA0,0x65B9,0x11CE,0xA9,0xBA,0x00,0xAA,0x00,0x
ICOM_DEFINE(IPersistFolder, IPersist)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPersistFolder_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistFolder_AddRef(p) ICOM_CALL (AddRef,p)
@ -209,7 +206,6 @@ ICOM_DEFINE(IPersistFolder, IPersist)
#define IPersistFolder_GetClassID(p,a) ICOM_CALL1(GetClassID,p,a)
/*** IPersistFolder methods ***/
#define IPersistFolder_Initialize(p,a) ICOM_CALL1(Initialize,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_shelllink.h
View File

@ -70,7 +70,6 @@ typedef enum
ICOM_DEFINE(IShellLink,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IShellLink_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IShellLink_AddRef(p) ICOM_CALL (AddRef,p)
@ -94,7 +93,6 @@ ICOM_DEFINE(IShellLink,IUnknown)
#define IShellLink_SetRelativePath(p,a,b) ICOM_CALL2(SetRelativePath,p,a,b)
#define IShellLink_Resolve(p,a,b) ICOM_CALL2(Resolve,p,a,b)
#define IShellLink_SetPath(p,a) ICOM_CALL1(SetPath,p,a)
#endif
/*****************************************************************************
* IShellLinkW interface
@ -125,7 +123,6 @@ ICOM_DEFINE(IShellLink,IUnknown)
ICOM_DEFINE(IShellLinkW,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IShellLinkW_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IShellLinkW_AddRef(p) ICOM_CALL (AddRef,p)
@ -149,7 +146,6 @@ ICOM_DEFINE(IShellLinkW,IUnknown)
#define IShellLinkW_SetRelativePath(p,a,b) ICOM_CALL2(SetRelativePath,p,a,b)
#define IShellLinkW_Resolve(p,a,b) ICOM_CALL2(Resolve,p,a,b)
#define IShellLinkW_SetPath(p,a) ICOM_CALL1(SetPath,p,a)
#endif
#ifdef __cplusplus
} /* extern "C" */

4
include/wine/obj_shellview.h
View File

@ -124,10 +124,11 @@ typedef enum
ICOM_DEFINE(IShellView,IOleWindow)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IShellView_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IShellView_AddRef(p) ICOM_CALL(AddRef,p)
#define IShellView_Release(p) ICOM_CALL(Release,p)
/*** IShellView methods ***/
#define IShellView_GetWindow(p,a) ICOM_CALL1(GetWindow,p,a)
#define IShellView_ContextSensitiveHelp(p,a) ICOM_CALL1(ContextSensitiveHelp,p,a)
#define IShellView_TranslateAccelerator(p,a) ICOM_CALL1(TranslateAccelerator,p,a)
@ -141,7 +142,6 @@ ICOM_DEFINE(IShellView,IOleWindow)
#define IShellView_SaveViewState(p) ICOM_CALL(SaveViewState,p)
#define IShellView_SelectItem(p,a,b) ICOM_CALL2(SelectItem,p,a,b)
#define IShellView_GetItemObject(p,a,b,c) ICOM_CALL3(GetItemObject,p,a,b,c)
#endif
#ifdef __cplusplus
} /* extern "C" */

30
include/wine/obj_storage.h
View File

@ -173,7 +173,6 @@ typedef struct IStream IStream,*LPSTREAM;
ICOM_DEFINE(IEnumSTATSTG,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IEnumSTATSTG_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IEnumSTATSTG_AddRef(p) ICOM_CALL (AddRef,p)
@ -183,7 +182,6 @@ ICOM_DEFINE(IEnumSTATSTG,IUnknown)
#define IEnumSTATSTG_Skip(p,a) ICOM_CALL1(Skip,p,a)
#define IEnumSTATSTG_Reset(p) ICOM_CALL(Reset,p)
#define IEnumSTATSTG_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
/*****************************************************************************
@ -201,7 +199,6 @@ ICOM_DEFINE(IEnumSTATSTG,IUnknown)
ICOM_DEFINE(IFillLockBytes,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IFillLockBytes_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IFillLockBytes_AddRef(p) ICOM_CALL (AddRef,p)
@ -211,7 +208,6 @@ ICOM_DEFINE(IFillLockBytes,IUnknown)
#define IFillLockBytes_FillAt(p,a,b,c,d) ICOM_CALL4(FillAt,p,a,b,c,d)
#define IFillLockBytes_SetFillSize(p,a) ICOM_CALL1(SetFillSize,p,a)
#define IFillLockBytes_Terminate(p,a) ICOM_CALL1(Terminate,p,a)
#endif
/*****************************************************************************
@ -230,7 +226,6 @@ ICOM_DEFINE(IFillLockBytes,IUnknown)
ICOM_DEFINE(ILayoutStorage,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define ILayoutStorage_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ILayoutStorage_AddRef(p) ICOM_CALL (AddRef,p)
@ -241,7 +236,6 @@ ICOM_DEFINE(ILayoutStorage,IUnknown)
#define ILayoutStorage_EndMonitor(p) ICOM_CALL (EndMonitor,p)
#define ILayoutStorage_ReLayoutDocfile(p,a) ICOM_CALL1(ReLayoutDocfile,p,a)
#define ILayoutStorage_ReLayoutDocfileOnILockBytes(p,a) ICOM_CALL1(ReLayoutDocfileOnILockBytes,p,a)
#endif
/*****************************************************************************
@ -262,7 +256,6 @@ ICOM_DEFINE(ILayoutStorage,IUnknown)
ICOM_DEFINE(ILockBytes,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define ILockBytes_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ILockBytes_AddRef(p) ICOM_CALL (AddRef,p)
@ -275,7 +268,6 @@ ICOM_DEFINE(ILockBytes,IUnknown)
#define ILockBytes_LockRegion(p,a,b,c) ICOM_CALL3(LockRegion,p,a,b,c)
#define ILockBytes_UnlockRegion(p,a,b,c) ICOM_CALL3(UnlockRegion,p,a,b,c)
#define ILockBytes_Stat(p,a,b) ICOM_CALL2(Stat,p,a,b)
#endif
/*****************************************************************************
@ -290,14 +282,12 @@ ICOM_DEFINE(ILockBytes,IUnknown)
ICOM_DEFINE(IPersist,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPersist_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersist_AddRef(p) ICOM_CALL (AddRef,p)
#define IPersist_Release(p) ICOM_CALL (Release,p)
/*** IPersist methods ***/
#define IPersist_GetClassID(p,a) ICOM_CALL1(GetClassID,p,a)
#endif
/*****************************************************************************
@ -316,7 +306,6 @@ ICOM_DEFINE(IPersist,IUnknown)
ICOM_DEFINE(IPersistFile,IPersist)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPersistFile_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistFile_AddRef(p) ICOM_CALL (AddRef,p)
@ -329,7 +318,6 @@ ICOM_DEFINE(IPersistFile,IPersist)
#define IPersistFile_Save(p,a,b) ICOM_CALL2(Save,p,a,b)
#define IPersistFile_SaveCompleted(p,a) ICOM_CALL1(SaveCompleted,p,a)
#define IPersistFile_GetCurFile(p,a) ICOM_CALL1(GetCurFile,p,a)
#endif
/*****************************************************************************
@ -349,7 +337,6 @@ ICOM_DEFINE(IPersistFile,IPersist)
ICOM_DEFINE(IPersistStorage,IPersist)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPersistStorage_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistStorage_AddRef(p) ICOM_CALL (AddRef,p)
@ -363,7 +350,6 @@ ICOM_DEFINE(IPersistStorage,IPersist)
#define IPersistStorage_Save(p,a,b) ICOM_CALL2(Save,p,a,b)
#define IPersistStorage_SaveCompleted(p,a) ICOM_CALL1(SaveCompleted,p,a)
#define IPersistStorage_HandsOffStorage(p) ICOM_CALL (HandsOffStorage,p)
#endif
/*****************************************************************************
@ -381,7 +367,6 @@ ICOM_DEFINE(IPersistStorage,IPersist)
ICOM_DEFINE(IPersistStream,IPersist)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IPersistStream_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IPersistStream_AddRef(p) ICOM_CALL (AddRef,p)
@ -393,7 +378,6 @@ ICOM_DEFINE(IPersistStream,IPersist)
#define IPersistStream_Load(p,a) ICOM_CALL1(Load,p,a)
#define IPersistStream_Save(p,a,b) ICOM_CALL2(Save,p,a,b)
#define IPersistStream_GetSizeMax(p,a) ICOM_CALL1(GetSizeMax,p,a)
#endif
/*****************************************************************************
@ -408,14 +392,12 @@ ICOM_DEFINE(IPersistStream,IPersist)
ICOM_DEFINE(IProgressNotify,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IProgressNotify_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IProgressNotify_AddRef(p) ICOM_CALL (AddRef,p)
#define IProgressNotify_Release(p) ICOM_CALL (Release,p)
/*** IProgressNotify methods ***/
#define IProgressNotify_OnProgress(p,a,b,c,d) ICOM_CALL4(OnProgress,p,a,b,c,d)
#endif
/*****************************************************************************
@ -430,14 +412,12 @@ ICOM_DEFINE(IProgressNotify,IUnknown)
ICOM_DEFINE(IRootStorage,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IRootStorage_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IRootStorage_AddRef(p) ICOM_CALL (AddRef,p)
#define IRootStorage_Release(p) ICOM_CALL (Release,p)
/*** IRootStorage methods ***/
#define IRootStorage_SwitchToFile(p,a) ICOM_CALLSwitchToFile(,p,a)
#endif
/*****************************************************************************
@ -453,7 +433,6 @@ ICOM_DEFINE(IRootStorage,IUnknown)
ICOM_DEFINE(ISequentialStream,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define ISequentialStream_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define ISequentialStream_AddRef(p) ICOM_CALL (AddRef,p)
@ -461,7 +440,6 @@ ICOM_DEFINE(ISequentialStream,IUnknown)
/*** ISequentialStream methods ***/
#define ISequentialStream_Read(p,a,b,c) ICOM_CALL3(Read,p,a,b,c)
#define ISequentialStream_Write(p,a,b,c) ICOM_CALL3(Write,p,a,b,c)
#endif
/*****************************************************************************
@ -490,7 +468,6 @@ ICOM_DEFINE(ISequentialStream,IUnknown)
ICOM_DEFINE(IStorage16,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IStorage16_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IStorage16_AddRef(p) ICOM_CALL (AddRef,p)
@ -511,7 +488,6 @@ ICOM_DEFINE(IStorage16,IUnknown)
#define IStorage16_SetClass(p,a) ICOM_CALL1(SetClass,p,a)
#define IStorage16_SetStateBits(p,a,b) ICOM_CALL2(SetStateBits,p,a,b)
#define IStorage16_Stat(p,a,b) ICOM_CALL2(Stat,p,a,b)
#endif
#define ICOM_INTERFACE IStorage
@ -537,7 +513,6 @@ ICOM_DEFINE(IStorage16,IUnknown)
ICOM_DEFINE(IStorage,IUnknown)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IStorage_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IStorage_AddRef(p) ICOM_CALL (AddRef,p)
@ -582,7 +557,6 @@ ICOM_DEFINE(IStorage,IUnknown)
#define IStorage_SetStateBits(p,a,b) ICOM_CALL2(SetStateBits,p,a,b)
#define IStorage_Stat(p,a,b) ICOM_CALL2(Stat,p,a,b)
#endif
#endif
/*****************************************************************************
@ -605,7 +579,6 @@ ICOM_DEFINE(IStorage,IUnknown)
ICOM_DEFINE(IStream16,ISequentialStream)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IStream16_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IStream16_AddRef(p) ICOM_CALL (AddRef,p)
@ -623,7 +596,6 @@ ICOM_DEFINE(IStream16,ISequentialStream)
#define IStream16_UnlockRegion(p,a,b,c) ICOM_CALL3(UnlockRegion,p,a,b,c)
#define IStream16_Stat(p,a,b) ICOM_CALL2(Stat,p,a,b)
#define IStream16_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
#define ICOM_INTERFACE IStream
@ -643,7 +615,6 @@ ICOM_DEFINE(IStream16,ISequentialStream)
ICOM_DEFINE(IStream,ISequentialStream)
#undef ICOM_INTERFACE
#ifdef ICOM_CINTERFACE
/*** IUnknown methods ***/
#define IStream_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IStream_AddRef(p) ICOM_CALL (AddRef,p)
@ -682,7 +653,6 @@ ICOM_DEFINE(IStream,ISequentialStream)
#define IStream_Stat(p,a,b) ICOM_CALL2(Stat,p,a,b)
#define IStream_Clone(p,a) ICOM_CALL1(Clone,p,a)
#endif
#endif
/*****************************************************************************