Changeset 16971 in vbox

Timestamp:

Feb 20, 2009 12:26:19 PM (16 years ago)

Author:

vboxsync

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

43138

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Converted ostype collection. Tested with VBoxManage list ostypes.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageList.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (4 diffs)
• Main/VirtualBoxImpl.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (4 diffs)
• Main/include/GuestOSTypeImpl.h (modified) (2 diffs)
• Main/include/VirtualBoxImpl.h (modified) (2 diffs)
• Main/xpcom/server.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -134 +134 @@
     if (strcmp(a->argv[0], "ostypes") == 0)
     {
-        ComPtr<IGuestOSTypeCollection> coll;
-        ComPtr<IGuestOSTypeEnumerator> enumerator;
-        CHECK_ERROR(a->virtualBox, COMGETTER(GuestOSTypes)(coll.asOutParam()));
-        if (SUCCEEDED(rc) && coll)
-        {
-            CHECK_ERROR(coll, Enumerate(enumerator.asOutParam()));
-            BOOL hasMore;
-            while (SUCCEEDED(enumerator->HasMore(&hasMore)) && hasMore)
+        com::SafeIfaceArray <IGuestOSType> coll;
+        rc = a->virtualBox->COMGETTER(GuestOSTypes)(ComSafeArrayAsOutParam(coll));
+        if (SUCCEEDED(rc))
+        {
+            /*
+             * Iterate through the collection.
+             */
+            for (size_t i = 0; i < coll.size(); ++ i)
             {
                 ComPtr<IGuestOSType> guestOS;
-                CHECK_ERROR_BREAK(enumerator, GetNext(guestOS.asOutParam()));
+                guestOS = coll[i];
                 Bstr guestId;
                 guestOS->COMGETTER(Id)(guestId.asOutParam());

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -5536 +5536 @@
 #endif
 
-    /* Initialize guest OS Type list */
-    CGuestOSTypeCollection coll = mVBox.GetGuestOSTypes();
-    int osTypeCount = coll.GetCount();
+    /* Initialize guest OS Type list. */
+    CGuestOSTypeVector coll = mVBox.GetGuestOSTypes();
+    int osTypeCount = coll.size();
     AssertMsg (osTypeCount > 0, ("Number of OS types must not be zero"));
     if (osTypeCount > 0)
     {
-        CGuestOSTypeEnumerator en = coll.Enumerate();
-
-        /* Here we assume 'Other' type is always the first, so we
-         * remember it and will append it to the list when finish */
-        CGuestOSType otherType (en.GetNext());
+        /* Here we assume the 'Other' type is always the first, so we
+         * remember it and will append it to the list when finished. */
+        CGuestOSType otherType = coll[0];
         QString otherFamilyId (otherType.GetFamilyId());
 
         /* Fill the lists with all the available OS Types except
-         * the 'Other' one type, it will be appended. */
-        while (en.HasMore())
-        {
-            CGuestOSType os (en.GetNext());
+         * the 'Other' type, which will be appended. */
+        for (int i = 1; i < coll.size(); ++i)
+        {
+            CGuestOSType os = coll[i];
             QString familyId (os.GetFamilyId());
             if (!mFamilyIDs.contains (familyId))
@@ -5563 +5561 @@
         }
 
-        /* Append the 'Other' OS Type to the end of list */
+        /* Append the 'Other' OS Type to the end of list. */
         if (!mFamilyIDs.contains (otherFamilyId))
         {
@@ -5572 +5570 @@
     }
 
-    /* Fill in OS type icon dictionary */
+    /* Fill in OS type icon dictionary. */
     static const char *kOSTypeIcons [][2] =
     {

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -692 +692 @@
 }
 
-STDMETHODIMP VirtualBox::COMGETTER(GuestOSTypes) (IGuestOSTypeCollection **aGuestOSTypes)
+STDMETHODIMP VirtualBox::COMGETTER(GuestOSTypes) (ComSafeArrayOut (IGuestOSType *, aGuestOSTypes))
 {
     CheckComArgOutSafeArrayPointerValid(aGuestOSTypes);
@@ -699 +699 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    ComObjPtr <GuestOSTypeCollection> collection;
-    collection.createObject();
-
     AutoReadLock alock (this);
-    collection->init (mData.mGuestOSTypes);
-    collection.queryInterfaceTo (aGuestOSTypes);
+
+    SafeIfaceArray <IGuestOSType> ostypes (mData.mGuestOSTypes);
+    ostypes.detachTo (ComSafeArrayOutArg (aGuestOSTypes));
 
     return S_OK;

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

@@ -46 +46 @@
  *    (<result> extraction for the %Rhrc format specifier)
  *
-     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
@@ -1409 +1409 @@
     <attribute name="progressOperations" type="IProgress" readonly="yes" safearray="yes"/>
 
-    <attribute name="guestOSTypes" type="IGuestOSTypeCollection" readonly="yes"/>
+    <attribute name="guestOSTypes" type="IGuestOSType" readonly="yes" safearray="yes"/>
 
     <attribute name="sharedFolders" type="ISharedFolder" readonly="yes" safearray="yes">
@@ -7101 +7101 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="bc415228-eed0-402c-92f5-96fc4e2dd7e4"
+    uuid="cfe9e64c-4430-435b-9e7c-e3d8e417bd58"
     wsmap="struct"
   >
@@ -7151 +7151 @@
     </attribute>
   </interface>
-
-
-  <enumerator
-     name="IGuestOSTypeEnumerator" type="IGuestOSType"
-     uuid="a3335e02-4669-4e3c-80c7-c4dc7056a07c"
-     />
-
-  <collection
-     name="IGuestOSTypeCollection" type="IGuestOSType" enumerator="IGuestOSTypeEnumerator"
-     uuid="a5e36749-a610-498b-9f29-2e36c1042d65"
-     readonly="yes"
-     />
 
   <interface

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -101 +101 @@
 };
 
-COM_DECL_READONLY_ENUM_AND_COLLECTION (GuestOSType)
-
 #endif // ____H_GUESTOSTYPEIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -130 +130 @@
     STDMETHOD(COMGETTER(FloppyImages)) (ComSafeArrayOut (IFloppyImage *, aFloppyImages));
     STDMETHOD(COMGETTER(ProgressOperations)) (ComSafeArrayOut (IProgress *, aOperations));
-    STDMETHOD(COMGETTER(GuestOSTypes)) (IGuestOSTypeCollection **aGuestOSTypes);
+    STDMETHOD(COMGETTER(GuestOSTypes)) (ComSafeArrayOut (IGuestOSType *, aGuestOSTypes));
     STDMETHOD(COMGETTER(SharedFolders)) (ComSafeArrayOut (ISharedFolder *, aSharedFolders));
     STDMETHOD(COMGETTER(PerformanceCollector)) (IPerformanceCollector **aPerformanceCollector);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -243 +243 @@
 
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(Snapshot)
-COM_IMPL_READONLY_ENUM_AND_COLLECTION(GuestOSType)
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(HostDVDDrive)
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(HostFloppyDrive)