ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xinput1_3: Only write haptics waveform reports when needed. 

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2022-02-16 09:26:55 +01:00 committed by Alexandre Julliard
parent 59584b996b
commit 57aaa274d9
1 changed files with 54 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/xinput1_3/main.c
View File

@ -286,11 +286,14 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO
PHIDP_PREPARSED_DATA preparsed = controller->hid.preparsed;
char *report_buf = controller->hid.output_report_buf;
BYTE report_id = controller->hid.haptics_report;
BOOL update_rumble, update_buzz;
NTSTATUS status;
if (!(controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED)) return ERROR_SUCCESS;
update_rumble = (controller->vibration.wLeftMotorSpeed != state->wLeftMotorSpeed);
controller->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed;
update_buzz = (controller->vibration.wRightMotorSpeed != state->wRightMotorSpeed);
controller->vibration.wRightMotorSpeed = state->wRightMotorSpeed;
if (!controller->enabled) return ERROR_SUCCESS;
@ -311,6 +314,8 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO
return 0;
}
if (update_rumble)
{
/* send haptics rumble report (left motor) */
status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len);
if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status);
@ -328,7 +333,10 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO
WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError());
return GetLastError();
}
}
if (update_buzz)
{
/* send haptics buzz report (right motor) */
status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len);
if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status);
@ -346,7 +354,10 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO
WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError());
return GetLastError();
}
}
if (update_rumble || update_buzz)
{
/* trigger haptics waveforms */
status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len);
if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status);
@ -361,6 +372,7 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO
WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError());
return GetLastError();
}
}
return ERROR_SUCCESS;
}