Changeset 18275 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 25, 2009 7:18:22 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45025

Message:

Main: fix borkage introduced by r44866 which caused all hard disk to have 0 byte sizes in instance data (stupid C++ overloading)

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (4 diffs)
• include/HardDiskImpl.h (modified) (1 diff)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -115 +115 @@
         case MediaState_LockedWrite:
         {
-            rc = queryInfo();
+            rc = queryInfo(true /* fWrite */);
             break;
         }
@@ -715 +715 @@
  * size and description will be updated with the current information.
  *
+ * The fWrite parameter is ignored in this variant, since this always opens
+ * the medium read-only; it is however acknowledged by HardDisk::queryInfo(),
+ * which overrides this implementation for hard disk media.
+ *
  * @note This method may block during a system I/O call that checks image file
  *       accessibility.
@@ -720 +724 @@
  * @note Locks this object for writing.
  */
-HRESULT MediumBase::queryInfo()
+HRESULT MediumBase::queryInfo(bool fWrite)
 {
     AutoWriteLock alock (this);
@@ -962 +966 @@
 
     /* get all the information about the medium from the file */
-    rc = queryInfo();
+    rc = queryInfo(true);
     if (SUCCEEDED (rc))
     {

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

@@ -256 +256 @@
     HRESULT setFormat (CBSTR aFormat);
 
-    HRESULT queryInfo(bool fWrite);
+    virtual HRESULT queryInfo(bool fWrite);
 
     HRESULT canClose();

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

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