[PATCH 0/3] MR3254: Remove DECLSPEC_HIDDEN for internet dll

[PATCH 1/3] urlmon: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/urlmon/urlmon_main.h | 108 +++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h
index b1a255a125c..81b0d629f53 100644
--- a/dlls/urlmon/urlmon_main.h
+++ b/dlls/urlmon/urlmon_main.h
@@ -33,57 +33,57 @@

#include "wine/list.h"

-extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;
-extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT StdURLMoniker_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT Uri_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;
-
-extern BOOL WINAPI URLMON_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI URLMON_DllRegisterServer(void) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI URLMON_DllUnregisterServer(void) DECLSPEC_HIDDEN;
-
-extern GUID const CLSID_PSFactoryBuffer DECLSPEC_HIDDEN;
-extern GUID const CLSID_CUri DECLSPEC_HIDDEN;
+extern HINSTANCE hProxyDll;
+extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT StdURLMoniker_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+extern HRESULT Uri_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);
+
+extern BOOL WINAPI URLMON_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
+extern HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv);
+extern HRESULT WINAPI URLMON_DllRegisterServer(void);
+extern HRESULT WINAPI URLMON_DllUnregisterServer(void);
+
+extern GUID const CLSID_PSFactoryBuffer;
+extern GUID const CLSID_CUri;

/**********************************************************************
  * Dll lifetime tracking declaration for urlmon.dll
  */
-extern LONG URLMON_refCount DECLSPEC_HIDDEN;
+extern LONG URLMON_refCount;
 static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); }
 static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); }

-extern HINSTANCE urlmon_instance DECLSPEC_HIDDEN;
+extern HINSTANCE urlmon_instance;

-IInternetProtocolInfo *get_protocol_info(LPCWSTR) DECLSPEC_HIDDEN;
-HRESULT get_protocol_handler(IUri*,CLSID*,IClassFactory**) DECLSPEC_HIDDEN;
-IInternetProtocol *get_mime_filter(LPCWSTR) DECLSPEC_HIDDEN;
-BOOL is_registered_protocol(LPCWSTR) DECLSPEC_HIDDEN;
-HRESULT register_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL) DECLSPEC_HIDDEN;
-HINTERNET get_internet_session(IInternetBindInfo*) DECLSPEC_HIDDEN;
-WCHAR *get_useragent(void) DECLSPEC_HIDDEN;
-void update_user_agent(WCHAR*) DECLSPEC_HIDDEN;
-void free_session(void) DECLSPEC_HIDDEN;
+IInternetProtocolInfo *get_protocol_info(LPCWSTR);
+HRESULT get_protocol_handler(IUri*,CLSID*,IClassFactory**);
+IInternetProtocol *get_mime_filter(LPCWSTR);
+BOOL is_registered_protocol(LPCWSTR);
+HRESULT register_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL);
+HINTERNET get_internet_session(IInternetBindInfo*);
+WCHAR *get_useragent(void);
+void update_user_agent(WCHAR*);
+void free_session(void);

-HRESULT find_mime_from_ext(const WCHAR*,WCHAR**) DECLSPEC_HIDDEN;
+HRESULT find_mime_from_ext(const WCHAR*,WCHAR**);

-HRESULT bind_to_storage(IUri*,IBindCtx*,REFIID,void**) DECLSPEC_HIDDEN;
-HRESULT bind_to_object(IMoniker*,IUri*,IBindCtx*,REFIID,void**ppv) DECLSPEC_HIDDEN;
+HRESULT bind_to_storage(IUri*,IBindCtx*,REFIID,void**);
+HRESULT bind_to_object(IMoniker*,IUri*,IBindCtx*,REFIID,void**ppv);

