[PATCH 0/7] MR3642: Remove DECLSPEC_HIDDEN usage.

[PATCH 1/7] opcservices: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

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

diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h
index b1163fe1215..cfd8ee864b2 100644
--- a/dlls/opcservices/opc_private.h
+++ b/dlls/opcservices/opc_private.h
@@ -55,14 +55,14 @@ struct opc_uri
     struct opc_uri *source_uri;
 };

-extern HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **package) DECLSPEC_HIDDEN;
-extern HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN;
-extern HRESULT opc_root_uri_create(IOpcUri **opc_uri) DECLSPEC_HIDDEN;
+extern HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **package);
+extern HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri **part_uri);
+extern HRESULT opc_root_uri_create(IOpcUri **opc_uri);

-extern HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream) DECLSPEC_HIDDEN;
+extern HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream);

struct zip_archive;
-extern HRESULT compress_create_archive(IStream *output, struct zip_archive **archive) DECLSPEC_HIDDEN;
+extern HRESULT compress_create_archive(IStream *output, struct zip_archive **archive);
 extern HRESULT compress_add_file(struct zip_archive *archive, const WCHAR *path, IStream *content,
-        OPC_COMPRESSION_OPTIONS options) DECLSPEC_HIDDEN;
-extern void compress_finalize_archive(struct zip_archive *archive) DECLSPEC_HIDDEN;
+        OPC_COMPRESSION_OPTIONS options);
+extern void compress_finalize_archive(struct zip_archive *archive);

[PATCH 2/7] avifil32: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/avifil32/avifile_private.h | 18 +++++++++---------
 dlls/avifil32/extrachunk.h      |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h
index 4bf11f42a8c..b1c0011e400 100644
--- a/dlls/avifil32/avifile_private.h
+++ b/dlls/avifil32/avifile_private.h
@@ -56,16 +56,16 @@ DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0);
 DEFINE_AVIGUID(CLSID_WAVFile,   0x00020003, 0, 0);
 DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0);

-extern HMODULE AVIFILE_hModule DECLSPEC_HIDDEN;
+extern HMODULE AVIFILE_hModule;

-extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN;
-extern PAVIFILE  AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN;
+extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj);
+extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface);
+extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj);
+extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj);
+extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream);
+extern PAVIFILE  AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams);

-extern LPCWSTR  AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN;
+extern LPCWSTR  AVIFILE_BasenameW(LPCWSTR szFileName);
+extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv);

#endif
diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h
index 5b87d7f44de..d401a39a6a1 100644
--- a/dlls/avifil32/extrachunk.h
+++ b/dlls/avifil32/extrachunk.h
@@ -35,18 +35,18 @@ typedef struct _EXTRACHUNKS {
 } EXTRACHUNKS, *LPEXTRACHUNKS;

/* reads a chunk outof the extrachunk-structure */
-HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size) DECLSPEC_HIDDEN;
+HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size);

/* writes a chunk into the extrachunk-structure */
-HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size) DECLSPEC_HIDDEN;
+HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size);

/* reads a chunk from the HMMIO into the extrachunk-structure */
-HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck) DECLSPEC_HIDDEN;
+HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck);

/* reads all non-junk chunks into the extrachunk-structure until it finds
  * the given chunk or the optional parent-chunk is at the end */
 HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,
-			       MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags) DECLSPEC_HIDDEN;
+			       MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags);

#ifdef __cplusplus
 }

[PATCH 3/7] evr: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/evr/evr_private.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h
index 93047b50c94..225e60348b4 100644
--- a/dlls/evr/evr_private.h
+++ b/dlls/evr/evr_private.h
@@ -51,9 +51,9 @@ static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *
     return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom);
 }

-HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN;
-HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN;
-HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN;
+HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv);
+HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv);
+HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv);

HRESULT create_video_sample_allocator(BOOL lock_notify_release, REFIID riid, void **obj);

[PATCH 4/7] hhctrl.ocx: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/hhctrl.ocx/hhctrl.h | 76 ++++++++++++++++++++--------------------
 dlls/hhctrl.ocx/stream.h | 16 ++++-----
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h
index 359b199e141..ebec0eebf30 100644
--- a/dlls/hhctrl.ocx/hhctrl.h
+++ b/dlls/hhctrl.ocx/hhctrl.h
@@ -205,42 +205,42 @@ typedef struct {
     DWORD current_tab;
 } HHInfo;

