[PATCH 0/9] MR3196: Remove macro

List overview All Threads

newer

older

[PATCH v11 0/2] MR2068: comdlg32:...

[PATCH v2 0/2] MR3198: combase:...

Alistair Leslie-Hughes (＠alesliehughes)

29 Jun 2023 29 Jun '23

10:47 a.m.

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

Show replies by date

Alistair Leslie-Hughes

29 Jun 29 Jun

10:47 a.m.

New subject: [PATCH 1/9] dmsynth: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dmsynth/dmsynth_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

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

/***************************************************************************** * IDirectMusicSynth8Impl implementation structure @@ -83,7 +83,7 @@ struct IDirectMusicSynthSinkImpl { /********************************************************************** * Dll lifetime tracking declaration for dmsynth.dll */ -extern LONG DMSYNTH_refCount DECLSPEC_HIDDEN; +extern LONG DMSYNTH_refCount; static inline void DMSYNTH_LockModule(void) { InterlockedIncrement( &DMSYNTH_refCount ); } static inline void DMSYNTH_UnlockModule(void) { InterlockedDecrement( &DMSYNTH_refCount ); }

@@ -106,6 +106,6 @@ typedef struct { #define GE(x) { &x, #x }

/* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; +extern const char *debugstr_dmguid (const GUID *id);

#endif /* __WINE_DMSYNTH_PRIVATE_H */

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

Alistair Leslie-Hughes

10:47 a.m.

New subject: [PATCH 2/9] dmstyle: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dmstyle/dmobject.h | 50 +++++++++++++++++----------------- dlls/dmstyle/dmstyle_private.h | 16 +++++------ dlls/dmstyle/dmutils.h | 4 +-- 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/dlls/dmstyle/dmobject.h b/dlls/dmstyle/dmobject.h index afe721dc824..772be015c80 100644 --- a/dlls/dmstyle/dmobject.h +++ b/dlls/dmstyle/dmobject.h @@ -31,16 +31,16 @@ struct chunk_entry { const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ };

-HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; -HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; -HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk) DECLSPEC_HIDDEN; +HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk); +HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk); +HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk);

HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array, - unsigned int *count, DWORD elem_size) DECLSPEC_HIDDEN; + unsigned int *count, DWORD elem_size); HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data, - ULONG size) DECLSPEC_HIDDEN; + ULONG size); HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, - ULONG size) DECLSPEC_HIDDEN; + ULONG size);

static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { @@ -71,21 +71,21 @@ struct dmobject { DMUS_OBJECTDESC desc; };

-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);

/* Generic IDirectMusicObject methods */ HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid, - void **ret_iface) DECLSPEC_HIDDEN; -ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface) DECLSPEC_HIDDEN; -ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface) DECLSPEC_HIDDEN; + void **ret_iface); +ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface); +ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface); HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface, - DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + DMUS_OBJECTDESC *desc); HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface, - DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; + DMUS_OBJECTDESC *desc);

/* Helper for IDirectMusicObject::ParseDescriptor */ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, - DMUS_OBJECTDESC *desc, DWORD supported) DECLSPEC_HIDDEN; + DMUS_OBJECTDESC *desc, DWORD supported); /* Additional supported flags for dmobj_parsedescriptor. DMUS_OBJ_NAME is 'UNAM' chunk in UNFO list */ #define DMUS_OBJ_NAME_INAM 0x1000 /* 'INAM' chunk in UNFO list */ @@ -93,28 +93,28 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,

/* 'DMRF' (reference list) helper */ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, - IDirectMusicObject **dmobj) DECLSPEC_HIDDEN; + IDirectMusicObject **dmobj);

/* Generic IPersistStream methods */ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid, - void **ret_iface) DECLSPEC_HIDDEN; -ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; -ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) DECLSPEC_HIDDEN; + void **ret_iface); +ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface); +ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface); +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class);

/* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, - CLSID *class) DECLSPEC_HIDDEN; -HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) DECLSPEC_HIDDEN; + CLSID *class); +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface); HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, - BOOL clear_dirty) DECLSPEC_HIDDEN; + BOOL clear_dirty); HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, - ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + ULARGE_INTEGER *size);

/* Debugging helpers */ -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; -const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; -void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; +const char *debugstr_chunk(const struct chunk_entry *chunk); +const char *debugstr_dmguid(const GUID *id); +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc);