-HRESULT create_default_callback(IBindStatusCallback**) DECLSPEC_HIDDEN;
-HRESULT wrap_callback(IBindStatusCallback*,IBindStatusCallback**) DECLSPEC_HIDDEN;
-IBindStatusCallback *bsc_from_bctx(IBindCtx*) DECLSPEC_HIDDEN;
+HRESULT create_default_callback(IBindStatusCallback**);
+HRESULT wrap_callback(IBindStatusCallback*,IBindStatusCallback**);
+IBindStatusCallback *bsc_from_bctx(IBindCtx*);

typedef HRESULT (*stop_cache_binding_proc_t)(void*,const WCHAR*,HRESULT,const WCHAR*);
-HRESULT download_to_cache(IUri*,stop_cache_binding_proc_t,void*,IBindStatusCallback*) DECLSPEC_HIDDEN;
+HRESULT download_to_cache(IUri*,stop_cache_binding_proc_t,void*,IBindStatusCallback*);

typedef struct ProtocolVtbl ProtocolVtbl;

@@ -151,16 +151,16 @@ struct ProtocolVtbl {
 #define FLAG_ERROR                    0x0040
 #define FLAG_SYNC_READ                0x0080

-HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*) DECLSPEC_HIDDEN;
-HRESULT protocol_continue(Protocol*,PROTOCOLDATA*) DECLSPEC_HIDDEN;
-HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*) DECLSPEC_HIDDEN;
-HRESULT protocol_lock_request(Protocol*) DECLSPEC_HIDDEN;
-HRESULT protocol_unlock_request(Protocol*) DECLSPEC_HIDDEN;
-HRESULT protocol_abort(Protocol*,HRESULT) DECLSPEC_HIDDEN;
-HRESULT protocol_syncbinding(Protocol*) DECLSPEC_HIDDEN;
-void protocol_close_connection(Protocol*) DECLSPEC_HIDDEN;
+HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*);
+HRESULT protocol_continue(Protocol*,PROTOCOLDATA*);
+HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*);
+HRESULT protocol_lock_request(Protocol*);
+HRESULT protocol_unlock_request(Protocol*);
+HRESULT protocol_abort(Protocol*,HRESULT);
+HRESULT protocol_syncbinding(Protocol*);
+void protocol_close_connection(Protocol*);

-void find_domain_name(const WCHAR*,DWORD,INT*) DECLSPEC_HIDDEN;
+void find_domain_name(const WCHAR*,DWORD,INT*);

typedef struct _task_header_t task_header_t;

@@ -212,8 +212,8 @@ typedef struct {
     BSTR display_uri;
 }  BindProtocol;

-HRESULT create_binding_protocol(BindProtocol**) DECLSPEC_HIDDEN;
-void set_binding_sink(BindProtocol*,IInternetProtocolSink*,IInternetBindInfo*) DECLSPEC_HIDDEN;
+HRESULT create_binding_protocol(BindProtocol**);
+void set_binding_sink(BindProtocol*,IInternetProtocolSink*,IInternetBindInfo*);

typedef struct {
     HWND notif_hwnd;
@@ -222,13 +222,13 @@ typedef struct {
     struct list entry;
 } tls_data_t;

-tls_data_t *get_tls_data(void) DECLSPEC_HIDDEN;
+tls_data_t *get_tls_data(void);

-void unregister_notif_wnd_class(void) DECLSPEC_HIDDEN;
-HWND get_notif_hwnd(void) DECLSPEC_HIDDEN;
-void release_notif_hwnd(HWND) DECLSPEC_HIDDEN;
+void unregister_notif_wnd_class(void);
+HWND get_notif_hwnd(void);
+void release_notif_hwnd(HWND);

-const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN;
+const char *debugstr_bindstatus(ULONG);

static inline WCHAR *strndupW(LPCWSTR str, int len)
 {

[PATCH 2/3] shdocvw: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

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

diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h
index 568fbadfbd6..0b76b3d91f7 100644
--- a/dlls/shdocvw/shdocvw.h
+++ b/dlls/shdocvw/shdocvw.h
@@ -41,12 +41,12 @@
  * Shell Instance Objects
  */
 extern HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, 
-    REFIID riid, LPVOID *ppvClassObj) DECLSPEC_HIDDEN;
+    REFIID riid, LPVOID *ppvClassObj);

