dinput: Introduce new HID joystick backend.

This adds a new joystick backend, implemented on top of HID and without any host dependencies. This will be progressively implementated, and it's not going to be usable until at least a few more patches. Because of that, and because it may also introduce regressions compared to the existing backends, it is disabled by default and is optionally enabled using the following global registry key: [HKCU\\Software\\Wine\\DirectInput\\Joysticks] "HID"="enabled" Or using the corresponding AppDefaults registry key: [HKCU\\Software\\Wine\\AppDefaults\\<app.exe>\\DirectInput\\Joysticks] "HID"="enabled" This setting will be removed later, when it becomes usable enough, to use the individual device disable mechanism available in joy.cpl. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Introduce new HID joystick backend.
afa1e60b · Rémi Bernon · Alexandre Julliard · 0ba137e3 · afa1e60b · afa1e60b
Commit afa1e60b authored Aug 25, 2021 by Rémi Bernon Committed by Alexandre Julliard Aug 26, 2021
5 changed files
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
 MODULE    = dinput.dll
 IMPORTLIB = dinput
-IMPORTS   = dinput dxguid uuid comctl32 ole32 user32 advapi32
+IMPORTS   = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi
 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700
 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)

@@ -12,6 +12,7 @@ C_SRCS = \
 	dinput_main.c \
 	effect_linuxinput.c \
 	joystick.c \
+	joystick_hid.c \
 	joystick_linux.c \
 	joystick_linuxinput.c \
 	joystick_osx.c \

--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -80,7 +80,8 @@ static const struct dinput_device *dinput_devices[] =
    &keyboard_device,
    &joystick_linuxinput_device,
    &joystick_linux_device,
-    &joystick_osx_device
+    &joystick_osx_device,
+    &joystick_hid_device,
 };

 HINSTANCE DINPUT_instance;

--- a/dlls/dinput/dinput_private.h
+++ b/dlls/dinput/dinput_private.h
@@ -67,6 +67,7 @@ struct DevicePlayer {

 extern const struct dinput_device mouse_device DECLSPEC_HIDDEN;
 extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN;
+extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN;
 extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN;
 extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN;
 extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN;

--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
 MODULE    = dinput8.dll
 IMPORTLIB = dinput8
-IMPORTS   = dinput8 dxguid uuid comctl32 ole32 user32 advapi32
+IMPORTS   = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi
 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800
 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
 PARENTSRC = ../dinput
@@ -13,6 +13,7 @@ C_SRCS = \
 	dinput_main.c \
 	effect_linuxinput.c \
 	joystick.c \
+	joystick_hid.c \
 	joystick_linux.c \
 	joystick_linuxinput.c \
 	joystick_osx.c \