Changeset 15991 in vbox for trunk/src/VBox/Main/include/FloppyDriveImpl.h

Timestamp:

Jan 16, 2009 2:02:20 PM (16 years ago)

Author:

vboxsync

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

41663

Message:

Main: Fixed: CD/DVD and Floppy not locked for reading when manually attached at VM runtime (#3504).

File:

• trunk/src/VBox/Main/include/FloppyDriveImpl.h (modified) (5 diffs)

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

@@ -43 +43 @@
         Data()
         {
-            mEnabled    = true;
-            mState = DriveState_NotMounted;
+            enabled = true;
+            state = DriveState_NotMounted;
         }
 
@@ -50 +50 @@
         {
             return this == &that ||
-                   (mState == that.mState &&
-                    mImage.equalsTo (that.mImage) &&
-                    mHostDrive.equalsTo (that.mHostDrive));
+                   (state == that.state &&
+                    image.equalsTo (that.image) &&
+                    hostDrive.equalsTo (that.hostDrive));
         }
 
-        BOOL mEnabled;
-        ComObjPtr <FloppyImage2> mImage;
-        ComPtr <IHostFloppyDrive> mHostDrive;
-        DriveState_T mState;
+        BOOL enabled;
+        ComObjPtr <FloppyImage2> image;
+        ComPtr <IHostFloppyDrive> hostDrive;
+        DriveState_T state;
     };
 
@@ -102 +102 @@
     HRESULT saveSettings (settings::Key &aMachineNode);
 
-    bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }
-    bool isReallyModified() { AutoWriteLock alock (this); return mData.hasActualChanges(); }
+    bool isModified() { AutoWriteLock alock (this); return m.isBackedUp(); }
+    bool isReallyModified() { AutoWriteLock alock (this); return m.hasActualChanges(); }
     bool rollback();
     void commit();
@@ -113 +113 @@
     // (ensure there is a caller and a read lock before calling them!)
 
-    Backupable <Data> &data() { return mData; }
+    Backupable <Data> &data() { return m; }
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -123 +123 @@
     const ComObjPtr <FloppyDrive> mPeer;
 
-    Backupable <Data> mData;
+    Backupable <Data> m;
 };