Lucas Zawacki : dinput: Implement DIPROP_INSTANCENAME for joystick.

Alexandre Julliard julliard at winehq.org
Thu Oct 11 15:25:16 CDT 2012


Module: wine
Branch: master
Commit: 478f0b6691d221ecb4fd0f4ff63068e23d116f83
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=478f0b6691d221ecb4fd0f4ff63068e23d116f83

Author: Lucas Zawacki <lfzawacki at gmail.com>
Date:   Thu Oct 11 10:45:27 2012 -0300

dinput: Implement DIPROP_INSTANCENAME for joystick.

---

 dlls/dinput/joystick.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
index 8c0b5e5..d32acec 100644
--- a/dlls/dinput/joystick.c
+++ b/dlls/dinput/joystick.c
@@ -328,6 +328,17 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF
             }
             break;
         }
+        case (DWORD_PTR) DIPROP_INSTANCENAME: {
+            DIPROPSTRING *ps = (DIPROPSTRING*) pdiph;
+            DIDEVICEINSTANCEW didev;
+
+            didev.dwSize = sizeof(didev);
+
+            IDirectInputDevice_GetDeviceInfo(iface, &didev);
+            lstrcpynW(ps->wsz, didev.tszInstanceName, MAX_PATH);
+
+            return DI_OK;
+        }
         default:
             return IDirectInputDevice2WImpl_GetProperty(iface, rguid, pdiph);
         }




More information about the wine-cvs mailing list