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

Timestamp:

May 30, 2007 1:31:16 PM (18 years ago)

Author:

vboxsync

Message:

Main: Removed devNode from the host DVD drive description (it's up to UI to decide how to visually represent things); switched HostDVDDrive and HostFloppyDrive objects to the new locking scheme.

Location:

trunk/src/VBox/Main/include

Files:

• HostDVDDriveImpl.h (modified) (5 diffs)
• HostFloppyDriveImpl.h (modified) (5 diffs)

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

@@ -27 +27 @@
 
 class ATL_NO_VTABLE HostDVDDrive :
+    public VirtualBoxBaseNEXT,
     public VirtualBoxSupportErrorInfoImpl <HostDVDDrive, IHostDVDDrive>,
     public VirtualBoxSupportTranslation <HostDVDDrive>,
-    public VirtualBoxBase,
     public IHostDVDDrive
 {
 public:
 
-    HostDVDDrive();
-    virtual ~HostDVDDrive();
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (HostDVDDrive)
 
-    DECLARE_NOT_AGGREGATABLE(HostDVDDrive)
+    DECLARE_NOT_AGGREGATABLE (HostDVDDrive)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
@@ -48 +47 @@
     NS_DECL_ISUPPORTS
 
+    DECLARE_EMPTY_CTOR_DTOR (HostDVDDrive)
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (INPTR BSTR driveName);
-    HRESULT init (INPTR BSTR driveName, INPTR BSTR driveDescription);
+    HRESULT init (INPTR BSTR aName, INPTR BSTR aDescription = NULL);
+    void uninit();
 
     // IHostDVDDrive properties
-    STDMETHOD(COMGETTER(Name)) (BSTR *driveName);
-    STDMETHOD(COMGETTER(Description)) (BSTR *driveDescription);
+    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
+    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
 
     // public methods for internal purposes only
 
-    const Bstr &driveName() const { return mDriveName; }
+    /* @note Must be called from under the object read lock. */
+    const Bstr &name() const { return mName; }
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -65 +70 @@
 private:
 
-    Bstr mDriveName;
-    Bstr mDriveDescription;
+    const Bstr mName;
+    const Bstr mDescription;
 };
 
 COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostDVDDrive)
 
-    STDMETHOD(FindByName) (INPTR BSTR name, IHostDVDDrive **drive)
+    STDMETHOD(FindByName) (INPTR BSTR aName, IHostDVDDrive **aDrive)
     {
-        if (!name)
+        if (!aName)
             return E_INVALIDARG;
-        if (!drive)
+        if (!aDrive)
             return E_POINTER;
 
-        *drive = NULL;
+        *aDrive = NULL;
         Vector::value_type found;
         Vector::iterator it = vec.begin();
@@ -85 +90 @@
             Bstr n;
             (*it)->COMGETTER(Name) (n.asOutParam());
-            if (n == name)
+            if (n == aName)
                 found = *it;
             ++ it;
@@ -92 +97 @@
         if (!found)
             return setError (E_INVALIDARG, HostDVDDriveCollection::tr (
-                "The host DVD drive named '%ls' could not be found"), name);
+                "The host DVD drive named '%ls' could not be found"), aName);
 
-        return found.queryInterfaceTo (drive);
+        return found.queryInterfaceTo (aDrive);
     }
 

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

@@ -27 +27 @@
 
 class ATL_NO_VTABLE HostFloppyDrive :
+    public VirtualBoxBaseNEXT,
     public VirtualBoxSupportErrorInfoImpl <HostFloppyDrive, IHostFloppyDrive>,
     public VirtualBoxSupportTranslation <HostFloppyDrive>,
-    public VirtualBoxBase,
     public IHostFloppyDrive
 {
 public:
 
-    HostFloppyDrive();
-    virtual ~HostFloppyDrive();
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (HostFloppyDrive)
 
-    DECLARE_NOT_AGGREGATABLE(HostFloppyDrive)
+    DECLARE_NOT_AGGREGATABLE (HostFloppyDrive)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
@@ -48 +47 @@
     NS_DECL_ISUPPORTS
 
+    DECLARE_EMPTY_CTOR_DTOR (HostFloppyDrive)
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (INPTR BSTR driveName);
+    HRESULT init (INPTR BSTR aName);
+    void uninit();
 
     // IHostDVDDrive properties
-    STDMETHOD(COMGETTER(Name)) (BSTR *driveName);
+    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
 
     // public methods for internal purposes only
 
-    const Bstr &driveName() const { return mDriveName; }
+    /* @note Must be called from under the object read lock. */
+    const Bstr &name() const { return mName; }
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -63 +69 @@
 private:
 
-    Bstr mDriveName;
+    const Bstr mName;
 };
 
 COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostFloppyDrive)
 
-    STDMETHOD(FindByName) (INPTR BSTR name, IHostFloppyDrive **drive)
+    STDMETHOD(FindByName) (INPTR BSTR aName, IHostFloppyDrive **aDrive)
     {
-        if (!name)
+        if (!aName)
             return E_INVALIDARG;
-        if (!drive)
+        if (!aDrive)
             return E_POINTER;
 
-        *drive = NULL;
+        *aDrive = NULL;
         Vector::value_type found;
         Vector::iterator it = vec.begin();
@@ -82 +88 @@
             Bstr n;
             (*it)->COMGETTER(Name) (n.asOutParam());
-            if (n == name)
+            if (n == aName)
                 found = *it;
             ++ it;
@@ -89 +95 @@
         if (!found)
             return setError (E_INVALIDARG, HostFloppyDriveCollection::tr (
-                "The host floppy drive named '%ls' could not be found"), name);
+                "The host floppy drive named '%ls' could not be found"), aName);
 
-        return found.queryInterfaceTo (drive);
+        return found.queryInterfaceTo (aDrive);
     }