static inline const char *debugstr_fourcc(DWORD fourcc) { diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 0d7ede7f00d..2807e98fe61 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -44,13 +44,13 @@ /***************************************************************************** * ClassFactory */ -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; +extern HRESULT create_dmstyle(REFIID riid, void **ret_iface); +extern HRESULT create_dmauditiontrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmchordtrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmcommandtrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmmotiftrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmmutetrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmstyletrack(REFIID riid, void **ret_iface);

/***************************************************************************** * Auxiliary definitions @@ -64,7 +64,7 @@ typedef struct _DMUS_PRIVATE_COMMAND { /********************************************************************** * Dll lifetime tracking declaration for dmstyle.dll */ -extern LONG DMSTYLE_refCount DECLSPEC_HIDDEN; +extern LONG DMSTYLE_refCount; static inline void DMSTYLE_LockModule(void) { InterlockedIncrement( &DMSTYLE_refCount ); } static inline void DMSTYLE_UnlockModule(void) { InterlockedDecrement( &DMSTYLE_refCount ); }

diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index dbeb7a2a978..4f50bb0bfce 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -30,7 +30,7 @@ typedef struct _DMUS_PRIVATE_CHUNK { /** * Parsing utilities */ -extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; -extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); +extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc);

#endif /* __WINE_DMUTILS_H */

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

Alistair Leslie-Hughes

10:47 a.m.

New subject: [PATCH 3/9] dmband: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dmband/dmband_private.h | 6 ++--- dlls/dmband/dmobject.h | 50 ++++++++++++++++++------------------ dlls/dmband/dmutils.h | 6 ++--- 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index b0b26076285..b89dd08dd83 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -44,8 +44,8 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmband(REFIID riid, void **ret_iface); +extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface);

/***************************************************************************** @@ -77,7 +77,7 @@ typedef struct _DMUS_PRIVATE_BAND { /********************************************************************** * Dll lifetime tracking declaration for dmband.dll */ -extern LONG DMBAND_refCount DECLSPEC_HIDDEN; +extern LONG DMBAND_refCount; static inline void DMBAND_LockModule(void) { InterlockedIncrement( &DMBAND_refCount ); } static inline void DMBAND_UnlockModule(void) { InterlockedDecrement( &DMBAND_refCount ); }

diff --git a/dlls/dmband/dmobject.h b/dlls/dmband/dmobject.h index afe721dc824..772be015c80 100644 --- a/dlls/dmband/dmobject.h +++ b/dlls/dmband/dmobject.h @@ -31,16 +31,16 @@ struct chunk_entry { const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ };

static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { @@ -71,21 +71,21 @@ struct dmobject { DMUS_OBJECTDESC desc; };

-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);

/* 'DMRF' (reference list) helper */ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, - IDirectMusicObject **dmobj) DECLSPEC_HIDDEN; + IDirectMusicObject **dmobj);

static inline const char *debugstr_fourcc(DWORD fourcc) { diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index 2f13c4b1f44..7f9b98cf310 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -30,8 +30,8 @@ typedef struct _DMUS_PRIVATE_CHUNK { /** * Parsing utilities */ -extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; -extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; -extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); +extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); +extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject);

#endif /* __WINE_DMUTILS_H */

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

Alistair Leslie-Hughes

10:47 a.m.

New subject: [PATCH 4/9] dmcompos: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dmcompos/dmcompos_private.h | 10 +++---- dlls/dmcompos/dmobject.h | 50 ++++++++++++++++---------------- 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index bd44607d00c..c04d7da6060 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -44,15 +44,15 @@ /***************************************************************************** * ClassFactory */ -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; +extern HRESULT create_dmchordmap(REFIID riid, void **ret_iface); +extern HRESULT create_dmcomposer(REFIID riid, void **ret_iface); +extern HRESULT create_dmchordmaptrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmsignposttrack(REFIID riid, void **ret_iface);

/********************************************************************** * Dll lifetime tracking declaration for dmcompos.dll */ -extern LONG DMCOMPOS_refCount DECLSPEC_HIDDEN; +extern LONG DMCOMPOS_refCount; static inline void DMCOMPOS_LockModule(void) { InterlockedIncrement( &DMCOMPOS_refCount ); } static inline void DMCOMPOS_UnlockModule(void) { InterlockedDecrement( &DMCOMPOS_refCount ); }

diff --git a/dlls/dmcompos/dmobject.h b/dlls/dmcompos/dmobject.h index afe721dc824..772be015c80 100644 --- a/dlls/dmcompos/dmobject.h +++ b/dlls/dmcompos/dmobject.h @@ -31,16 +31,16 @@ struct chunk_entry { const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ };

static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { @@ -71,21 +71,21 @@ struct dmobject { DMUS_OBJECTDESC desc; };

-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);

