[PATCH 0/6] MR3204: ole/com Remove DECLSPEC_HIDDEN macro.

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

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/oledb32/oledb_private.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h
index 773b646f08e..3bc16f73f52 100644
--- a/dlls/oledb32/oledb_private.h
+++ b/dlls/oledb32/oledb_private.h
@@ -17,13 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
-HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
-HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
-HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
-HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;
+HRESULT create_oledb_convert(IUnknown *outer, void **obj);
+HRESULT create_data_init(IUnknown *outer, void **obj);
+HRESULT create_error_info(IUnknown *outer, void **obj);
+HRESULT create_oledb_rowpos(IUnknown *outer, void **obj);
+HRESULT create_dslocator(IUnknown *outer, void **obj);

HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid,
-    IUnknown **datasource) DECLSPEC_HIDDEN;
+    IUnknown **datasource);

extern HINSTANCE instance;

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

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/ole32/compobj_private.h | 76 ++++++++++++++++++------------------
 dlls/ole32/dictionary.h      | 14 +++----
 dlls/ole32/moniker.h         | 10 ++---
 dlls/ole32/storage32.h       | 30 +++++++-------
 4 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index 34f5a8ec485..eae1a5998c0 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -66,15 +66,15 @@ struct oletls
 };

/* Global Interface Table Functions */
-extern void release_std_git(void) DECLSPEC_HIDDEN;
-extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN;
+extern void release_std_git(void);
+extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv);

-HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN;
-HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) DECLSPEC_HIDDEN;
-HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
+HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key);
+HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv);
+HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv);

/* Drag and drop */
-void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN;
+void OLEDD_UnInitialize(void);

extern HRESULT WINAPI InternalTlsAllocData(struct oletls **tlsdata);

@@ -97,49 +97,49 @@ static inline struct apartment * COM_CurrentApt(void)
 #define CHARS_IN_GUID 39 /* including NULL */

/* from dlldata.c */
-extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;
-extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI OLE32_DllRegisterServer(void) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN;
+extern HINSTANCE hProxyDll;
+extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv);
+extern HRESULT WINAPI OLE32_DllRegisterServer(void);
+extern HRESULT WINAPI OLE32_DllUnregisterServer(void);

-extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
-extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
+extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv);
+extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv);

extern HRESULT WINAPI GlobalOptions_CreateInstance(IClassFactory *iface, IUnknown *pUnk,
-                                                   REFIID riid, void **ppv) DECLSPEC_HIDDEN;
-extern IClassFactory GlobalOptionsCF DECLSPEC_HIDDEN;
+                                                   REFIID riid, void **ppv);
+extern IClassFactory GlobalOptionsCF;
 extern HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid,
-        void **obj) DECLSPEC_HIDDEN;
-extern IClassFactory GlobalInterfaceTableCF DECLSPEC_HIDDEN;
+        void **obj);
+extern IClassFactory GlobalInterfaceTableCF;
 extern HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid,
-        void **obj) DECLSPEC_HIDDEN;
-extern IClassFactory ManualResetEventCF DECLSPEC_HIDDEN;
-extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) DECLSPEC_HIDDEN;
+        void **obj);
+extern IClassFactory ManualResetEventCF;
+extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj);

/* Exported non-interface Data Advise Holder functions */
-HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN;
-void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface) DECLSPEC_HIDDEN;
+HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate);
+void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface);

-extern UINT ownerlink_clipboard_format DECLSPEC_HIDDEN;
-extern UINT filename_clipboard_format DECLSPEC_HIDDEN;
-extern UINT filenameW_clipboard_format DECLSPEC_HIDDEN;
-extern UINT dataobject_clipboard_format DECLSPEC_HIDDEN;
-extern UINT embedded_object_clipboard_format DECLSPEC_HIDDEN;
-extern UINT embed_source_clipboard_format DECLSPEC_HIDDEN;
-extern UINT custom_link_source_clipboard_format DECLSPEC_HIDDEN;
-extern UINT link_source_clipboard_format DECLSPEC_HIDDEN;
-extern UINT object_descriptor_clipboard_format DECLSPEC_HIDDEN;
-extern UINT link_source_descriptor_clipboard_format DECLSPEC_HIDDEN;
-extern UINT ole_private_data_clipboard_format DECLSPEC_HIDDEN;
+extern UINT ownerlink_clipboard_format;
+extern UINT filename_clipboard_format;
+extern UINT filenameW_clipboard_format;
+extern UINT dataobject_clipboard_format;
+extern UINT embedded_object_clipboard_format;
+extern UINT embed_source_clipboard_format;
+extern UINT custom_link_source_clipboard_format;
+extern UINT link_source_clipboard_format;
+extern UINT object_descriptor_clipboard_format;
+extern UINT link_source_descriptor_clipboard_format;
+extern UINT ole_private_data_clipboard_format;

