Changeset 17238 in vbox for trunk/src/VBox/Main/DVDDriveImpl.cpp

Timestamp:

Mar 2, 2009 10:58:10 AM (16 years ago)

Author:

vboxsync

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

43560

Message:

3551: “Main: Replace remaining collections with safe arrays”
Converted HostDVDDriveCollection.
Fixed a locking problem that caused hangs in r43495. Tested locally and by lelik.

File:

• trunk/src/VBox/Main/DVDDriveImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/DVDDriveImpl.cpp

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