Changeset 38713 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp

Timestamp:

Sep 12, 2011 11:21:20 AM (13 years ago)

Author:

vboxsync

Message:

VBoxUsbLib-win.cpp: Don't assert if we somehow failed to open the driver (sloppy init code?). FUNCTION is not necessary in assertion message since it's part of the standard output (RTAssertMsg1)

File:

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

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

@@ -97 +97 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": CreateFile FAILED to open %s, winEr (%d)\n", pVuDev->szName, winEr));
+        AssertMsgFailed(("CreateFile FAILED to open %s, winEr (%d)\n", pVuDev->szName, winEr));
         return VERR_GENERAL_FAILURE;
     }
@@ -109 +109 @@
         if (!DeviceIoControl(hOut, SUPUSB_IOCTL_GET_VERSION, NULL, 0,&version, sizeof(version),  &cbReturned, NULL))
         {
-            AssertMsgFailed((__FUNCTION__": DeviceIoControl SUPUSB_IOCTL_GET_VERSION failed with LastError=%Rwa\n", GetLastError()));
+            AssertMsgFailed(("DeviceIoControl SUPUSB_IOCTL_GET_VERSION failed with LastError=%Rwa\n", GetLastError()));
             break;
         }
@@ -116 +116 @@
                 || version.u32Minor <  USBDRV_MINOR_VERSION)
         {
-            AssertMsgFailed((__FUNCTION__": Invalid version %d:%d vs %d:%d\n", version.u32Major, version.u32Minor, USBDRV_MAJOR_VERSION, USBDRV_MINOR_VERSION));
+            AssertMsgFailed(("Invalid version %d:%d vs %d:%d\n", version.u32Major, version.u32Minor, USBDRV_MAJOR_VERSION, USBDRV_MINOR_VERSION));
             break;
         }
@@ -122 +122 @@
         if (!DeviceIoControl(hOut, SUPUSB_IOCTL_IS_OPERATIONAL, NULL, 0, NULL, NULL, &cbReturned, NULL))
         {
-            AssertMsgFailed((__FUNCTION__": DeviceIoControl SUPUSB_IOCTL_IS_OPERATIONAL failed with LastError=%Rwa\n", GetLastError()));
+            AssertMsgFailed(("DeviceIoControl SUPUSB_IOCTL_IS_OPERATIONAL failed with LastError=%Rwa\n", GetLastError()));
             break;
         }
@@ -149 +149 @@
     if (!pIfDetailData)
     {
-        AssertMsgFailed((__FUNCTION__": RTMemAllocZ failed\n"));
+        AssertMsgFailed(("RTMemAllocZ failed\n"));
         return VERR_OUT_OF_RESOURCES;
     }
@@ -167 +167 @@
         {
             DWORD winEr = GetLastError();
-            AssertMsgFailed((__FUNCTION__": SetupDiGetDeviceInterfaceDetail, cbRequired (%d), was (%d), winEr (%d)\n", cbDbgRequired, cbIfDetailData, winEr));
+            AssertMsgFailed(("SetupDiGetDeviceInterfaceDetail, cbRequired (%d), was (%d), winEr (%d)\n", cbDbgRequired, cbIfDetailData, winEr));
             rc = VERR_GENERAL_FAILURE;
             break;
@@ -181 +181 @@
         {
             DWORD winEr = GetLastError();
-            AssertMsgFailed((__FUNCTION__": SetupDiGetDeviceRegistryPropertyA, cbRequired (%d), was (%d), winEr (%d)\n", cbDbgRequired, sizeof (pVuDev->szDriverRegName), winEr));
+            AssertMsgFailed(("SetupDiGetDeviceRegistryPropertyA, cbRequired (%d), was (%d), winEr (%d)\n", cbDbgRequired, sizeof (pVuDev->szDriverRegName), winEr));
             rc = VERR_GENERAL_FAILURE;
             break;
@@ -217 +217 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": SetupDiGetClassDevs, winEr (%d)\n", winEr));
+        AssertMsgFailed(("SetupDiGetClassDevs, winEr (%d)\n", winEr));
         return VERR_GENERAL_FAILURE;
     }
@@ -235 +235 @@
                 break;
 
-            AssertMsgFailed((__FUNCTION__": SetupDiEnumDeviceInterfaces, winEr (%d), resuming\n", winEr));
+            AssertMsgFailed(("SetupDiEnumDeviceInterfaces, winEr (%d), resuming\n", winEr));
             continue;
         }
