Changeset 49811 in vbox for trunk/src/VBox

Timestamp:

Dec 6, 2013 1:31:01 PM (11 years ago)

Author:

vboxsync

Message:

OS X host: HID LEDs sync: prevent LEDs flickering.

File:

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

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

@@ -1270 +1270 @@
     IOReturn      rc = kIOReturnError;
 
-    /* Try to resume built-in keyboard. Abort if failed in order to avoid GUI freezes. */
-    int rc1 = SUPR3ResumeBuiltinKeyboard();
-    if (RT_FAILURE(rc1))
-        return rc1;
-
     valueRef = IOHIDValueCreateWithIntegerValue(kCFAllocatorDefault, element, 0, (fEnabled) ? 1 : 0);
     if (valueRef)
@@ -1296 +1291 @@
     IOReturn      rc;
     CFIndex       integerValue;
-
-    /* Try to resume built-in keyboard. Abort if failed in order to avoid GUI freezes. */
-    int rc1 = SUPR3ResumeBuiltinKeyboard();
-    if (RT_FAILURE(rc1))
-        return rc1;
 
     rc = IOHIDDeviceGetValue(hidDevice, element, &valueRef);
@@ -1330 +1320 @@
     CFArrayRef matchingElementsArrayRef;
     int        rc2 = 0;
+
+    /* Try to resume built-in keyboard. Abort if failed in order to avoid GUI freezes. */
+    int rc1 = SUPR3ResumeBuiltinKeyboard();
+    if (RT_FAILURE(rc1))
+        return rc1;
 
     matchingElementsArrayRef = IOHIDDeviceCopyMatchingElements(hidDevice, elementMatchingDict, kIOHIDOptionsTypeNone);
@@ -1375 +1370 @@
     CFArrayRef matchingElementsArrayRef;
     int        rc2 = 0;
+
+    /* Try to resume built-in keyboard. Abort if failed in order to avoid GUI freezes. */
+    int rc1 = SUPR3ResumeBuiltinKeyboard();
+    if (RT_FAILURE(rc1))
+        return rc1;
 
     matchingElementsArrayRef = IOHIDDeviceCopyMatchingElements(hidDevice, elementMatchingDict, kIOHIDOptionsTypeNone);
@@ -1701 +1701 @@
                 if (elementMatchingDict)
                 {
-                    (void)darwinSetDeviceLedsState(pKbd->pDevice, elementMatchingDict, pHidState->guestState.fNumLockOn,
-                        pHidState->guestState.fCapsLockOn, pHidState->guestState.fScrollLockOn);
-
+                    (void)darwinSetDeviceLedsState(pKbd->pDevice, elementMatchingDict, fNum, fCaps, pHidState->guestState.fScrollLockOn);
                     CFRelease(elementMatchingDict);
                 }