Changeset 54800 in vbox for trunk/src/VBox

Timestamp:

Mar 16, 2015 9:28:32 PM (10 years ago)

Author:

vboxsync

Message:

fixed Interface information size calculation using GET_USBD_INTERFACE_SIZE

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp (modified) (2 diffs)

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

@@ -634 +634 @@
                     for (i = 0; i < pDevExt->Rt.uNumInterfaces; i++)
                     {
-                        size_t uTotalIfaceInfoLength = RT_OFFSETOF(struct _USBD_INTERFACE_INFORMATION, Pipes[RT_MAX(pIfLe[i].Interface->NumberOfPipes, 1)]);
+                        size_t uTotalIfaceInfoLength = GET_USBD_INTERFACE_SIZE(pIfLe[i].Interface->NumberOfPipes);
                         pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo = (PUSBD_INTERFACE_INFORMATION)vboxUsbMemAlloc(uTotalIfaceInfoLength);
                         if (!pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo)
@@ -824 +824 @@
                 for(ULONG i = 0; i < pIfInfo->NumberOfPipes; i++)
                 {
-                    pDevExt->Rt.pVBIfaceInfo[InterfaceNumber].pInterfaceInfo->Pipes[i] = pIfInfo->Pipes[i];
                     pDevExt->Rt.pVBIfaceInfo[InterfaceNumber].pPipeInfo[i].EndpointAddress = pIfInfo->Pipes[i].EndpointAddress;
                     pDevExt->Rt.pVBIfaceInfo[InterfaceNumber].pPipeInfo[i].NextScheduledFrame = 0;