Changeset 48930 in vbox

Timestamp:

Oct 7, 2013 7:20:52 PM (11 years ago)

Author:

vboxsync

Message:

OS X host: leds sync: hopefully fixed GUI SEGFAULT if using old IOKit framework.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp

@@ -22 +22 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_GUI
-//#define VBOX_WITH_KBD_LEDS_SYNC
+#define VBOX_WITH_KBD_LEDS_SYNC
 
 #include "DarwinKeyboard.h"
@@ -1185 +1185 @@
                                                        &kCFTypeDictionaryValueCallBacks);
 
+            if (deviceMatchingDictRef)
+            {
+                CFRelease(usageKeyCFNumberRef);
+                CFRelease(usagePageKeyCFNumberRef);
+
+                return deviceMatchingDictRef;
+            }
+
             CFRelease(usageKeyCFNumberRef);
-            CFRelease(usagePageKeyCFNumberRef);
-
-            return deviceMatchingDictRef;
         }
 
@@ -1220 +1225 @@
                                                     &kCFTypeDictionaryValueCallBacks);
 
+        if (elementMatchingDictRef)
+        {
+            CFRelease(usagePageKeyCFNumberRef);
+            return elementMatchingDictRef;
+        }
+
         CFRelease(usagePageKeyCFNumberRef);
-        return elementMatchingDictRef;
     }
 
@@ -1284 +1294 @@
     int        rc2 = 0;
 
-    matchingElementsArrayRef = IOHIDDeviceCopyMatchingElements(hidDevice, elementMatchingDict, 0);
+    matchingElementsArrayRef = IOHIDDeviceCopyMatchingElements(hidDevice, elementMatchingDict, kIOHIDOptionsTypeNone);
     if (matchingElementsArrayRef)
     {
@@ -1330 +1340 @@
     int        rc2 = 0;
 
-    matchingElementsArrayRef = IOHIDDeviceCopyMatchingElements(hidDevice, elementMatchingDict, 0);
+    matchingElementsArrayRef = IOHIDDeviceCopyMatchingElements(hidDevice, elementMatchingDict, kIOHIDOptionsTypeNone);
     if (matchingElementsArrayRef)
     {
@@ -1484 +1494 @@
     uint32_t  vendorId = 0;
 
-    pNumberRef = IOHIDDeviceGetProperty(pHidDeviceRef, CFSTR(kIOHIDVendorIDKey));
-    if (pNumberRef)
-    {
-        if (CFGetTypeID(pNumberRef) == CFNumberGetTypeID())
-        {
-            if (CFNumberGetValue((CFNumberRef)pNumberRef, kCFNumberSInt32Type, &vendorId))
+    if (pHidDeviceRef)
+    {
+        pNumberRef = IOHIDDeviceGetProperty(pHidDeviceRef, CFSTR(kIOHIDVendorIDKey));
+        if (pNumberRef)
+        {
+            if (CFGetTypeID(pNumberRef) == CFNumberGetTypeID())
             {
-                switch (vendorId)
+                if (CFNumberGetValue((CFNumberRef)pNumberRef, kCFNumberSInt32Type, &vendorId))
                 {
-                    case kIOUSBVendorIDAppleComputer:   /** Apple devices always in the list */
-                    case 0x03F0:                        /** Hewlett-Packard (verified with model KU-0316) */
-                        fSupported = true;
-                        break;
+                    switch (vendorId)
+                    {
+                        case kIOUSBVendorIDAppleComputer:   /** Apple devices always in the list */
+                        case 0x03F0:                        /** Hewlett-Packard (verified with model KU-0316) */
+                            fSupported = true;
+                            break;
+                    }
+
+                    Log2(("HID device Vendor ID 0x%X %s in the list of supported devices.\n", vendorId, (fSupported ? "is" : "is not")));
                 }
-
-                Log2(("HID device Vendor ID 0x%X %s in the list of supported devices.\n", vendorId, (fSupported ? "is" : "is not")));
             }
-        }
-
-        CFRelease(pNumberRef);
+
+            //CFRelease(pNumberRef);
+        }
     }
 
@@ -1521 +1534 @@
     if (hidsState)
     {
-        hidsState->hidManagerRef = IOHIDManagerCreate(kCFAllocatorDefault, 0);
+        hidsState->hidManagerRef = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
         if (hidsState->hidManagerRef)
         {