Vitaliy Margolen : dinput: Use more friendly name for the joystick than its device path.
Alexandre Julliard
julliard at winehq.org
Mon Apr 20 11:33:08 CDT 2009
Module: wine
Branch: master
Commit: 542b17943ff353bc3a2becec2c7ca7cf85ff8a7a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=542b17943ff353bc3a2becec2c7ca7cf85ff8a7a
Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date: Sun Apr 19 20:33:31 2009 -0600
dinput: Use more friendly name for the joystick than its device path.
---
dlls/dinput/joystick_linuxinput.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 2a9db66..f9f6146 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -299,7 +299,7 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver
lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8);
strcpy(lpddi->tszInstanceName, joydevs[id].name);
- strcpy(lpddi->tszProductName, joydevs[id].device);
+ strcpy(lpddi->tszProductName, joydevs[id].name);
}
static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, int id)
@@ -320,7 +320,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver
lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8);
MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH);
- MultiByteToWideChar(CP_ACP, 0, joydevs[id].device, -1, lpddi->tszProductName, MAX_PATH);
+ MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszProductName, MAX_PATH);
}
static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id)
More information about the wine-cvs
mailing list