Changeset 37064 in vbox

Timestamp:

May 13, 2011 10:27:17 AM (14 years ago)

Author:

vboxsync

Message:

usb: disable annoying assertions with ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp (modified) (12 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp

@@ -354 +354 @@
     if (!DeviceIoControl(hHub, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME, &Name, sizeof (Name), &Name, sizeof (Name), &cbReturned, NULL))
     {
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         DWORD winEr = GetLastError();
         AssertMsgFailed((__FUNCTION__": DeviceIoControl 1 fail winEr (%d)\n", winEr));
@@ -485 +485 @@
         DWORD winEr = GetLastError();
         LogRel((__FUNCTION__": DeviceIoControl 1 fail winEr (%d)\n", winEr));
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertFailed();
 #endif
@@ -522 +522 @@
             DWORD winEr = GetLastError();
             LogRel((__FUNCTION__": DeviceIoControl 2 fail winEr (%d)\n", winEr));
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
             AssertFailed();
 #endif
@@ -572 +572 @@
         DWORD winEr = GetLastError();
         LogRel((__FUNCTION__": DeviceIoControl 1 fail winEr (%d)\n", winEr));
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
             AssertFailed();
 #endif
@@ -644 +644 @@
 {
     int rc = usbLibDevStrDrEntryGet(hHub, iPort, 0, 0, ppList);
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
     AssertRC(rc);
+#endif
     if (RT_FAILURE(rc))
         return rc;
@@ -779 +781 @@
     {
         rc = usbLibDevStrDrEntryGetAll(hHub, iPort, &pConInfo->DeviceDescriptor, pCfgDr, &pList);
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertRC(rc);
+#endif
     }
 
@@ -923 +927 @@
                  DWORD winEr = GetLastError();
                  /* ERROR_DEVICE_NOT_CONNECTED -> device was removed just now */
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
                  AssertMsg(winEr == ERROR_DEVICE_NOT_CONNECTED, (__FUNCTION__": DeviceIoControl failed winEr (%d)\n", winEr));
 #endif
@@ -965 +969 @@
                 pDevs->pszAddress = RTStrDup(pDevInfos->szName);
             }
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
             else
             {
@@ -1076 +1080 @@
     if (g_VBoxUsbGlobal.hMonitor == INVALID_HANDLE_VALUE)
     {
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertFailed();
 #endif
@@ -1113 +1117 @@
     if (g_VBoxUsbGlobal.hMonitor == INVALID_HANDLE_VALUE)
     {
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertFailed();
 #endif
@@ -1425 +1429 @@
             {
                 LogRel((__FUNCTION__": USB Service not found\n"));
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
                 AssertFailed();
 #endif
@@ -1466 +1470 @@
     if (g_VBoxUsbGlobal.hMonitor == INVALID_HANDLE_VALUE)
     {
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertFailed();
 #endif