[PATCH 2/2] dinput: Dump the condition effect correctly for 2 array items
Bruno Jesus
00cpxxx at gmail.com
Tue Aug 23 17:24:11 CDT 2016
Based on ideas by Elias Vanderstuyft.
Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
---
dlls/dinput/joystick.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
index 52ff925..45c3618 100644
--- a/dlls/dinput/joystick.c
+++ b/dlls/dinput/joystick.c
@@ -215,10 +215,14 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags)
_dump_DIRAMPFORCE(eff->lpvTypeSpecificParams);
}
} else if (type == DIEFT_CONDITION) {
- if (eff->cbTypeSpecificParams != sizeof(DICONDITION)) {
- WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n");
- } else {
+ if (eff->cbTypeSpecificParams == sizeof(DICONDITION)) {
_dump_DICONDITION(eff->lpvTypeSpecificParams);
+ } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION)) {
+ DICONDITION *condition = eff->lpvTypeSpecificParams;
+ _dump_DICONDITION(&condition[0]);
+ _dump_DICONDITION(&condition[1]);
+ } else {
+ WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n");
}
} else if (type == DIEFT_CUSTOMFORCE) {
if (eff->cbTypeSpecificParams != sizeof(DICUSTOMFORCE)) {
--
2.9.3
More information about the wine-patches
mailing list