[v1 1/3] dinput: Set tszInstanceName equal to product name on Mac
David Lawrie
david.dljunk at gmail.com
Fri Aug 26 20:40:44 CDT 2016
Makes Linux and Mac dinput equivalent
joy.cpl now displays product name rather than "Joystick #x"
Tested on OS X 10.10.5.
Signed-off-by: David Lawrie <david.dljunk at gmail.com>
---
dlls/dinput/joystick_osx.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c
index 43fa20e..7685e0f 100644
--- a/dlls/dinput/joystick_osx.c
+++ b/dlls/dinput/joystick_osx.c
@@ -952,10 +952,10 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS
lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8);
else
lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8);
- sprintf(lpddi->tszInstanceName, "Joystick %d", id);
/* get the device name */
get_osx_device_name(id, lpddi->tszProductName, MAX_PATH);
+ get_osx_device_name(id, lpddi->tszInstanceName, MAX_PATH);
lpddi->guidFFDriver = GUID_NULL;
return S_OK;
@@ -967,7 +967,6 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS
static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id)
{
char name[MAX_PATH];
- char friendly[32];
TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id);
@@ -992,12 +991,12 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS
lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8);
else
lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8);
- sprintf(friendly, "Joystick %d", id);
- MultiByteToWideChar(CP_ACP, 0, friendly, -1, lpddi->tszInstanceName, MAX_PATH);
+
/* get the device name */
get_osx_device_name(id, name, MAX_PATH);
-
MultiByteToWideChar(CP_ACP, 0, name, -1, lpddi->tszProductName, MAX_PATH);
+ MultiByteToWideChar(CP_ACP, 0, name, -1, lpddi->tszInstanceName, MAX_PATH);
+
lpddi->guidFFDriver = GUID_NULL;
return S_OK;
}
--
1.7.12.4 (Apple Git-37)
More information about the wine-patches
mailing list