Changeset 17218 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

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

Author:

vboxsync

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

43527

Message:

Revert r43495 because everything locks forever.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (1 diff)
• VBoxManageList.cpp (modified) (3 diffs)
• VBoxManageModifyVM.cpp (modified) (3 diffs)

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)
                     {