Changeset 34260 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/USBLib-win.cpp

Timestamp:

Nov 22, 2010 6:12:25 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68008

Message:

USBLib-win: attempt to fix xtracker 5374

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/USBLib-win.cpp (modified) (10 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/USBLib-win.cpp

@@ -2696 +2696 @@
 
 /**
- * Return all attached USB devices.that are captured by the filter
+ * Return all attached USB devices that are captured by the filter
  *
  * @returns VBox status code
@@ -2706 +2706 @@
     USBSUP_GETNUMDEV numdev;
     PUSBDEVICE pDevice = NULL;
-    PUSBDEVICE pCaptured = NULL;
-    PUSBDEVICE pList = NULL;
     Log(("usbLibGetDevices: enter\n"));
 
@@ -2798 +2796 @@
     Assert(numdev.cUSBDevices == *pcDevices);
 
-    if (numdev.cUSBDevices == 0 || *pcDevices == 0)
+    if ((int32_t)numdev.cUSBDevices <= 0 || *pcDevices == 0)
     {
         /* Only return the host devices */
@@ -2810 +2808 @@
 
     /* Get the required info for each captured device */
-    pCaptured = NULL;
-    for (int i = 0; i < (int32_t)numdev.cUSBDevices; i++)
+    PUSBDEVICE *ppCaptured = (PUSBDEVICE*)RTMemAllocZ(sizeof(PUSBDEVICE * numDev.cUSBDevices));
+    if (!ppCaptured)
+        goto failure;
+
+    uint32_t cCaptured = 0;
+    for (uint32_t i = 0; i < numdev.cUSBDevices; i++)
     {
         USBSUP_GETDEV dev = {0};
@@ -2833 +2835 @@
             {
                 pDevice = (PUSBDEVICE)RTMemAllocZ(sizeof(USBDEVICE));
-                if (pDevice == NULL)
+                if (!pDevice)
                     goto failure;
 
@@ -2847 +2849 @@
                 Log(("usbLibGetDevices: Detected device vid=%x did=%x rev=%x hispd=%d hash=%s hash=%RX64\n", dev.vid, dev.did, dev.rev, dev.fHiSpeed, dev.serial_hash, pDevice->u64SerialHash));
 
-                /* Insert into the list */
-                pDevice->pNext = pCaptured;
-                if (pCaptured)
-                    pCaptured->pPrev = pDevice;
-
-                pCaptured = pDevice;
-
+                ppCaptured[i] = pDevice;
+                cCaptured++;
             }
 
@@ -2862 +2859 @@
     }
 
-    if (!pCaptured)
+    if (!cCaptured)
     {
         /* Only return the host devices */
@@ -2871 +2868 @@
     }
 
-    /* 3: Add all host devices to array of captured devices; obviously making sure there are no duplicates */
-    Assert(pHostDevices && pCaptured);
-    pList = pCaptured;
+    /* 3: Go through the list of captured devices, lookup the corresponding device
+     *    in the list of host devices and update the information there. */
+    Assert(pHostDevices);
     for (uint32_t i = 0; i < numdev.cUSBDevices; i++)
     {
-        uint32_t j;
+        char *pszDeviceRegPath = usblibQueryDeviceRegPath(i);
+        Assert(pszDeviceRegPath);
 
         pDevice = pHostDevices;
-        Assert(pDevice);
-
-        for (j = 0; j < cHostDevices; j++)
-        {
-            char *pszDeviceRegPath = usblibQueryDeviceRegPath(i);
-
-            Assert(pszDeviceRegPath);
+        for (uint32_t j = 0; j < cHostDevices; j++)
+        {
             if (pszDeviceRegPath)
             {
@@ -2910 +2903 @@
 
             pDevice->enmState = USBDEVICESTATE_HELD_BY_PROXY;
-            pDevice->enmSpeed = pList->enmSpeed;    // @todo: Is that right?
+            if (ppCaptured[i])
+                pDevice->enmSpeed = ppCaptured[i]->enmSpeed;    // @todo: Is that right?
             RTStrFree(pDevice->pszAltAddress);
             pDevice->pszAltAddress = (char *)pDevice->pszAddress;
             pDevice->pszAddress = RTStrDup(usblibQueryDeviceName(i));
         }
-        pList = pList->pNext;
     }
     *pcDevices = cHostDevices;
 
     /* Free captured devices list */
-    pDevice = pCaptured;
-    while (pDevice)
-    {
-        PUSBDEVICE pOldDev = pDevice;
-
-        if (pDevice->pszAddress)
+    for (uint32_t i = 0; i < numdev.cUSBDevices; i++)
+    {
+        pDevice = ppCaptured[i];
+        if (pDevice)
+        {
             RTMemFree((void *)pDevice->pszAddress);
-        if (pDevice->pszAltAddress)
             RTStrFree(pDevice->pszAltAddress);
-        if (pDevice->pszHubName)
             RTStrFree(pDevice->pszHubName);
-        if (pDevice->pszManufacturer)
             RTMemFree((void *)pDevice->pszManufacturer);
-        if (pDevice->pszProduct)
             RTMemFree((void *)pDevice->pszProduct);
-        if (pDevice->pszSerialNumber)
             RTMemFree((void *)pDevice->pszSerialNumber);
-
-        pDevice = pDevice->pNext;
-
-        RTMemFree(pOldDev);
-    }
+            RTMemFree(pDevice);
+        }
+    }
+    RTMemFree(ppCaptured);
 
     Log(("usbLibGetDevices: returns %d devices\n", *pcDevices));
@@ -2991 +2977 @@
 
 failure:
+    /* free host devices */
     pDevice      = pHostDevices;
     pHostDevices = NULL;
     while (pDevice)
     {
-        PUSBDEVICE pOldDev = pDevice;
-
-        if (pDevice->pszAddress)
+        PUSBDEVICE pNext = pDevice->pNext;
+
+        RTMemFree((void *)pDevice->pszAddress);
+        RTMemFree((void *)pDevice->pszManufacturer);
+        RTMemFree((void *)pDevice->pszProduct);
+        RTMemFree((void *)pDevice->pszSerialNumber);
+        RTMemFree(pDevice);
+
+        pDevice = Next;
+    }
+
+    /* free captured devices */
+    for (uint32_t i = 0; i < numdev.cUSBDevices; i++)
+    {
+        pDevice = ppCaptured[i];
+        if (pDevice)
+        {
             RTMemFree((void *)pDevice->pszAddress);
-        if (pDevice->pszManufacturer)
             RTMemFree((void *)pDevice->pszManufacturer);
-        if (pDevice->pszProduct)
             RTMemFree((void *)pDevice->pszProduct);
-        if (pDevice->pszSerialNumber)
             RTMemFree((void *)pDevice->pszSerialNumber);
-
-        pDevice = pDevice->pNext;
-
-        RTMemFree(pOldDev);
-
-        if (pDevice == NULL && pCaptured)
-        {
-            pDevice   = pCaptured;
-            pCaptured = NULL;
-        }
-    }
+            RTMemFree(pDevice);
+        }
+    }
+    RTMemFree(ppCaptured);
 
     *ppDevices = NULL;