Changeset 38436 in vbox

Timestamp:

Aug 12, 2011 2:10:45 PM (14 years ago)

Author:

vboxsync

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

73481

Message:

usb/win: keep going on get string descriptor failure while devinfo population

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp

@@ -458 +458 @@
                 {
                     WARN(("reading serial number failed\n"));
+                    ASSERT_WARN(pDevice->szSerial[0] == '\0', ("serial is not zero!!"));
                     if (Status == STATUS_CANCELLED)
                     {
@@ -463 +464 @@
                         vboxUsbFltBlDevAddLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice);
                         Status = STATUS_UNSUCCESSFUL;
+                        break;
                     }
-                    break;
+                    LOG(("pretending success.."));
+                    Status = STATUS_SUCCESS;
                 }
             }
@@ -474 +477 @@
                 {
                     WARN(("reading manufacturer name failed\n"));
+                    ASSERT_WARN(pDevice->szMfgName[0] == '\0', ("szMfgName is not zero!!"));
                     if (Status == STATUS_CANCELLED)
                     {
@@ -479 +483 @@
                         vboxUsbFltBlDevAddLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice);
                         Status = STATUS_UNSUCCESSFUL;
+                        break;
                     }
-                    break;
+                    LOG(("pretending success.."));
+                    Status = STATUS_SUCCESS;
                 }
             }
@@ -490 +496 @@
                 {
                     WARN(("reading product name failed\n"));
+                    ASSERT_WARN(pDevice->szProduct[0] == '\0', ("szProduct is not zero!!"));
                     if (Status == STATUS_CANCELLED)
                     {
@@ -495 +502 @@
                         vboxUsbFltBlDevAddLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice);
                         Status = STATUS_UNSUCCESSFUL;
+                        break;
                     }
-                    break;
+                    LOG(("pretending success.."));
+                    Status = STATUS_SUCCESS;
                 }
             }