-BOOL InitWebBrowser(HHInfo*,HWND) DECLSPEC_HIDDEN;
-void ReleaseWebBrowser(HHInfo*) DECLSPEC_HIDDEN;
-void ResizeWebBrowser(HHInfo*,DWORD,DWORD) DECLSPEC_HIDDEN;
-void DoPageAction(WebBrowserContainer*,DWORD) DECLSPEC_HIDDEN;
-
-void InitContent(HHInfo*) DECLSPEC_HIDDEN;
-void ReleaseContent(HHInfo*) DECLSPEC_HIDDEN;
-void ActivateContentTopic(HWND,LPCWSTR,ContentItem *) DECLSPEC_HIDDEN;
-
-void InitIndex(HHInfo*) DECLSPEC_HIDDEN;
-void ReleaseIndex(HHInfo*) DECLSPEC_HIDDEN;
-
-CHMInfo *OpenCHM(LPCWSTR szFile) DECLSPEC_HIDDEN;
-BOOL LoadWinTypeFromCHM(HHInfo *info) DECLSPEC_HIDDEN;
-CHMInfo *CloseCHM(CHMInfo *pCHMInfo) DECLSPEC_HIDDEN;
-void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN;
-IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN;
-LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN;
-WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN;
-
-extern struct list window_list DECLSPEC_HIDDEN;
-HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN;
-void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN;
-BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN;
-BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN;
-void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL) DECLSPEC_HIDDEN;
-void UpdateHelpWindow(HHInfo *info) DECLSPEC_HIDDEN;
-
-void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN;
-void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN;
-
-LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN;
-void wintype_stringsA_free(struct wintype_stringsA *stringsA) DECLSPEC_HIDDEN;
-void wintype_stringsW_free(struct wintype_stringsW *stringsW) DECLSPEC_HIDDEN;
-WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page) DECLSPEC_HIDDEN;
-HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN;
+BOOL InitWebBrowser(HHInfo*,HWND);
+void ReleaseWebBrowser(HHInfo*);
+void ResizeWebBrowser(HHInfo*,DWORD,DWORD);
+void DoPageAction(WebBrowserContainer*,DWORD);
+
+void InitContent(HHInfo*);
+void ReleaseContent(HHInfo*);
+void ActivateContentTopic(HWND,LPCWSTR,ContentItem *);
+
+void InitIndex(HHInfo*);
+void ReleaseIndex(HHInfo*);
+
+CHMInfo *OpenCHM(LPCWSTR szFile);
+BOOL LoadWinTypeFromCHM(HHInfo *info);
+CHMInfo *CloseCHM(CHMInfo *pCHMInfo);
+void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR);
+IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*);
+LPWSTR FindContextAlias(CHMInfo*,DWORD);
+WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR);
+
+extern struct list window_list;
+HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND);
+void ReleaseHelpViewer(HHInfo*);
+BOOL NavigateToUrl(HHInfo*,LPCWSTR);
+BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR);
+void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL);
+void UpdateHelpWindow(HHInfo *info);
+
+void InitSearch(HHInfo *info, const char *needle);
+void ReleaseSearch(HHInfo *info);
+
+LPCWSTR skip_schema(LPCWSTR url);
+void wintype_stringsA_free(struct wintype_stringsA *stringsA);
+void wintype_stringsW_free(struct wintype_stringsW *stringsW);
+WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page);
+HHInfo *find_window(const WCHAR *window);

/* memory allocation functions */

@@ -287,7 +287,7 @@ static inline LPSTR strdupWtoA(LPCWSTR str)
 }

-extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN;
-extern BOOL hh_process DECLSPEC_HIDDEN;
+extern HINSTANCE hhctrl_hinstance;
+extern BOOL hh_process;

#endif
diff --git a/dlls/hhctrl.ocx/stream.h b/dlls/hhctrl.ocx/stream.h
index 8d61ad54d51..68f105c11a3 100644
--- a/dlls/hhctrl.ocx/stream.h
+++ b/dlls/hhctrl.ocx/stream.h
@@ -36,13 +36,13 @@ typedef struct {
     ULONG p;
 } stream_t;

