Changeset 34274 in vbox

Timestamp:

Nov 23, 2010 10:39:27 AM (14 years ago)

Author:

vboxsync

Message:

USBLib-win: be more verbose on last error

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/USBLib-win.cpp (modified) (16 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/USBLib-win.cpp

@@ -100 +100 @@
         if (!DeviceIoControl(hOut, SUPUSB_IOCTL_GET_VERSION, NULL, 0,&version, sizeof(version),  &cbReturned, NULL))
         {
-            Log(("DeviceIoControl SUPUSB_IOCTL_GET_VERSION failed with rc=%d\n", GetLastError()));
+            Log(("DeviceIoControl SUPUSB_IOCTL_GET_VERSION failed with LastError=%Rwa\n", GetLastError()));
             goto failure;
         }
@@ -112 +112 @@
         if (!DeviceIoControl(hOut, SUPUSB_IOCTL_IS_OPERATIONAL, NULL, 0, NULL, NULL, &cbReturned, NULL))
         {
-            Log(("DeviceIoControl SUPUSB_IOCTL_IS_OPERATIONAL failed with rc=%d\n", GetLastError()));
+            Log(("DeviceIoControl SUPUSB_IOCTL_IS_OPERATIONAL failed with LastError=%Rwa\n", GetLastError()));
             goto failure;
         }
@@ -151 +151 @@
 
     functionClassDeviceData = (PSP_DEVICE_INTERFACE_DETAIL_DATA) RTMemAllocZ(predictedLength);
-    if(NULL == functionClassDeviceData)
+    if (NULL == functionClassDeviceData)
     {
         return false;
@@ -1693 +1693 @@
     {
 #ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
-        AssertMsgFailed(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with %d\n", GetLastError()));
+        AssertMsgFailed(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with LastError=%Rwa\n", GetLastError()));
 #else
-        LogRel(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with %d\n", GetLastError()));
+        LogRel(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with LastError=%Rwa\n", GetLastError()));
 #endif
         return NULL;
@@ -1763 +1763 @@
     {
 #ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
-        AssertMsgFailed(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with %d\n", GetLastError()));
+        AssertMsgFailed(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with LastError=%Rwa\n", GetLastError()));
 #else
-        LogRel(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with %d\n", GetLastError()));
+        LogRel(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with LastError=%Rwa\n", GetLastError()));
 #endif
         RTMemFree(configDescReq);
@@ -2120 +2120 @@
     {
 #ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
-        AssertMsgFailed(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with %d\n", GetLastError()));
+        AssertMsgFailed(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with LastError=%Rwa\n", GetLastError()));
 #else
-        LogRel(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with %d\n", GetLastError()));
+        LogRel(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION failed with LastError=%Rwa\n", GetLastError()));
 #endif
         return NULL;
@@ -2490 +2490 @@
         {
             DWORD LastError = GetLastError(); NOREF(LastError);
-            AssertMsgFailed(("OpenService failed LastError=%Rwa\n", LastError));
+            AssertMsgFailed(("OpenService failed with LastError=%Rwa\n", LastError));
         }
         CloseServiceHandle(hSMgr);
@@ -2524 +2524 @@
         {
             /* AssertFailed(); */
-            LogRel(("usbproxy: Unable to open monitor driver!! (rc=%d)\n", GetLastError()));
+            LogRel(("usbproxy: Unable to open monitor driver!! LastError=%Rwa\n", GetLastError()));
             rc = VERR_FILE_NOT_FOUND;
             goto failure;
@@ -2536 +2536 @@
     if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_GET_VERSION, NULL, 0,&version, sizeof(version),  &cbReturned, NULL))
     {
-        LogRel(("usbproxy: Unable to query filter version!! (rc=%d)\n", GetLastError()));
+        LogRel(("usbproxy: Unable to query filter version!! LastError=%Rwa\n", GetLastError()));
         rc = VERR_VERSION_MISMATCH;
         goto failure;
@@ -2613 +2613 @@
     if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_CAPTURE_DEVICE, &capture, sizeof(capture),  NULL, 0, &cbReturned, NULL))
     {
-        AssertMsgFailed(("DeviceIoControl failed with %d\n", GetLastError()));
+        AssertMsgFailed(("DeviceIoControl failed with LastError=%Rwa\n", GetLastError()));
         return RTErrConvertFromWin32(GetLastError());
     }
@@ -2644 +2644 @@
     if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_RELEASE_DEVICE, &release, sizeof(release),  NULL, 0, &cbReturned, NULL))
     {
-        AssertMsgFailed(("DeviceIoControl failed with %d\n", GetLastError()));
+        AssertMsgFailed(("DeviceIoControl failed with LastError=%Rwa\n", GetLastError()));
         return RTErrConvertFromWin32(GetLastError());
     }
@@ -2667 +2667 @@
     if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_ADD_FILTER, (LPVOID)pFilter, sizeof(*pFilter), &add_out, sizeof(add_out), &cbReturned, NULL))
     {
-        AssertMsgFailed(("DeviceIoControl failed with %d\n", GetLastError()));
+        AssertMsgFailed(("DeviceIoControl failed with LastError=%Rwa\n", GetLastError()));
         return NULL;
     }
@@ -2691 +2691 @@
     uId = (uintptr_t)pvId;
     if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_REMOVE_FILTER, &uId, sizeof(uId),  NULL, 0,&cbReturned, NULL))
-        AssertMsgFailed(("DeviceIoControl failed with %d\n", GetLastError()));
+        AssertMsgFailed(("DeviceIoControl failed with LastError=%Rwa\n", GetLastError()));
 }
 
@@ -2777 +2777 @@
         if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_GET_NUM_DEVICES, NULL, 0, &numdev, sizeof(numdev), &cbReturned, NULL))
         {
-            AssertMsgFailed(("DeviceIoControl failed with %d\n", GetLastError()));
+            AssertMsgFailed(("DeviceIoControl failed with LastError=%Rwa\n", GetLastError()));
             return RTErrConvertFromWin32(GetLastError());
         }
@@ -2827 +2827 @@
             if (!DeviceIoControl(hDev, SUPUSB_IOCTL_GET_DEVICE, &dev, sizeof(dev), &dev, sizeof(dev), &cbReturned, NULL))
             {
-                int iErr = GetLastError();
+                DWORD LastError = GetLastError();
                 /* ERROR_DEVICE_NOT_CONNECTED -> device was removed just now */
-                AssertMsg(iErr == ERROR_DEVICE_NOT_CONNECTED, ("DeviceIoControl %d failed with %d\n", i, iErr));
+                AssertMsg(LastError == ERROR_DEVICE_NOT_CONNECTED, ("DeviceIoControl %d failed with LastError=%Rwa\n", i, LastError));
                 Log(("SUPUSB_IOCTL_GET_DEVICE: DeviceIoControl %d no longer connected\n", i));
             }
@@ -2856 +2856 @@
         }
         else
-            AssertMsgFailed(("Unexpected failure to open %s. lasterr=%d\n", pszDevname, GetLastError()));
+            AssertMsgFailed(("Unexpected failure to open %s. LastError=%Rwa\n", pszDevname, GetLastError()));
     }