-void clipbrd_destroy(void) DECLSPEC_HIDDEN;
+void clipbrd_destroy(void);

-extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN;
-extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN;
+extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *);
+extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *);

-extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN;
+extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*);

-extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN;
+extern const char *debugstr_formatetc(const FORMATETC *formatetc);

static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src)
 {
@@ -154,6 +154,6 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src)
 }

extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data,
-                                      BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN;
+                                      BOOL copy, IEnumSTATDATA **ppenum);

#endif /* __WINE_OLE_COMPOBJ_H */
diff --git a/dlls/ole32/dictionary.h b/dlls/ole32/dictionary.h
index f3693ccc5c2..231a6474723 100644
--- a/dlls/ole32/dictionary.h
+++ b/dlls/ole32/dictionary.h
@@ -52,15 +52,15 @@ typedef BOOL (*enumeratefunc)(const void *k, const void *v, void *extra,
  * extra is passed to c (and d, if it's provided).
  * Assumes c is not NULL.
  */
-struct dictionary *dictionary_create(comparefunc c, destroyfunc d, void *extra) DECLSPEC_HIDDEN;
+struct dictionary *dictionary_create(comparefunc c, destroyfunc d, void *extra);

/* Assumes d is not NULL. */
-void dictionary_destroy(struct dictionary *d) DECLSPEC_HIDDEN;
+void dictionary_destroy(struct dictionary *d);

/* Returns how many entries have been stored in the dictionary.  If two values
  * with the same key are inserted, only one is counted.
  */
-UINT dictionary_num_entries(struct dictionary *d) DECLSPEC_HIDDEN;
+UINT dictionary_num_entries(struct dictionary *d);

/* Sets an element with key k and value v to the dictionary.  If a value
  * already exists with key k, its value is replaced, and the destroyfunc (if
@@ -70,7 +70,7 @@ UINT dictionary_num_entries(struct dictionary *d) DECLSPEC_HIDDEN;
  * values for either the key or the value.
  * Assumes d is not NULL.
  */
-void dictionary_insert(struct dictionary *d, const void *k, const void *v) DECLSPEC_HIDDEN;
+void dictionary_insert(struct dictionary *d, const void *k, const void *v);

/* If a value with key k has been inserted into the dictionary, *v is set
  * to its associated value.  Returns FALSE if the key is not found, and TRUE
@@ -79,15 +79,15 @@ void dictionary_insert(struct dictionary *d, const void *k, const void *v) DECLS
  * value; see dictionary_insert.)
  * Assumes d and v are not NULL.
  */
-BOOL dictionary_find(struct dictionary *d, const void *k, void **v) DECLSPEC_HIDDEN;
+BOOL dictionary_find(struct dictionary *d, const void *k, void **v);

/* Removes the element with key k from the dictionary.  Calls the destroyfunc
  * for the dictionary with the element if found (so you may destroy it if it's
  * dynamically allocated.)
  * Assumes d is not NULL.
  */
-void dictionary_remove(struct dictionary *d, const void *k) DECLSPEC_HIDDEN;
+void dictionary_remove(struct dictionary *d, const void *k);

-void dictionary_enumerate(struct dictionary *d, enumeratefunc e, void *closure) DECLSPEC_HIDDEN;
+void dictionary_enumerate(struct dictionary *d, enumeratefunc e, void *closure);

#endif /* ndef __DICTIONARY_H__ */
diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h
index 2106e374394..94282b3fffc 100644
--- a/dlls/ole32/moniker.h
+++ b/dlls/ole32/moniker.h
@@ -41,13 +41,13 @@ HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUn
 HRESULT WINAPI ComCat_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv);

HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName,
-                                          LPDWORD pchEaten, LPMONIKER *ppmk) DECLSPEC_HIDDEN;
+                                          LPDWORD pchEaten, LPMONIKER *ppmk);
 HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName,
-                                           LPDWORD pchEaten, LPMONIKER *ppmk) DECLSPEC_HIDDEN;
+                                           LPDWORD pchEaten, LPMONIKER *ppmk);

-HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer) DECLSPEC_HIDDEN;
+HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer);

-BOOL is_anti_moniker(IMoniker *iface, DWORD *order) DECLSPEC_HIDDEN;
-HRESULT create_anti_moniker(DWORD order, IMoniker **ret) DECLSPEC_HIDDEN;
+BOOL is_anti_moniker(IMoniker *iface, DWORD *order);
+HRESULT create_anti_moniker(DWORD order, IMoniker **ret);

#endif /* __WINE_MONIKER_H__ */
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index f79f96e9293..dd4b89aceec 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -157,14 +157,14 @@ struct DirEntry
   ULARGE_INTEGER size;
 };

-HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsName, ILockBytes **pLockBytes) DECLSPEC_HIDDEN;
+HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsName, ILockBytes **pLockBytes);

/*************************************************************************
  * Ole Convert support
  */

-HRESULT STORAGE_CreateOleStream(IStorage*, DWORD) DECLSPEC_HIDDEN;
-HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName) DECLSPEC_HIDDEN;
+HRESULT STORAGE_CreateOleStream(IStorage*, DWORD);
+HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName);

enum swmr_mode
 {
@@ -356,8 +356,8 @@ static inline HRESULT StorageBaseImpl_UnlockTransaction(StorageBaseImpl *This, B
  * StorageBaseImpl stream list handlers
  */

-void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm) DECLSPEC_HIDDEN;
-void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm) DECLSPEC_HIDDEN;
+void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm);
+void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm);

/* Number of BlockChainStream objects to cache in a StorageImpl */
 #define BLOCKCHAIN_CACHE_SIZE 4
@@ -466,7 +466,7 @@ static inline StgStreamImpl *impl_from_IStream( IStream *iface )
 StgStreamImpl* StgStreamImpl_Construct(
    	StorageBaseImpl* parentStorage,
     DWORD            grfMode,
-    DirRef           dirEntry) DECLSPEC_HIDDEN;
+    DirRef           dirEntry);

/* Range lock constants.
@@ -555,17 +555,17 @@ StgStreamImpl* StgStreamImpl_Construct(
  * are abstractions used to read values from file buffers without having to
  * worry about bit order
  */
-void StorageUtl_ReadWord(const BYTE* buffer, ULONG offset, WORD* value) DECLSPEC_HIDDEN;
-void StorageUtl_WriteWord(void *buffer, ULONG offset, WORD value) DECLSPEC_HIDDEN;
-void StorageUtl_ReadDWord(const BYTE* buffer, ULONG offset, DWORD* value) DECLSPEC_HIDDEN;
-void StorageUtl_WriteDWord(void *buffer, ULONG offset, DWORD value) DECLSPEC_HIDDEN;
+void StorageUtl_ReadWord(const BYTE* buffer, ULONG offset, WORD* value);
+void StorageUtl_WriteWord(void *buffer, ULONG offset, WORD value);
+void StorageUtl_ReadDWord(const BYTE* buffer, ULONG offset, DWORD* value);
+void StorageUtl_WriteDWord(void *buffer, ULONG offset, DWORD value);
 void StorageUtl_ReadULargeInteger(const BYTE* buffer, ULONG offset,
- ULARGE_INTEGER* value) DECLSPEC_HIDDEN;
-void StorageUtl_WriteULargeInteger(void *buffer, ULONG offset, const ULARGE_INTEGER *value) DECLSPEC_HIDDEN;
-void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value) DECLSPEC_HIDDEN;
-void StorageUtl_WriteGUID(void *buffer, ULONG offset, const GUID* value) DECLSPEC_HIDDEN;
+ ULARGE_INTEGER* value);
+void StorageUtl_WriteULargeInteger(void *buffer, ULONG offset, const ULARGE_INTEGER *value);
+void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value);
+void StorageUtl_WriteGUID(void *buffer, ULONG offset, const GUID* value);
 void StorageUtl_CopyDirEntryToSTATSTG(StorageBaseImpl *storage,STATSTG* destination,
- const DirEntry* source, int statFlags) DECLSPEC_HIDDEN;
+ const DirEntry* source, int statFlags);

