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
9aaea0c1
Commit
9aaea0c1
authored
Sep 22, 2021
by
Rémi Bernon
Committed by
Alexandre Julliard
Sep 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hidparse.sys: Output array caps data indexes in the correct order.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d6c47adc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
hid.c
dlls/dinput8/tests/hid.c
+0
-2
main.c
dlls/hidparse.sys/main.c
+2
-2
No files found.
dlls/dinput8/tests/hid.c
View file @
9aaea0c1
...
...
@@ -3174,9 +3174,7 @@ static void test_hidp_kdr(void)
check_member
(
kdr
->
caps
[
i
],
expect_caps
[
i
],
"%d"
,
string_max
);
check_member
(
kdr
->
caps
[
i
],
expect_caps
[
i
],
"%d"
,
designator_min
);
check_member
(
kdr
->
caps
[
i
],
expect_caps
[
i
],
"%d"
,
designator_max
);
todo_wine_if
(
!
(
kdr
->
caps
[
i
].
bit_field
&
2
)
&&
!
(
kdr
->
caps
[
i
].
flags
&
HIDP_KDR_CAPS_IS_RANGE
)
)
check_member
(
kdr
->
caps
[
i
],
expect_caps
[
i
],
"%#x"
,
data_index_min
);
todo_wine_if
(
!
(
kdr
->
caps
[
i
].
bit_field
&
2
)
&&
!
(
kdr
->
caps
[
i
].
flags
&
HIDP_KDR_CAPS_IS_RANGE
)
)
check_member
(
kdr
->
caps
[
i
],
expect_caps
[
i
],
"%#x"
,
data_index_max
);
todo_wine_if
(
expect_caps
[
i
].
null_value
)
check_member
(
kdr
->
caps
[
i
],
expect_caps
[
i
],
"%d"
,
null_value
);
...
...
dlls/hidparse.sys/main.c
View file @
9aaea0c1
...
...
@@ -384,9 +384,9 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY
for
(
i
=
0
;
i
<
usages_size
;
++
i
)
{
if
(
!
is_array
)
start_bit
-=
state
->
items
.
report_count
*
state
->
items
.
bit_size
;
else
if
(
i
<
usages_size
-
1
)
state
->
items
.
flags
|=
HID_VALUE_CAPS_ARRAY_HAS_MORE
;
else
if
(
i
)
state
->
items
.
flags
|=
HID_VALUE_CAPS_ARRAY_HAS_MORE
;
else
state
->
items
.
flags
&=
~
HID_VALUE_CAPS_ARRAY_HAS_MORE
;
add_new_value_caps
(
state
,
values
,
i
,
start_bit
);
add_new_value_caps
(
state
,
values
,
i
s_array
?
usages_size
-
i
-
1
:
i
,
start_bit
);
if
(
!
is_array
)
state
->
items
.
report_count
=
1
;
}
state
->
caps_count
[
type
]
+=
usages_size
;
...
...
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