Changeset 33760 in vbox

Timestamp:

Nov 4, 2010 11:00:40 AM (14 years ago)

Author:

vboxsync

Message:

Main/Medium: don't just randomly throw exception if a device type conversion is not possible, no one handles them.

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (2 diffs)
• include/VirtualBoxBase.h (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -4230 +4230 @@
             break;
         default:
-            ComAssertFailedThrow(E_FAIL);
+            ComAssertFailedRet(VDTYPE_INVALID);
     }
 
@@ -4255 +4255 @@
             break;
         default:
-            ComAssertFailedThrow(E_FAIL);
+            ComAssertFailedRet(DeviceType_Null);
     }
 

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -265 +265 @@
 #define ComAssertComRCRetRC(rc)             \
     do { ComAssertComRC(rc); if (!SUCCEEDED(rc)) return (rc); } while (0)
+/** Special version of ComAssert that returns ret */
+#define ComAssertFailedRet(ret)                \
+    if (1) { ComAssertFailed(); { return (ret); } } else do {} while (0)