[PATCH 0/8] MR1489: DirectMusic: Don't force a calling convention on internal functions.

List overview All Threads

newer

older

Re: [PATCH v2 0/2] MR1508:...

[PATCH 0/3] MR1536: Preparation to...

Alex Henrie (＠alexhenrie)

22 Nov 2022 22 Nov '22

5:56 a.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Show replies by date

Alex Henrie

22 Nov 22 Nov

5:56 a.m.

New subject: [PATCH 1/8] dmband: Don't force a calling convention on internal functions.

From: Alex Henrie alexhenrie24@gmail.com

--- dlls/dmband/band.c | 2 +- dlls/dmband/bandtrack.c | 2 +- dlls/dmband/dmband_main.c | 2 +- dlls/dmband/dmband_private.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 1910e53d187..d71863a1f9d 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -510,7 +510,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };

/* for ClassFactory */ -HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) +HRESULT create_dmband(REFIID lpcGUID, void **ppobj) { IDirectMusicBandImpl* obj; HRESULT hr; diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 0864e91bd4b..0142b5b5188 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -633,7 +633,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };

/* for ClassFactory */ -HRESULT WINAPI create_dmbandtrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj) { IDirectMusicBandTrack *track; HRESULT hr; diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index 93553c88ca1..c08f8b0a087 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -27,7 +27,7 @@ LONG DMBAND_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/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index b618b9b3c0b..b0b26076285 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -44,8 +44,8 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmbandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;

/*****************************************************************************

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Alex Henrie

5:56 a.m.

New subject: [PATCH 2/8] dmcompos: Don't force a calling convention on internal functions.

From: Alex Henrie alexhenrie24@gmail.com

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;

-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;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Alex Henrie

5:56 a.m.

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

From: Alex Henrie alexhenrie24@gmail.com

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;

/****************************************************************** 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;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Alex Henrie

5:56 a.m.

New subject: [PATCH 4/8] dmloader: Don't force a calling convention on internal functions.

From: Alex Henrie alexhenrie24@gmail.com

diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 111c0db4760..f2b284e1cb3 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -647,7 +647,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };

/* for ClassFactory */ -HRESULT WINAPI create_dmcontainer(REFIID lpcGUID, void **ppobj) +HRESULT create_dmcontainer(REFIID lpcGUID, void **ppobj) { IDirectMusicContainerImpl* obj; HRESULT hr; diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 61aa092b5f8..512e6102d86 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -40,7 +40,7 @@ LONG module_ref = 0;

typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv); } IClassFactoryImpl;