/**********************************************************************
  * Dll lifetime tracking declaration for shdocvw.dll
  */
-extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN;
+extern LONG SHDOCVW_refCount;
 static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); }
 static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); }

[PATCH 3/3] wininet: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/wininet/internet.h | 90 ++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index d9598d18eb5..b5be0523188 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -29,7 +29,7 @@

#include "winineti.h"

-extern HMODULE WININET_hModule DECLSPEC_HIDDEN;
+extern HMODULE WININET_hModule;

typedef struct {
     WCHAR *name;
@@ -52,15 +52,15 @@ typedef struct {
     struct list conn_pool;
 } server_t;

-void server_addref(server_t*) DECLSPEC_HIDDEN;
-void server_release(server_t*) DECLSPEC_HIDDEN;
+void server_addref(server_t*);
+void server_release(server_t*);

typedef enum {
     COLLECT_TIMEOUT,
     COLLECT_CONNECTIONS,
     COLLECT_CLEANUP
 } collect_type_t;
-BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN;
+BOOL collect_connections(collect_type_t);

/* used for netconnection.c stuff */
 typedef struct
@@ -85,8 +85,8 @@ typedef struct
     struct list pool_entry;
 } netconn_t;

-BOOL is_valid_netconn(netconn_t *) DECLSPEC_HIDDEN;
-void close_netconn(netconn_t *) DECLSPEC_HIDDEN;
+BOOL is_valid_netconn(netconn_t *);
+void close_netconn(netconn_t *);

static inline WCHAR *strndupW(const WCHAR *str, UINT max_len)
 {
@@ -360,61 +360,61 @@ struct task_header_t
     object_header_t *hdr;
 };

-void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN;
+void *alloc_async_task(object_header_t*,async_task_proc_t,size_t);

-void *alloc_object(object_header_t*,const object_vtbl_t*,size_t) DECLSPEC_HIDDEN;
-object_header_t *get_handle_object( HINTERNET hinternet ) DECLSPEC_HIDDEN;
-object_header_t *WININET_AddRef( object_header_t *info ) DECLSPEC_HIDDEN;
-BOOL WININET_Release( object_header_t *info ) DECLSPEC_HIDDEN;
+void *alloc_object(object_header_t*,const object_vtbl_t*,size_t);
+object_header_t *get_handle_object( HINTERNET hinternet );
+object_header_t *WININET_AddRef( object_header_t *info );
+BOOL WININET_Release( object_header_t *info );

-DWORD INET_QueryOption(object_header_t*,DWORD,void*,DWORD*,BOOL) DECLSPEC_HIDDEN;
-DWORD INET_SetOption(object_header_t*,DWORD,void*,DWORD) DECLSPEC_HIDDEN;
+DWORD INET_QueryOption(object_header_t*,DWORD,void*,DWORD*,BOOL);
+DWORD INET_SetOption(object_header_t*,DWORD,void*,DWORD);

-time_t ConvertTimeString(LPCWSTR asctime) DECLSPEC_HIDDEN;
+time_t ConvertTimeString(LPCWSTR asctime);

HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName,
    INTERNET_PORT nServerPort, LPCWSTR lpszUserName,
    LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext,
-	DWORD dwInternalFlags) DECLSPEC_HIDDEN;
+	DWORD dwInternalFlags);

DWORD HTTP_Connect(appinfo_t*,LPCWSTR,
         INTERNET_PORT nServerPort, LPCWSTR lpszUserName,
         LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext,
-        DWORD dwInternalFlags, HINTERNET*) DECLSPEC_HIDDEN;
+        DWORD dwInternalFlags, HINTERNET*);

