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
ac035365
Commit
ac035365
authored
Oct 04, 2021
by
Rémi Bernon
Committed by
Alexandre Julliard
Oct 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Look for the PID effect control output report.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3b3228e9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
joystick_hid.c
dlls/dinput/joystick_hid.c
+9
-0
No files found.
dlls/dinput/joystick_hid.c
View file @
ac035365
...
@@ -114,6 +114,7 @@ struct hid_joystick
...
@@ -114,6 +114,7 @@ struct hid_joystick
struct
list
effect_list
;
struct
list
effect_list
;
struct
pid_control_report
pid_device_control
;
struct
pid_control_report
pid_device_control
;
struct
pid_control_report
pid_effect_control
;
};
};
static
inline
struct
hid_joystick
*
impl_from_IDirectInputDevice8W
(
IDirectInputDevice8W
*
iface
)
static
inline
struct
hid_joystick
*
impl_from_IDirectInputDevice8W
(
IDirectInputDevice8W
*
iface
)
...
@@ -1587,6 +1588,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *
...
@@ -1587,6 +1588,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *
DIDEVICEOBJECTINSTANCEW
*
instance
,
void
*
data
)
DIDEVICEOBJECTINSTANCEW
*
instance
,
void
*
data
)
{
{
struct
pid_control_report
*
device_control
=
&
impl
->
pid_device_control
;
struct
pid_control_report
*
device_control
=
&
impl
->
pid_device_control
;
struct
pid_control_report
*
effect_control
=
&
impl
->
pid_effect_control
;
#define SET_COLLECTION( rep ) \
#define SET_COLLECTION( rep ) \
do \
do \
...
@@ -1610,7 +1612,10 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *
...
@@ -1610,7 +1612,10 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps *
switch
(
instance
->
wUsage
)
switch
(
instance
->
wUsage
)
{
{
case
PID_USAGE_DEVICE_CONTROL_REPORT
:
SET_COLLECTION
(
device_control
);
break
;
case
PID_USAGE_DEVICE_CONTROL_REPORT
:
SET_COLLECTION
(
device_control
);
break
;
case
PID_USAGE_EFFECT_OPERATION_REPORT
:
SET_COLLECTION
(
effect_control
);
break
;
case
PID_USAGE_DEVICE_CONTROL
:
SET_SUB_COLLECTION
(
device_control
,
control_coll
);
break
;
case
PID_USAGE_DEVICE_CONTROL
:
SET_SUB_COLLECTION
(
device_control
,
control_coll
);
break
;
case
PID_USAGE_EFFECT_OPERATION
:
SET_SUB_COLLECTION
(
effect_control
,
control_coll
);
break
;
}
}
}
}
...
@@ -1624,6 +1629,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap
...
@@ -1624,6 +1629,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap
DIDEVICEOBJECTINSTANCEW
*
instance
,
void
*
data
)
DIDEVICEOBJECTINSTANCEW
*
instance
,
void
*
data
)
{
{
struct
pid_control_report
*
device_control
=
&
impl
->
pid_device_control
;
struct
pid_control_report
*
device_control
=
&
impl
->
pid_device_control
;
struct
pid_control_report
*
effect_control
=
&
impl
->
pid_effect_control
;
if
(
!
(
instance
->
dwType
&
DIDFT_OUTPUT
))
return
DIENUM_CONTINUE
;
if
(
!
(
instance
->
dwType
&
DIDFT_OUTPUT
))
return
DIENUM_CONTINUE
;
...
@@ -1638,6 +1644,8 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap
...
@@ -1638,6 +1644,8 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap
if
(
instance
->
wCollectionNumber
==
device_control
->
control_coll
)
if
(
instance
->
wCollectionNumber
==
device_control
->
control_coll
)
SET_REPORT_ID
(
device_control
);
SET_REPORT_ID
(
device_control
);
if
(
instance
->
wCollectionNumber
==
effect_control
->
control_coll
)
SET_REPORT_ID
(
effect_control
);
#undef SET_REPORT_ID
#undef SET_REPORT_ID
...
@@ -1741,6 +1749,7 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID
...
@@ -1741,6 +1749,7 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID
TRACE
(
"device control id %u, coll %u, control coll %u
\n
"
,
impl
->
pid_device_control
.
id
,
TRACE
(
"device control id %u, coll %u, control coll %u
\n
"
,
impl
->
pid_device_control
.
id
,
impl
->
pid_device_control
.
collection
,
impl
->
pid_device_control
.
control_coll
);
impl
->
pid_device_control
.
collection
,
impl
->
pid_device_control
.
control_coll
);
TRACE
(
"effect control id %u, coll %u
\n
"
,
impl
->
pid_effect_control
.
id
,
impl
->
pid_effect_control
.
collection
);
if
(
impl
->
pid_device_control
.
id
)
if
(
impl
->
pid_device_control
.
id
)
{
{
...
...
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