[PATCH 0/6] MR3306: Remove DECLSPEC_HIDDEN

[Alistair Leslie-Hughes (＠alesliehughes)]

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

[PATCH 1/6] kernelbase: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 dlls/kernelbase/kernelbase.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h
index 6043fe49dd5..2209939a8a2 100644
--- a/dlls/kernelbase/kernelbase.h
+++ b/dlls/kernelbase/kernelbase.h
@@ -31,18 +31,18 @@ struct pseudo_console
     HANDLE process;
 };
 
-extern WCHAR *file_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN;
-extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN;
-extern void init_global_data(void) DECLSPEC_HIDDEN;
-extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN;
-extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN;
-extern void init_console(void) DECLSPEC_HIDDEN;
+extern WCHAR *file_name_AtoW( LPCSTR name, BOOL alloc );
+extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen );
+extern void init_global_data(void);
+extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params );
+extern void init_locale( HMODULE module );
+extern void init_console(void);
 
-extern const WCHAR windows_dir[] DECLSPEC_HIDDEN;
-extern const WCHAR system_dir[] DECLSPEC_HIDDEN;
+extern const WCHAR windows_dir[];
+extern const WCHAR system_dir[];
 
 static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
-extern BOOL is_wow64 DECLSPEC_HIDDEN;
+extern BOOL is_wow64;
 
 static inline BOOL set_ntstatus( NTSTATUS status )
 {
-- 
GitLab


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

[PATCH 2/6] fusion: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 dlls/fusion/fusionpriv.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h
index 66ef7b9ff08..850b6622b98 100644
--- a/dlls/fusion/fusionpriv.h
+++ b/dlls/fusion/fusionpriv.h
@@ -428,18 +428,18 @@ typedef struct
 struct tagASSEMBLY;
 typedef struct tagASSEMBLY ASSEMBLY;
 
-HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN;
-HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN;
-HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) DECLSPEC_HIDDEN;
-HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDEN;
-HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN;
-PEKIND assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN;
-HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN;
-HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN;
-HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *count) DECLSPEC_HIDDEN;
-
-extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN;
-extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN;
+HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file);
+HRESULT assembly_release(ASSEMBLY *assembly);
+HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name);
+HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path);
+HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version);
+PEKIND assembly_get_architecture(ASSEMBLY *assembly);
+HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token);
+HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version);
+HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *count);
+
+extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path);
+extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len);
 
 #define BYTES_PER_TOKEN 8
 #define CHARS_PER_BYTE  2
-- 
GitLab


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

[PATCH 3/6] wnaspi32: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 dlls/wnaspi32/winescsi.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/wnaspi32/winescsi.h b/dlls/wnaspi32/winescsi.h
index a97ffc0aeb7..043d42c3d6e 100644
--- a/dlls/wnaspi32/winescsi.h
+++ b/dlls/wnaspi32/winescsi.h
@@ -19,10 +19,8 @@
 #ifndef __WINESCSI_H__
 #define __WINESCSI_H__
 
-int
-ASPI_GetNumControllers(void) DECLSPEC_HIDDEN;
+int ASPI_GetNumControllers(void);
 
-DWORD
-ASPI_GetHCforController( int controller ) DECLSPEC_HIDDEN;
+DWORD ASPI_GetHCforController( int controller );
 
 #endif /* #ifndef __WINESCSI_H */
-- 
GitLab


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

[PATCH 4/6] msctf: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 dlls/msctf/msctf_internal.h | 68 ++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h
index 45a39806c22..24c8c017ff3 100644
--- a/dlls/msctf/msctf_internal.h
+++ b/dlls/msctf/msctf_internal.h
@@ -36,42 +36,42 @@
 #define COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK 0x00b0
 #define COOKIE_MAGIC_ACTIVELANGSINK 0x00c0
 
-extern DWORD tlsIndex DECLSPEC_HIDDEN;
-extern TfClientId processId DECLSPEC_HIDDEN;
-extern ITfCompartmentMgr *globalCompartmentMgr DECLSPEC_HIDDEN;
+extern DWORD tlsIndex;
+extern TfClientId processId;
+extern ITfCompartmentMgr *globalCompartmentMgr;
 
-extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN;
-extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut) DECLSPEC_HIDDEN;
-extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) DECLSPEC_HIDDEN;
-extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN;
-extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN;
-extern HRESULT Range_Constructor(ITfContext *context, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN;
-extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut) DECLSPEC_HIDDEN;
-extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This) DECLSPEC_HIDDEN;
-extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN;
-extern HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN;
+extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut);
+extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut);
+extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore);
+extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut);
+extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut);
+extern HRESULT Range_Constructor(ITfContext *context, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut);
+extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut);
+extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This);
+extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut);
+extern HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut);
 
-extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager) DECLSPEC_HIDDEN;
-extern HRESULT Context_Uninitialize(ITfContext *cxt) DECLSPEC_HIDDEN;
-extern void    ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr) DECLSPEC_HIDDEN;
-extern HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp) DECLSPEC_HIDDEN;
+extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager);
+extern HRESULT Context_Uninitialize(ITfContext *cxt);
+extern void    ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr);
+extern HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp);
 
 /* cookie function */
-extern DWORD  generate_Cookie(DWORD magic, LPVOID data) DECLSPEC_HIDDEN;
-extern DWORD  get_Cookie_magic(DWORD id) DECLSPEC_HIDDEN;
-extern LPVOID get_Cookie_data(DWORD id) DECLSPEC_HIDDEN;
-extern LPVOID remove_Cookie(DWORD id) DECLSPEC_HIDDEN;
-extern DWORD enumerate_Cookie(DWORD magic, DWORD *index) DECLSPEC_HIDDEN;
+extern DWORD  generate_Cookie(DWORD magic, LPVOID data);
+extern DWORD  get_Cookie_magic(DWORD id);
+extern LPVOID get_Cookie_data(DWORD id);
+extern LPVOID remove_Cookie(DWORD id);
+extern DWORD enumerate_Cookie(DWORD magic, DWORD *index);
 
 /* activated text services functions */
-extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN;
-extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN;
-extern HRESULT activate_textservices(ITfThreadMgrEx *tm) DECLSPEC_HIDDEN;
-extern HRESULT deactivate_textservices(void) DECLSPEC_HIDDEN;
+extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp);
+extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp);
+extern HRESULT activate_textservices(ITfThreadMgrEx *tm);
+extern HRESULT deactivate_textservices(void);
 
-extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN;
-extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink) DECLSPEC_HIDDEN;
-extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) DECLSPEC_HIDDEN;
+extern CLSID get_textservice_clsid(TfClientId tid);
+extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink);
+extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink);
 
 typedef struct {
     struct list entry;
@@ -91,11 +91,11 @@ typedef struct {
          (cursor) != (list); \
          (cursor) = (cursor)->next, elem = SINK_ENTRY(cursor,type))
 
-HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) DECLSPEC_HIDDEN;
-HRESULT unadvise_sink(DWORD cookie) DECLSPEC_HIDDEN;
-void free_sinks(struct list *sink_list) DECLSPEC_HIDDEN;
+HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie);
+HRESULT unadvise_sink(DWORD cookie);
+void free_sinks(struct list *sink_list);
 
-extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN;
-extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN;
+extern const WCHAR szwSystemTIPKey[];
+extern const WCHAR szwSystemCTFKey[];
 
 #endif /* __WINE_MSCTF_I_H */
-- 
GitLab


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

[PATCH 5/6] taskschd: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 dlls/taskschd/taskschd_private.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h
index 8f83c9f42bd..cf5b3b17ae4 100644
--- a/dlls/taskschd/taskschd_private.h
+++ b/dlls/taskschd/taskschd_private.h
@@ -19,14 +19,14 @@
 #ifndef __WINE_TASKSCHD_PRIVATE_H__
 #define __WINE_TASKSCHD_PRIVATE_H__
 
-HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN;
-HRESULT TaskDefinition_create(ITaskDefinition **obj) DECLSPEC_HIDDEN;
-HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN;
-HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) DECLSPEC_HIDDEN;
+HRESULT TaskService_create(void **obj);
+HRESULT TaskDefinition_create(ITaskDefinition **obj);
+HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create);
+HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj);
 HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinition *definition, LONG flags,
-                              TASK_LOGON_TYPE logon, IRegisteredTask **obj, BOOL create) DECLSPEC_HIDDEN;
-HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollection **obj) DECLSPEC_HIDDEN;
+                              TASK_LOGON_TYPE logon, IRegisteredTask **obj, BOOL create);
+HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollection **obj);
 
-WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) DECLSPEC_HIDDEN;
+WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path);
 
 #endif /* __WINE_TASKSCHD_PRIVATE_H__ */
-- 
GitLab


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

[PATCH 6/6] msado15: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 dlls/msado15/msado15_private.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h
index f7062c94b27..f8a515a596f 100644
--- a/dlls/msado15/msado15_private.h
+++ b/dlls/msado15/msado15_private.h
@@ -21,10 +21,10 @@
 
 #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err )
 
-HRESULT Command_create( void ** ) DECLSPEC_HIDDEN;
-HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN;
-HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN;
-HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN;
+HRESULT Command_create( void ** );
+HRESULT Connection_create( void ** );
+HRESULT Recordset_create( void ** );
+HRESULT Stream_create( void ** );
 
 typedef enum tid_t {
     ADORecordsetConstruction_tid,
@@ -39,6 +39,6 @@ typedef enum tid_t {
     LAST_tid
 } tid_t;
 
-HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN;
+HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo);
 
 #endif /* _WINE_MSADO15_PRIVATE_H_ */
-- 
GitLab

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