Changeset 54779 in vbox

Timestamp:

Mar 16, 2015 12:33:31 PM (10 years ago)

Author:

vboxsync

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

98964

Message:

fix of misprint, calculation of memory size allocation used wrong structure

File:

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

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

@@ -605 +605 @@
     {
         pIfLe[i].InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(pCfgDr, pCfgDr, i, 0, -1, -1, -1);
-                pIfLe[i].Interface = NULL;
+        pIfLe[i].Interface = NULL;
         if (!pIfLe[i].InterfaceDescriptor)
         {
@@ -613 +613 @@
         }
     }
-        pIfLe[pCfgDr->bNumInterfaces].InterfaceDescriptor = NULL;
-        
+    pIfLe[pCfgDr->bNumInterfaces].InterfaceDescriptor = NULL;
+
     if (NT_SUCCESS(Status))
     {
@@ -635 +635 @@
                     for (i = 0; i < pDevExt->Rt.uNumInterfaces; i++)
                     {
-                        uint32_t uTotalIfaceInfoLength = sizeof (struct _URB_SELECT_INTERFACE) + ((pIfLe[i].Interface->NumberOfPipes > 0) ? (pIfLe[i].Interface->NumberOfPipes - 1) : 0) * sizeof(USBD_PIPE_INFORMATION);
+                        size_t uTotalIfaceInfoLength = RT_OFFSETOF(struct _USBD_INTERFACE_INFORMATION, Pipes[RT_MAX(pIfLe[i].Interface->NumberOfPipes, 1)]);
                         pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo = (PUSBD_INTERFACE_INFORMATION)vboxUsbMemAlloc(uTotalIfaceInfoLength);
                         if (!pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo)
@@ -658 +658 @@
                             pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo = NULL;
                         }
-
-                        *pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo = *pIfLe[i].Interface;
-
-                                                // AM try/catch for handle citrix case with wrong data from device.
-                                                __try
-                                                {
-                                                        for (ULONG j = 0; j < pIfLe[i].Interface->NumberOfPipes; j++)
-                                                        {
-                                                                pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo->Pipes[j] = pIfLe[i].Interface->Pipes[j];
-                                                                pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo[j].EndpointAddress = pIfLe[i].Interface->Pipes[j].EndpointAddress;
-                                                                pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo[j].NextScheduledFrame = 0;
-                                                        }
-                                                }
-                                                __except (EXCEPTION_EXECUTE_HANDLER)
-                                                {
-                                                        Status = GetExceptionCode();
-                                                        break;
-                                                }
+                        
+                        RtlCopyMemory(pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo, pIfLe[i].Interface, uTotalIfaceInfoLength);
+                       
+                        for (ULONG j = 0; j < pIfLe[i].Interface->NumberOfPipes; j++)
+                        {
+                            pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo[j].EndpointAddress = pIfLe[i].Interface->Pipes[j].EndpointAddress;
+                            pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo[j].NextScheduledFrame = 0;
+                        }
                     }