Changeset 14596 in vbox for trunk

Timestamp:

Nov 25, 2008 8:23:51 PM (16 years ago)

Author:

vboxsync

Message:

Main: Implemented IHardDisk2::getProperty()/setProperty().

Location:

trunk/src/VBox/Main

Files:

• HardDisk2Impl.cpp (modified) (3 diffs)
• include/HardDisk2Impl.h (modified) (2 diffs)
• include/HardDiskFormatImpl.h (modified) (1 diff)
• testcase/tstAPI.cpp (modified) (3 diffs)

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -923 +923 @@
 STDMETHODIMP HardDisk2::GetProperty (INPTR BSTR aName, BSTR *aValue)
 {
-//  CheckComArgStrNotEmptyOrNull (aName);
-//  CheckComArgOutPointerValid (aValue);
-//
-//  AutoCaller autoCaller (this);
-//  CheckComRCReturnRC (autoCaller.rc());
-//
-//  AutoReadLock alock (this);
-
-    return E_NOTIMPL;
+    CheckComArgStrNotEmptyOrNull (aName);
+    CheckComArgOutPointerValid (aValue);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    Data::PropertyMap::const_iterator it = mm.properties.find (Bstr (aName));
+    if (it == mm.properties.end())
+        return setError (VBOX_E_OBJECT_NOT_FOUND,
+            tr ("Property '%ls' does not exist"), aName);
+
+    it->second.cloneTo (aValue);
+
+    return S_OK;
 }
 
 STDMETHODIMP HardDisk2::SetProperty (INPTR BSTR aName, INPTR BSTR aValue)
 {
-//  CheckComArgStrNotEmptyOrNull (aName);
-//
-//  AutoWriteLock alock (this);
-
-    return E_NOTIMPL;
+    CheckComArgStrNotEmptyOrNull (aName);
+
+    AutoWriteLock alock (this);
+
+    Data::PropertyMap::iterator it = mm.properties.find (Bstr (aName));
+    if (it == mm.properties.end())
+        return setError (VBOX_E_OBJECT_NOT_FOUND,
+            tr ("Property '%ls' does not exist"), aName);
+
+    it->second = aValue;
+
+    return S_OK;
 }
 
@@ -947 +961 @@
                                        ComSafeArrayOut (BSTR, aReturnValues))
 {
-//  ComSafeArrayOutIsNull
-
-    return E_NOTIMPL;
+    CheckComArgOutSafeArrayPointerValid (aReturnNames);
+    CheckComArgOutSafeArrayPointerValid (aReturnValues);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    com::SafeArray <BSTR> names (mm.properties.size());
+    com::SafeArray <BSTR> values (mm.properties.size());
+    size_t i = 0;
+
+    for (Data::PropertyMap::const_iterator it = mm.properties.begin();
+          it != mm.properties.end(); ++ it)
+    {
+        it->first.cloneTo (&names [i]);
+        it->second.cloneTo (&values [i]);
+        ++ i;
+    }
+
+    names.detachTo (ComSafeArrayOutArg (aReturnNames));
+    values.detachTo (ComSafeArrayOutArg (aReturnValues));
+
+    return S_OK;
 }
 
@@ -2437 +2472 @@
         HRESULT rc = mm.formatObj->addCaller();
         AssertComRCReturnRC (rc);
+
+        /* get properties (preinsert them as keys in the map). Note that the
+         * map doesn't grow over the object life time since the set of
+         * properties is meant to be constant. */
+
+        mm.properties.clear();
+
+        for (HardDiskFormat::PropertyList::const_iterator it =
+                mm.formatObj->properties().begin();
+             it != mm.formatObj->properties().end();
+             ++ it)
+        {
+            mm.properties.insert (std::make_pair (it->name, Bstr::Null));
+        }
     }
 

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

@@ -35 +35 @@
 #include <VBox/VBoxHDD-new.h>
 
+#include <map>
+
 class Progress;
 
@@ -267 +269 @@
         uint64_t logicalSize;   /*< In MBytes. */
 
+        typedef std::map <Bstr, Bstr> PropertyMap;
+        PropertyMap properties;
+
         bool implicit : 1;
 

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

@@ -114 +114 @@
 
     /** Const, no need to lock */
-    const Bstr &id() { return m.id; }
+    const Bstr &id() const { return m.id; }
     /** Const, no need to lock */
-    const BstrList &fileExtensions() { return m.fileExtensions; }
+    const BstrList &fileExtensions() const { return m.fileExtensions; }
     /** Const, no need to lock */
-    uint64_t capabilities() { return m.capabilities; }
+    uint64_t capabilities() const { return m.capabilities; }
+    /** Const, no need to lock */
+    const PropertyList &properties() const { return m.properties; }
 
     // for VirtualBoxSupportErrorInfoImpl

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

@@ -593 +593 @@
 
 #if 0
-    // find a registered hard disk by location
+    // find a registered hard disk by location and get properties
     ///////////////////////////////////////////////////////////////////////////
     do
     {
-        ComPtr <IHardDisk> hd;
+        ComPtr <IHardDisk2> hd;
         static const wchar_t *Names[] =
         {
 #ifndef RT_OS_LINUX
-            L"E:/Develop/innotek/images/thinker/freedos.vdi",
-            L"E:/Develop/innotek/images/thinker/fReeDoS.vDI",
-            L"E:/Develop/innotek/images/vmdk/haiku.vmdk",
+            L"freedos.vdi",
+            L"MS-DOS.vmdk",
+            L"iscsi",
+            L"some/path/and/disk.vdi",
 #else
-            L"/mnt/host/common/Develop/innotek/images/maggot/freedos.vdi",
-            L"/mnt/host/common/Develop/innotek/images/maggot/fReeDoS.vDI",
+            L"xp.vdi",
+            L"Xp.vDI",
 #endif
         };
+
+        printf ("\n");
+
         for (size_t i = 0; i < RT_ELEMENTS (Names); ++ i)
         {
             Bstr src = Names [i];
             printf ("Searching for hard disk '%ls'...\n", src.raw());
-            rc = virtualBox->FindHardDisk (src, hd.asOutParam());
+            rc = virtualBox->FindHardDisk2 (src, hd.asOutParam());
             if (SUCCEEDED (rc))
             {
@@ -622 +626 @@
                 printf ("Found, UUID={%Vuuid}, location='%ls'.\n",
                         id.raw(), location.raw());
+
+                com::SafeArray <BSTR> names;
+                com::SafeArray <BSTR> values;
+
+                CHECK_ERROR_BREAK (hd, GetProperties (NULL,
+                                                      ComSafeArrayAsOutParam (names),
+                                                      ComSafeArrayAsOutParam (values)));
+
+                printf ("Properties:\n");
+                for (size_t i = 0; i < names.size(); ++ i)
+                    printf (" %ls = %ls\n", names [i], values [i]);
+
+                if (names.size() == 0)
+                    printf (" <none>\n");
+
             }
             else
             {
-                PRINT_ERROR_INFO (com::ErrorInfo (virtualBox));
+                com::ErrorInfo info (virtualBox);
+                PRINT_ERROR_INFO (info);
             }
+            printf ("\n");
         }
     }
@@ -1097 +1118 @@
 #endif
 
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
+#if 0 && defined (VBOX_WITH_RESOURCE_USAGE_API)
     do {
         // Get collector