Changeset 83803 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase

Timestamp:

Apr 18, 2020 6:20:34 PM (5 years ago)

Author:

vboxsync

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

137329

Message:

VBoxUSB: VC++ 14.1 adjustments and warnings (and some cleanups). bugref:8489

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp

@@ -79 +79 @@
     int rc = -1;
     SC_HANDLE   hSMgr = OpenSCManager(NULL, NULL, SERVICE_STOP | SERVICE_QUERY_STATUS);
-    DWORD LastError = GetLastError(); NOREF(LastError);
-    AssertMsg(hSMgr, ("OpenSCManager(,,delete) failed rc=%d\n", LastError));
+    AssertMsg(hSMgr, ("OpenSCManager(,,delete) failed rc=%d\n", GetLastError()));
     if (hSMgr)
     {
@@ -107 +106 @@
             }
             else
-            {
-                DWORD LastError = GetLastError(); NOREF(LastError);
-                AssertMsgFailed(("ControlService failed with LastError=%Rwa. status=%d\n", LastError, Status.dwCurrentState));
-            }
+                AssertMsgFailed(("ControlService failed with LastError=%Rwa. status=%d\n", GetLastError(), Status.dwCurrentState));
             CloseServiceHandle(hService);
         }
@@ -116 +112 @@
             rc = 0;
         else
-        {
-            DWORD LastError = GetLastError(); NOREF(LastError);
-            AssertMsgFailed(("OpenService failed LastError=%Rwa\n", LastError));
-        }
+            AssertMsgFailed(("OpenService failed LastError=%Rwa\n", GetLastError()));
         CloseServiceHandle(hSMgr);
     }
     return rc;
 }
+
 /**
  * Release specified USB device to the host.
@@ -265 +259 @@
         {
             /* AssertFailed(); */
-            printf("usbproxy: Unable to open filter driver!! (rc=%d)\n", GetLastError());
+            printf("usbproxy: Unable to open filter driver!! (rc=%lu)\n", GetLastError());
             rc = VERR_FILE_NOT_FOUND;
             goto failure;
@@ -277 +271 @@
     if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_GET_VERSION, NULL, 0,&version, sizeof(version),  &cbReturned, NULL))
     {
-        printf("usbproxy: Unable to query filter version!! (rc=%d)\n", GetLastError());
+        printf("usbproxy: Unable to query filter version!! (rc=%lu)\n", GetLastError());
         rc = VERR_VERSION_MISMATCH;
         goto failure;