Changeset 57972 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB

Timestamp:

Sep 30, 2015 3:19:05 PM (9 years ago)

Author:

vboxsync

Message:

VBoxUSB/darwin: Workaround for IOUSBUserClientInit::probe returning NULL on 10.11 (El Capitan).

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp

@@ -194 +194 @@
     static void  scheduleReleaseByOwner(RTPROCESS Owner);
 private:
+    /** Padding to guard against parent class expanding (see class remarks). */
+    uint8_t m_abPadding[256];
     /** The interface we're driving (aka. the provider). */
     IOUSBDevice *m_pDevice;
@@ -1090 +1092 @@
      */
     IOService *pRet = IOUSBUserClientInit::probe(pProvider, pi32Score);
-    Assert(pRet == this);
+    /*AssertMsg(pRet == this, ("pRet=%p this=%p *pi32Score=%d \n", pRet, this, pi32Score ? *pi32Score : 0)); - call always returns NULL on 10.11+ */
+    pRet = this;
     m_Owner = Owner;
     m_uId = uId;