[PATCH 0/3] MR3304: Remove DECLSPEC_HIDDEN from Media Foundation
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mf/mf_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 69923154b79..d191dadafb1 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -56,7 +56,7 @@ struct activate_funcs void (*free_private)(void *context); }; -HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret) DECLSPEC_HIDDEN; +HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret); static inline const char *debugstr_time(LONGLONG time) { @@ -113,8 +113,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) } } -extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; -extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; -extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; -extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler) DECLSPEC_HIDDEN; -extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type) DECLSPEC_HIDDEN; +extern BOOL mf_is_sample_copier_transform(IMFTransform *transform); +extern BOOL mf_is_sar_sink(IMFMediaSink *sink); +extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj); +extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler); +extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3304
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfreadwrite/mf_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/mf_private.h b/dlls/mfreadwrite/mf_private.h index e2372e7e856..d8b44712b4a 100644 --- a/dlls/mfreadwrite/mf_private.h +++ b/dlls/mfreadwrite/mf_private.h @@ -19,9 +19,9 @@ #include "mferror.h" extern HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *stream, - IMFAttributes *attributes, REFIID riid, void **out) DECLSPEC_HIDDEN; + IMFAttributes *attributes, REFIID riid, void **out); extern HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attributes, - REFIID riid, void **out) DECLSPEC_HIDDEN; + REFIID riid, void **out); static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3304
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/mfplat_private.h | 70 ++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 8418c8eb2ef..28bef1f670a 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -43,49 +43,49 @@ struct attributes size_t count; }; -extern HRESULT init_attributes_object(struct attributes *object, UINT32 size) DECLSPEC_HIDDEN; -extern void clear_attributes_object(struct attributes *object) DECLSPEC_HIDDEN; -extern const char *debugstr_attr(const GUID *guid) DECLSPEC_HIDDEN; -extern const char *debugstr_mf_guid(const GUID *guid) DECLSPEC_HIDDEN; +extern HRESULT init_attributes_object(struct attributes *object, UINT32 size); +extern void clear_attributes_object(struct attributes *object); +extern const char *debugstr_attr(const GUID *guid); +extern const char *debugstr_mf_guid(const GUID *guid); -extern HRESULT attributes_GetItem(struct attributes *object, REFGUID key, PROPVARIANT *value) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetItemType(struct attributes *object, REFGUID key, MF_ATTRIBUTE_TYPE *type) DECLSPEC_HIDDEN; +extern HRESULT attributes_GetItem(struct attributes *object, REFGUID key, PROPVARIANT *value); +extern HRESULT attributes_GetItemType(struct attributes *object, REFGUID key, MF_ATTRIBUTE_TYPE *type); extern HRESULT attributes_CompareItem(struct attributes *object, REFGUID key, REFPROPVARIANT value, - BOOL *result) DECLSPEC_HIDDEN; + BOOL *result); extern HRESULT attributes_Compare(struct attributes *object, IMFAttributes *theirs, - MF_ATTRIBUTES_MATCH_TYPE match_type, BOOL *ret) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetUINT32(struct attributes *object, REFGUID key, UINT32 *value) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetUINT64(struct attributes *object, REFGUID key, UINT64 *value) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetDouble(struct attributes *object, REFGUID key, double *value) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetGUID(struct attributes *object, REFGUID key, GUID *value) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetStringLength(struct attributes *object, REFGUID key, UINT32 *length) DECLSPEC_HIDDEN; + MF_ATTRIBUTES_MATCH_TYPE match_type, BOOL *ret); +extern HRESULT attributes_GetUINT32(struct attributes *object, REFGUID key, UINT32 *value); +extern HRESULT attributes_GetUINT64(struct attributes *object, REFGUID key, UINT64 *value); +extern HRESULT attributes_GetDouble(struct attributes *object, REFGUID key, double *value); +extern HRESULT attributes_GetGUID(struct attributes *object, REFGUID key, GUID *value); +extern HRESULT attributes_GetStringLength(struct attributes *object, REFGUID key, UINT32 *length); extern HRESULT attributes_GetString(struct attributes *object, REFGUID key, WCHAR *value, UINT32 size, - UINT32 *length) DECLSPEC_HIDDEN; + UINT32 *length); extern HRESULT attributes_GetAllocatedString(struct attributes *object, REFGUID key, WCHAR **value, - UINT32 *length) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetBlobSize(struct attributes *object, REFGUID key, UINT32 *size) DECLSPEC_HIDDEN; + UINT32 *length); +extern HRESULT attributes_GetBlobSize(struct attributes *object, REFGUID key, UINT32 *size); extern HRESULT attributes_GetBlob(struct attributes *object, REFGUID key, UINT8 *buf, UINT32 bufsize, - UINT32 *blobsize) DECLSPEC_HIDDEN; + UINT32 *blobsize); extern HRESULT attributes_GetAllocatedBlob(struct attributes *object, REFGUID key, UINT8 **buf, - UINT32 *size) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetUnknown(struct attributes *object, REFGUID key, REFIID riid, void **out) DECLSPEC_HIDDEN; -extern HRESULT attributes_SetItem(struct attributes *object, REFGUID key, REFPROPVARIANT value) DECLSPEC_HIDDEN; -extern HRESULT attributes_DeleteItem(struct attributes *object, REFGUID key) DECLSPEC_HIDDEN; -extern HRESULT attributes_DeleteAllItems(struct attributes *object) DECLSPEC_HIDDEN; -extern HRESULT attributes_SetUINT32(struct attributes *object, REFGUID key, UINT32 value) DECLSPEC_HIDDEN; -extern HRESULT attributes_SetUINT64(struct attributes *object, REFGUID key, UINT64 value) DECLSPEC_HIDDEN; -extern HRESULT attributes_SetDouble(struct attributes *object, REFGUID key, double value) DECLSPEC_HIDDEN; -extern HRESULT attributes_SetGUID(struct attributes *object, REFGUID key, REFGUID value) DECLSPEC_HIDDEN; -extern HRESULT attributes_SetString(struct attributes *object, REFGUID key, const WCHAR *value) DECLSPEC_HIDDEN; + UINT32 *size); +extern HRESULT attributes_GetUnknown(struct attributes *object, REFGUID key, REFIID riid, void **out); +extern HRESULT attributes_SetItem(struct attributes *object, REFGUID key, REFPROPVARIANT value); +extern HRESULT attributes_DeleteItem(struct attributes *object, REFGUID key); +extern HRESULT attributes_DeleteAllItems(struct attributes *object); +extern HRESULT attributes_SetUINT32(struct attributes *object, REFGUID key, UINT32 value); +extern HRESULT attributes_SetUINT64(struct attributes *object, REFGUID key, UINT64 value); +extern HRESULT attributes_SetDouble(struct attributes *object, REFGUID key, double value); +extern HRESULT attributes_SetGUID(struct attributes *object, REFGUID key, REFGUID value); +extern HRESULT attributes_SetString(struct attributes *object, REFGUID key, const WCHAR *value); extern HRESULT attributes_SetBlob(struct attributes *object, REFGUID key, const UINT8 *buf, - UINT32 size) DECLSPEC_HIDDEN; -extern HRESULT attributes_SetUnknown(struct attributes *object, REFGUID key, IUnknown *unknown) DECLSPEC_HIDDEN; -extern HRESULT attributes_LockStore(struct attributes *object) DECLSPEC_HIDDEN; -extern HRESULT attributes_UnlockStore(struct attributes *object) DECLSPEC_HIDDEN; -extern HRESULT attributes_GetCount(struct attributes *object, UINT32 *items) DECLSPEC_HIDDEN; + UINT32 size); +extern HRESULT attributes_SetUnknown(struct attributes *object, REFGUID key, IUnknown *unknown); +extern HRESULT attributes_LockStore(struct attributes *object); +extern HRESULT attributes_UnlockStore(struct attributes *object); +extern HRESULT attributes_GetCount(struct attributes *object, UINT32 *items); extern HRESULT attributes_GetItemByIndex(struct attributes *object, UINT32 index, GUID *key, - PROPVARIANT *value) DECLSPEC_HIDDEN; -extern HRESULT attributes_CopyAllItems(struct attributes *object, IMFAttributes *dest) DECLSPEC_HIDDEN; + PROPVARIANT *value); +extern HRESULT attributes_CopyAllItems(struct attributes *object, IMFAttributes *dest); static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { @@ -114,7 +114,7 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co return TRUE; } -extern unsigned int mf_format_get_stride(const GUID *subtype, unsigned int width, BOOL *is_yuv) DECLSPEC_HIDDEN; +extern unsigned int mf_format_get_stride(const GUID *subtype, unsigned int width, BOOL *is_yuv); static inline const char *debugstr_propvar(const PROPVARIANT *v) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3304
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3304
participants (3)
-
Alistair Leslie-Hughes -
Alistair Leslie-Hughes (＠alesliehughes)
-
Nikolay Sivov (＠nsivov)