[PATCH v2 0/3] MR4349: winhttp/msi/wmiutils Remove DECLSPEC_HIDDEN usage.
-- v2: winhttp: Remove DECLSPEC_HIDDEN usage. msi: Remove DECLSPEC_HIDDEN usage. wmiutils: Remove DECLSPEC_HIDDEN usage. https://gitlab.winehq.org/wine/wine/-/merge_requests/4349
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wmiutils/wmiutils_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 791e6123bdb..599b27b41f1 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemPath_create(LPVOID *); +HRESULT WbemStatusCodeText_create(LPVOID *); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4349
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msi/query.h | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 2323a8481d4..1997b50e932 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -108,50 +108,46 @@ typedef struct struct list *mem; } SQL_input; -UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, - struct list *mem ) DECLSPEC_HIDDEN; +UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, struct list *mem ); -UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ); -UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, - const column_info *columns ) DECLSPEC_HIDDEN; +UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, const column_info *columns ); -UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) DECLSPEC_HIDDEN; +UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); -UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, - column_info *columns ) DECLSPEC_HIDDEN; +UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, column_info *columns ); -UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, - struct expr *cond ) DECLSPEC_HIDDEN; +UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, struct expr *cond ); UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, - column_info *col_info, BOOL hold ) DECLSPEC_HIDDEN; + column_info *col_info, BOOL hold ); UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, - column_info *columns, column_info *values, BOOL temp ) DECLSPEC_HIDDEN; + column_info *columns, column_info *values, BOOL temp ); UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, - column_info *list, struct expr *expr ) DECLSPEC_HIDDEN; + column_info *list, struct expr *expr ); -UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) DECLSPEC_HIDDEN; +UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); -UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) DECLSPEC_HIDDEN; +UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ); -UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ); -UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN; +UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ); -UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ) DECLSPEC_HIDDEN; +UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ); -int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip) DECLSPEC_HIDDEN; +int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip); -MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN; +MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ); UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent, BOOL hold ) DECLSPEC_HIDDEN; + MSICONDITION persistent, BOOL hold ); -UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ) DECLSPEC_HIDDEN; +UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ); -UINT msi_view_refresh_row( MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec ) DECLSPEC_HIDDEN; +UINT msi_view_refresh_row( MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec ); #endif /* __WINE_MSI_QUERY_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4349
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/winhttp_private.h | 80 +++++++++++++++++----------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index bf1e60e2cee..0bf1c5bc6b0 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -378,45 +378,45 @@ struct socket_shutdown BOOL complete_async; }; -struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN; -struct object_header *grab_object( HINTERNET ) DECLSPEC_HIDDEN; -void release_object( struct object_header * ) DECLSPEC_HIDDEN; -HINTERNET alloc_handle( struct object_header * ) DECLSPEC_HIDDEN; -BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; - -void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; -void close_connection( struct request * ) DECLSPEC_HIDDEN; -void init_queue( struct queue *queue ) DECLSPEC_HIDDEN; -void stop_queue( struct queue * ) DECLSPEC_HIDDEN; - -void netconn_addref( struct netconn * ) DECLSPEC_HIDDEN; -void netconn_release( struct netconn * ) DECLSPEC_HIDDEN; -DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN; -void netconn_unload( void ) DECLSPEC_HIDDEN; -ULONG netconn_query_data_available( struct netconn * ) DECLSPEC_HIDDEN; -DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; -DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; -DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ) DECLSPEC_HIDDEN; -BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) DECLSPEC_HIDDEN; -void netconn_cancel_io( struct netconn *conn ) DECLSPEC_HIDDEN; -DWORD netconn_set_timeout( struct netconn *, BOOL, int ) DECLSPEC_HIDDEN; -BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN; -const void *netconn_get_certificate( struct netconn * ) DECLSPEC_HIDDEN; -int netconn_get_cipher_strength( struct netconn * ) DECLSPEC_HIDDEN; - -BOOL set_cookies( struct request *, const WCHAR * ) DECLSPEC_HIDDEN; -DWORD add_cookie_headers( struct request * ) DECLSPEC_HIDDEN; -DWORD add_request_headers( struct request *, const WCHAR *, DWORD, DWORD ) DECLSPEC_HIDDEN; -void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; -BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ) DECLSPEC_HIDDEN; -void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; - -void release_host( struct hostdata * ) DECLSPEC_HIDDEN; -DWORD process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOOL ) DECLSPEC_HIDDEN; - -extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; -void release_typelib( void ) DECLSPEC_HIDDEN; +struct object_header *addref_object( struct object_header * ); +struct object_header *grab_object( HINTERNET ); +void release_object( struct object_header * ); +HINTERNET alloc_handle( struct object_header * ); +BOOL free_handle( HINTERNET ); + +void send_callback( struct object_header *, DWORD, LPVOID, DWORD ); +void close_connection( struct request * ); +void init_queue( struct queue *queue ); +void stop_queue( struct queue * ); + +void netconn_addref( struct netconn * ); +void netconn_release( struct netconn * ); +DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ); +void netconn_unload( void ); +ULONG netconn_query_data_available( struct netconn * ); +DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ); +DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ); +DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ); +DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ); +BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ); +void netconn_cancel_io( struct netconn *conn ); +DWORD netconn_set_timeout( struct netconn *, BOOL, int ); +BOOL netconn_is_alive( struct netconn * ); +const void *netconn_get_certificate( struct netconn * ); +int netconn_get_cipher_strength( struct netconn * ); + +BOOL set_cookies( struct request *, const WCHAR * ); +DWORD add_cookie_headers( struct request * ); +DWORD add_request_headers( struct request *, const WCHAR *, DWORD, DWORD ); +void destroy_cookies( struct session * ); +BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ); +void destroy_authinfo( struct authinfo * ); + +void release_host( struct hostdata * ); +DWORD process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOOL ); + +extern HRESULT WinHttpRequest_create( void ** ); +void release_typelib( void ); static inline WCHAR *strdupAW( const char *src ) { @@ -457,7 +457,7 @@ static inline char *strdupWA_sized( const WCHAR *src, DWORD size ) return dst; } -extern HINSTANCE winhttp_instance DECLSPEC_HIDDEN; +extern HINSTANCE winhttp_instance; #define MIN_WEBSOCKET_SEND_BUFFER_SIZE 16 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4349
This merge request was approved by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4349
participants (3)
-
Alistair Leslie-Hughes -
Alistair Leslie-Hughes (＠alesliehughes)
-
Hans Leidekker (＠hans)