[PATCH v2 0/1] MR10052: dinput: Return DIERR_UNSUPPORTED in dinput_device_Escape

[Viktor Balogh (＠viktorb)]

At least Thrustmaster wheels are known for using the Escape method for communication between the driver and the game. This is not utilized by every game, but one that does is RaceRoom Racing Experience (RRRE).

RRRE uses it to query/set the wheel range and set force strengths. The problematic part is the wheel range query, because the returned value (0) is not the real range and that throws off the internal logic of RRRE's engine and causes the wheel to snap in one direction.

Returning DIERR_UNSUPPORTED clearly indicates that the call failed and RRRE no longer tries to use these methods for interaction with the wheel. Returning DIERR_UNSUPPORTED is also aligns with the behaviour of `hid_joystick_effect_Escape`.

Captures of what RRRE used are available over here: https://github.com/Kimplul/hid-tmff2/issues/165

See this issue for more context and the resolution: https://github.com/Kimplul/hid-tmff2/issues/39#issuecomment-3104689106

--
  v2: dinput: Return DIERR_UNSUPPORTED in dinput_device_Escape
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10052

[PATCH v2 1/1] dinput: Return DIERR_UNSUPPORTED in dinput_device_Escape

[Viktor Balogh]

From: Viktor Balogh <[e-mail]>

At least Thrustmaster wheels are known for using the Escape method for
communication between the driver and the game. This is not utilized by
every game, but one that does is RaceRoom Racing Experience (RRRE).

RRRE uses it to query/set the wheel range and set force strengths. The
problematic part is the wheel range query, because the returned value
(0) is not the real range and that throws off the internal logic of
RRRE's engine and causes the wheel to snap in one direction.

Returning DIERR_UNSUPPORTED clearly indicates that the call failed and
RRRE no longer tries to use these methods for interaction with the
wheel.
Returning DIERR_UNSUPPORTED is also aligns with the behaviour of
hid_joystick_effect_Escape.
---
 dlls/dinput/device.c          | 2 +-
 dlls/dinput/tests/joystick8.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 31240d03f65..35518dd91dd 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1758,7 +1758,7 @@ static HRESULT WINAPI dinput_device_EnumCreatedEffectObjects( IDirectInputDevice
 static HRESULT WINAPI dinput_device_Escape( IDirectInputDevice8W *iface, DIEFFESCAPE *escape )
 {
     FIXME( "iface %p, escape %p stub!\n", iface, escape );
-    return DI_OK;
+    return DIERR_UNSUPPORTED;
 }
 
 static HRESULT WINAPI dinput_device_Poll( IDirectInputDevice8W *iface )
diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c
index fc33ba981e4..eab4a7ff7e8 100644
--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -3231,7 +3231,6 @@ static void test_simple_joystick( DWORD version )
     escape.lpvOutBuffer = buffer + 10;
     escape.cbOutBuffer = 10;
     hr = IDirectInputDevice8_Escape( device, &escape );
-    todo_wine
     ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#lx\n", hr );
 
     if (version == 0x800) test_action_map( device, file, event );
-- 
GitLab

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