/****************************************************************** diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 94bb9ddf1bd..47994a48c4e 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -62,11 +62,11 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Creation helpers */ -extern HRESULT WINAPI create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderFileStream(void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream(void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream(void **ppobj) DECLSPEC_HIDDEN;

/***************************************************************************** * IDirectMusicLoaderFileStream implementation structure diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0bb22a406ab..6c4b29ab5ea 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -903,7 +903,7 @@ static HRESULT DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) { }

/* for ClassFactory */ -HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) +HRESULT create_dmloader(REFIID lpcGUID, void **ppobj) { IDirectMusicLoaderImpl *obj; DMUS_OBJECTDESC Desc; diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 864c222e118..38862c0fec7 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -288,7 +288,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtb IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoader };

-HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderFileStream (void** ppobj) { IDirectMusicLoaderFileStream *obj;

TRACE("(%p)\n", ppobj); @@ -545,7 +545,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_GetLoader };

-HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream (void** ppobj) { IDirectMusicLoaderResourceStream *obj;

TRACE("(%p)\n", ppobj); @@ -797,7 +797,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_ IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_GetLoader };

-HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream (void** ppobj) { IDirectMusicLoaderGenericStream *obj;

TRACE("(%p)\n", ppobj);

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Alex Henrie

5:56 a.m.

New subject: [PATCH 5/8] dmscript: Don't force a calling convention on internal functions.

From: Alex Henrie alexhenrie24@gmail.com

--- dlls/dmscript/dmscript_main.c | 4 ++-- dlls/dmscript/dmscript_private.h | 4 ++-- dlls/dmscript/script.c | 2 +- dlls/dmscript/scripttrack.c | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7191129f96d..f6785176aec 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -42,10 +42,10 @@ LONG DMSCRIPT_refCount = 0;

typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl;

-static HRESULT WINAPI create_unimpl_instance(REFIID riid, void **ppv, IUnknown *pUnkOuter) +static HRESULT create_unimpl_instance(REFIID riid, void **ppv, IUnknown *pUnkOuter) { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv);

diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index a6723e36aa1..3b3a4c86c84 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -44,9 +44,9 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN;

-extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN;

/********************************************************************** * Dll lifetime tracking declaration for dmscript.dll diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 5bc6a8b3067..375eebf69aa 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -488,7 +488,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };

/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) +HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) { IDirectMusicScriptImpl *obj; HRESULT hr; diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 6e430de3f39..fbe454c09e5 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -317,8 +317,7 @@ static const IPersistStreamVtbl persist_vtbl = { };

/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, - IUnknown *pUnkOuter) +HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, IUnknown *pUnkOuter) { DirectMusicScriptTrack *track; HRESULT hr;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Alex Henrie

5:56 a.m.

New subject: [PATCH 6/8] dmstyle: Don't force a calling convention on internal functions.

From: Alex Henrie alexhenrie24@gmail.com

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;

-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;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Alex Henrie

5:56 a.m.

New subject: [PATCH 7/8] dmsynth: Don't force a calling convention on internal functions.

From: Alex Henrie alexhenrie24@gmail.com

--- dlls/dmsynth/dmsynth_main.c | 2 +- dlls/dmsynth/dmsynth_private.h | 4 ++-- dlls/dmsynth/synth.c | 2 +- dlls/dmsynth/synthsink.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 014eb0eb6f1..a5e2e605419 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -29,7 +29,7 @@ LONG DMSYNTH_refCount = 0;

typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv); } IClassFactoryImpl;

/****************************************************************** diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 0058ce04d3a..b0e4c66f416 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -49,8 +49,8 @@ typedef struct IDirectMusicSynthSinkImpl IDirectMusicSynthSinkImpl; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN;

/***************************************************************************** * IDirectMusicSynth8Impl implementation structure diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index d96ee943a5e..121d9aadf35 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -729,7 +729,7 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { };

/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) +HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) { IDirectMusicSynth8Impl *obj; HRESULT hr; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index d34bcf9df5e..a277a05bafb 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -298,7 +298,7 @@ static const IKsControlVtbl DMSynthSinkImpl_IKsControl_Vtbl = { };

/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) +HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) { IDirectMusicSynthSinkImpl *obj; HRESULT hr;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Alex Henrie

5:56 a.m.

New subject: [PATCH 8/8] dmusic: Don't force a calling convention on internal functions.

From: Alex Henrie alexhenrie24@gmail.com

--- dlls/dmusic/collection.c | 2 +- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_main.c | 2 +- dlls/dmusic/dmusic_private.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 05f67d5578d..8473c0078ec 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -522,7 +522,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };

-HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) +HRESULT DMUSIC_CreateDirectMusicCollectionImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) { IDirectMusicCollectionImpl* obj; HRESULT hr; diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index cb94497883e..3a1824143d7 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -588,7 +588,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) }

/* For ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) +HRESULT DMUSIC_CreateDirectMusicImpl(REFIID riid, void **ret_iface, IUnknown *unkouter) { IDirectMusic8Impl *dmusic; HRESULT ret; diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 6f69e48d607..5d4939937a9 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -43,7 +43,7 @@ LONG DMUSIC_refCount = 0;

/****************************************************************** diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index ea6b7482f33..18d3e079b12 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -95,8 +95,8 @@ typedef struct instrument_articulation { */

/* CLSID */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicImpl(REFIID riid, void **ret_iface, IUnknown *pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicCollectionImpl(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN;

/* Internal */ extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

Marvin

5:03 p.m.

New subject: [PATCH 8/8] dmusic: Don't force a calling convention on internal functions.

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=126608

Your paranoid android.

=== debian11 (32 bit report) ===

d3d9: stateblock: Timeout visual: Timeout

d3dcompiler_43: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout

d3dcompiler_46: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout

d3dcompiler_47: asm: Timeout blob: Timeout hlsl_d3d11: Timeout hlsl_d3d9: Timeout reflection: Timeout

d3drm: d3drm: Timeout vector: Timeout

d3dx10_34: d3dx10: Timeout

d3dx10_35: d3dx10: Timeout

d3dx10_36: d3dx10: Timeout

d3dx10_37: d3dx10: Timeout

d3dx10_38: d3dx10: Timeout

d3dx10_39: d3dx10: Timeout

d3dx10_40: d3dx10: Timeout

Report validation errors: d3dx10_41:d3dx10 timeout

=== debian11 (build log) ===

WineRunWineTest.pl:error: The task timed out

Michael Stefaniuc (＠mstefani)

24 Nov 24 Nov

6:32 p.m.

New subject: [PATCH 0/8] MR1489: DirectMusic: Don't force a calling convention on internal functions. - approved

This merge request was approved by Michael Stefaniuc.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1489

805

Age (days ago)

807

Last active (days ago)

wine-gitlab@winehq.org

10 comments

4 participants

tags (0)

participants (4)

Alex Henrie
Alex Henrie (＠alexhenrie)
Marvin
Michael Stefaniuc (＠mstefani)