Changeset 33524 in vbox for trunk/src/VBox/Main/include

Timestamp:

Oct 27, 2010 4:44:37 PM (14 years ago)

Author:

vboxsync

Message:

Storage: Implement offical support for other disk types like DVD and floppy images. DMG images can be used now without hacks

Location:

trunk/src/VBox/Main/include

Files:

• MediumFormatImpl.h (modified) (3 diffs)
• MediumImpl.h (modified) (1 diff)
• VirtualBoxBase.h (modified) (2 diffs)

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

@@ -53 +53 @@
     };
 
-    typedef std::list<Utf8Str>  StrList;
-    typedef std::list<Property> PropertyList;
+    typedef std::list<Utf8Str>      StrList;
+    typedef std::list<DeviceType_T> DeviceTypeList;
+    typedef std::list<Property>     PropertyList;
 
     struct Data
@@ -60 +61 @@
         Data() : capabilities(0) {}
 
-        const Utf8Str       strId;
-        const Utf8Str       strName;
-        const StrList       llFileExtensions;
-        const uint64_t      capabilities;
-        const PropertyList  llProperties;
+        const Utf8Str        strId;
+        const Utf8Str        strName;
+        const StrList        llFileExtensions;
+        const DeviceTypeList llDeviceTypes;
+        const uint64_t       capabilities;
+        const PropertyList   llProperties;
     };
 
@@ -91 +93 @@
     STDMETHOD(COMGETTER(Id))(BSTR *aId);
     STDMETHOD(COMGETTER(Name))(BSTR *aName);
-    STDMETHOD(COMGETTER(FileExtensions))(ComSafeArrayOut(BSTR, aFileExtensions));
     STDMETHOD(COMGETTER(Capabilities))(ULONG *aCaps);
 
     // IMediumFormat methods
+    STDMETHOD(DescribeFileExtensions)(ComSafeArrayOut(BSTR, aFileExtensions),
+                                      ComSafeArrayOut(DeviceType_T, aDeviceTypes));
     STDMETHOD(DescribeProperties)(ComSafeArrayOut(BSTR, aNames),
                                   ComSafeArrayOut(BSTR, aDescriptions),

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

@@ -300 +300 @@
     Utf8Str vdError(int aVRC);
 
+    VDTYPE convertDeviceType();
+    DeviceType_T convertToDeviceType(VDTYPE enmType);
+
     static DECLCALLBACK(void) vdErrorCall(void *pvUser, int rc, RT_SRC_POS_DECL,
                                           const char *pszFormat, va_list va);

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

@@ -164 +164 @@
 
 /**
+ *  Special version of the AssertFailed macro to be used within VirtualBoxBase
+ *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *
+ *  In the debug build, this macro is equivalent to AssertFailed.
+ *  In the release build, this macro uses |setError(E_FAIL, ...)| to set the
+ *  error info from the asserted expression.
+ *
+ *  @see VirtualBoxSupportErrorInfoImpl::setError
+ *
+ */
+#if defined (DEBUG)
+#define ComAssertFailed()    AssertFailed()
+#else
+#define ComAssertFailed()    \
+    do { \
+        setError(E_FAIL, \
+                 "Assertion failed: at '%s' (%d) in %s.\nPlease contact the product vendor!", \
+                 __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+    } while (0)
+#endif
+
+/**
  *  Special version of the AssertMsg macro to be used within VirtualBoxBase
  *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
@@ -280 +302 @@
 #define ComAssertComRCThrowRC(rc)                 \
     if (1)  { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { throw rc; } } else do {} while (0)
+/** Special version of ComAssert that throws eval */
+#define ComAssertFailedThrow(eval)                \
+    if (1) { ComAssertFailed(); { throw (eval); } } else do {} while (0)
 
 ////////////////////////////////////////////////////////////////////////////////