Changeset 37132 in vbox for trunk/src/VBox

Timestamp:

May 18, 2011 12:04:54 PM (14 years ago)

Author:

vboxsync

Message:

dev/usb/win: ditto

File:

• trunk/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp (modified) (6 diffs)

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

@@ -311 +311 @@
     }
     else
-        AssertMsgFailed(("lasterr=%d\n", GetLastError()));
+    {
+        /* do not use GetLastError() in AssertMsgFailed directly since the "real" err will be overwritten with the
+         * RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); call encapsulated by AssertMsgFailed */
+        DWORD winEr = GetLastError();
+        AssertMsgFailed(("lasterr=%d\n", winEr));
+    }
 
     return 0;
@@ -368 +373 @@
     }
     else
-        AssertMsgFailed(("lasterr=%d\n", GetLastError()));
+    {
+        /* do not use GetLastError() in AssertMsgFailed directly since the "real" err will be overwritten with the
+         * RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); call encapsulated by AssertMsgFailed */
+        DWORD winEr = GetLastError();
+        AssertMsgFailed(("lasterr=%d\n", winEr));
+    }
     return 0;
 }
@@ -397 +407 @@
     }
     else
-        AssertMsgFailed(("lasterr=%d\n", GetLastError()));
+    {
+        /* do not use GetLastError() in AssertMsgFailed directly since the "real" err will be overwritten with the
+         * RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); call encapsulated by AssertMsgFailed */
+        DWORD winEr = GetLastError();
+        AssertMsgFailed(("lasterr=%d\n", winEr));
+    }
     return 0;
 }
@@ -428 +443 @@
     }
     else
-        AssertMsgFailed(("lasterr=%d\n", GetLastError()));
+    {
+        /* do not use GetLastError() in AssertMsgFailed directly since the "real" err will be overwritten with the
+         * RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); call encapsulated by AssertMsgFailed */
+        DWORD winEr = GetLastError();
+        AssertMsgFailed(("lasterr=%d\n", winEr));
+    }
     return RTErrConvertFromWin32(rc);
 }
@@ -654 +674 @@
              || (rc >= WAIT_ABANDONED_0 && rc < WAIT_ABANDONED_0 + cQueuedUrbs))
     {
-        /* do not use GetLastError() in AssertMsgFailed directly since the "real" err will be overwriten with the
+        /* do not use GetLastError() in AssertMsgFailed directly since the "real" err will be overwritten with the
          * RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); call encapsulated by AssertMsgFailed */
         DWORD winEr = GetLastError();
@@ -776 +796 @@
     }
     else
-        AssertMsgFailed(("lasterr=%d\n", GetLastError()));
+    {
+        /* do not use GetLastError() in AssertMsgFailed directly since the "real" err will be overwritten with the
+         * RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); call encapsulated by AssertMsgFailed */
+        DWORD winEr = GetLastError();
+        AssertMsgFailed(("lasterr=%d\n", winEr));
+    }
 }