#endif /* __STORAGE32_H__ */

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

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/oleaut32/connpt.h  | 2 +-
 dlls/oleaut32/oleaut.c  | 8 ++++----
 dlls/oleaut32/variant.h | 6 +++---
 dlls/oleaut32/vartype.c | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/oleaut32/connpt.h b/dlls/oleaut32/connpt.h
index e0bdd8b59b4..cac3ae62fa8 100644
--- a/dlls/oleaut32/connpt.h
+++ b/dlls/oleaut32/connpt.h
@@ -19,6 +19,6 @@
 #ifndef _CONNPT_H
 #define _CONNPT_H

-HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, IConnectionPoint **pCP) DECLSPEC_HIDDEN;
+HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, IConnectionPoint **pCP);

#endif /* _CONNPT_H */
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 92a9f12661b..5381df2d051 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -758,10 +758,10 @@ HRESULT WINAPI OleTranslateColor(
   return S_OK;
 }

-extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
-extern BOOL WINAPI OLEAUTPS_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI OLEAUTPS_DllRegisterServer(void) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI OLEAUTPS_DllUnregisterServer(void) DECLSPEC_HIDDEN;
+extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *);
+extern BOOL WINAPI OLEAUTPS_DllMain(HINSTANCE, DWORD, LPVOID);
+extern HRESULT WINAPI OLEAUTPS_DllRegisterServer(void);
+extern HRESULT WINAPI OLEAUTPS_DllUnregisterServer(void);

extern HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo,
         IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **obj);
diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h
index 1be8f8cdc79..5dc27f860a8 100644
--- a/dlls/oleaut32/variant.h
+++ b/dlls/oleaut32/variant.h
@@ -101,7 +101,7 @@
 #define  VAR_BOOLYESNO 0x0800 /* Convert bool to "Yes"/"No" */
 #define  VAR_NEGATIVE  0x1000 /* Number is negative */

-unsigned int get_type_size(ULONG*, VARTYPE) DECLSPEC_HIDDEN;
-HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN;
+unsigned int get_type_size(ULONG*, VARTYPE);
+HRESULT VARIANT_ClearInd(VARIANTARG *);
 BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *,
-        const WCHAR *, WCHAR *, int) DECLSPEC_HIDDEN;
+        const WCHAR *, WCHAR *, int);
diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index bc8bd0d2197..8424365b5f9 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -33,7 +33,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(variant);

-extern HMODULE hProxyDll DECLSPEC_HIDDEN;
+extern HMODULE hProxyDll;

#define CY_MULTIPLIER   10000             /* 4 dp of precision */
 #define CY_MULTIPLIER_F 10000.0

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

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/oleacc/main.c           |  8 ++++----
 dlls/oleacc/oleacc_private.h | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c
index 062884f9bf4..b2096d5d557 100644
--- a/dlls/oleacc/main.c
+++ b/dlls/oleacc/main.c
@@ -33,10 +33,10 @@ static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a',
 #define NAVDIR_INTERNAL_HWND 10
 DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76);

-extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN;
-extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI OLEACC_DllRegisterServer(void) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI OLEACC_DllUnregisterServer(void) DECLSPEC_HIDDEN;
+extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**);
+extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*);
+extern HRESULT WINAPI OLEACC_DllRegisterServer(void);
+extern HRESULT WINAPI OLEACC_DllUnregisterServer(void);

static HINSTANCE oleacc_handle = 0;

diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h
index c91b1465a79..2b9ac0ec060 100644
--- a/dlls/oleacc/oleacc_private.h
+++ b/dlls/oleacc/oleacc_private.h
@@ -25,10 +25,10 @@ struct win_class_data {
     BOOL stub;
     const void *vtbl;
 };
-const struct win_class_data* find_class_data(HWND, const struct win_class_data*) DECLSPEC_HIDDEN;
+const struct win_class_data* find_class_data(HWND, const struct win_class_data*);

-HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN;
-HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN;
-HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN;
+HRESULT create_client_object(HWND, const IID*, void**);
+HRESULT create_window_object(HWND, const IID*, void**);
+HRESULT get_accpropservices_factory(REFIID, void**);

