Module: wine Branch: master Commit: c9fb12c19de14badb9dd5cb6629f95468a73908b URL: https://gitlab.winehq.org/wine/wine/-/commit/c9fb12c19de14badb9dd5cb6629f954...
Author: Alex Henrie alexhenrie24@gmail.com Date: Mon Nov 21 20:54:30 2022 -0700
dmcompos: Don't force a calling convention on internal functions.
---
dlls/dmcompos/chordmap.c | 2 +- dlls/dmcompos/chordmaptrack.c | 2 +- dlls/dmcompos/composer.c | 2 +- dlls/dmcompos/dmcompos_main.c | 4 ++-- dlls/dmcompos/dmcompos_private.h | 8 ++++---- dlls/dmcompos/signposttrack.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index ef2fa036ccb..adc17402f39 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -309,7 +309,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) +HRESULT create_dmchordmap(REFIID lpcGUID, void **ppobj) { IDirectMusicChordMapImpl* obj; HRESULT hr; diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 27e7dd94887..66517340d70 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -285,7 +285,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) { IDirectMusicChordMapTrack* track; HRESULT hr; diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index 84ca90aaf42..a13a77bff94 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -144,7 +144,7 @@ static const IDirectMusicComposerVtbl dmcomposer_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) +HRESULT create_dmcomposer(REFIID riid, void **ret_iface) { IDirectMusicComposerImpl *obj; HRESULT hr; diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index eee94a20f48..dff77aa4d32 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -42,10 +42,10 @@ LONG DMCOMPOS_refCount = 0;
typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); + HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl;
-static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ret_iface) +static HRESULT create_direct_music_template(REFIID riid, void **ret_iface) { FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface);
diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index bfee61e5bee..bd44607d00c 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -44,10 +44,10 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
/********************************************************************** * Dll lifetime tracking declaration for dmcompos.dll diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 8da4ade961a..249f37b7711 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -273,7 +273,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmsignposttrack(REFIID lpcGUID, void **ppobj) { IDirectMusicSignPostTrack *track; HRESULT hr;