-BOOL GetAddress(const WCHAR*,INTERNET_PORT,SOCKADDR*,int*,char*) DECLSPEC_HIDDEN;
+BOOL GetAddress(const WCHAR*,INTERNET_PORT,SOCKADDR*,int*,char*);

-DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**) DECLSPEC_HIDDEN;
-DWORD set_cookie(substr_t,substr_t,substr_t,substr_t,DWORD) DECLSPEC_HIDDEN;
+DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**);
+DWORD set_cookie(substr_t,substr_t,substr_t,substr_t,DWORD);

-void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN;
-DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN;
-DWORD INTERNET_AsyncCall(task_header_t*) DECLSPEC_HIDDEN;
-LPSTR INTERNET_GetResponseBuffer(void) DECLSPEC_HIDDEN;
+void INTERNET_SetLastError(DWORD dwError);
+DWORD INTERNET_GetLastError(void);
+DWORD INTERNET_AsyncCall(task_header_t*);
+LPSTR INTERNET_GetResponseBuffer(void);

VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext,
                            DWORD dwInternetStatus, LPVOID lpvStatusInfo,
-                           DWORD dwStatusInfoLength) DECLSPEC_HIDDEN;
-WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto) DECLSPEC_HIDDEN;
+                           DWORD dwStatusInfoLength);
+WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto);

-DWORD create_netconn(server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN;
-void free_netconn(netconn_t*) DECLSPEC_HIDDEN;
-void NETCON_unload(void) DECLSPEC_HIDDEN;
-DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN;
+DWORD create_netconn(server_t*,DWORD,BOOL,DWORD,netconn_t**);
+void free_netconn(netconn_t*);
+void NETCON_unload(void);
+DWORD NETCON_secure_connect(netconn_t*,server_t*);
 DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags,
-		int *sent /* out */) DECLSPEC_HIDDEN;
-DWORD NETCON_recv(netconn_t*,void*,size_t,BOOL,int*) DECLSPEC_HIDDEN;
-BOOL NETCON_is_alive(netconn_t*) DECLSPEC_HIDDEN;
-LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN;
-int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN;
-DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN;
-int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN;
-int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN;
+		int *sent /* out */);
+DWORD NETCON_recv(netconn_t*,void*,size_t,BOOL,int*);
+BOOL NETCON_is_alive(netconn_t*);
+LPCVOID NETCON_GetCert(netconn_t *connection);
+int NETCON_GetCipherStrength(netconn_t*);
+DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value);
+int sock_send(int fd, const void *msg, size_t len, int flags);
+int sock_recv(int fd, void *msg, size_t len, int flags);

-server_t *get_server(substr_t,INTERNET_PORT,BOOL,BOOL) DECLSPEC_HIDDEN;
+server_t *get_server(substr_t,INTERNET_PORT,BOOL,BOOL);

-DWORD create_req_file(const WCHAR*,req_file_t**) DECLSPEC_HIDDEN;
-void req_file_release(req_file_t*) DECLSPEC_HIDDEN;
+DWORD create_req_file(const WCHAR*,req_file_t**);
+void req_file_release(req_file_t*);

static inline req_file_t *req_file_addref(req_file_t *req_file)
 {
@@ -422,12 +422,12 @@ static inline req_file_t *req_file_addref(req_file_t *req_file)
     return req_file;
 }

-BOOL init_urlcache(void) DECLSPEC_HIDDEN;
-void free_urlcache(void) DECLSPEC_HIDDEN;
-void free_cookie(void) DECLSPEC_HIDDEN;
-void free_authorization_cache(void) DECLSPEC_HIDDEN;
+BOOL init_urlcache(void);
+void free_urlcache(void);
+void free_cookie(void);
+void free_authorization_cache(void);

-void init_winsock(void) DECLSPEC_HIDDEN;
+void init_winsock(void);

#define MAX_REPLY_LEN   0x1000

[PATCH 0/3] MR3254: Remove DECLSPEC_HIDDEN for internet dll - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.