/* 'DMRF' (reference list) helper */ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, - IDirectMusicObject **dmobj) DECLSPEC_HIDDEN; + IDirectMusicObject **dmobj);

static inline const char *debugstr_fourcc(DWORD fourcc) {

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

Alistair Leslie-Hughes

10:47 a.m.

New subject: [PATCH 5/9] dmusic: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dmusic/dmobject.h | 50 ++++++++++++++++++------------------ dlls/dmusic/dmusic_private.h | 32 +++++++++++------------ 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h index afe721dc824..772be015c80 100644 --- a/dlls/dmusic/dmobject.h +++ b/dlls/dmusic/dmobject.h @@ -31,16 +31,16 @@ struct chunk_entry { const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ };

static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { @@ -71,21 +71,21 @@ struct dmobject { DMUS_OBJECTDESC desc; };

-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);

/* 'DMRF' (reference list) helper */ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, - IDirectMusicObject **dmobj) DECLSPEC_HIDDEN; + IDirectMusicObject **dmobj);

static inline const char *debugstr_fourcc(DWORD fourcc) { diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 18d3e079b12..1b91f4bac94 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -95,14 +95,14 @@ typedef struct instrument_articulation { */

/* CLSID */ -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; +extern HRESULT DMUSIC_CreateDirectMusicImpl(REFIID riid, void **ret_iface, IUnknown *pUnkOuter); +extern HRESULT DMUSIC_CreateDirectMusicCollectionImpl(REFIID riid, void **ppobj, IUnknown *pUnkOuter);

/* Internal */ -extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface); +extern HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter);

/***************************************************************************** * IDirectMusic8Impl implementation structure @@ -160,11 +160,11 @@ struct IDirectMusicDownloadImpl {

/** Internal factory */ extern HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, - DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port); extern HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, - DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port); extern HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, - DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port);

/***************************************************************************** * IReferenceClockImpl implementation structure @@ -215,12 +215,12 @@ static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDire }

/* custom :) */ -extern HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream);

/********************************************************************** * Dll lifetime tracking declaration for dmusic.dll */ -extern LONG DMUSIC_refCount DECLSPEC_HIDDEN; +extern LONG DMUSIC_refCount; static inline void DMUSIC_LockModule(void) { InterlockedIncrement( &DMUSIC_refCount ); } static inline void DMUSIC_UnlockModule(void) { InterlockedDecrement( &DMUSIC_refCount ); }

@@ -228,7 +228,7 @@ static inline void DMUSIC_UnlockModule(void) { InterlockedDecrement( &DMUSIC_ref /***************************************************************************** * Misc. */ -void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port) DECLSPEC_HIDDEN; +void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port);

/* for simpler reading */ typedef struct _DMUS_PRIVATE_CHUNK { @@ -245,13 +245,13 @@ typedef struct { #define FE(x) { x, #x }

/* dwPatch from MIDILOCALE */ -extern DWORD MIDILOCALE2Patch (const MIDILOCALE *pLocale) DECLSPEC_HIDDEN; +extern DWORD MIDILOCALE2Patch (const MIDILOCALE *pLocale); /* MIDILOCALE from dwPatch */ -extern void Patch2MIDILOCALE (DWORD dwPatch, LPMIDILOCALE pLocale) DECLSPEC_HIDDEN; +extern void Patch2MIDILOCALE (DWORD dwPatch, LPMIDILOCALE pLocale);

/* check whether the given DWORD is even (return 0) or odd (return 1) */ -extern int even_or_odd (DWORD number) DECLSPEC_HIDDEN; +extern int even_or_odd (DWORD number); /* Dump whole DMUS_PORTPARAMS struct */ -extern void dump_DMUS_PORTPARAMS(LPDMUS_PORTPARAMS params) DECLSPEC_HIDDEN; +extern void dump_DMUS_PORTPARAMS(LPDMUS_PORTPARAMS params);

#endif /* __WINE_DMUSIC_PRIVATE_H */

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

Alistair Leslie-Hughes

10:47 a.m.

New subject: [PATCH 6/9] dmscript: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dmscript/dmobject.h | 50 ++++++++++++++++---------------- dlls/dmscript/dmscript_private.h | 6 ++-- 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/dlls/dmscript/dmobject.h b/dlls/dmscript/dmobject.h index afe721dc824..772be015c80 100644 --- a/dlls/dmscript/dmobject.h +++ b/dlls/dmscript/dmobject.h @@ -31,16 +31,16 @@ struct chunk_entry { const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ };

static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { @@ -71,21 +71,21 @@ struct dmobject { DMUS_OBJECTDESC desc; };

-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);

/* 'DMRF' (reference list) helper */ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, - IDirectMusicObject **dmobj) DECLSPEC_HIDDEN; + IDirectMusicObject **dmobj);

