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
5d07cdf5
Commit
5d07cdf5
authored
Dec 11, 2019
by
Bernat Arlandis
Committed by
Alexandre Julliard
Dec 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Log effect directions, and use effective flags.
Signed-off-by:
Andrew Eikum
<
aeikum@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8576d5ad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
effect_linuxinput.c
dlls/dinput/effect_linuxinput.c
+2
-2
joystick.c
dlls/dinput/joystick.c
+6
-0
No files found.
dlls/dinput/effect_linuxinput.c
View file @
5d07cdf5
...
@@ -489,8 +489,6 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
...
@@ -489,8 +489,6 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
TRACE
(
"(this=%p,%p,%d)
\n
"
,
This
,
peff
,
dwFlags
);
TRACE
(
"(this=%p,%p,%d)
\n
"
,
This
,
peff
,
dwFlags
);
dump_DIEFFECT
(
peff
,
&
This
->
guid
,
dwFlags
);
if
((
dwFlags
&
~
DIEP_NORESTART
&
~
DIEP_NODOWNLOAD
&
~
DIEP_START
)
==
0
)
{
if
((
dwFlags
&
~
DIEP_NORESTART
&
~
DIEP_NODOWNLOAD
&
~
DIEP_START
)
==
0
)
{
/* set everything */
/* set everything */
dwFlags
=
DIEP_AXES
|
DIEP_DIRECTION
|
DIEP_DURATION
|
DIEP_ENVELOPE
|
dwFlags
=
DIEP_AXES
|
DIEP_DIRECTION
|
DIEP_DURATION
|
DIEP_ENVELOPE
|
...
@@ -498,6 +496,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
...
@@ -498,6 +496,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
DIEP_TRIGGERREPEATINTERVAL
|
DIEP_TYPESPECIFICPARAMS
;
DIEP_TRIGGERREPEATINTERVAL
|
DIEP_TYPESPECIFICPARAMS
;
}
}
dump_DIEFFECT
(
peff
,
&
This
->
guid
,
dwFlags
);
if
(
dwFlags
&
DIEP_AXES
)
{
if
(
dwFlags
&
DIEP_AXES
)
{
/* the linux input effect system only supports one or two axes */
/* the linux input effect system only supports one or two axes */
if
(
peff
->
cAxes
>
2
)
if
(
peff
->
cAxes
>
2
)
...
...
dlls/dinput/joystick.c
View file @
5d07cdf5
...
@@ -207,6 +207,12 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags)
...
@@ -207,6 +207,12 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags)
TRACE
(
" - dwTriggerButton: %d
\n
"
,
eff
->
dwTriggerButton
);
TRACE
(
" - dwTriggerButton: %d
\n
"
,
eff
->
dwTriggerButton
);
TRACE
(
" - dwTriggerRepeatInterval: %d
\n
"
,
eff
->
dwTriggerRepeatInterval
);
TRACE
(
" - dwTriggerRepeatInterval: %d
\n
"
,
eff
->
dwTriggerRepeatInterval
);
TRACE
(
" - rglDirection: %p
\n
"
,
eff
->
rglDirection
);
TRACE
(
" - rglDirection: %p
\n
"
,
eff
->
rglDirection
);
if
(
dwFlags
&
DIEP_DIRECTION
)
{
TRACE
(
" "
);
for
(
i
=
0
;
i
<
eff
->
cAxes
;
++
i
)
TRACE
(
"%d "
,
eff
->
rglDirection
[
i
]);
TRACE
(
"
\n
"
);
}
TRACE
(
" - cbTypeSpecificParams: %d
\n
"
,
eff
->
cbTypeSpecificParams
);
TRACE
(
" - cbTypeSpecificParams: %d
\n
"
,
eff
->
cbTypeSpecificParams
);
TRACE
(
" - lpvTypeSpecificParams: %p
\n
"
,
eff
->
lpvTypeSpecificParams
);
TRACE
(
" - lpvTypeSpecificParams: %p
\n
"
,
eff
->
lpvTypeSpecificParams
);
...
...
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