-void strbuf_init(strbuf_t *buf) DECLSPEC_HIDDEN;
-void strbuf_zero(strbuf_t *buf) DECLSPEC_HIDDEN;
-void strbuf_free(strbuf_t *buf) DECLSPEC_HIDDEN;
-void stream_init(stream_t *stream, IStream *str) DECLSPEC_HIDDEN;
-void get_node_name(strbuf_t *node, strbuf_t *name) DECLSPEC_HIDDEN;
-BOOL next_content(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN;
-BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN;
-const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN;
+void strbuf_init(strbuf_t *buf);
+void strbuf_zero(strbuf_t *buf);
+void strbuf_free(strbuf_t *buf);
+void stream_init(stream_t *stream, IStream *str);
+void get_node_name(strbuf_t *node, strbuf_t *name);
+BOOL next_content(stream_t *stream, strbuf_t *buf);
+BOOL next_node(stream_t *stream, strbuf_t *buf);
+const char *get_attr(const char *node, const char *name, int *len);

#endif

[PATCH 5/7] dxdiagn: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

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

diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h
index 7c32a8518a5..5f4b7c28fd0 100644
--- a/dlls/dxdiagn/dxdiag_private.h
+++ b/dlls/dxdiagn/dxdiag_private.h
@@ -70,18 +70,18 @@ struct IDxDiagContainerImpl {
 /**
  * factories
  */
-extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN;
+extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj);

/** internal factory */
-extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, IDxDiagContainerImpl_Container *cont, IDxDiagProvider *pProv, LPVOID *ppobj) DECLSPEC_HIDDEN;
+extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, IDxDiagContainerImpl_Container *cont, IDxDiagProvider *pProv, LPVOID *ppobj);

/**********************************************************************
  * Dll lifetime tracking declaration for dxdiagn.dll
  */
-extern LONG DXDIAGN_refCount DECLSPEC_HIDDEN;
+extern LONG DXDIAGN_refCount;
 static inline void DXDIAGN_LockModule(void) { InterlockedIncrement( &DXDIAGN_refCount ); }
 static inline void DXDIAGN_UnlockModule(void) { InterlockedDecrement( &DXDIAGN_refCount ); }

-extern HINSTANCE dxdiagn_instance DECLSPEC_HIDDEN;
+extern HINSTANCE dxdiagn_instance;

#endif

[PATCH 6/7] netcfgx: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/netcfgx/netcfg_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/netcfgx/netcfg_private.h b/dlls/netcfgx/netcfg_private.h
index 14c5111168d..a43dd881632 100644
--- a/dlls/netcfgx/netcfg_private.h
+++ b/dlls/netcfgx/netcfg_private.h
@@ -18,6 +18,6 @@
 #ifndef __NETCFG_PRIVATE_H__
 #define __NETCFG_PRIVATE_H__

-extern HRESULT INetCfg_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN;
+extern HRESULT INetCfg_CreateInstance(IUnknown **ppUnk);

#endif

[PATCH 7/7] schedsvc: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/schedsvc/schedsvc_private.h | 20 ++++++++++----------
 dlls/schedsvc/tests/atsvcapi.c   |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h
index 224b4c1b398..fae5d2b376a 100644
--- a/dlls/schedsvc/schedsvc_private.h
+++ b/dlls/schedsvc/schedsvc_private.h
@@ -19,15 +19,15 @@
 #ifndef __WINE_SCHEDSVC_PRIVATE_H__
 #define __WINE_SCHEDSVC_PRIVATE_H__

-void schedsvc_auto_start(void) DECLSPEC_HIDDEN;
-void add_job(const WCHAR *name) DECLSPEC_HIDDEN;
-void remove_job(const WCHAR *name) DECLSPEC_HIDDEN;
-void check_task_state(void) DECLSPEC_HIDDEN;
-void add_process_to_queue(HANDLE hproc) DECLSPEC_HIDDEN;
-void update_process_status(DWORD pid) DECLSPEC_HIDDEN;
-BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN;
-void check_task_time(void) DECLSPEC_HIDDEN;
-void load_at_tasks(void) DECLSPEC_HIDDEN;
-void check_missed_task_time(void) DECLSPEC_HIDDEN;
+void schedsvc_auto_start(void);
+void add_job(const WCHAR *name);
+void remove_job(const WCHAR *name);
+void check_task_state(void);
+void add_process_to_queue(HANDLE hproc);
+void update_process_status(DWORD pid);
+BOOL get_next_runtime(LARGE_INTEGER *rt);
+void check_task_time(void);
+void load_at_tasks(void);
+void check_missed_task_time(void);

#endif /* __WINE_SCHEDSVC_PRIVATE_H__ */
diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c
index fb70c346654..4903c9d9417 100644
--- a/dlls/schedsvc/tests/atsvcapi.c
+++ b/dlls/schedsvc/tests/atsvcapi.c
@@ -177,7 +177,7 @@ skip_tests:
     ok(hr == RPC_S_OK, "RpcBindingFree error %#lx\n", hr);
 }

-DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str)
+handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str)
 {
     static unsigned char ncalrpc[] = "ncalrpc";
     unsigned char *binding_str;
@@ -194,7 +194,7 @@ DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str)
     return rpc_handle;
 }

-DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle)
+void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle)
 {
     RpcBindingFree(&rpc_handle);
 }