Module: wine Branch: master Commit: 6bf23c4ae91ed85ab8e08ae5ca53b712699568ed URL: https://gitlab.winehq.org/wine/wine/-/commit/6bf23c4ae91ed85ab8e08ae5ca53b71...
Author: Alex Henrie alexhenrie24@gmail.com Date: Mon Nov 21 20:54:30 2022 -0700
dmstyle: Don't force a calling convention on internal functions.
---
dlls/dmstyle/auditiontrack.c | 2 +- dlls/dmstyle/chordtrack.c | 2 +- dlls/dmstyle/commandtrack.c | 2 +- dlls/dmstyle/dmstyle_main.c | 4 ++-- dlls/dmstyle/dmstyle_private.h | 14 +++++++------- dlls/dmstyle/motiftrack.c | 2 +- dlls/dmstyle/mutetrack.c | 2 +- dlls/dmstyle/style.c | 2 +- dlls/dmstyle/styletrack.c | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 29ad868f773..0bf1c818f6c 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -316,7 +316,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmauditiontrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmauditiontrack(REFIID lpcGUID, void **ppobj) { IDirectMusicAuditionTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 98c9169d2ee..fdaecac1240 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -415,7 +415,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmchordtrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmchordtrack(REFIID lpcGUID, void **ppobj) { IDirectMusicChordTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 417b7847403..32e0bbe8c0d 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -368,7 +368,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmcommandtrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmcommandtrack(REFIID lpcGUID, void **ppobj) { IDirectMusicCommandTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index cdee2fefc10..8f951ece5ae 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -41,10 +41,10 @@ LONG DMSTYLE_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_section(REFIID riid, void **ret_iface) +static HRESULT create_direct_music_section(REFIID riid, void **ret_iface) { FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface);
diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 2956dad1513..4c8dd091536 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -44,13 +44,13 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI create_dmstyle(REFIID lpcGUID, LPVOID* ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmauditiontrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmchordtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmcommandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmmotiftrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmmutetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmstyle(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmauditiontrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmchordtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmcommandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmmotiftrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmmutetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
/***************************************************************************** * Auxiliary definitions diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 0fa1a48bcc4..5efe90706e0 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -288,7 +288,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmmotiftrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmmotiftrack(REFIID lpcGUID, void **ppobj) { IDirectMusicMotifTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 08fed5d5f2a..2248d7151dd 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -297,7 +297,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmmutetrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmmutetrack(REFIID lpcGUID, void **ppobj) { IDirectMusicMuteTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 9048984adea..ae939f8b738 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -973,7 +973,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) +HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj) { IDirectMusicStyle8Impl* obj; HRESULT hr; diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index a1e31bcd3b4..bdc665fe302 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -502,7 +502,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI create_dmstyletrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmstyletrack(REFIID lpcGUID, void **ppobj) { IDirectMusicStyleTrack *track; HRESULT hr;