Get rid of the ICOM_CALL macros.
diff --git a/include/dmusics.h b/include/dmusics.h
index 8d893aa..c6e2da6 100644
--- a/include/dmusics.h
+++ b/include/dmusics.h
@@ -92,28 +92,30 @@
ICOM_DEFINE(IDirectMusicSynth,IUnknown)
#undef INTERFACE
+#ifdef COBJMACROS
/*** IUnknown methods ***/
-#define IDirectMusicSynth_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
-#define IDirectMusicSynth_AddRef(p) ICOM_CALL (AddRef,p)
-#define IDirectMusicSynth_Release(p) ICOM_CALL (Release,p)
+#define IDirectMusicSynth_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectMusicSynth_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectMusicSynth_Release(p) (p)->lpVtbl->Release(p)
/*** IDirectMusicSynth methods ***/
-#define IDirectMusicSynth_Open(p,a) ICOM_CALL1(Open,p,a)
-#define IDirectMusicSynth_Close(p) ICOM_CALL (Close,p)
-#define IDirectMusicSynth_SetNumChannelGroups(p,a) ICOM_CALL1(SetNumChannelGroups,p,a)
-#define IDirectMusicSynth_Download(p,a,b,c) ICOM_CALL3(Download,p,a,b,c)
-#define IDirectMusicSynth_Unload(p,a,b,c) ICOM_CALL3(Unload,p,a,b,c)
-#define IDirectMusicSynth_PlayBuffer(p,a,b,c) ICOM_CALL3(PlayBuffer,p,a,b,c)
-#define IDirectMusicSynth_GetRunningStats(p,a) ICOM_CALL1(GetRunningStats,p,a)
-#define IDirectMusicSynth_GetPortCaps(p,a) ICOM_CALL1(GetPortCaps,p,a)
-#define IDirectMusicSynth_SetMasterClock(p,a) ICOM_CALL1(SetMasterClock,p,a)
-#define IDirectMusicSynth_GetLatencyClock(p,a) ICOM_CALL1(GetLatencyClock,p,a)
-#define IDirectMusicSynth_Activate(p,a) ICOM_CALL1(Activate,p,a)
-#define IDirectMusicSynth_SetSynthSink(p,a) ICOM_CALL1(SetSynthSink,p,a)
-#define IDirectMusicSynth_Render(p,a,b,c) ICOM_CALL3(Render,p,a,b,c)
-#define IDirectMusicSynth_SetChannelPriority(p,a,b,c) ICOM_CALL3(SetChannelPriority,p,a,b,c)
-#define IDirectMusicSynth_GetChannelPriority(p,a,b,c) ICOM_CALL3(GetChannelPriority,p,a,b,c)
-#define IDirectMusicSynth_GetFormat(p,a,b) ICOM_CALL2(GetFormat,p,a,b)
-#define IDirectMusicSynth_GetAppend(p,a) ICOM_CALL1(GetAppend,p,a)
+#define IDirectMusicSynth_Open(p,a) (p)->lpVtbl->Open(p,a)
+#define IDirectMusicSynth_Close(p) (p)->lpVtbl->Close(p)
+#define IDirectMusicSynth_SetNumChannelGroups(p,a) (p)->lpVtbl->SetNumChannelGroups(p,a)
+#define IDirectMusicSynth_Download(p,a,b,c) (p)->lpVtbl->Download(p,a,b,c)
+#define IDirectMusicSynth_Unload(p,a,b,c) (p)->lpVtbl->Unload(p,a,b,c)
+#define IDirectMusicSynth_PlayBuffer(p,a,b,c) (p)->lpVtbl->PlayBuffer(p,a,b,c)
+#define IDirectMusicSynth_GetRunningStats(p,a) (p)->lpVtbl->GetRunningStats(p,a)
+#define IDirectMusicSynth_GetPortCaps(p,a) (p)->lpVtbl->GetPortCaps(p,a)
+#define IDirectMusicSynth_SetMasterClock(p,a) (p)->lpVtbl->SetMasterClock(p,a)
+#define IDirectMusicSynth_GetLatencyClock(p,a) (p)->lpVtbl->GetLatencyClock(p,a)
+#define IDirectMusicSynth_Activate(p,a) (p)->lpVtbl->Activate(p,a)
+#define IDirectMusicSynth_SetSynthSink(p,a) (p)->lpVtbl->SetSynthSink(p,a)
+#define IDirectMusicSynth_Render(p,a,b,c) (p)->lpVtbl->Render(p,a,b,c)
+#define IDirectMusicSynth_SetChannelPriority(p,a,b,c) (p)->lpVtbl->SetChannelPriority(p,a,b,c)
+#define IDirectMusicSynth_GetChannelPriority(p,a,b,c) (p)->lpVtbl->GetChannelPriority(p,a,b,c)
+#define IDirectMusicSynth_GetFormat(p,a,b) (p)->lpVtbl->GetFormat(p,a,b)
+#define IDirectMusicSynth_GetAppend(p,a) (p)->lpVtbl->GetAppend(p,a)
+#endif
/*****************************************************************************
@@ -137,34 +139,36 @@
ICOM_DEFINE(IDirectMusicSynth8,IDirectMusicSynth)
#undef INTERFACE
+#ifdef COBJMACROS
/*** IUnknown methods ***/
-#define IDirectMusicSynth8_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
-#define IDirectMusicSynth8_AddRef(p) ICOM_CALL (AddRef,p)
-#define IDirectMusicSynth8_Release(p) ICOM_CALL (Release,p)
+#define IDirectMusicSynth8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectMusicSynth8_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectMusicSynth8_Release(p) (p)->lpVtbl->Release(p)
/*** IDirectMusicSynth methods ***/
-#define IDirectMusicSynth8_Open(p,a) ICOM_CALL1(Open,p,a)
-#define IDirectMusicSynth8_Close(p) ICOM_CALL (Close,p)
-#define IDirectMusicSynth8_SetNumChannelGroups(p,a) ICOM_CALL1(SetNumChannelGroups,p,a)
-#define IDirectMusicSynth8_Download(p,a,b,c) ICOM_CALL3(Download,p,a,b,c)
-#define IDirectMusicSynth8_Unload(p,a,b,c) ICOM_CALL3(Unload,p,a,b,c)
-#define IDirectMusicSynth8_PlayBuffer(p,a,b,c) ICOM_CALL3(PlayBuffer,p,a,b,c)
-#define IDirectMusicSynth8_GetRunningStats(p,a) ICOM_CALL1(GetRunningStats,p,a)
-#define IDirectMusicSynth8_GetPortCaps(p,a) ICOM_CALL1(GetPortCaps,p,a)
-#define IDirectMusicSynth8_SetMasterClock(p,a) ICOM_CALL1(SetMasterClock,p,a)
-#define IDirectMusicSynth8_GetLatencyClock(p,a) ICOM_CALL1(GetLatencyClock,p,a)
-#define IDirectMusicSynth8_Activate(p,a) ICOM_CALL1(Activate,p,a)
-#define IDirectMusicSynth8_SetSynthSink(p,a) ICOM_CALL1(SetSynthSink,p,a)
-#define IDirectMusicSynth8_Render(p,a,b,c) ICOM_CALL3(Render,p,a,b,c)
-#define IDirectMusicSynth8_SetChannelPriority(p,a,b,c) ICOM_CALL3(SetChannelPriority,p,a,b,c)
-#define IDirectMusicSynth8_GetChannelPriority(p,a,b,c) ICOM_CALL3(GetChannelPriority,p,a,b,c)
-#define IDirectMusicSynth8_GetFormat(p,a,b) ICOM_CALL2(GetFormat,p,a,b)
-#define IDirectMusicSynth8_GetAppend(p,a) ICOM_CALL1(GetAppend,p,a)
+#define IDirectMusicSynth8_Open(p,a) (p)->lpVtbl->Open(p,a)
+#define IDirectMusicSynth8_Close(p) (p)->lpVtbl->Close(p)
+#define IDirectMusicSynth8_SetNumChannelGroups(p,a) (p)->lpVtbl->SetNumChannelGroups(p,a)
+#define IDirectMusicSynth8_Download(p,a,b,c) (p)->lpVtbl->Download(p,a,b,c)
+#define IDirectMusicSynth8_Unload(p,a,b,c) (p)->lpVtbl->Unload(p,a,b,c)
+#define IDirectMusicSynth8_PlayBuffer(p,a,b,c) (p)->lpVtbl->PlayBuffer(p,a,b,c)
+#define IDirectMusicSynth8_GetRunningStats(p,a) (p)->lpVtbl->GetRunningStats(p,a)
+#define IDirectMusicSynth8_GetPortCaps(p,a) (p)->lpVtbl->GetPortCaps(p,a)
+#define IDirectMusicSynth8_SetMasterClock(p,a) (p)->lpVtbl->SetMasterClock(p,a)
+#define IDirectMusicSynth8_GetLatencyClock(p,a) (p)->lpVtbl->GetLatencyClock(p,a)
+#define IDirectMusicSynth8_Activate(p,a) (p)->lpVtbl->Activate(p,a)
+#define IDirectMusicSynth8_SetSynthSink(p,a) (p)->lpVtbl->SetSynthSink(p,a)
+#define IDirectMusicSynth8_Render(p,a,b,c) (p)->lpVtbl->Render(p,a,b,c)
+#define IDirectMusicSynth8_SetChannelPriority(p,a,b,c) (p)->lpVtbl->SetChannelPriority(p,a,b,c)
+#define IDirectMusicSynth8_GetChannelPriority(p,a,b,c) (p)->lpVtbl->GetChannelPriority(p,a,b,c)
+#define IDirectMusicSynth8_GetFormat(p,a,b) (p)->lpVtbl->GetFormat(p,a,b)
+#define IDirectMusicSynth8_GetAppend(p,a) (p)->lpVtbl->GetAppend(p,a)
/*** IDirectMusicSynth8 methods ***/
-#define IDirectMusicSynth8_PlayVoice(p,a,b,c,d,e,f,g,h,i,j) ICOM_CALL10(PlayVoice,p,a,b,c,d,e,f,g,h,i,j)
-#define IDirectMusicSynth8_StopVoice(p,a,b) ICOM_CALL2(StopVoice,p,a,b)
-#define IDirectMusicSynth8_GetVoiceState(p,a,b,c) ICOM_CALL3(GetVoiceState,p,a,b,c)
-#define IDirectMusicSynth8_Refresh(p,a,b) ICOM_CALL2(Refresh,p,a,b)
-#define IDirectMusicSynth8_AssignChannelToBuses(p,a,b,c,d) ICOM_CALL4(AssignChannelToBuses,p,a,b,c,d)
+#define IDirectMusicSynth8_PlayVoice(p,a,b,c,d,e,f,g,h,i,j) (p)->lpVtbl->PlayVoice(p,a,b,c,d,e,f,g,h,i,j)
+#define IDirectMusicSynth8_StopVoice(p,a,b) (p)->lpVtbl->StopVoice(p,a,b)
+#define IDirectMusicSynth8_GetVoiceState(p,a,b,c) (p)->lpVtbl->GetVoiceState(p,a,b,c)
+#define IDirectMusicSynth8_Refresh(p,a,b) (p)->lpVtbl->Refresh(p,a,b)
+#define IDirectMusicSynth8_AssignChannelToBuses(p,a,b,c,d) (p)->lpVtbl->AssignChannelToBuses(p,a,b,c,d)
+#endif
/*****************************************************************************
@@ -190,18 +194,20 @@
ICOM_DEFINE(IDirectMusicSynthSink,IUnknown)
#undef INTERFACE
+#ifdef COBJMACROS
/*** IUnknown methods ***/
-#define IDirectMusicSynthSink_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
-#define IDirectMusicSynthSink_AddRef(p) ICOM_CALL (AddRef,p)
-#define IDirectMusicSynthSink_Release(p) ICOM_CALL (Release,p)
+#define IDirectMusicSynthSink_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectMusicSynthSink_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectMusicSynthSink_Release(p) (p)->lpVtbl->Release(p)
/*** IDirectMusicSynth methods ***/
-#define IDirectMusicSynthSink_Init(p,a) ICOM_CALL1(Init,p,a)
-#define IDirectMusicSynthSink_SetMasterClock(p,a) ICOM_CALL1(SetMasterClock,p,a)
-#define IDirectMusicSynthSink_GetLatencyClock(p,a) ICOM_CALL1(GetLatencyClock,p,a)
-#define IDirectMusicSynthSink_Activate(p,a) ICOM_CALL1(Activate,p,a)
-#define IDirectMusicSynthSink_SampleToRefTime(p,a,b) ICOM_CALL2(SampleToRefTime,p,a,b)
-#define IDirectMusicSynthSink_RefTimeToSample(p,a,b) ICOM_CALL2(RefTimeToSample,p,a,b)
-#define IDirectMusicSynthSink_SetDirectSound(p,a,b) ICOM_CALL2(SetDirectSound,p,a,b)
-#define IDirectMusicSynthSink_GetDesiredBufferSize(p,a) ICOM_CALL1(GetDesiredBufferSize,p,a)
+#define IDirectMusicSynthSink_Init(p,a) (p)->lpVtbl->Init(p,a)
+#define IDirectMusicSynthSink_SetMasterClock(p,a) (p)->lpVtbl->SetMasterClock(p,a)
+#define IDirectMusicSynthSink_GetLatencyClock(p,a) (p)->lpVtbl->GetLatencyClock(p,a)
+#define IDirectMusicSynthSink_Activate(p,a) (p)->lpVtbl->Activate(p,a)
+#define IDirectMusicSynthSink_SampleToRefTime(p,a,b) (p)->lpVtbl->SampleToRefTime(p,a,b)
+#define IDirectMusicSynthSink_RefTimeToSample(p,a,b) (p)->lpVtbl->RefTimeToSample(p,a,b)
+#define IDirectMusicSynthSink_SetDirectSound(p,a,b) (p)->lpVtbl->SetDirectSound(p,a,b)
+#define IDirectMusicSynthSink_GetDesiredBufferSize(p,a) (p)->lpVtbl->GetDesiredBufferSize(p,a)
+#endif
#endif /* __WINE_DMUSIC_SOFTWARESYNTH_H */
