Changeset 6909 in vbox

Timestamp:

Feb 11, 2008 8:00:12 PM (17 years ago)

Author:

vboxsync

Message:

Main: Added IMachine::machines2 that returns the array instead of the collection (will supercede IMachine::machines after web services are fixed).

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxVMListBox.cpp (modified) (1 diff)
• Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (2 diffs)
• Main/VirtualBoxImpl.cpp (modified) (13 diffs)
• Main/idl/VirtualBox.xidl (modified) (4 diffs)
• Main/include/VirtualBoxImpl.h (modified) (4 diffs)
• Main/testcase/tstAPI.cpp (modified) (4 diffs)

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

@@ -228 +228 @@
     clear();
 
-    CMachineEnumerator en = mVBox.GetMachines().Enumerate();
-    while (en.HasMore())
-    {
-        CMachine m = en.GetNext();
-        new VBoxVMListBoxItem (this, m);
-    }
+    CMachineVector vec = mVBox.GetMachines2();
+    for (CMachineVector::ConstIterator m = vec.begin();
+         m != vec.end(); ++ m)
+        new VBoxVMListBoxItem (this, *m);
 
     sort();

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -1028 +1028 @@
     /* clear inner list */
     mNetworksList.clear();
-    /* loading internal networks list */
+
+    /* load internal network list */
     CVirtualBox vbox = vboxGlobal().virtualBox();
     ulong count = vbox.GetSystemProperties().GetNetworkAdapterCount();
-    CMachineEnumerator en = vbox.GetMachines().Enumerate();
-    while (en.HasMore())
-    {
-        CMachine machine = en.GetNext();
+    CMachineVector vec =  vbox.GetMachines2();
+    for (CMachineVector::ConstIterator m = vec.begin();
+         m != vec.end(); ++ m)
+    {
         for (ulong slot = 0; slot < count; ++ slot)
         {
-            CNetworkAdapter adapter = machine.GetNetworkAdapter (slot);
+            CNetworkAdapter adapter = m->GetNetworkAdapter (slot);
             if (adapter.GetAttachmentType() == CEnums::InternalNetworkAttachment &&
                 !mNetworksList.contains (adapter.GetInternalNetwork()))
@@ -1043 +1044 @@
         }
     }
+
     mLockNetworkListUpdate = false;
 }

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -57 +57 @@
 
 #include <VBox/com/com.h>
+#include <VBox/com/array.h>
 
 #include <algorithm>
@@ -467 +468 @@
 }
 
-STDMETHODIMP VirtualBox::COMGETTER(SystemProperties) (ISystemProperties **aSystemProperties)
+STDMETHODIMP
+VirtualBox::COMGETTER(SystemProperties) (ISystemProperties **aSystemProperties)
 {
     if (!aSystemProperties)
@@ -479 +481 @@
 }
 
-/** @note Locks this object for reading. */
+/**
+ * @note Locks this object for reading.
+ */
 STDMETHODIMP VirtualBox::COMGETTER(Machines) (IMachineCollection **aMachines)
 {
@@ -498 +502 @@
 }
 
-/** @note Locks this object for reading. */
+/**
+ * @note Locks this object for reading.
+ */
+STDMETHODIMP
+VirtualBox::COMGETTER(Machines2) (ComSafeArrayOut (IMachine *, aMachines))
+{
+    if (ComSafeArrayOutIsNull (aMachines))
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    SafeIfaceArray <IMachine> machines (mData.mMachines);
+    machines.detachTo (ComSafeArrayOutArg (aMachines));
+
+    return S_OK;
+}
+
+/**
+ * @note Locks this object for reading.
+ */
 STDMETHODIMP VirtualBox::COMGETTER(HardDisks) (IHardDiskCollection **aHardDisks)
 {
@@ -517 +543 @@
 }
 
-/** @note Locks this object for reading. */
+/**
+ * @note Locks this object for reading.
+ */
 STDMETHODIMP VirtualBox::COMGETTER(DVDImages) (IDVDImageCollection **aDVDImages)
 {
@@ -536 +564 @@
 }
 
-/** @note Locks this object for reading. */
+/**
+ * @note Locks this object for reading.
+ */
 STDMETHODIMP VirtualBox::COMGETTER(FloppyImages) (IFloppyImageCollection **aFloppyImages)
 {
@@ -555 +585 @@
 }
 
-/** @note Locks this object for reading. */
+/**
+ * @note Locks this object for reading.
+ */
 STDMETHODIMP VirtualBox::COMGETTER(ProgressOperations) (IProgressCollection **aOperations)
 {
@@ -574 +606 @@
 }
 
-/** @note Locks this object for reading. */
+/**
+ * @note Locks this object for reading.
+ */
 STDMETHODIMP VirtualBox::COMGETTER(GuestOSTypes) (IGuestOSTypeCollection **aGuestOSTypes)
 {
@@ -4061 +4095 @@
 }
 
