dmusic: Remove DECLSPEC_HIDDEN usage.

dlls/dmusic/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)
 {

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