-int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN;
+int convert_child_id(VARIANT *v);

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

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/oledlg/oledlg_private.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/oledlg/oledlg_private.h b/dlls/oledlg/oledlg_private.h
index 8be1d6b3cb6..4ff3bb6f9f8 100644
--- a/dlls/oledlg/oledlg_private.h
+++ b/dlls/oledlg/oledlg_private.h
@@ -21,18 +21,18 @@
 #ifndef __OLEDLG_PRIVATE_H__
 #define __OLEDLG_PRIVATE_H__

-extern HINSTANCE OLEDLG_hInstance DECLSPEC_HIDDEN;
+extern HINSTANCE OLEDLG_hInstance;

-extern UINT cf_embed_source DECLSPEC_HIDDEN;
-extern UINT cf_embedded_object DECLSPEC_HIDDEN;
-extern UINT cf_link_source DECLSPEC_HIDDEN;
-extern UINT cf_object_descriptor DECLSPEC_HIDDEN;
-extern UINT cf_link_src_descriptor DECLSPEC_HIDDEN;
-extern UINT cf_ownerlink DECLSPEC_HIDDEN;
-extern UINT cf_filename DECLSPEC_HIDDEN;
-extern UINT cf_filenamew DECLSPEC_HIDDEN;
+extern UINT cf_embed_source;
+extern UINT cf_embedded_object;
+extern UINT cf_link_source;
+extern UINT cf_object_descriptor;
+extern UINT cf_link_src_descriptor;
+extern UINT cf_ownerlink;
+extern UINT cf_filename;
+extern UINT cf_filenamew;

-extern UINT oleui_msg_help DECLSPEC_HIDDEN;
-extern UINT oleui_msg_enddialog DECLSPEC_HIDDEN;
+extern UINT oleui_msg_help;
+extern UINT oleui_msg_enddialog;

#endif /* __OLEDLG_PRIVATE_H__ */

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

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/combase/combase_private.h | 98 +++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h
index 52facd44792..f9c349c3e20 100644
--- a/dlls/combase/combase_private.h
+++ b/dlls/combase/combase_private.h
@@ -19,7 +19,7 @@

#include "wine/list.h"

-extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;
+extern HINSTANCE hProxyDll;

struct apartment
 {
@@ -53,8 +53,8 @@ struct apartment
     struct list usage_cookies; /* Used for refcount control with CoIncrementMTAUsage()/CoDecrementMTAUsage(). */
 };

-HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN;
-HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN;
+HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM access, HKEY *subkey);
+HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey);

/* DCOM messages used by the apartment window (not compatible with native) */
 #define DM_EXECUTERPC   (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */
@@ -109,30 +109,30 @@ static inline struct apartment* com_get_current_apt(void)
     return tlsdata->apt;
 }

-HWND apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN;
-HRESULT apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN;
-void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN;
-void apartment_global_cleanup(void) DECLSPEC_HIDDEN;
-OXID apartment_getoxid(const struct apartment *apt) DECLSPEC_HIDDEN;
-HRESULT apartment_disconnectproxies(struct apartment *apt) DECLSPEC_HIDDEN;
+HWND apartment_getwindow(const struct apartment *apt);
+HRESULT apartment_createwindowifneeded(struct apartment *apt);
+void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay);
+void apartment_global_cleanup(void);
+OXID apartment_getoxid(const struct apartment *apt);
+HRESULT apartment_disconnectproxies(struct apartment *apt);

/* RpcSs interface */
-HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN;
-HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN;
-HRESULT rpc_register_local_server(REFCLSID clsid, IStream *stream, DWORD flags, unsigned int *cookie) DECLSPEC_HIDDEN;
-HRESULT rpc_revoke_local_server(unsigned int cookie) DECLSPEC_HIDDEN;
+HRESULT rpcss_get_next_seqid(DWORD *id);
+HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj);
+HRESULT rpc_register_local_server(REFCLSID clsid, IStream *stream, DWORD flags, unsigned int *cookie);
+HRESULT rpc_revoke_local_server(unsigned int cookie);
 HRESULT rpc_create_clientchannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, const IID *iid,
