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

Timestamp:

Mar 26, 2009 1:59:14 PM (16 years ago)

Author:

vboxsync

Message:

Main: a different approach to opening images read-only for import which does not assert on empty UUIDs

Location:

trunk/src/VBox/Main/include

Files:

• HardDiskImpl.h (modified) (3 diffs)
• MediumImpl.h (modified) (1 diff)

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

@@ -256 +256 @@
     HRESULT setFormat (CBSTR aFormat);
 
-    virtual HRESULT queryInfo(bool fWrite);
+    virtual HRESULT queryInfo();
 
     HRESULT canClose();
@@ -289 +289 @@
     struct Data
     {
-        Data() : type (HardDiskType_Normal), logicalSize (0), autoReset (false)
-               , implicit (false), numCreateDiffTasks (0)
-               , vdProgress (NULL) , vdDiskIfaces (NULL) {}
+        Data()
+            : type(HardDiskType_Normal),
+              logicalSize(0),
+              hddOpenMode(OpenReadWrite),
+              autoReset(false),
+              implicit(false),
+              numCreateDiffTasks(0),
+              vdProgress(NULL),
+              vdDiskIfaces(NULL)
+        {}
 
         const Bstr format;
@@ -299 +306 @@
         uint64_t logicalSize;   /*< In MBytes. */
 
+        HDDOpenMode hddOpenMode;
+
         BOOL autoReset : 1;
 

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

@@ -143 +143 @@
 
     virtual HRESULT setLocation (CBSTR aLocation);
-    virtual HRESULT queryInfo(bool fWrite);
+    virtual HRESULT queryInfo();
 
     /**