[PATCH 3/8] dmime: Don't force a calling convention on internal functions.

[Alex Henrie]

From: Alex Henrie

---
 dlls/dmime/audiopath.c         |  2 +-
 dlls/dmime/dmime_main.c        |  2 +-
 dlls/dmime/dmime_private.h     | 30 +++++++++++++++---------------
 dlls/dmime/graph.c             |  2 +-
 dlls/dmime/lyricstrack.c       |  2 +-
 dlls/dmime/markertrack.c       |  2 +-
 dlls/dmime/paramcontroltrack.c |  2 +-
 dlls/dmime/performance.c       |  2 +-
 dlls/dmime/segment.c           |  2 +-
 dlls/dmime/segmentstate.c      |  2 +-
 dlls/dmime/segtriggertrack.c   |  2 +-
 dlls/dmime/seqtrack.c          |  2 +-
 dlls/dmime/sysextrack.c        |  2 +-
 dlls/dmime/tempotrack.c        |  2 +-
 dlls/dmime/timesigtrack.c      |  2 +-
 dlls/dmime/wavetrack.c         |  2 +-
 16 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c
index 5018be9d453..0857ed77c48 100644
--- a/dlls/dmime/audiopath.c
+++ b/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;
diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c
index 0842517452c..c24cf944af5 100644
--- a/dlls/dmime/dmime_main.c
+++ b/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;

/******************************************************************
diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index c2221a15fd2..4159abffa99 100644
--- a/dlls/dmime/dmime_private.h
+++ b/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;
diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c
index 526163e5b54..6cb719025c1 100644
--- a/dlls/dmime/graph.c
+++ b/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;
diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c
index 769713a6ba1..4983fe99a2d 100644
--- a/dlls/dmime/lyricstrack.c
+++ b/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;
diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c
index cfb788ccf50..7749d9abb08 100644
--- a/dlls/dmime/markertrack.c
+++ b/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;
diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c
index c0aed374101..641fd73baa3 100644
--- a/dlls/dmime/paramcontroltrack.c
+++ b/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;
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index f59be107c58..d69a27540d6 100644
--- a/dlls/dmime/performance.c
+++ b/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;

diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index 8ec4059e8f9..b1dd21c1242 100644
--- a/dlls/dmime/segment.c
+++ b/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;
diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c
index 61347d8c1a2..21544fad773 100644
--- a/dlls/dmime/segmentstate.c
+++ b/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;
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index 14e013c8e16..1b7fc6d951c 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/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;
diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c
index 3c4e2c22439..743be10e5c6 100644
--- a/dlls/dmime/seqtrack.c
+++ b/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;
diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c
index ded348aede9..d3ff9a051b8 100644
--- a/dlls/dmime/sysextrack.c
+++ b/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;
diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index 0e8d5bcab48..a3cbffc341a 100644
--- a/dlls/dmime/tempotrack.c
+++ b/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;
diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c
index d6452e92e1b..1f4c0dbf187 100644
--- a/dlls/dmime/timesigtrack.c
+++ b/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;
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index 171c3e5c6b7..d87d16fcdab 100644
--- a/dlls/dmime/wavetrack.c
+++ b/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;