@@ -243 +243 @@
         if (!pVuDev)
         {
-            AssertMsgFailed((__FUNCTION__": RTMemAllocZ failed, resuming\n"));
+            AssertMsgFailed(("RTMemAllocZ failed, resuming\n"));
             continue;
         }
@@ -250 +250 @@
         if (!RT_SUCCESS(rc))
         {
-            AssertMsgFailed((__FUNCTION__": usbLibVuDevicePopulate failed, rc (%d), resuming\n", rc));
+            AssertMsgFailed(("usbLibVuDevicePopulate failed, rc (%d), resuming\n", rc));
             continue;
         }
@@ -356 +356 @@
 #ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": DeviceIoControl 1 fail winEr (%d)\n", winEr));
+        AssertMsgFailed(("DeviceIoControl 1 fail winEr (%d)\n", winEr));
 #endif
         return VERR_GENERAL_FAILURE;
@@ -386 +386 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": DeviceIoControl 2 fail winEr (%d)\n", winEr));
+        AssertMsgFailed(("DeviceIoControl 2 fail winEr (%d)\n", winEr));
         rc = VERR_GENERAL_FAILURE;
     }
@@ -954 +954 @@
                  DWORD winEr = GetLastError();
                  /* ERROR_DEVICE_NOT_CONNECTED -> device was removed just now */
-                 AssertMsgFailed((__FUNCTION__": Monitor DeviceIoControl failed winEr (%d)\n", winEr));
+                 AssertMsgFailed(("Monitor DeviceIoControl failed winEr (%d)\n", winEr));
                  Log(("SUPUSBFLT_IOCTL_GET_DEVICE: DeviceIoControl no longer connected\n"));
                  CloseHandle(hDev);
@@ -1039 +1039 @@
         {
             DWORD winEr = GetLastError();
-            AssertMsgFailed((__FUNCTION__": WaitForMultipleObjects failed, winEr (%d)\n", winEr));
+            AssertMsgFailed(("WaitForMultipleObjects failed, winEr (%d)\n", winEr));
             return VERR_GENERAL_FAILURE;
         }
@@ -1058 +1058 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": SetEvent failed, winEr (%d)\n", winEr));
+        AssertMsgFailed(("SetEvent failed, winEr (%d)\n", winEr));
         return VERR_GENERAL_FAILURE;
     }
@@ -1195 +1195 @@
     {
             DWORD winEr = GetLastError();
-            AssertMsgFailed((__FUNCTION__": CreateTimerQueueTimer failed, winEr (%d)\n", winEr));
+            AssertMsgFailed(("CreateTimerQueueTimer failed, winEr (%d)\n", winEr));
 
             /* call it directly */
@@ -1366 +1366 @@
                                 return VINF_SUCCESS;
                             else
-                                AssertMsgFailed((__FUNCTION__": SetEvent failed, rc (%d)\n", rc));
+                                AssertMsgFailed(("SetEvent failed, rc (%d)\n", rc));
                         }
                         else
                         {
                             DWORD winEr = GetLastError();
-                            AssertMsgFailed((__FUNCTION__": SetEvent Ioctl failed, winEr (%d)\n", winEr));
+                            AssertMsgFailed(("SetEvent Ioctl failed, winEr (%d)\n", winEr));
                             rc = VERR_VERSION_MISMATCH;
                         }
@@ -1404 +1404 @@
                                 {
                                     DWORD winEr = GetLastError();
-                                    AssertMsgFailed((__FUNCTION__": CloseHandle for hThread failed winEr(%d)\n", winEr));
+                                    AssertMsgFailed(("CloseHandle for hThread failed winEr(%d)\n", winEr));
                                 }
                             }
@@ -1410 +1410 @@
                             {
                                 DWORD winEr = GetLastError();
-                                AssertMsgFailed((__FUNCTION__": CreateThread failed, winEr (%d)\n", winEr));
+                                AssertMsgFailed(("CreateThread failed, winEr (%d)\n", winEr));
                                 rc = VERR_GENERAL_FAILURE;
                             }
