dmime: Don't force a calling convention on internal functions.

dlls/dmime/audiopath.c

@@ -325,7 +325,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmaudiopath(REFIID riid, void **ppobj)
+HRESULT create_dmaudiopath(REFIID riid, void **ppobj)
 {
     IDirectMusicAudioPathImpl* obj;
     HRESULT hr;

dlls/dmime/dmime_main.c

@@ -42,7 +42,7 @@ LONG DMIME_refCount = 0;
 
 typedef struct {
         IClassFactory IClassFactory_iface;
-        HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface);
+        HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface);
 } IClassFactoryImpl;
 
 /******************************************************************

dlls/dmime/dmime_private.h

@@ -51,21 +51,21 @@ typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl;
 /*****************************************************************************
  * ClassFactory
  */
-extern HRESULT WINAPI create_dmperformance(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmsegment(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmsegmentstate(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmgraph(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmaudiopath(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-
-extern HRESULT WINAPI create_dmlyricstrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmmarkertrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmparamcontroltrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmsegtriggertrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmseqtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmsysextrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmtempotrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmtimesigtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmwavetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmperformance(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmsegment(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmsegmentstate(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmgraph(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmaudiopath(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+
+extern HRESULT create_dmlyricstrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmmarkertrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmparamcontroltrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmsegtriggertrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmseqtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmsysextrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmtempotrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmtimesigtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmwavetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
 
 extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerformance8*) DECLSPEC_HIDDEN;
 extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN;

dlls/dmime/graph.c

@@ -251,7 +251,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmgraph(REFIID riid, void **ret_iface)
+HRESULT create_dmgraph(REFIID riid, void **ret_iface)
 {
     IDirectMusicGraphImpl* obj;
     HRESULT hr;

dlls/dmime/lyricstrack.c

@@ -343,7 +343,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmlyricstrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmlyricstrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicLyricsTrack *track;
     HRESULT hr;

dlls/dmime/markertrack.c

@@ -221,7 +221,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmmarkertrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmmarkertrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicMarkerTrack *track;
     HRESULT hr;

dlls/dmime/paramcontroltrack.c

@@ -257,7 +257,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmparamcontroltrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmparamcontroltrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicParamControlTrack *track;
     HRESULT hr;

dlls/dmime/performance.c

@@ -1284,7 +1284,7 @@ static const IDirectMusicPerformance8Vtbl DirectMusicPerformance8_Vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmperformance(REFIID lpcGUID, void **ppobj)
 {
 	IDirectMusicPerformance8Impl *obj;
 

dlls/dmime/segment.c

@@ -827,7 +827,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmsegment(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmsegment(REFIID lpcGUID, void **ppobj)
 {
   IDirectMusicSegment8Impl* obj;
   HRESULT hr;

dlls/dmime/segmentstate.c

@@ -144,7 +144,7 @@ static const IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8Vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmsegmentstate(REFIID riid, void **ret_iface)
+HRESULT create_dmsegmentstate(REFIID riid, void **ret_iface)
 {
     IDirectMusicSegmentState8Impl* obj;
     HRESULT hr;

dlls/dmime/segtriggertrack.c

@@ -382,7 +382,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmsegtriggertrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmsegtriggertrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicSegTriggerTrack *track;
     HRESULT hr;

dlls/dmime/seqtrack.c

@@ -257,7 +257,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmseqtrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmseqtrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicSeqTrack *track;
     HRESULT hr;

dlls/dmime/sysextrack.c

@@ -256,7 +256,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmsysextrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmsysextrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicSysExTrack *track;
     HRESULT hr;

dlls/dmime/tempotrack.c

@@ -370,7 +370,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmtempotrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmtempotrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicTempoTrack *track;
     HRESULT hr;

dlls/dmime/timesigtrack.c

@@ -285,7 +285,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmtimesigtrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmtimesigtrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicTimeSigTrack *track;
     HRESULT hr;

dlls/dmime/wavetrack.c

@@ -471,7 +471,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };
 
 /* for ClassFactory */
-HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmwavetrack(REFIID lpcGUID, void **ppobj)
 {
     IDirectMusicWaveTrack *track;
     HRESULT hr;