Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b65a76de
Commit
b65a76de
authored
Feb 15, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Feb 15, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winebus.sys: Add a repeat count value to haptics output report.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c2c730a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
hid.c
dlls/winebus.sys/hid.c
+10
-1
main.c
dlls/xinput1_3/main.c
+6
-0
No files found.
dlls/winebus.sys/hid.c
View file @
b65a76de
...
...
@@ -314,6 +314,7 @@ struct hid_haptics_waveform
{
UINT16
intensity
;
BYTE
manual_trigger
;
BYTE
repeat_count
;
};
#include "poppack.h"
...
...
@@ -373,6 +374,13 @@ BOOL hid_device_add_haptics(struct unix_device *iface)
REPORT_SIZE
(
1
,
8
),
REPORT_COUNT
(
1
,
1
),
OUTPUT
(
1
,
Data
|
Var
|
Abs
),
USAGE
(
1
,
HID_USAGE_HAPTICS_REPEAT_COUNT
),
LOGICAL_MINIMUM
(
1
,
0
),
LOGICAL_MAXIMUM
(
1
,
1
),
REPORT_SIZE
(
1
,
8
),
REPORT_COUNT
(
1
,
1
),
OUTPUT
(
1
,
Data
|
Var
|
Abs
),
END_COLLECTION
,
};
...
...
@@ -1066,7 +1074,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC
{
haptics
->
waveform_intensity
[
report
->
manual_trigger
]
=
report
->
intensity
;
duration_ms
=
haptics
->
features
.
waveform_cutoff_time_ms
;
io
->
Status
=
iface
->
hid_vtbl
->
haptics_start
(
iface
,
duration_ms
,
*
rumble_intensity
,
*
buzz_intensity
);
if
(
!
report
->
repeat_count
)
io
->
Status
=
STATUS_SUCCESS
;
else
io
->
Status
=
iface
->
hid_vtbl
->
haptics_start
(
iface
,
duration_ms
,
*
rumble_intensity
,
*
buzz_intensity
);
}
}
}
...
...
dlls/xinput1_3/main.c
View file @
b65a76de
...
...
@@ -320,6 +320,9 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO
status
=
HidP_SetUsageValue
(
HidP_Output
,
HID_USAGE_PAGE_HAPTICS
,
0
,
HID_USAGE_HAPTICS_MANUAL_TRIGGER
,
controller
->
hid
.
haptics_rumble_ordinal
,
preparsed
,
report_buf
,
report_len
);
if
(
status
!=
HIDP_STATUS_SUCCESS
)
WARN
(
"HidP_SetUsageValue MANUAL_TRIGGER returned %#lx
\n
"
,
status
);
status
=
HidP_SetUsageValue
(
HidP_Output
,
HID_USAGE_PAGE_HAPTICS
,
0
,
HID_USAGE_HAPTICS_REPEAT_COUNT
,
1
,
preparsed
,
report_buf
,
report_len
);
if
(
status
!=
HIDP_STATUS_SUCCESS
)
WARN
(
"HidP_SetUsageValue REPEAT_COUNT returned %#lx
\n
"
,
status
);
if
(
!
HidD_SetOutputReport
(
controller
->
device
,
report_buf
,
report_len
))
{
WARN
(
"HidD_SetOutputReport failed with error %lu
\n
"
,
GetLastError
());
...
...
@@ -335,6 +338,9 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO
status
=
HidP_SetUsageValue
(
HidP_Output
,
HID_USAGE_PAGE_HAPTICS
,
0
,
HID_USAGE_HAPTICS_MANUAL_TRIGGER
,
controller
->
hid
.
haptics_buzz_ordinal
,
preparsed
,
report_buf
,
report_len
);
if
(
status
!=
HIDP_STATUS_SUCCESS
)
WARN
(
"HidP_SetUsageValue MANUAL_TRIGGER returned %#lx
\n
"
,
status
);
status
=
HidP_SetUsageValue
(
HidP_Output
,
HID_USAGE_PAGE_HAPTICS
,
0
,
HID_USAGE_HAPTICS_REPEAT_COUNT
,
1
,
preparsed
,
report_buf
,
report_len
);
if
(
status
!=
HIDP_STATUS_SUCCESS
)
WARN
(
"HidP_SetUsageValue REPEAT_COUNT returned %#lx
\n
"
,
status
);
if
(
!
HidD_SetOutputReport
(
controller
->
device
,
report_buf
,
report_len
))
{
WARN
(
"HidD_SetOutputReport failed with error %lu
\n
"
,
GetLastError
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment