Module: wine Branch: master Commit: 4f545cb6278ee4cd34a016960657d5b2e9190b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f545cb6278ee4cd34a0169606...
Author: Bruno Jesus 00cpxxx@gmail.com Date: Thu Aug 18 01:41:46 2016 -0300
dinput: Properly debug DIDEVTYPE_HID in _dump_DIDEVCAPS.
Signed-off-by: Bruno Jesus 00cpxxx@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dinput/joystick.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 1c4b436..de76896 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -406,7 +406,7 @@ HRESULT WINAPI JoystickAGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REF void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) { int type = GET_DIDEVICE_TYPE(lpDIDevCaps->dwDevType); - const char *str; + const char *str, *hid = ""; TRACE("dwSize: %d\n", lpDIDevCaps->dwSize); TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags); switch(type) @@ -416,7 +416,6 @@ void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) DEBUG_TYPE(DIDEVTYPE_MOUSE); DEBUG_TYPE(DIDEVTYPE_KEYBOARD); DEBUG_TYPE(DIDEVTYPE_JOYSTICK); - DEBUG_TYPE(DIDEVTYPE_HID); /* Direct X >= 8 definitions */ DEBUG_TYPE(DI8DEVTYPE_DEVICE); DEBUG_TYPE(DI8DEVTYPE_MOUSE); @@ -433,7 +432,10 @@ void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) default: str = "UNKNOWN"; }
- TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, str); + if (lpDIDevCaps->dwDevType & DIDEVTYPE_HID) + hid = " (HID)"; + + TRACE("dwDevType: %08x %s%s\n", lpDIDevCaps->dwDevType, str, hid); TRACE("dwAxes: %d\n", lpDIDevCaps->dwAxes); TRACE("dwButtons: %d\n", lpDIDevCaps->dwButtons); TRACE("dwPOVs: %d\n", lpDIDevCaps->dwPOVs);