Changeset 22601 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 31, 2009 12:22:42 PM (16 years ago)

Author:

vboxsync

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

51650

Message:

Main/GuestProperties: tentatively fix r51587 and r51594 to use C constructs, not C++ ones

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2832 +2832 @@
         AssertMsgReturn(SUCCEEDED(hrc), ("hrc=%#x\n", hrc),
                         VERR_GENERAL_FAILURE);
-        size_t cProps = namesOut.size();
+        size_t cProps = namesOut.size(), cAlloc = cProps + 1;
         if (   valuesOut.size() != cProps
             || timestampsOut.size() != cProps
@@ -2839 +2839 @@
             AssertFailedReturn(VERR_INVALID_PARAMETER);
 
-        try
-        {
-            std::vector<Utf8Str> utf8Names, utf8Values, utf8Flags;
-            std::vector<const char *> names, values, flags;
-            std::vector<ULONG64> timestamps;
-            for (unsigned i = 0; i < cProps && RT_SUCCESS(rc); ++i)
-            {
-                AssertPtrReturn(namesOut[i], VERR_INVALID_PARAMETER);
-                utf8Names.push_back(Bstr(namesOut[i]));
-                utf8Values.push_back(Bstr(valuesOut[i]));
-                timestamps.push_back(timestampsOut[i]);
-                utf8Flags.push_back(Bstr(flagsOut[i]));
-            }
-            for (unsigned i = 0; i < cProps && RT_SUCCESS(rc); ++i)
-            {
-                names.push_back(utf8Names[i].c_str());
-                AssertPtrReturn(names[i], VERR_NO_MEMORY);
+        char **pacszNames, **pacszValues, **pacszFlags;
+        char szEmpty[] = "";
+        ULONG64 *pau64Timestamps;
+        pacszNames = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
+        pacszValues = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
+        pau64Timestamps = (ULONG64 *)RTMemTmpAllocZ(sizeof(ULONG64) * cAlloc);
+        pacszFlags = (char **)RTMemTmpAllocZ(sizeof(void *) * cAlloc);
+        if (!(pacszNames && pacszValues && pau64Timestamps && pacszFlags))
+            rc = VERR_NO_MEMORY;
+        for (unsigned i = 0; RT_SUCCESS(rc) && i < cProps; ++i)
+        {
+            AssertPtrReturn(namesOut[i], VERR_INVALID_PARAMETER);
+            rc = RTUtf16ToUtf8(namesOut[i], &pacszNames[i]);
+            if (RT_FAILURE(rc))
+                break;
+            if (valuesOut[i])
+                rc = RTUtf16ToUtf8(valuesOut[i], &pacszValues[i]);
+            else
+                pacszValues[i] = szEmpty;
+            if (RT_FAILURE(rc))
+                break;
+            pau64Timestamps[i] = timestampsOut[i];
+            if (flagsOut[i])
+                rc = RTUtf16ToUtf8(flagsOut[i], &pacszFlags[i]);
+            else
+                pacszFlags[i] = szEmpty;
+        }
+        if (RT_SUCCESS(rc))
+            configSetProperties(pConsole->mVMMDev, (void *)pacszNames,
+                                (void *)pacszValues, (void *)pau64Timestamps,
+                                (void *)pacszFlags);
+        if (pacszNames && pacszValues && pau64Timestamps && pacszFlags)
+            for (unsigned i = 0; i < cProps; ++i)
+            {
+                RTStrFree(pacszNames[i]);
                 if (valuesOut[i])
-                    values.push_back(utf8Values[i].c_str());
-                else
-                    values.push_back("");
-                AssertPtrReturn(values[i], VERR_NO_MEMORY);
+                    RTStrFree(pacszValues[i]);
                 if (flagsOut[i])
-                    flags.push_back(utf8Flags[i].c_str());
-                else
-                    flags.push_back("");
-                AssertPtrReturn(flags[i], VERR_NO_MEMORY);
-            }
-            names.push_back(NULL);
-            values.push_back(NULL);
-            timestamps.push_back(0);
-            flags.push_back(NULL);
-
-            configSetProperties(pConsole->mVMMDev,
-                                (void *)&names.front(),
-                                (void *)&values.front(),
-                                (void *)&timestamps.front(),
-                                (void *)&flags.front());
-        }
-        catch(std::bad_alloc & /*e*/)
-        {
-            return VERR_NO_MEMORY;
-        }
+                    RTStrFree(pacszFlags[i]);
+            }
+        RTMemTmpFree(pacszNames);
+        RTMemTmpFree(pacszValues);
+        RTMemTmpFree(pau64Timestamps);
+        RTMemTmpFree(pacszFlags);
 
         /* Set the VBox version string as a guest property */