static inline const char *debugstr_fourcc(DWORD fourcc) { diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 3b3a4c86c84..90808d59f00 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -44,14 +44,14 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID riid, void **ppobj, IUnknown *pUnkOuter);

-extern HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ppobj, IUnknown *pUnkOuter);

/********************************************************************** * Dll lifetime tracking declaration for dmscript.dll */ -extern LONG DMSCRIPT_refCount DECLSPEC_HIDDEN; +extern LONG DMSCRIPT_refCount; static inline void DMSCRIPT_LockModule(void) { InterlockedIncrement( &DMSCRIPT_refCount ); } static inline void DMSCRIPT_UnlockModule(void) { InterlockedDecrement( &DMSCRIPT_refCount ); }

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

Alistair Leslie-Hughes

10:47 a.m.

New subject: [PATCH 7/9] dswave: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dswave/dmobject.h | 50 ++++++++++++++++++------------------ dlls/dswave/dswave_private.h | 4 +-- 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/dlls/dswave/dmobject.h b/dlls/dswave/dmobject.h index afe721dc824..772be015c80 100644 --- a/dlls/dswave/dmobject.h +++ b/dlls/dswave/dmobject.h @@ -31,16 +31,16 @@ struct chunk_entry { const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ };

static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { @@ -71,21 +71,21 @@ struct dmobject { DMUS_OBJECTDESC desc; };

-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);

/* 'DMRF' (reference list) helper */ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, - IDirectMusicObject **dmobj) DECLSPEC_HIDDEN; + IDirectMusicObject **dmobj);

static inline const char *debugstr_fourcc(DWORD fourcc) { diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index dfd8ed6f51c..a7758a970bc 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -42,12 +42,12 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT create_dswave(REFIID lpcGUID, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dswave(REFIID lpcGUID, void **ret_iface);

/********************************************************************** * Dll lifetime tracking declaration for dswave.dll */ -extern LONG DSWAVE_refCount DECLSPEC_HIDDEN; +extern LONG DSWAVE_refCount; static inline void DSWAVE_LockModule(void) { InterlockedIncrement( &DSWAVE_refCount ); } static inline void DSWAVE_UnlockModule(void) { InterlockedDecrement( &DSWAVE_refCount ); }

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

Alistair Leslie-Hughes

10:47 a.m.

New subject: [PATCH 8/9] dmime: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dmime/dmime_private.h | 40 +++++++++++++++--------------- dlls/dmime/dmobject.h | 50 +++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 4159abffa99..7cdc1534866 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -51,25 +51,25 @@ typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl; /***************************************************************************** * ClassFactory */ -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; -extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN; +extern HRESULT create_dmperformance(REFIID riid, void **ret_iface); +extern HRESULT create_dmsegment(REFIID riid, void **ret_iface); +extern HRESULT create_dmsegmentstate(REFIID riid, void **ret_iface); +extern HRESULT create_dmgraph(REFIID riid, void **ret_iface); +extern HRESULT create_dmaudiopath(REFIID riid, void **ret_iface); + +extern HRESULT create_dmlyricstrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmmarkertrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmparamcontroltrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmsegtriggertrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmseqtrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmsysextrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmtempotrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmtimesigtrack(REFIID riid, void **ret_iface); +extern HRESULT create_dmwavetrack(REFIID riid, void **ret_iface); + +extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerformance8*); +extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); +extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*);

/***************************************************************************** * Auxiliary definitions @@ -99,7 +99,7 @@ typedef struct _DMUS_PRIVATE_TEMPO_PLAY_STATE { /********************************************************************** * Dll lifetime tracking declaration for dmime.dll */ -extern LONG DMIME_refCount DECLSPEC_HIDDEN; +extern LONG DMIME_refCount; static inline void DMIME_LockModule(void) { InterlockedIncrement( &DMIME_refCount ); } static inline void DMIME_UnlockModule(void) { InterlockedDecrement( &DMIME_refCount ); }

diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index afe721dc824..772be015c80 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -31,16 +31,16 @@ struct chunk_entry { const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ };

static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { @@ -71,21 +71,21 @@ struct dmobject { DMUS_OBJECTDESC desc; };

-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);

/* 'DMRF' (reference list) helper */ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, - IDirectMusicObject **dmobj) DECLSPEC_HIDDEN; + IDirectMusicObject **dmobj);

