[PATCH 0/2] MR3448: Remove DECLSPEC_HIDDEN patches.

[Alistair Leslie-Hughes (＠alesliehughes)]

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

[PATCH 1/2] dinput: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

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

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

diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h
index 944d12b860f..0609b816b3b 100644
--- a/dlls/dinput/dinput_private.h
+++ b/dlls/dinput/dinput_private.h
@@ -44,8 +44,8 @@ struct dinput
     struct list device_players; /* device instance guid to player name */
 };
 
-extern const IDirectInput7AVtbl dinput7_a_vtbl DECLSPEC_HIDDEN;
-extern const IDirectInput8AVtbl dinput8_a_vtbl DECLSPEC_HIDDEN;
+extern const IDirectInput7AVtbl dinput7_a_vtbl;
+extern const IDirectInput8AVtbl dinput8_a_vtbl;
 
 extern void dinput_internal_addref( struct dinput *dinput );
 extern void dinput_internal_release( struct dinput *dinput );
@@ -75,12 +75,12 @@ extern void dinput_mouse_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wpar
 extern void dinput_keyboard_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam,
                                            RAWINPUT *raw );
 
-extern void check_dinput_events(void) DECLSPEC_HIDDEN;
+extern void check_dinput_events(void);
 
-extern HRESULT _configure_devices(IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData) DECLSPEC_HIDDEN;
+extern HRESULT _configure_devices(IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData);
 
-extern WCHAR* get_mapping_path(const WCHAR *device, const WCHAR *username) DECLSPEC_HIDDEN;
-extern DWORD get_device_type(DWORD version, BOOL is_joystick) DECLSPEC_HIDDEN;
+extern WCHAR* get_mapping_path(const WCHAR *device, const WCHAR *username);
+extern DWORD get_device_type(DWORD version, BOOL is_joystick);
 
 #define IS_DIPROP(x)    (((ULONG_PTR)(x) >> 16) == 0)
 
-- 
GitLab


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

[PATCH 2/2] hidclass.sys: Remove DECLSPEC_HIDDEN usage.

[Alistair Leslie-Hughes]

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

---
 dlls/hidclass.sys/hid.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h
index b8cec55fb7c..032cfb0fec8 100644
--- a/dlls/hidclass.sys/hid.h
+++ b/dlls/hidclass.sys/hid.h
@@ -118,15 +118,15 @@ typedef struct _minidriver
 } minidriver;
 
 void call_minidriver( ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size,
-                      void *out_buff, ULONG out_size, IO_STATUS_BLOCK *io ) DECLSPEC_HIDDEN;
+                      void *out_buff, ULONG out_size, IO_STATUS_BLOCK *io );
 
 /* Internal device functions */
-void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
+void HID_StartDeviceThread(DEVICE_OBJECT *device);
 void hid_queue_remove_pending_irps( struct hid_queue *queue );
 void hid_queue_destroy( struct hid_queue *queue );
 
-NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
-NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
-NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
-NTSTATUS WINAPI pdo_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
-NTSTATUS WINAPI pdo_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
+NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp);
+NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp);
+NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp);
+NTSTATUS WINAPI pdo_create(DEVICE_OBJECT *device, IRP *irp);
+NTSTATUS WINAPI pdo_close(DEVICE_OBJECT *device, IRP *irp);
-- 
GitLab

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

[Rémi Bernon]

Rémi Bernon (@rbernon) commented about dlls/hidclass.sys/hid.h:
> /* Internal device functions */
> -void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
> +void HID_StartDeviceThread(DEVICE_OBJECT *device);
>  void hid_queue_remove_pending_irps( struct hid_queue *queue );
>  void hid_queue_destroy( struct hid_queue *queue );
>
> -NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
> -NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
> -NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
> -NTSTATUS WINAPI pdo_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
> -NTSTATUS WINAPI pdo_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;
> +NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp);
> +NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp);
> +NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp);
> +NTSTATUS WINAPI pdo_create(DEVICE_OBJECT *device, IRP *irp);
> +NTSTATUS WINAPI pdo_close(DEVICE_OBJECT *device, IRP *irp);
void HID_StartDeviceThread( DEVICE_OBJECT *device );
void hid_queue_remove_pending_irps( struct hid_queue *queue );
void hid_queue_destroy( struct hid_queue *queue );

NTSTATUS WINAPI pdo_ioctl( DEVICE_OBJECT *device, IRP *irp );
NTSTATUS WINAPI pdo_read( DEVICE_OBJECT *device, IRP *irp );
NTSTATUS WINAPI pdo_write( DEVICE_OBJECT *device, IRP *irp );
NTSTATUS WINAPI pdo_create( DEVICE_OBJECT *device, IRP *irp );
NTSTATUS WINAPI pdo_close( DEVICE_OBJECT *device, IRP *irp );

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3448#note_40744