-/** 
+/**
  * Helper method to load the setting tree and turn expected exceptions into
  * COM errors, according to arguments.
- * 
+ *
  * Note that this method will not catch unexpected errors so it may still
  * throw something.
@@ -4120 +4154 @@
 }
 
-/** 
+/**
  * Helper method to save the settings tree and turn expected exceptions to COM
  * errors.
@@ -4126 +4160 @@
  * Note that this method will not catch unexpected errors so it may still
  * throw something.
- * 
+ *
  * @param aTree Tree to save.
  * @param aFile File to save the tree to.
@@ -4151 +4185 @@
 }
 
-/** 
+/**
  * Handles unexpected exceptions by turning them into COM errors in release
  * builds or by hitting a breakpoint in the release builds.
@@ -4170 +4204 @@
         }
  * @endcode
- * 
+ *
  * @param RT_SRC_POS_DECL "RT_SRC_POS" macro instantiation.
  */

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

@@ -43 +43 @@
  *
      Copyright (C) 2006-2007 innotek GmbH
-    
+
      This file is part of VirtualBox Open Source Edition (OSE), as
      available from http://www.virtualbox.org. This file is free software;
@@ -814 +814 @@
      wsmap="managed"
      >
-    <desc> The main interface exposed by the product that provides virtual
-      machine management.
+    <desc>
+      The IVirtualBox interface represents the main interface exposed by the
+      product that provides virtual machine management.
 
       An instance of IVirtualBox is required for the product to do anything
@@ -859 +860 @@
     </attribute>
 
-    <attribute name="machines" type="IMachineCollection" readonly="yes"/>
+        <attribute name="machines" type="IMachineCollection" readonly="yes">
+      <desc>
+        Collection of machine objects registered within this VirtualBox
+        instance.
+      </desc>
+    </attribute>
+
+    <attribute name="machines2" type="IMachine" readonly="yes" safearray="yes">
+      <desc>
+        Array of machine objects registered within this VirtualBox instance.
+      </desc>
+    </attribute>
 
     <attribute name="hardDisks" type="IHardDiskCollection" readonly="yes">
       <desc>
-        A collection of hard disk objects registered within this
-        VirtualBox instance.
-        This collection contains only "top-level" (basic or independent)
-        hard disk images, but not differencing ones. All differencing
-        images of the given top-level image (i.e. all its children) can
-        be enumerated using <link to="IHardDisk::children"/>.
+        Collection of hard disk objects registered within this VirtualBox
+        instance.
+
+        This collection contains only "top-level" (basic or independent) hard
+        disk images, but not differencing ones. All differencing images of the
+        given top-level image (i.e. all its children) can be enumerated using
+        <link to="IHardDisk::children"/>.
       </desc>
     </attribute>
@@ -9064 +9077 @@
       </desc>
     </attribute>
-    
+
     <attribute name="writable" type="boolean" readonly="yes">
       <desc>

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

@@ -112 +112 @@
     STDMETHOD(COMGETTER(SystemProperties)) (ISystemProperties **aSystemProperties);
     STDMETHOD(COMGETTER(Machines)) (IMachineCollection **aMachines);
+    STDMETHOD(COMGETTER(Machines2)) (ComSafeArrayOut (IMachine *, aMachines));
     STDMETHOD(COMGETTER(HardDisks)) (IHardDiskCollection **aHardDisks);
     STDMETHOD(COMGETTER(DVDImages)) (IDVDImageCollection **aDVDImages);
@@ -269 +270 @@
                                      bool aAddDefaults);
 
-    /** 
+    /**
      * Shortcut to loadSettingsTree (aTree, aFile, true, true, true).
      *
@@ -281 +282 @@
     }
 
-    /** 
+    /**
      * Shortcut to loadSettingsTree (aTree, aFile, true, false, true).
      *
@@ -295 +296 @@
     }
 
-    /** 
+    /**
      * Shortcut to loadSettingsTree (aTree, aFile, true, false, false).
      *

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -21 +21 @@
 #include <VBox/com/com.h>
 #include <VBox/com/string.h>
+#include <VBox/com/array.h>
 #include <VBox/com/Guid.h>
 #include <VBox/com/ErrorInfo.h>
@@ -222 +223 @@
     Utf8Str nullUtf8Str;
     printf ("nullUtf8Str='%s'\n", nullUtf8Str.raw());
-    
+
     Utf8Str simpleUtf8Str = "simpleUtf8Str";
     printf ("simpleUtf8Str='%s'\n", simpleUtf8Str.raw());
@@ -248 +249 @@
     }
 
-#if 1
+#if 0
     // IUnknown identity test
     ////////////////////////////////////////////////////////////////////////////
@@ -333 +334 @@
         CHECK_ERROR_BREAK (virtualBox, COMGETTER(Version) (version.asOutParam()));
         printf ("VirtualBox version = %ls\n", version.raw());
+    }
+#endif
+
+#if 1
+    // Array test
+    ////////////////////////////////////////////////////////////////////////////
+    {
+        printf ("Calling IVirtualBox::Machines...\n");
+
+        com::SafeArray <ULONG> aaa (10);
+
+        com::SafeIfaceArray <IMachine> machines;
+        CHECK_ERROR_BREAK (virtualBox,
+                           COMGETTER(Machines2) (ComSafeArrayAsOutParam (machines)));
+
+        printf ("%u machines registered.\n", machines.size());
+
+        for (size_t i = 0; i < machines.size(); ++ i)
+        {
+            Bstr name;
+            CHECK_ERROR_BREAK (machines [i], COMGETTER(Name) (name.asOutParam()));
+            printf ("machines[%u]='%s'\n", i, Utf8Str (name).raw());
+        }
     }
 #endif