Changeset 47920 in vbox

Timestamp:

Aug 20, 2013 2:24:50 PM (12 years ago)

Author:

vboxsync

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

88227

Message:

Main/Medium: allow free form properties in the Special/ namespace, previously only properties defined by the VD backend were possible

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -2392 +2392 @@
     }
 
-    settings::StringsMap::iterator it = m->mapProperties.find(Utf8Str(aName));
-    if (it == m->mapProperties.end())
-        return setError(VBOX_E_OBJECT_NOT_FOUND,
-                        tr("Property '%ls' does not exist"),
-                        aName);
-
-    it->second = aValue;
+    Utf8Str strName(aName);
+    Utf8Str strValue(aValue);
+    settings::StringsMap::iterator it = m->mapProperties.find(strName);
+    if (!strName.startsWith("Special/"))
+    {
+        if (it == m->mapProperties.end())
+            return setError(VBOX_E_OBJECT_NOT_FOUND,
+                            tr("Property '%s' does not exist"),
+                            strName.c_str());
+        it->second = strValue;
+    }
+    else
+    {
+        if (it == m->mapProperties.end())
+        {
+            if (!strValue.isEmpty())
+                m->mapProperties[strName] = strValue;
+        }
+        else
+        {
+            if (!strValue.isEmpty())
+                it->second = aValue;
+            else
+                m->mapProperties.erase(it);
+        }
+    }
 
     // save the settings
@@ -2461 +2480 @@
          ++i)
     {
-        if (m->mapProperties.find(Utf8Str(names[i])) == m->mapProperties.end())
+        Utf8Str strName(names[i]);
+        if (   !strName.startsWith("Special/")
+            && m->mapProperties.find(strName) == m->mapProperties.end())
             return setError(VBOX_E_OBJECT_NOT_FOUND,
-                            tr("Property '%ls' does not exist"), names[i]);
+                            tr("Property '%s' does not exist"), strName.c_str());
     }
 
@@ -2471 +2492 @@
          ++i)
     {
-        settings::StringsMap::iterator it = m->mapProperties.find(Utf8Str(names[i]));
-        AssertReturn(it != m->mapProperties.end(), E_FAIL);
-
-        it->second = Utf8Str(values[i]);
+        Utf8Str strName(names[i]);
+        Utf8Str strValue(values[i]);
+        settings::StringsMap::iterator it = m->mapProperties.find(strName);
+        if (!strName.startsWith("Special/"))
+        {
+            AssertReturn(it != m->mapProperties.end(), E_FAIL);
+            it->second = strValue;
+        }
+        else
+        {
+            if (it == m->mapProperties.end())
+            {
+                if (!strValue.isEmpty())
+                    m->mapProperties[strName] = strValue;
+            }
+            else
+            {
+                if (!strValue.isEmpty())
+                    it->second = strValue;
+                else
+                    m->mapProperties.erase(it);
+            }
+        }
     }