-        DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt) DECLSPEC_HIDDEN;
-HRESULT rpc_create_serverchannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN;
-HRESULT rpc_register_interface(REFIID riid) DECLSPEC_HIDDEN;
-void rpc_unregister_interface(REFIID riid, BOOL wait) DECLSPEC_HIDDEN;
-HRESULT rpc_resolve_oxid(OXID oxid, OXID_INFO *oxid_info) DECLSPEC_HIDDEN;
-void rpc_start_remoting(struct apartment *apt) DECLSPEC_HIDDEN;
-HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook) DECLSPEC_HIDDEN;
-void rpc_unregister_channel_hooks(void) DECLSPEC_HIDDEN;
+        DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, struct apartment *apt);
+HRESULT rpc_create_serverchannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan);
+HRESULT rpc_register_interface(REFIID riid);
+void rpc_unregister_interface(REFIID riid, BOOL wait);
+HRESULT rpc_resolve_oxid(OXID oxid, OXID_INFO *oxid_info);
+void rpc_start_remoting(struct apartment *apt);
+HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook);
+void rpc_unregister_channel_hooks(void);

struct dispatch_params;
-void rpc_execute_call(struct dispatch_params *params) DECLSPEC_HIDDEN;
+void rpc_execute_call(struct dispatch_params *params);

enum class_reg_data_origin
 {
@@ -155,24 +155,24 @@ struct class_reg_data
     } u;
 };

-HRESULT enter_apartment(struct tlsdata *data, DWORD model) DECLSPEC_HIDDEN;
-void leave_apartment(struct tlsdata *data) DECLSPEC_HIDDEN;
-void apartment_release(struct apartment *apt) DECLSPEC_HIDDEN;
-struct apartment * apartment_get_current_or_mta(void) DECLSPEC_HIDDEN;
-HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN;
-void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN;
-struct apartment * apartment_get_mta(void) DECLSPEC_HIDDEN;
+HRESULT enter_apartment(struct tlsdata *data, DWORD model);
+void leave_apartment(struct tlsdata *data);
+void apartment_release(struct apartment *apt);
+struct apartment * apartment_get_current_or_mta(void);
+HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie);
+void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie);
+struct apartment * apartment_get_mta(void);
 HRESULT apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata,
-        REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv) DECLSPEC_HIDDEN;
-HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN;
+        REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv);
+HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret);
 IUnknown *com_get_registered_class_object(const struct apartment *apartment, REFCLSID rclsid,
-        DWORD clscontext) DECLSPEC_HIDDEN;
-void apartment_revoke_all_classes(const struct apartment *apt) DECLSPEC_HIDDEN;
-struct apartment * apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN;
-struct apartment * apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN;
+        DWORD clscontext);
+void apartment_revoke_all_classes(const struct apartment *apt);
+struct apartment * apartment_findfromoxid(OXID oxid);
+struct apartment * apartment_findfromtid(DWORD tid);

HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object,
-        DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN;
+        DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags);

/* Stub Manager */

@@ -241,19 +241,19 @@ struct stub_manager
     BOOL              disconnected; /* CoDisconnectObject has been called (CS lock) */
 };

-ULONG stub_manager_int_release(struct stub_manager *stub_manager) DECLSPEC_HIDDEN;
-struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN;
-void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN;
-ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN;
-ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN;
-struct stub_manager * get_stub_manager(struct apartment *apt, OID oid) DECLSPEC_HIDDEN;
-void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN;
-BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN;
-BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN;
-struct ifstub * stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN;
+ULONG stub_manager_int_release(struct stub_manager *stub_manager);
+struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *object, BOOL alloc);
+void stub_manager_disconnect(struct stub_manager *m);
+ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak);
+ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases);
+struct stub_manager * get_stub_manager(struct apartment *apt, OID oid);
+void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak);
+BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid);
+BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid);
+struct ifstub * stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags);
 struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context,
-    void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN;
+    void *dest_context_data, MSHLFLAGS flags);
 HRESULT ipid_get_dispatch_params(const IPID *ipid, struct apartment **stub_apt,
         struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan,
-        IID *iid, IUnknown **iface) DECLSPEC_HIDDEN;
-HRESULT start_apartment_remote_unknown(struct apartment *apt) DECLSPEC_HIDDEN;
+        IID *iid, IUnknown **iface);
+HRESULT start_apartment_remote_unknown(struct apartment *apt);

[Esme Povirk (＠madewokherd)]

Is there anything really for me to review here? If it's no longer needed generally then it's not needed in ole32 storage.

[PATCH 0/6] MR3204: ole/com Remove DECLSPEC_HIDDEN macro. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.

[Huw Davies (＠huw)]

> Is there anything really for me to review here?

No, not really.  I've removed you from the approval list.