[PATCH 0/1] MR573: winebus.sys/sdl: Use the 8 absolute axes supported by DIJOYSTATE2.

[Arek Hiler (＠ivyl)]

Most games use c_dfDIJoystick2 which can support up to 8 absolute axes,
6 directional ones and 2 sliders.

With this change we now have 8 usable axes instead of six and we FIXME
if device exposes more than that.

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

[PATCH 1/1] winebus.sys/sdl: Use the 8 absolute axes supported by DIJOYSTATE2.

[Arkadiusz Hiler]

From: Arkadiusz Hiler <ahiler(a)codeweavers.com>

Most games use c_dfDIJoystick2 which can support up to 8 absolute axes,
6 directional ones and 2 sliders.

With this change we now have 8 usable axes instead of six and we FIXME
if device exposes more than that.
---
 dlls/winebus.sys/bus_sdl.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index 5d810d25205..39432ce9f17 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -249,17 +249,14 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface)
     const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_JOYSTICK};
     static const USAGE_AND_PAGE absolute_usages[] =
     {
-        {.UsagePage = HID_USAGE_PAGE_GENERIC,    .Usage = HID_USAGE_GENERIC_X},
-        {.UsagePage = HID_USAGE_PAGE_GENERIC,    .Usage = HID_USAGE_GENERIC_Y},
-        {.UsagePage = HID_USAGE_PAGE_GENERIC,    .Usage = HID_USAGE_GENERIC_Z},
-        {.UsagePage = HID_USAGE_PAGE_GENERIC,    .Usage = HID_USAGE_GENERIC_RX},
-        {.UsagePage = HID_USAGE_PAGE_GENERIC,    .Usage = HID_USAGE_GENERIC_RY},
-        {.UsagePage = HID_USAGE_PAGE_GENERIC,    .Usage = HID_USAGE_GENERIC_RZ},
-        {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE},
-        {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER},
-        {.UsagePage = HID_USAGE_PAGE_GENERIC,    .Usage = HID_USAGE_GENERIC_WHEEL},
-        {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR},
-        {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE},
+        {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X},
+        {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y},
+        {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z},
+        {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX},
+        {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY},
+        {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ},
+        {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER},
+        {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL},
     };
     static const USAGE_AND_PAGE relative_usages[] =
     {
-- 
GitLab

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

[Arek Hiler (＠ivyl)]

Ccing @timozuccarello because it may be also worth bumping the number of axes for controller splitting to 8. Not sure what's the use case for that but if the games are using dinput most likely it should work.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/573#note_5487

[PATCH 0/1] MR573: winebus.sys/sdl: Use the 8 absolute axes supported by DIJOYSTATE2. - approved

[Rémi Bernon]

This merge request was approved by R��mi Bernon.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/573