[v4 1/3] dinput: Print location ID in debugstr_device on the Mac
David Lawrie
david.dljunk at gmail.com
Mon Jul 11 06:06:00 CDT 2016
Tested on OS X 10.10.5.
Signed-off-by: David Lawrie <david.dljunk at gmail.com>
---
dlls/dinput/joystick_osx.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c
index c9c30fd..21d8d51 100644
--- a/dlls/dinput/joystick_osx.c
+++ b/dlls/dinput/joystick_osx.c
@@ -175,6 +175,30 @@ static HRESULT osx_to_win32_hresult(HRESULT in)
return in;
}
+static long get_device_property_long(IOHIDDeviceRef device, CFStringRef key)
+{
+ CFTypeRef ref;
+ long result = 0;
+
+ if (device)
+ {
+ assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device));
+
+ ref = IOHIDDeviceGetProperty(device, key);
+
+ if (ref && CFNumberGetTypeID() == CFGetTypeID(ref))
+ CFNumberGetValue((CFNumberRef)ref, kCFNumberLongType, &result);
+ }
+
+ return result;
+}
+
+static long get_device_location_ID(IOHIDDeviceRef device)
+{
+ return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey));
+}
+
+
static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context)
{
CFArrayAppendValue( ( CFMutableArrayRef ) context, value );
@@ -212,8 +236,9 @@ static const char* debugstr_cf(CFTypeRef t)
static const char* debugstr_device(IOHIDDeviceRef device)
{
- return wine_dbg_sprintf("<IOHIDDevice %p product %s>", device,
- debugstr_cf(IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey))));
+ return wine_dbg_sprintf("<IOHIDDevice %p product %s IOHIDLocationID %lu>", device,
+ debugstr_cf(IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey))),
+ get_device_location_ID(device));
}
static const char* debugstr_element(IOHIDElementRef element)
--
1.7.12.4 (Apple Git-37)
More information about the wine-patches
mailing list