Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp	(revision 37063)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp	(revision 37064)
@@ -354,5 +354,5 @@
     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,5 +485,5 @@
         DWORD winEr = GetLastError();
         LogRel((__FUNCTION__": DeviceIoControl 1 fail winEr (%d)\n", winEr));
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertFailed();
 #endif
@@ -522,5 +522,5 @@
             DWORD winEr = GetLastError();
             LogRel((__FUNCTION__": DeviceIoControl 2 fail winEr (%d)\n", winEr));
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
             AssertFailed();
 #endif
@@ -572,5 +572,5 @@
         DWORD winEr = GetLastError();
         LogRel((__FUNCTION__": DeviceIoControl 1 fail winEr (%d)\n", winEr));
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
             AssertFailed();
 #endif
@@ -644,5 +644,7 @@
 {
     int rc = usbLibDevStrDrEntryGet(hHub, iPort, 0, 0, ppList);
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
     AssertRC(rc);
+#endif
     if (RT_FAILURE(rc))
         return rc;
@@ -779,5 +781,7 @@
     {
         rc = usbLibDevStrDrEntryGetAll(hHub, iPort, &pConInfo->DeviceDescriptor, pCfgDr, &pList);
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertRC(rc);
+#endif
     }
 
@@ -923,5 +927,5 @@
                  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,5 +969,5 @@
                 pDevs->pszAddress = RTStrDup(pDevInfos->szName);
             }
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
             else
             {
@@ -1076,5 +1080,5 @@
     if (g_VBoxUsbGlobal.hMonitor == INVALID_HANDLE_VALUE)
     {
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertFailed();
 #endif
@@ -1113,5 +1117,5 @@
     if (g_VBoxUsbGlobal.hMonitor == INVALID_HANDLE_VALUE)
     {
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertFailed();
 #endif
@@ -1425,5 +1429,5 @@
             {
                 LogRel((__FUNCTION__": USB Service not found\n"));
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
                 AssertFailed();
 #endif
@@ -1466,5 +1470,5 @@
     if (g_VBoxUsbGlobal.hMonitor == INVALID_HANDLE_VALUE)
     {
-#ifdef DEBUG_misha
+#ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         AssertFailed();
 #endif