Changeset 23223 in vbox for trunk/src/VBox/Main/HostImpl.cpp

Timestamp:

Sep 22, 2009 3:50:03 PM (15 years ago)

Author:

vboxsync

Message:

API: big medium handling change and lots of assorted other cleanups and fixes

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (25 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -94 +94 @@
 
 #include "HostImpl.h"
-#include "HostDVDDriveImpl.h"
-#include "HostFloppyDriveImpl.h"
 #include "HostNetworkInterfaceImpl.h"
 #ifdef VBOX_WITH_USB
@@ -314 +312 @@
  * @param drives address of result pointer
  */
-STDMETHODIMP Host::COMGETTER(DVDDrives) (ComSafeArrayOut(IHostDVDDrive *, aDrives))
+STDMETHODIMP Host::COMGETTER(DVDDrives)(ComSafeArrayOut(IMedium *, aDrives))
 {
     CheckComArgOutSafeArrayPointerValid(aDrives);
@@ -323 +321 @@
     AutoWriteLock alock(this);
 
-    std::list< ComObjPtr<HostDVDDrive> > list;
+    std::list< ComObjPtr<Medium> > list;
     HRESULT rc = S_OK;
     try
@@ -338 +336 @@
             {
                 driveName[0] = *p;
-                ComObjPtr<HostDVDDrive> hostDVDDriveObj;
+                ComObjPtr<Medium> hostDVDDriveObj;
                 hostDVDDriveObj.createObject();
-                hostDVDDriveObj->init (Bstr (driveName));
-                list.push_back (hostDVDDriveObj);
+                hostDVDDriveObj->init(mParent, DeviceType_DVD, Bstr(driveName));
+                list.push_back(hostDVDDriveObj);
             }
             p += _tcslen(p) + 1;
@@ -364 +362 @@
                     if (validateDevice(cdromDrive, true))
                     {
-                        ComObjPtr<HostDVDDrive> hostDVDDriveObj;
+                        ComObjPtr<Medium> hostDVDDriveObj;
                         hostDVDDriveObj.createObject();
-                        hostDVDDriveObj->init (Bstr (cdromDrive));
-                        list.push_back (hostDVDDriveObj);
+                        hostDVDDriveObj->init(mParent, DeviceType_DVD, Bstr(cdromDrive));
+                        list.push_back(hostDVDDriveObj);
                     }
                     cdromDrive = strtok(NULL, ":");
@@ -378 +376 @@
                 if (validateDevice("/cdrom/cdrom0", true))
                 {
-                    ComObjPtr<HostDVDDrive> hostDVDDriveObj;
+                    ComObjPtr<Medium> hostDVDDriveObj;
                     hostDVDDriveObj.createObject();
-                    hostDVDDriveObj->init (Bstr ("cdrom/cdrom0"));
-                    list.push_back (hostDVDDriveObj);
+                    hostDVDDriveObj->init(mParent, DeviceType_DVD, Bstr("cdrom/cdrom0"));
+                    list.push_back(hostDVDDriveObj);
                 }
 
@@ -394 +392 @@
                 SUCCEEDED(rc) && it != mHostDrives.DVDEnd(); ++it)
             {
-                ComObjPtr<HostDVDDrive> hostDVDDriveObj;
-                Bstr device(it->mDevice);
-                Bstr udi(it->mUdi);
+                ComObjPtr<Medium> hostDVDDriveObj;
+                Bstr location(it->mDevice);
                 Bstr description(it->mDescription);
                 if (SUCCEEDED(rc))
                     rc = hostDVDDriveObj.createObject();
                 if (SUCCEEDED(rc))
-                    rc = hostDVDDriveObj->init (device, udi, description);
+                    rc = hostDVDDriveObj->init(mParent, DeviceType_DVD, location, description);
                 if (SUCCEEDED(rc))
                     list.push_back(hostDVDDriveObj);
@@ -409 +406 @@
         while (cur)
         {
-            ComObjPtr<HostDVDDrive> hostDVDDriveObj;
+            ComObjPtr<Medium> hostDVDDriveObj;
             hostDVDDriveObj.createObject();
             hostDVDDriveObj->init(Bstr(cur->szName));
@@ -430 +427 @@
 #endif
 
-        SafeIfaceArray<IHostDVDDrive> array (list);
+        SafeIfaceArray<IMedium> array(list);
         array.detachTo(ComSafeArrayOutArg(aDrives));
     }
@@ -446 +443 @@
  * @param drives address of result pointer
  */
-STDMETHODIMP Host::COMGETTER(FloppyDrives) (ComSafeArrayOut(IHostFloppyDrive *, aDrives))
+STDMETHODIMP Host::COMGETTER(FloppyDrives)(ComSafeArrayOut(IMedium *, aDrives))
 {
     CheckComArgOutPointerValid(aDrives);
@@ -455 +452 @@
     AutoWriteLock alock(this);
 
-    std::list<ComObjPtr<HostFloppyDrive> > list;
+    std::list<ComObjPtr<Medium> > list;
     HRESULT rc = S_OK;
 
@@ -471 +468 @@
             {
                 driveName[0] = *p;
-                ComObjPtr<HostFloppyDrive> hostFloppyDriveObj;
+                ComObjPtr<Medium> hostFloppyDriveObj;
                 hostFloppyDriveObj.createObject();
-                hostFloppyDriveObj->init (Bstr (driveName));
-                list.push_back (hostFloppyDriveObj);
+                hostFloppyDriveObj->init(mParent, DeviceType_Floppy, Bstr(driveName));
+                list.push_back(hostFloppyDriveObj);
             }
             p += _tcslen(p) + 1;
@@ -485 +482 @@
                 SUCCEEDED(rc) && it != mHostDrives.FloppyEnd(); ++it)
             {
-                ComObjPtr<HostFloppyDrive> hostFloppyDriveObj;
-                Bstr device(it->mDevice);
-                Bstr udi(it->mUdi);
+                ComObjPtr<Medium> hostFloppyDriveObj;
+                Bstr location(it->mDevice);
                 Bstr description(it->mDescription);
                 if (SUCCEEDED(rc))
                     rc = hostFloppyDriveObj.createObject();
                 if (SUCCEEDED(rc))
-                    rc = hostFloppyDriveObj->init (device, udi, description);
+                    rc = hostFloppyDriveObj->init(mParent, DeviceType_Floppy, location, description);
                 if (SUCCEEDED(rc))
                     list.push_back(hostFloppyDriveObj);
@@ -500 +496 @@
 #endif
 
-        SafeIfaceArray<IHostFloppyDrive> collection (list);
+        SafeIfaceArray<IMedium> collection(list);
         collection.detachTo(ComSafeArrayOutArg(aDrives));
     }
@@ -1481 +1477 @@
  * @retval  list drives found will be attached to this list
  */
-bool Host::getDVDInfoFromHal(std::list <ComObjPtr<HostDVDDrive> > &list)
+bool Host::getDVDInfoFromHal(std::list <ComObjPtr<Medium> > &list)
 {
     bool halSuccess = false;
@@ -1559 +1555 @@
                                             description = product;
                                         }
-                                        ComObjPtr<HostDVDDrive> hostDVDDriveObj;
+                                        ComObjPtr<Medium> hostDVDDriveObj;
                                         hostDVDDriveObj.createObject();
                                         hostDVDDriveObj->init (Bstr (devNode),
@@ -1574 +1570 @@
                                             gDBusErrorFree(&dbusError);
                                         }
-                                        ComObjPtr<HostDVDDrive> hostDVDDriveObj;
+                                        ComObjPtr<Medium> hostDVDDriveObj;
                                         hostDVDDriveObj.createObject();
                                         hostDVDDriveObj->init (Bstr (devNode),
@@ -1653 +1649 @@
  * @retval  list drives found will be attached to this list
  */
-bool Host::getFloppyInfoFromHal(std::list <ComObjPtr<HostFloppyDrive> > &list)
+bool Host::getFloppyInfoFromHal(std::list <ComObjPtr<Medium> > &list)
 {
     bool halSuccess = false;
@@ -1723 +1719 @@
                                             description = product;
                                         }
-                                        ComObjPtr<HostFloppyDrive> hostFloppyDrive;
+                                        ComObjPtr<Medium> hostFloppyDrive;
                                         hostFloppyDrive.createObject();
                                         hostFloppyDrive->init (Bstr (devNode),
@@ -1738 +1734 @@
                                             gDBusErrorFree(&dbusError);
                                         }
-                                        ComObjPtr<HostFloppyDrive> hostFloppyDrive;
+                                        ComObjPtr<Medium> hostFloppyDrive;
                                         hostFloppyDrive.createObject();
                                         hostFloppyDrive->init (Bstr (devNode),
@@ -1811 +1807 @@
  * Helper function to parse the given mount file and add found entries
  */
-void Host::parseMountTable(char *mountTable, std::list <ComObjPtr<HostDVDDrive> > &list)
+void Host::parseMountTable(char *mountTable, std::list <ComObjPtr<Medium> > &list)
 {
 #ifdef RT_OS_LINUX
@@ -1861 +1857 @@
                 if (validateDevice(mnt_dev, true))
                 {
-                    ComObjPtr<HostDVDDrive> hostDVDDriveObj;
+                    ComObjPtr<Medium> hostDVDDriveObj;
                     hostDVDDriveObj.createObject();
                     hostDVDDriveObj->init (Bstr (mnt_dev));
@@ -1893 +1889 @@
                 if (validateDevice(rawDevName, true))
                 {
-                    ComObjPtr<HostDVDDrive> hostDVDDriveObj;
+                    ComObjPtr<Medium> hostDVDDriveObj;
                     hostDVDDriveObj.createObject();
                     hostDVDDriveObj->init (Bstr (rawDevName));
@@ -2123 +2119 @@
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
-STDMETHODIMP Host::FindHostDVDDrive(IN_BSTR aName, IHostDVDDrive **aDrive)
+STDMETHODIMP Host::FindHostDVDDrive(IN_BSTR aName, IMedium **aDrive)
 {
     CheckComArgNotNull(aName);
@@ -2130 +2126 @@
     *aDrive = NULL;
 
-    SafeIfaceArray<IHostDVDDrive> drivevec;
-    HRESULT rc = COMGETTER(DVDDrives) (ComSafeArrayAsOutParam(drivevec));
+    SafeIfaceArray<IMedium> drivevec;
+    HRESULT rc = COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(drivevec));
     CheckComRCReturnRC(rc);
 
     for (size_t i = 0; i < drivevec.size(); ++i)
     {
+        ComPtr<IMedium> drive = drivevec[i];
+        Bstr name, location;
+        rc = drive->COMGETTER(Name)(name.asOutParam());
+        CheckComRCReturnRC(rc);
+        rc = drive->COMGETTER(Location)(location.asOutParam());
+        CheckComRCReturnRC(rc);
+        if (name == aName || location == aName)
+            return drive.queryInterfaceTo(aDrive);
+    }
+
+    return setError(VBOX_E_OBJECT_NOT_FOUND,
+                    Medium::tr("The host DVD drive named '%ls' could not be found"), aName);
+}
+
+STDMETHODIMP Host::FindHostFloppyDrive(IN_BSTR aName, IMedium **aDrive)
+{
+    CheckComArgNotNull(aName);
+    CheckComArgOutPointerValid(aDrive);
+
+    *aDrive = NULL;
+
+    SafeIfaceArray<IMedium> drivevec;
+    HRESULT rc = COMGETTER(FloppyDrives)(ComSafeArrayAsOutParam(drivevec));
+    CheckComRCReturnRC(rc);
+
+    for (size_t i = 0; i < drivevec.size(); ++i)
+    {
+        ComPtr<IMedium> drive = drivevec[i];
         Bstr name;
-        rc = drivevec[i]->COMGETTER(Name) (name.asOutParam());
+        rc = drive->COMGETTER(Name)(name.asOutParam());
         CheckComRCReturnRC(rc);
         if (name == aName)
-        {
-            ComObjPtr<HostDVDDrive> found;
-            found.createObject();
-            Bstr udi, description;
-            rc = drivevec[i]->COMGETTER(Udi) (udi.asOutParam());
-            CheckComRCReturnRC(rc);
-            rc = drivevec[i]->COMGETTER(Description) (description.asOutParam());
-            CheckComRCReturnRC(rc);
-            found->init(name, udi, description);
-            return found.queryInterfaceTo(aDrive);
-        }
-    }
-
-    return setError (VBOX_E_OBJECT_NOT_FOUND, HostDVDDrive::tr (
-        "The host DVD drive named '%ls' could not be found"), aName);
-}
-
-STDMETHODIMP Host::FindHostFloppyDrive(IN_BSTR aName, IHostFloppyDrive **aDrive)
-{
-    CheckComArgNotNull(aName);
-    CheckComArgOutPointerValid(aDrive);
-
-    *aDrive = NULL;
-
-    SafeIfaceArray<IHostFloppyDrive> drivevec;
-    HRESULT rc = COMGETTER(FloppyDrives) (ComSafeArrayAsOutParam(drivevec));
-    CheckComRCReturnRC(rc);
-
-    for (size_t i = 0; i < drivevec.size(); ++i)
-    {
-        Bstr name;
-        rc = drivevec[i]->COMGETTER(Name) (name.asOutParam());
-        CheckComRCReturnRC(rc);
-        if (name == aName)
-        {
-            ComObjPtr<HostFloppyDrive> found;
-            found.createObject();
-            Bstr udi, description;
-            rc = drivevec[i]->COMGETTER(Udi) (udi.asOutParam());
-            CheckComRCReturnRC(rc);
-            rc = drivevec[i]->COMGETTER(Description) (description.asOutParam());
-            CheckComRCReturnRC(rc);
-            found->init(name, udi, description);
-            return found.queryInterfaceTo(aDrive);
-        }
-    }
-
-    return setError (VBOX_E_OBJECT_NOT_FOUND, HostFloppyDrive::tr (
-        "The host floppy drive named '%ls' could not be found"), aName);
+            return drive.queryInterfaceTo(aDrive);
+    }
+
+    return setError(VBOX_E_OBJECT_NOT_FOUND,
+                    Medium::tr("The host floppy drive named '%ls' could not be found"), aName);
 }