From 2d855dcb04594cb2d0e12b50e16052e97caee46d Mon Sep 17 00:00:00 2001 From: Lucas Zawacki Date: Tue, 29 May 2012 13:42:27 -0300 Subject: [PATCH] dinput: Implement GetProperty for JOYSTICKID (LinuxInput driver). (cherry picked from commit 2cd3b908ad97696ff4abdbb39636c992f8f04554) --- dlls/dinput/joystick_linuxinput.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2902f9fc64b..3cab015bd13 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -965,6 +965,15 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF break; } + case (DWORD_PTR) DIPROP_JOYSTICKID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + pd->dwData = get_joystick_index(&This->generic.base.guid); + TRACE("DIPROP_JOYSTICKID(%d)\n", pd->dwData); + break; + } + default: return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); } -- 2.11.4.GIT