@@ -1417 +1417 @@
                         {
                             DWORD winEr = GetLastError();
-                            AssertMsgFailed((__FUNCTION__": CreateTimerQueue failed winEr(%d)\n", winEr));
+                            AssertMsgFailed(("CreateTimerQueue failed winEr(%d)\n", winEr));
                         }
 #endif
@@ -1433 +1433 @@
                 {
                     DWORD winEr = GetLastError();
-                    AssertMsgFailed((__FUNCTION__": DeviceIoControl failed winEr(%d)\n", winEr));
+                    AssertMsgFailed(("DeviceIoControl failed winEr(%d)\n", winEr));
                     rc = VERR_VERSION_MISMATCH;
                 }
@@ -1453 +1453 @@
         {
             DWORD winEr = GetLastError();
-            AssertMsgFailed((__FUNCTION__": CreateEvent for InterruptEvent failed winEr(%d)\n", winEr));
+            AssertMsgFailed(("CreateEvent for InterruptEvent failed winEr(%d)\n", winEr));
             rc = VERR_GENERAL_FAILURE;
         }
@@ -1462 +1462 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": CreateEvent for NotifyEvent failed winEr(%d)\n", winEr));
+        AssertMsgFailed(("CreateEvent for NotifyEvent failed winEr(%d)\n", winEr));
         rc = VERR_GENERAL_FAILURE;
     }
@@ -1495 +1495 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": PostMessage for hWnd failed winEr(%d)\n", winEr));
-    }
-
-    DWORD dwResult = WaitForSingleObject(g_VBoxUsbGlobal.hThread, INFINITE);
-    Assert(dwResult == WAIT_OBJECT_0);
-    bRc = CloseHandle(g_VBoxUsbGlobal.hThread);
-    if (!bRc)
-    {
-        DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": CloseHandle for hThread failed winEr(%d)\n", winEr));
+        AssertMsgFailed(("PostMessage for hWnd failed winEr(%d)\n", winEr));
+    }
+
+    if (g_VBoxUsbGlobal.hThread != NULL)
+    {
+        DWORD dwResult = WaitForSingleObject(g_VBoxUsbGlobal.hThread, INFINITE);
+        Assert(dwResult == WAIT_OBJECT_0);
+        bRc = CloseHandle(g_VBoxUsbGlobal.hThread);
+        if (!bRc)
+        {
+            DWORD winEr = GetLastError();
+            AssertMsgFailed(("CloseHandle for hThread failed winEr(%d)\n", winEr));
+        }
     }
 
@@ -1515 +1518 @@
         {
             DWORD winEr = GetLastError();
-            AssertMsgFailed((__FUNCTION__": DeleteTimerQueueEx failed winEr(%d)\n", winEr));
-        }
-    }
-
-    bRc = DeleteTimerQueueEx(g_VBoxUsbGlobal.hTimerQueue,
-            INVALID_HANDLE_VALUE /* <-- to block until all timers are completed */
-            );
-    if (!bRc)
-    {
-        DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": DeleteTimerQueueEx failed winEr(%d)\n", winEr));
+            AssertMsgFailed(("DeleteTimerQueueEx failed winEr(%d)\n", winEr));
+        }
+    }
+
+    if (g_VBoxUsbGlobal.hTimerQueue)
+    {
+        bRc = DeleteTimerQueueEx(g_VBoxUsbGlobal.hTimerQueue,
+                INVALID_HANDLE_VALUE /* <-- to block until all timers are completed */
+                );
+        if (!bRc)
+        {
+            DWORD winEr = GetLastError();
+            AssertMsgFailed(("DeleteTimerQueueEx failed winEr(%d)\n", winEr));
+        }
     }
 #endif
@@ -1533 +1539 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": CloseHandle for hMonitor failed winEr(%d)\n", winEr));
+        AssertMsgFailed(("CloseHandle for hMonitor failed winEr(%d)\n", winEr));
     }
 
@@ -1540 +1546 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": CloseHandle for hInterruptEvent failed winEr(%d)\n", winEr));
+        AssertMsgFailed(("CloseHandle for hInterruptEvent failed winEr(%d)\n", winEr));
     }
 
@@ -1547 +1553 @@
     {
         DWORD winEr = GetLastError();
-        AssertMsgFailed((__FUNCTION__": CloseHandle for hNotifyEvent failed winEr(%d)\n", winEr));
+        AssertMsgFailed(("CloseHandle for hNotifyEvent failed winEr(%d)\n", winEr));
     }