Changeset 17218 in vbox for trunk/src/VBox

Timestamp:

Feb 27, 2009 6:02:48 PM (16 years ago)

Author:

vboxsync

Message:

Revert r43495 because everything locks forever.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageList.cpp (modified) (3 diffs)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxVMFirstRunWzd.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/VBoxVMSettingsCD.cpp (modified) (4 diffs)
• Main/DVDDriveImpl.cpp (modified) (2 diffs)
• Main/HostImpl.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (4 diffs)
• Main/include/HostDVDDriveImpl.h (modified) (3 diffs)
• Main/include/HostImpl.h (modified) (3 diffs)
• Main/webservice/webtest.cpp (modified) (2 diffs)
• Main/xpcom/server.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -671 +671 @@
                 ComPtr<IHost> host;
                 CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-                com::SafeIfaceArray <IHostDVDDrive> hostDVDs;
-                rc = host->COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(hostDVDs));
-
+                ComPtr<IHostDVDDriveCollection> hostDVDs;
+                CHECK_ERROR(host, COMGETTER(DVDDrives)(hostDVDs.asOutParam()));
                 ComPtr<IHostDVDDrive> hostDVDDrive;
-                rc = host->FindHostDVDDrive(Bstr(a->argv[2] + 5), hostDVDDrive.asOutParam());
+                rc = hostDVDs->FindByName(Bstr(a->argv[2] + 5), hostDVDDrive.asOutParam());
                 if (!hostDVDDrive)
                 {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -224 +224 @@
             {
                 /*
-                 * Iterate through the collection.
-                 */
+                * Iterate through the collection.
+                */
                 for (size_t i = 0; i < coll.size(); ++ i)
                 {
@@ -245 +245 @@
             ComPtr<IHost> host;
             CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-            com::SafeIfaceArray <IHostDVDDrive> coll;
-            CHECK_ERROR(host, COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(coll)));
-            if (SUCCEEDED(rc))
-            {
-                for (size_t i = 0; i < coll.size(); ++ i)
-                {
-                    ComPtr<IHostDVDDrive> dvdDrive = coll[i];
+            ComPtr<IHostDVDDriveCollection> coll;
+            ComPtr<IHostDVDDriveEnumerator> enumerator;
+            CHECK_ERROR(host, COMGETTER(DVDDrives)(coll.asOutParam()));
+            if (SUCCEEDED(rc) && coll)
+            {
+                CHECK_ERROR(coll, Enumerate(enumerator.asOutParam()));
+                BOOL hasMore;
+                while (SUCCEEDED(enumerator->HasMore(&hasMore)) && hasMore)
+                {
+                    ComPtr<IHostDVDDrive> dvdDrive;
+                    CHECK_ERROR_BREAK(enumerator, GetNext(dvdDrive.asOutParam()));
                     Bstr name;
                     dvdDrive->COMGETTER(Name)(name.asOutParam());
@@ -775 +779 @@
 
 #endif /* !VBOX_ONLY_DOCS */
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */
+

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -25 +25 @@
 #ifndef VBOX_ONLY_DOCS
 #include <VBox/com/com.h>
-#include <VBox/com/array.h>
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint2.h>
@@ -1092 +1091 @@
                 ComPtr<IHost> host;
                 CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-                com::SafeIfaceArray <IHostDVDDrive> hostDVDs;
-                rc = host->COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(hostDVDs));
-
+                ComPtr<IHostDVDDriveCollection> hostDVDs;
+                CHECK_ERROR(host, COMGETTER(DVDDrives)(hostDVDs.asOutParam()));
                 ComPtr<IHostDVDDrive> hostDVDDrive;
-                rc = host->FindHostDVDDrive(Bstr(dvd + 5), hostDVDDrive.asOutParam());
+                rc = hostDVDs->FindByName(Bstr(dvd + 5), hostDVDDrive.asOutParam());
                 if (!hostDVDDrive)
                 {
@@ -1107 +1105 @@
                         break;
                     }
-                    rc = host->FindHostDVDDrive(Bstr(szPathReal), hostDVDDrive.asOutParam());
+                    rc = hostDVDs->FindByName(Bstr(szPathReal), hostDVDDrive.asOutParam());
                     if (!hostDVDDrive)
                     {

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2007 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1772 +1772 @@
             ComPtr <IHost> host;
             CHECK_ERROR_BREAK (virtualBox, COMGETTER(Host)(host.asOutParam()));
-            SafeIfaceArray <IHostDVDDrive> coll;
-            CHECK_ERROR_BREAK (host, COMGETTER(DVDDrives)(ComSafeArrayAsOutParam(coll)));
+            ComPtr <IHostDVDDriveCollection> coll;
+            CHECK_ERROR_BREAK (host, COMGETTER(DVDDrives)(coll.asOutParam()));
             ComPtr <IHostDVDDrive> hostDrive;
-            rc = host->FindHostDVDDrive (medium, hostDrive.asOutParam());
+            rc = coll->FindByName (medium, hostDrive.asOutParam());
             if (SUCCEEDED (rc))
             {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -3064 +3064 @@
 
     hostDVDMap.clear();
-    CHostDVDDriveVector drvvec =
-        vboxGlobal().virtualBox().GetHost().GetDVDDrives();
-    for (int i = 0; i < drvvec.size(); ++i)
-    {
-        CHostDVDDrive hostDVD = drvvec[i];
+    CHostDVDDriveEnumerator en =
+        vboxGlobal().virtualBox().GetHost().GetDVDDrives().Enumerate();
+    while (en.HasMore())
+    {
+        CHostDVDDrive hostDVD = en.GetNext();
         /** @todo set icon */
         QString drvName = hostDVD.GetName();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMFirstRunWzd.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -176 +176 @@
     {
         /* Search for the host dvd-drives */
-        CHostDVDDriveVector coll =
+        CHostDVDDriveCollection coll =
             vboxGlobal().virtualBox().GetHost().GetDVDDrives();
-        mHostDVDs.resize (coll.size());
-
-        for (int id = 0; id < coll.size(); ++id)
-        {
-            CHostDVDDrive hostDVD = coll[id];
+        mHostDVDs.resize (coll.GetCount());
+        int id = 0;
+        CHostDVDDriveEnumerator en = coll.Enumerate();
+        while (en.HasMore())
+        {
+            CHostDVDDrive hostDVD = en.GetNext();
             QString name = hostDVD.GetName();
             QString description = hostDVD.GetDescription();
@@ -189 +190 @@
             mCbHost->insertItem (id, fullName);
             mHostDVDs [id] = hostDVD;
+            ++ id;
         }
 
@@ -220 +222 @@
 
     /* Repopulate the media list */
-    mCbImage->repopulate();
+        mCbImage->repopulate();
 
     /* Revalidate updated page */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsCD.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -59 +59 @@
 
     /* Read out the host DVD drive list and prepare the combobox */
-    CHostDVDDriveVector coll =
+    CHostDVDDriveCollection coll =
         vboxGlobal().virtualBox().GetHost().GetDVDDrives();
-    mHostCDs.resize (coll.size());
+    mHostCDs.resize (coll.GetCount());
     mCbHostCD->clear();
-
-    for (int id = 0; id < coll.size(); ++id)
-    {
-        CHostDVDDrive hostDVD = coll[id];
+    int id = 0;
+    CHostDVDDriveEnumerator en = coll.Enumerate();
+    while (en.HasMore())
+    {
+        CHostDVDDrive hostDVD = en.GetNext();
         /// @todo (r=dmik) set icon?
         QString name = hostDVD.GetName();
@@ -74 +75 @@
         mCbHostCD->insertItem (id, fullName);
         mHostCDs [id] = hostDVD;
+        ++ id;
     }
 
@@ -87 +89 @@
                 name :
                 QString ("%1 (%2)").arg (description, name);
-            if (vboxGlobal().virtualBox().GetHost().FindHostDVDDrive (name).isNull())
+            if (coll.FindByName (name).isNull())
             {
                 /* If the DVD drive is not currently available,

trunk/src/VBox/Main/DVDDriveImpl.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -452 +452 @@
         Bstr src = typeNode.stringValue ("src");
 
-        /* find the corresponding object */
+        /* find the correspoding object */
         ComObjPtr <Host> host = mParent->virtualBox()->host();
 
-        com::SafeIfaceArray <IHostDVDDrive> coll;
-        rc = host->COMGETTER(DVDDrives) (ComSafeArrayAsOutParam(coll));
+        ComPtr <IHostDVDDriveCollection> coll;
+        rc = host->COMGETTER(DVDDrives) (coll.asOutParam());
         AssertComRC (rc);
 
         ComPtr <IHostDVDDrive> drive;
-        rc = host->FindHostDVDDrive (src, drive.asOutParam());
-
+        rc = coll->FindByName (src, drive.asOutParam());
         if (SUCCEEDED (rc))
         {

trunk/src/VBox/Main/HostImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2007 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -291 +291 @@
  * @param drives address of result pointer
  */
-STDMETHODIMP Host::COMGETTER(DVDDrives) (ComSafeArrayOut (IHostDVDDrive *, aDrives))
-{
-    CheckComArgOutSafeArrayPointerValid(aDrives);
+STDMETHODIMP Host::COMGETTER(DVDDrives) (IHostDVDDriveCollection **aDrives)
+{
+    CheckComArgOutPointerValid(aDrives);
     AutoWriteLock alock (this);
     CHECK_READY();
@@ -399 +399 @@
 #endif
 
-    SafeIfaceArray <IHostDVDDrive> array (list);
-    array.detachTo(ComSafeArrayOutArg(aDrives));
+    ComObjPtr<HostDVDDriveCollection> collection;
+    collection.createObject();
+    collection->init (list);
+    collection.queryInterfaceTo(aDrives);
     return rc;
 }
@@ -3321 +3323 @@
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
-STDMETHODIMP Host::FindHostDVDDrive(IN_BSTR aName, IHostDVDDrive **aDrive)
-{
-    CheckComArgNotNull(aName);
-    CheckComArgOutPointerValid(aDrive);
-    AutoReadLock alock (this);
-
-    *aDrive = NULL;
-
-    SafeIfaceArray <IHostDVDDrive> drivevec;
-    HRESULT rc = COMGETTER(DVDDrives) (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<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::FindHostNetworkInterfaceByName(IN_BSTR name, IHostNetworkInterface **networkInterface)
 {

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -6341 +6341 @@
   </interface>
 
+  <enumerator
+     name="IHostDVDDriveEnumerator" type="IHostDVDDrive"
+     uuid="1ed7cfaf-c363-40df-aa4e-89c1afb7d96b"
+     />
+
+  <collection
+     name="IHostDVDDriveCollection" type="IHostDVDDrive"
+     enumerator="IHostDVDDriveEnumerator"
+     uuid="1909c533-1a1e-445f-a4e1-a267cffc30ed"
+     readonly="yes"
+     >
+    <method name="findByName">
+      <desc>
+        Searches this collection for a host drive with the given name.
+        <note>
+          The method returns an error if the given name does not
+          correspond to any host drive in the collection.
+        </note>
+      </desc>
+      <param name="name" type="wstring" dir="in">
+        <desc>Name of the host drive to search for</desc>
+      </param>
+      <param name="drive" type="IHostDVDDrive" dir="return">
+        <desc>Found host drive object</desc>
+      </param>
+    </method>
+  </collection>
+
   <interface
      name="IHostFloppyDrive" extends="$unknown"
@@ -6515 +6543 @@
   <interface
      name="IHost" extends="$unknown"
-     uuid="ba0cb246-478a-4a2b-930e-51ce740ada9c"
+     uuid="7c172c42-b209-4bdc-9ddf-a84f222bd59a"
      wsmap="managed"
      >
@@ -6530 +6558 @@
 
     </desc>
-    <attribute name="DVDDrives" type="IHostDVDDrive" readonly="yes" safearray="yes">
+    <attribute name="DVDDrives" type="IHostDVDDriveCollection" readonly="yes">
       <desc>List of DVD drives available on the host.</desc>
     </attribute>
@@ -6805 +6833 @@
     </method>
 
-    <method name="findHostDVDDrive">
-      <desc>
-        Searches for a host DVD drive with the given @c name.
-
-        <result name="VBOX_E_OBJECT_NOT_FOUND">
-          Given @c name does not correspond to any host drive.
-        </result>
-
-      </desc>
-      <param name="name" type="wstring" dir="in">
-        <desc>Name of the host drive to search for</desc>
-      </param>
-      <param name="drive" type="IHostDVDDrive" dir="return">
-        <desc>Found host drive object</desc>
-      </param>
-    </method>
-
     <method name="findHostNetworkInterfaceByName">
       <desc>
         Searches through all host network interfaces for an interface with
-        the given @c name.
-        <note>
-          The method returns an error if the given @c name does not
+        the given name.
+        <note>
+          The method returns an error if the given name does not
           correspond to any host network interface.
         </note>

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2007 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 
 #include "VirtualBoxBase.h"
+#include "Collection.h"
 
 class ATL_NO_VTABLE HostDVDDrive :
@@ -82 +83 @@
 };
 
+COM_DECL_READONLY_ENUM_AND_COLLECTION_BEGIN (HostDVDDrive)
+
+    STDMETHOD(FindByName) (IN_BSTR aName, IHostDVDDrive **aDrive)
+    {
+        if (!aName)
+            return E_INVALIDARG;
+        if (!aDrive)
+            return E_POINTER;
+
+        *aDrive = NULL;
+        Vector::value_type found;
+        Vector::iterator it = vec.begin();
+        while (it != vec.end() && !found)
+        {
+            Bstr n;
+            (*it)->COMGETTER(Name) (n.asOutParam());
+            if (n == aName)
+                found = *it;
+            ++ it;
+        }
+
+        if (!found)
+            return setError (E_INVALIDARG, HostDVDDriveCollection::tr (
+                "The host DVD drive named '%ls' could not be found"), aName);
+
+        return found.queryInterfaceTo (aDrive);
+    }
+
+COM_DECL_READONLY_ENUM_AND_COLLECTION_END (HostDVDDrive)
+
 #endif // ____H_HOSTDVDDRIVEIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2007 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -81 +81 @@
 
     // IHost properties
-    STDMETHOD(COMGETTER(DVDDrives))(ComSafeArrayOut (IHostDVDDrive*, drives));
+    STDMETHOD(COMGETTER(DVDDrives))(IHostDVDDriveCollection **drives);
     STDMETHOD(COMGETTER(FloppyDrives))(IHostFloppyDriveCollection **drives);
     STDMETHOD(COMGETTER(USBDevices))(IHostUSBDeviceCollection **aUSBDevices);
@@ -111 +111 @@
     STDMETHOD(RemoveUSBDeviceFilter) (ULONG aPosition, IHostUSBDeviceFilter **aFilter);
 
-    STDMETHOD(FindHostDVDDrive) (IN_BSTR aName, IHostDVDDrive **aDrive);
     STDMETHOD(FindHostNetworkInterfaceByName) (IN_BSTR aName, IHostNetworkInterface **networkInterface);
     STDMETHOD(FindHostNetworkInterfaceById) (IN_GUID id, IHostNetworkInterface **networkInterface);

trunk/src/VBox/Main/webservice/webtest.cpp

@@ -4 +4 @@
  *      functionality of VBoxManage for testing purposes.
  *
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2007 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -233 +233 @@
         {
             unsigned int i,
-                         c = resp.returnval.size();
+                         c = resp.returnval->array.size();
             for(i = 0;
                 i < c;
                 ++i)
             {
-                std::cout << "DVD drive " << i << ": objref " << resp.returnval[i] << "\n";
+                std::cout << "DVD drive " << i << ": objref " << resp.returnval->array[i] << "\n";
             }
         }

trunk/src/VBox/Main/xpcom/server.cpp

@@ -243 +243 @@
 
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(Snapshot)
+COM_IMPL_READONLY_ENUM_AND_COLLECTION(HostDVDDrive)
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(HostFloppyDrive)
 #ifdef VBOX_WITH_USB