Bernat Arlandis : dinput: Log effect directions, and use effective flags.
Alexandre Julliard
julliard at winehq.org
Wed Dec 11 16:35:07 CST 2019
Module: wine
Branch: master
Commit: 5d07cdf54f576cf0c235ea6ba90756c849f5ac60
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d07cdf54f576cf0c235ea6ba90756c849f5ac60
Author: Bernat Arlandis <berarma at hotmail.com>
Date: Wed Dec 11 09:28:26 2019 -0600
dinput: Log effect directions, and use effective flags.
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dinput/effect_linuxinput.c | 4 ++--
dlls/dinput/joystick.c | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c
index 4b2f317ce3..cc2df3ce87 100644
--- a/dlls/dinput/effect_linuxinput.c
+++ b/dlls/dinput/effect_linuxinput.c
@@ -489,8 +489,6 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags);
- dump_DIEFFECT(peff, &This->guid, dwFlags);
-
if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) {
/* set everything */
dwFlags = DIEP_AXES | DIEP_DIRECTION | DIEP_DURATION | DIEP_ENVELOPE |
@@ -498,6 +496,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
DIEP_TRIGGERREPEATINTERVAL | DIEP_TYPESPECIFICPARAMS;
}
+ dump_DIEFFECT(peff, &This->guid, dwFlags);
+
if (dwFlags & DIEP_AXES) {
/* the linux input effect system only supports one or two axes */
if (peff->cAxes > 2)
diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
index 2220b5d576..01611b0e44 100644
--- a/dlls/dinput/joystick.c
+++ b/dlls/dinput/joystick.c
@@ -207,6 +207,12 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags)
TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton);
TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval);
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(" - lpvTypeSpecificParams: %p\n", eff->lpvTypeSpecificParams);
More information about the wine-cvs
mailing list