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
ab780cee
Commit
ab780cee
authored
Mar 03, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Mar 03, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Add object names for simulation HID usages.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3b45b4d5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
joystick_hid.c
dlls/dinput/joystick_hid.c
+5
-0
joystick8.c
dlls/dinput/tests/joystick8.c
+0
-9
No files found.
dlls/dinput/joystick_hid.c
View file @
ab780cee
...
@@ -414,6 +414,11 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance )
...
@@ -414,6 +414,11 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance )
case
MAKELONG
(
PID_USAGE_TRIGGER_BUTTON
,
HID_USAGE_PAGE_PID
):
return
L"Trigger Button"
;
case
MAKELONG
(
PID_USAGE_TRIGGER_BUTTON
,
HID_USAGE_PAGE_PID
):
return
L"Trigger Button"
;
case
MAKELONG
(
HID_USAGE_SIMULATION_RUDDER
,
HID_USAGE_PAGE_SIMULATION
):
return
L"Rudder"
;
case
MAKELONG
(
HID_USAGE_SIMULATION_RUDDER
,
HID_USAGE_PAGE_SIMULATION
):
return
L"Rudder"
;
case
MAKELONG
(
HID_USAGE_SIMULATION_THROTTLE
,
HID_USAGE_PAGE_SIMULATION
):
return
L"Throttle"
;
case
MAKELONG
(
HID_USAGE_SIMULATION_ACCELERATOR
,
HID_USAGE_PAGE_SIMULATION
):
return
L"Accelerator"
;
case
MAKELONG
(
HID_USAGE_SIMULATION_BRAKE
,
HID_USAGE_PAGE_SIMULATION
):
return
L"Brake"
;
case
MAKELONG
(
HID_USAGE_SIMULATION_CLUTCH
,
HID_USAGE_PAGE_SIMULATION
):
return
L"Clutch"
;
case
MAKELONG
(
HID_USAGE_SIMULATION_STEERING
,
HID_USAGE_PAGE_SIMULATION
):
return
L"Steering"
;
default:
return
NULL
;
default:
return
NULL
;
}
}
}
}
...
...
dlls/dinput/tests/joystick8.c
View file @
ab780cee
...
@@ -2773,20 +2773,11 @@ static void test_driving_wheel_axes(void)
...
@@ -2773,20 +2773,11 @@ static void test_driving_wheel_axes(void)
.
wUsage
=
HID_USAGE_GENERIC_JOYSTICK
,
.
wUsage
=
HID_USAGE_GENERIC_JOYSTICK
,
},
},
};
};
struct
check_objects_todos
object_todos
[
ARRAY_SIZE
(
expect_objects
)]
=
{
{.
name
=
TRUE
},
{.
name
=
TRUE
},
{.
name
=
TRUE
},
{.
name
=
TRUE
},
{.
name
=
TRUE
},
};
struct
check_objects_params
check_objects_params
=
struct
check_objects_params
check_objects_params
=
{
{
.
version
=
DIRECTINPUT_VERSION
,
.
version
=
DIRECTINPUT_VERSION
,
.
expect_count
=
ARRAY_SIZE
(
expect_objects
),
.
expect_count
=
ARRAY_SIZE
(
expect_objects
),
.
expect_objs
=
expect_objects
,
.
expect_objs
=
expect_objects
,
.
todo_objs
=
object_todos
,
};
};
WCHAR
cwd
[
MAX_PATH
],
tempdir
[
MAX_PATH
];
WCHAR
cwd
[
MAX_PATH
],
tempdir
[
MAX_PATH
];
...
...
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