Bruno Jesus : dinput: Dump the condition effect correctly for 2 array items.
Module: wine Branch: master Commit: 777ca9060166c2c3bf48aac06e3d738cf85bedb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777ca9060166c2c3bf48aac06e... Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 23 19:24:11 2016 -0300 dinput: Dump the condition effect correctly for 2 array items. Based on ideas by Elias Vanderstuyft. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)) {
participants (1)
-
Alexandre Julliard