Rémi Bernon : dinput: Fully implement GetForceFeedbackState / GetEffectStatus.
Alexandre Julliard
julliard at winehq.org
Thu Dec 2 15:30:16 CST 2021
Module: wine
Branch: master
Commit: 4604b11c25ea44b08a7e9b13c1e6db3c16eba315
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4604b11c25ea44b08a7e9b13c1e6db3c16eba315
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Thu Dec 2 10:47:47 2021 +0100
dinput: Fully implement GetForceFeedbackState / GetEffectStatus.
Using the PID effect state reports.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dinput/device.c | 2 +-
dlls/dinput/joystick_hid.c | 49 +++++++++++++++++++++++++++++++++++++++++++---
dlls/dinput8/tests/hid.c | 7 -------
3 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index cca7f796fdc..1dc3c311f2b 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1765,7 +1765,7 @@ static HRESULT WINAPI dinput_device_GetForceFeedbackState( IDirectInputDevice8W
struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface );
HRESULT hr = DI_OK;
- FIXME( "iface %p, out %p semi-stub!\n", iface, out );
+ TRACE( "iface %p, out %p.\n", iface, out );
if (!out) return E_POINTER;
*out = 0;
diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index 9dac2b3af4b..976961c3a9f 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -1052,7 +1052,11 @@ static HRESULT hid_joystick_send_force_feedback_command( IDirectInputDevice8W *i
case DISFFC_SETACTUATORSOFF: usage = PID_USAGE_DC_DISABLE_ACTUATORS; break;
}
- if (command == DISFFC_RESET) IDirectInputDevice8_EnumCreatedEffectObjects( iface, unload_effect_object, NULL, 0 );
+ if (command == DISFFC_RESET)
+ {
+ IDirectInputDevice8_EnumCreatedEffectObjects( iface, unload_effect_object, NULL, 0 );
+ impl->base.force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY;
+ }
count = 1;
status = HidP_InitializeReportForID( HidP_Output, report->id, impl->preparsed, report_buf, report_len );
@@ -1201,10 +1205,12 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface )
.dwHow = DIPH_DEVICE,
};
struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface );
- ULONG i, count, report_len = impl->caps.InputReportByteLength;
+ ULONG i, index, count, report_len = impl->caps.InputReportByteLength;
DIDATAFORMAT *format = impl->base.device_format;
struct parse_device_state_params params = {{0}};
char *report_buf = impl->input_report_buf;
+ struct hid_joystick_effect *effect;
+ DWORD device_state, effect_state;
USAGE_AND_PAGE *usages;
NTSTATUS status;
HRESULT hr;
@@ -1258,6 +1264,43 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface )
if (impl->base.hEvent && memcmp( ¶ms.old_state, impl->base.device_state, format->dwDataSize ))
SetEvent( impl->base.hEvent );
}
+ else if (report_buf[0] == impl->pid_effect_state.id)
+ {
+ status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX,
+ &index, impl->preparsed, report_buf, report_len );
+ if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_GetUsageValue EFFECT_BLOCK_INDEX returned %#x\n", status );
+
+ EnterCriticalSection( &impl->base.crit );
+ effect_state = 0;
+ device_state = impl->base.force_feedback_state & DIGFFS_EMPTY;
+ while (count--)
+ {
+ USAGE_AND_PAGE *button = impl->usages_buf + count;
+ if (button->UsagePage != HID_USAGE_PAGE_PID)
+ FIXME( "unimplemented usage page %#04x.\n", button->UsagePage );
+ else switch (button->Usage)
+ {
+ case PID_USAGE_DEVICE_PAUSED: device_state |= DIGFFS_PAUSED; break;
+ case PID_USAGE_ACTUATORS_ENABLED: device_state |= DIGFFS_ACTUATORSON; break;
+ case PID_USAGE_SAFETY_SWITCH: device_state |= DIGFFS_SAFETYSWITCHON; break;
+ case PID_USAGE_ACTUATOR_OVERRIDE_SWITCH: device_state |= DIGFFS_USERFFSWITCHON; break;
+ case PID_USAGE_ACTUATOR_POWER: device_state |= DIGFFS_POWERON; break;
+ case PID_USAGE_EFFECT_PLAYING: effect_state = DIEGES_PLAYING; break;
+ default: FIXME( "unimplemented usage %#04x\n", button->Usage ); break;
+ }
+ }
+ if (!(device_state & DIGFFS_ACTUATORSON)) device_state |= DIGFFS_ACTUATORSOFF;
+ if (!(device_state & DIGFFS_SAFETYSWITCHON)) device_state |= DIGFFS_SAFETYSWITCHOFF;
+ if (!(device_state & DIGFFS_USERFFSWITCHON)) device_state |= DIGFFS_USERFFSWITCHOFF;
+ if (!(device_state & DIGFFS_POWERON)) device_state |= DIGFFS_POWEROFF;
+
+ TRACE( "effect %u state %#x, device state %#x\n", index, effect_state, device_state );
+
+ LIST_FOR_EACH_ENTRY( effect, &impl->effect_list, struct hid_joystick_effect, entry )
+ if (effect->index == index) effect->status = effect_state;
+ impl->base.force_feedback_state = device_state;
+ LeaveCriticalSection( &impl->base.crit );
+ }
memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) );
impl->read_ovl.hEvent = impl->base.read_event;
@@ -2722,7 +2765,7 @@ static HRESULT WINAPI hid_joystick_effect_GetEffectStatus( IDirectInputEffect *i
struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface );
HRESULT hr = DI_OK;
- FIXME( "iface %p, status %p semi-stub!\n", iface, status );
+ TRACE( "iface %p, status %p.\n", iface, status );
if (!status) return E_POINTER;
*status = 0;
diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c
index 2efa817f00e..0a58f215ea9 100644
--- a/dlls/dinput8/tests/hid.c
+++ b/dlls/dinput8/tests/hid.c
@@ -9243,7 +9243,6 @@ static void test_device_managed_effect(void)
hr = IDirectInputDevice8_GetForceFeedbackState( device, &res );
ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr );
flags = DIGFFS_PAUSED|DIGFFS_EMPTY|DIGFFS_ACTUATORSON|DIGFFS_POWERON|DIGFFS_SAFETYSWITCHON|DIGFFS_USERFFSWITCHON;
- todo_wine
ok( res == flags, "got state %#x\n", res );
set_hid_expect( file, NULL, 0 );
@@ -9450,7 +9449,6 @@ static void test_device_managed_effect(void)
hr = IDirectInputDevice8_GetForceFeedbackState( device, &res );
ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr );
flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWERON|DIGFFS_SAFETYSWITCHON|DIGFFS_USERFFSWITCHON;
- todo_wine
ok( res == flags, "got state %#x\n", res );
set_hid_expect( file, NULL, 0 );
@@ -9460,14 +9458,12 @@ static void test_device_managed_effect(void)
res = 0xdeadbeef;
hr = IDirectInputEffect_GetEffectStatus( effect, &res );
ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr );
- todo_wine
ok( res == DIEGES_PLAYING, "got status %#x\n", res );
set_hid_expect( file, expect_pool, sizeof(struct hid_expect) );
res = 0xdeadbeef;
hr = IDirectInputDevice8_GetForceFeedbackState( device, &res );
ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr );
flags = DIGFFS_ACTUATORSOFF|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF;
- todo_wine
ok( res == flags, "got state %#x\n", res );
set_hid_expect( file, NULL, 0 );
@@ -9483,7 +9479,6 @@ static void test_device_managed_effect(void)
hr = IDirectInputDevice8_GetForceFeedbackState( device, &res );
ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr );
flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF;
- todo_wine
ok( res == flags, "got state %#x\n", res );
set_hid_expect( file, NULL, 0 );
@@ -9501,7 +9496,6 @@ static void test_device_managed_effect(void)
hr = IDirectInputDevice8_GetForceFeedbackState( device, &res );
ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr );
flags = DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF;
- todo_wine
ok( res == flags, "got state %#x\n", res );
set_hid_expect( file, NULL, 0 );
@@ -9519,7 +9513,6 @@ static void test_device_managed_effect(void)
hr = IDirectInputDevice8_GetForceFeedbackState( device, &res );
ok( hr == DI_OK, "GetForceFeedbackState returned %#x\n", hr );
flags = DIGFFS_EMPTY|DIGFFS_PAUSED|DIGFFS_ACTUATORSON|DIGFFS_POWEROFF|DIGFFS_SAFETYSWITCHOFF|DIGFFS_USERFFSWITCHOFF;
- todo_wine
ok( res == flags, "got state %#x\n", res );
set_hid_expect( file, NULL, 0 );
More information about the wine-cvs
mailing list