Changeset 37130 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

May 18, 2011 11:38:38 AM (14 years ago)

Author:

vboxsync

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

71802

Message:

dev/usb/win: make the last error be printed properly on err

File:

• trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp (modified) (1 diff)

trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp

@@ -653 +653 @@
     else if (   rc == WAIT_FAILED
              || (rc >= WAIT_ABANDONED_0 && rc < WAIT_ABANDONED_0 + cQueuedUrbs))
-        AssertMsgFailed(("USB: WaitForMultipleObjects %d objects failed with rc=%d and last error %d\n", cQueuedUrbs, rc, GetLastError()));
+    {
+        /* do not use GetLastError() in AssertMsgFailed directly since the "real" err will be overwriten with the
+         * RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); call encapsulated by AssertMsgFailed */
+        DWORD winEr = GetLastError();
+        AssertMsgFailed(("USB: WaitForMultipleObjects %d objects failed with rc=%d and last error %d\n", cQueuedUrbs, rc, winEr));
+    }
 
     return pUrb;