Changeset 31480 in vbox

Timestamp:

Aug 9, 2010 12:28:25 PM (15 years ago)

Author:

vboxsync

Message:

Main: use Utf8Str for media properties (also fixes incorrect length assumption in conversation with media backend)

File:

• trunk/src/VBox/Main/MediumImpl.cpp (modified) (15 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -150 +150 @@
     bool hostDrive : 1;
 
-    typedef std::map<Bstr, Bstr> PropertyMap;
-    PropertyMap properties;
+    settings::PropertiesMap mapProperties;
 
     bool implicit : 1;
@@ -993 +992 @@
         const Utf8Str &name = it->first;
         const Utf8Str &value = it->second;
-        m->properties[Bstr(name)] = Bstr(value);
+        m->mapProperties[name] = value;
     }
 
@@ -1963 +1962 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    Data::PropertyMap::const_iterator it = m->properties.find(Bstr(aName));
-    if (it == m->properties.end())
+    settings::PropertiesMap::const_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);
@@ -1991 +1990 @@
     }
 
-    Data::PropertyMap::iterator it = m->properties.find(Bstr(aName));
-    if (it == m->properties.end())
+    settings::PropertiesMap::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);
 
-    if (aValue && !*aValue)
-        it->second = (const char *)NULL;
-    else
-        it->second = aValue;
+    it->second = aValue;
 
     // save the global settings; for that we should hold only the VirtualBox lock
@@ -2025 +2021 @@
     NOREF(aNames);
 
-    com::SafeArray<BSTR> names(m->properties.size());
-    com::SafeArray<BSTR> values(m->properties.size());
+    com::SafeArray<BSTR> names(m->mapProperties.size());
+    com::SafeArray<BSTR> values(m->mapProperties.size());
     size_t i = 0;
 
-    for (Data::PropertyMap::const_iterator it = m->properties.begin();
-         it != m->properties.end();
+    for (settings::PropertiesMap::const_iterator it = m->mapProperties.begin();
+         it != m->mapProperties.end();
          ++it)
     {
@@ -2063 +2059 @@
          ++i)
     {
-        if (m->properties.find(Bstr(names[i])) == m->properties.end())
+        if (m->mapProperties.find(Utf8Str(names[i])) == m->mapProperties.end())
             return setError(VBOX_E_OBJECT_NOT_FOUND,
                             tr("Property '%ls' does not exist"), names[i]);
@@ -2073 +2069 @@
          ++i)
     {
-        Data::PropertyMap::iterator it = m->properties.find(Bstr(names[i]));
-        AssertReturn(it != m->properties.end(), E_FAIL);
-
-        if (values[i] && !*values[i])
-            it->second = (const char *)NULL;
-        else
-            it->second = values[i];
+        settings::PropertiesMap::iterator it = m->mapProperties.find(Utf8Str(names[i]));
+        AssertReturn(it != m->mapProperties.end(), E_FAIL);
+
+        it->second = Utf8Str(values[i]);
     }
 
@@ -3027 +3020 @@
     /* optional properties */
     data.properties.clear();
-    for (Data::PropertyMap::const_iterator it = m->properties.begin();
-         it != m->properties.end();
+    for (settings::PropertiesMap::const_iterator it = m->mapProperties.begin();
+         it != m->mapProperties.end();
          ++it)
     {
@@ -3034 +3027 @@
         if (!it->second.isEmpty())
         {
-            Utf8Str name = it->first;
-            Utf8Str value = it->second;
+            const Utf8Str &name = it->first;
+            const Utf8Str &value = it->second;
             data.properties[name] = value;
         }
@@ -4919 +4912 @@
          * properties is meant to be constant. */
 
-        Assert(m->properties.empty());
+        Assert(m->mapProperties.empty());
 
         for (MediumFormat::PropertyList::const_iterator it = m->formatObj->getProperties().begin();
@@ -4925 +4918 @@
              ++it)
         {
-            m->properties.insert(std::make_pair(it->strName, Utf8Str::Empty));
+            m->mapProperties.insert(std::make_pair(it->strName, Utf8Str::Empty));
         }
     }
@@ -5015 +5008 @@
 
 /* static */
-DECLCALLBACK(int) Medium::vdConfigQuerySize(void *pvUser, const char *pszName,
+DECLCALLBACK(int) Medium::vdConfigQuerySize(void *pvUser,
+                                            const char *pszName,
                                             size_t *pcbValue)
 {
@@ -5023 +5017 @@
     AssertReturn(that != NULL, VERR_GENERAL_FAILURE);
 
-    Data::PropertyMap::const_iterator it =
-        that->m->properties.find(Bstr(pszName));
-    if (it == that->m->properties.end())
+    settings::PropertiesMap::const_iterator it = that->m->mapProperties.find(Utf8Str(pszName));
+    if (it == that->m->mapProperties.end())
         return VERR_CFGM_VALUE_NOT_FOUND;
 
@@ -5038 +5031 @@
 
 /* static */
-DECLCALLBACK(int) Medium::vdConfigQuery(void *pvUser, const char *pszName,
-                                        char *pszValue, size_t cchValue)
+DECLCALLBACK(int) Medium::vdConfigQuery(void *pvUser,
+                                        const char *pszName,
+                                        char *pszValue,
+                                        size_t cchValue)
 {
     AssertReturn(VALID_PTR(pszValue), VERR_INVALID_POINTER);
@@ -5046 +5041 @@
     AssertReturn(that != NULL, VERR_GENERAL_FAILURE);
 
-    Data::PropertyMap::const_iterator it =
-        that->m->properties.find(Bstr(pszName));
-    if (it == that->m->properties.end())
+    settings::PropertiesMap::const_iterator it = that->m->mapProperties.find(Utf8Str(pszName));
+    if (it == that->m->mapProperties.end())
         return VERR_CFGM_VALUE_NOT_FOUND;
-
-    Utf8Str value = it->second;
-    if (value.length() >= cchValue)
-        return VERR_CFGM_NOT_ENOUGH_SPACE;
 
     /* we interpret null values as "no value" in Medium */
     if (it->second.isEmpty())
         return VERR_CFGM_VALUE_NOT_FOUND;
+
+    const Utf8Str &value = it->second;
+    if (value.length() >= cchValue)
+        return VERR_CFGM_NOT_ENOUGH_SPACE;
 
     memcpy(pszValue, value.c_str(), value.length() + 1);