Changeset 14272 in vbox for trunk/src/VBox/Main/include/HardDiskFormatImpl.h

Timestamp:

Nov 18, 2008 12:22:15 AM (16 years ago)

Author:

vboxsync

Message:

Main: HardDisk2: Fixed opening VMDK images for the first time. Made the implicit diff creatoin routine use the default backend extension. Improved setLocation() to distinguish between file and non-file locations according to the backend capability.

File:

• trunk/src/VBox/Main/include/HardDiskFormatImpl.h (modified) (4 diffs)

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

@@ -33 +33 @@
 struct VDBACKENDINFO;
 
+/**
+ * The HardDiskFormat class represents the backend used to store hard disk data
+ * (IHardDiskFormat interface).
+ *
+ * @note Instances of this class are permanently caller-referenced by HardDisk2
+ * objects (through addCaller()) so that an attempt to uninitialize or delete
+ * them before all HardDisk2 objects are uninitialized will produce an endless
+ * wait!
+ */
 class ATL_NO_VTABLE HardDiskFormat :
     public VirtualBoxBaseNEXT,
@@ -40 +49 @@
 {
 public:
+
+    struct Property
+    {
+        Bstr name;
+        Bstr description;
+        DataType_T type;
+        ULONG flags;
+        Bstr defaultValue;
+    };
+
+    typedef std::list <Bstr> BstrList;
+    typedef std::list <Property> PropertyList;
+
+    struct Data
+    {
+        Data() : capabilities (0) {}
+
+        const Bstr id;
+        const Bstr name;
+        const BstrList fileExtensions;
+        const uint64_t capabilities;
+        const PropertyList properties;
+    };
 
     VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (HardDiskFormat)
@@ -84 +116 @@
     const Bstr &id() { return m.id; }
     /** Const, no need to lock */
+    const BstrList &fileExtensions() { return m.fileExtensions; }
+    /** Const, no need to lock */
     uint64_t capabilities() { return m.capabilities; }
 
@@ -91 +125 @@
 private:
 
-    typedef std::list <Bstr> BstrList;
-
-    struct Property
-    {
-        Bstr name;
-        Bstr description;
-        DataType_T type;
-        ULONG flags;
-        Bstr defaultValue;
-    };
-    typedef std::list <Property> PropertyList;
-
-    struct Data
-    {
-        Data() : capabilities (0) {}
-
-        const Bstr id;
-        const Bstr name;
-        const BstrList fileExtensions;
-        const uint64_t capabilities;
-        const PropertyList properties;
-    };
-
     Data m;
 };