static inline const char *debugstr_fourcc(DWORD fourcc) {

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

Alistair Leslie-Hughes

10:47 a.m.

New subject: [PATCH 9/9] dmloader: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/dmloader/debug.h | 8 ++--- dlls/dmloader/dmloader_private.h | 18 ++++++------ dlls/dmloader/dmobject.h | 50 ++++++++++++++++---------------- 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index 43f48e832c4..b61d17bda62 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -36,11 +36,11 @@ typedef struct { #define FE(x) { x, #x }

/* check whether chunkID is valid dmobject form chunk */ -extern BOOL IS_VALID_DMFORM (FOURCC chunkID) DECLSPEC_HIDDEN; +extern BOOL IS_VALID_DMFORM (FOURCC chunkID); /* translate STREAM_SEEK flag to string */ -extern const char *resolve_STREAM_SEEK (DWORD flag) DECLSPEC_HIDDEN; +extern const char *resolve_STREAM_SEEK (DWORD flag);

-extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) DECLSPEC_HIDDEN; -extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) DECLSPEC_HIDDEN; +extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader); +extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader);

#endif /* __WINE_DMLOADER_DEBUG_H */ diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 47994a48c4e..204c9689ffb 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -45,7 +45,7 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))

/* dmloader.dll global (for DllCanUnloadNow) */ -extern LONG module_ref DECLSPEC_HIDDEN; +extern LONG module_ref; static inline void lock_module(void) { InterlockedIncrement( &module_ref ); } static inline void unlock_module(void) { InterlockedDecrement( &module_ref ); }

@@ -62,11 +62,11 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Creation helpers */ -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; +extern HRESULT create_dmloader(REFIID riid, void **ret_iface); +extern HRESULT create_dmcontainer(REFIID riid, void **ret_iface); +extern HRESULT DMUSIC_CreateDirectMusicLoaderFileStream(void **ppobj); +extern HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream(void **ppobj); +extern HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream(void **ppobj);

/***************************************************************************** * IDirectMusicLoaderFileStream implementation structure @@ -85,7 +85,7 @@ struct IDirectMusicLoaderFileStream { };

/* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderFileStream_Attach (LPSTREAM iface, LPCWSTR wzFile, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectMusicLoaderFileStream_Attach (LPSTREAM iface, LPCWSTR wzFile, LPDIRECTMUSICLOADER8 pLoader);

/***************************************************************************** * IDirectMusicLoaderResourceStream implementation structure @@ -106,7 +106,7 @@ struct IDirectMusicLoaderResourceStream { };

/* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderResourceStream_Attach (LPSTREAM iface, LPBYTE pbMemData, LONGLONG llMemLength, LONGLONG llPos, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectMusicLoaderResourceStream_Attach (LPSTREAM iface, LPBYTE pbMemData, LONGLONG llMemLength, LONGLONG llPos, LPDIRECTMUSICLOADER8 pLoader);

/***************************************************************************** * IDirectMusicLoaderGenericStream implementation structure @@ -124,7 +124,7 @@ struct IDirectMusicLoaderGenericStream { };

/* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderGenericStream_Attach (LPSTREAM iface, LPSTREAM pStream, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectMusicLoaderGenericStream_Attach (LPSTREAM iface, LPSTREAM pStream, LPDIRECTMUSICLOADER8 pLoader);

#include "debug.h"

diff --git a/dlls/dmloader/dmobject.h b/dlls/dmloader/dmobject.h index afe721dc824..772be015c80 100644 --- a/dlls/dmloader/dmobject.h +++ b/dlls/dmloader/dmobject.h @@ -31,16 +31,16 @@ struct chunk_entry { const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ };

static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { @@ -71,21 +71,21 @@ struct dmobject { DMUS_OBJECTDESC desc; };

-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN; +void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);

/* 'DMRF' (reference list) helper */ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, - IDirectMusicObject **dmobj) DECLSPEC_HIDDEN; + IDirectMusicObject **dmobj);

static inline const char *debugstr_fourcc(DWORD fourcc) {

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

Michael Stefaniuc (＠mstefani)

5:56 p.m.

New subject: [PATCH 0/9] MR3196: dm*: Remove DECLSPEC_HIDDEN usage. - approved

This merge request was approved by Michael Stefaniuc.

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

591

Age (days ago)

591

Last active (days ago)

wine-gitlab@winehq.org

10 comments

3 participants

tags (0)

participants (3)

Alistair Leslie-Hughes
Alistair Leslie-Hughes (＠alesliehughes)
Michael Stefaniuc (＠mstefani)