Changeset 60498 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Apr 14, 2016 3:23:51 PM (9 years ago)

Author:

vboxsync

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

106607

Message:

VBoxUSB.sys: Workaround to allow aborting the default control pipe.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev

Files:

• VBoxUsbRt.cpp (modified) (2 diffs)
• VBoxUsbRt.h (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp

@@ -897 +897 @@
 static HANDLE vboxUsbRtGetPipeHandle(PVBOXUSBDEV_EXT pDevExt, uint32_t EndPointAddress)
 {
+    if (EndPointAddress == 0)
+    {
+        return pDevExt->Rt.hPipe0;
+    }
+
     for (ULONG i = 0; i < pDevExt->Rt.uNumInterfaces; i++)
     {
@@ -1083 +1088 @@
                  */
                 pUrbInfo->len += sizeof (pUrb->UrbControlTransfer.SetupPacket);
+
+                /* If a control URB was successfully completed on the default control
+                 * pipe, stash away the handle. When submitting the URB, we don't need 
+                 * to know (and initially don't have) the handle. If we want to abort 
+                 * the default control pipe, we *have* to have a handle. This is how we 
+                 * find out what the handle is. 
+                 */
+                if (!pUrbInfo->ep && (pDevExt->Rt.hPipe0 == NULL))
+                {
+                    pDevExt->Rt.hPipe0 = pUrb->UrbControlTransfer.PipeHandle;
+                }
+
                 break;
             case USBSUP_TRANSFER_TYPE_ISOC:

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h

@@ -36 +36 @@
     UNICODE_STRING                  IfName;
 
+    HANDLE                          hPipe0;
     HANDLE                          hConfiguration;
     uint32_t                        uConfigValue;