Changeset 22173 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Aug 11, 2009 3:38:59 PM (16 years ago)

Author:

vboxsync

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

50951

Message:

Main: the big XML settings rework. Move XML reading/writing out of interface implementation code into separate layer so it can handle individual settings versions in the future.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (1 diff)
• VBoxManage.cpp (modified) (6 diffs)
• VBoxManageDisk.cpp (modified) (2 diffs)

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

@@ -474 +474 @@
     HRESULT hrc = NewUniqueKey(machine, "VBoxInternal/DBGF/loadsyms", KeyStr);
     if (SUCCEEDED(hrc))
-        hrc = SetString(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "Filename", pszFilename);
+        hrc = SetString(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "Filename", pszFilename);
     if (SUCCEEDED(hrc) && argc >= 3)
-        hrc = SetInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "Delta", offDelta);
+        hrc = SetInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "Delta", offDelta);
     if (SUCCEEDED(hrc) && argc >= 4)
-        hrc = SetString(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "Module", pszModule);
+        hrc = SetString(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "Module", pszModule);
     if (SUCCEEDED(hrc) && argc >= 5)
-        hrc = SetUInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "ModuleAddress", ModuleAddress);
+        hrc = SetUInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "ModuleAddress", ModuleAddress);
     if (SUCCEEDED(hrc) && argc >= 6)
-        hrc = SetUInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr, "ModuleSize", ModuleSize);
+        hrc = SetUInt64(machine, "VBoxInternal/DBGF/loadsyms", KeyStr.c_str(), "ModuleSize", ModuleSize);
 
     return FAILED(hrc);

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

@@ -1267 +1267 @@
         if (!strcmp(a->argv[1], "enumerate"))
         {
-            Bstr extraDataKey;
-
-            do
-            {
-                Bstr nextExtraDataKey;
-                Bstr nextExtraDataValue;
-                HRESULT rcEnum = a->virtualBox->GetNextExtraDataKey(extraDataKey, nextExtraDataKey.asOutParam(),
-                                                                    nextExtraDataValue.asOutParam());
-                extraDataKey = nextExtraDataKey;
-
-                if (SUCCEEDED(rcEnum) && !extraDataKey.isEmpty())
-                    RTPrintf("Key: %lS, Value: %lS\n", nextExtraDataKey.raw(), nextExtraDataValue.raw());
-            } while (!extraDataKey.isEmpty());
+            SafeArray<BSTR> aKeys;
+            CHECK_ERROR(a->virtualBox, GetExtraDataKeys(ComSafeArrayAsOutParam(aKeys)));
+
+            for (size_t i = 0;
+                 i < aKeys.size();
+                 ++i)
+            {
+                Bstr bstrKey(aKeys[i]);
+                Bstr bstrValue;
+                CHECK_ERROR(a->virtualBox, GetExtraData(bstrKey, bstrValue.asOutParam()));
+
+                RTPrintf("Key: %lS, Value: %lS\n", bstrKey.raw(), bstrValue.raw());
+            }
         }
         else
@@ -1306 +1306 @@
             if (!strcmp(a->argv[1], "enumerate"))
             {
-                Bstr extraDataKey;
-
-                do
-                {
-                    Bstr nextExtraDataKey;
-                    Bstr nextExtraDataValue;
-                    HRESULT rcEnum = machine->GetNextExtraDataKey(extraDataKey, nextExtraDataKey.asOutParam(),
-                                                                  nextExtraDataValue.asOutParam());
-                    extraDataKey = nextExtraDataKey;
-
-                    if (SUCCEEDED(rcEnum) && !extraDataKey.isEmpty())
-                    {
-                        RTPrintf("Key: %lS, Value: %lS\n", nextExtraDataKey.raw(), nextExtraDataValue.raw());
-                    }
-                } while (!extraDataKey.isEmpty());
+                SafeArray<BSTR> aKeys;
+                CHECK_ERROR(machine, GetExtraDataKeys(ComSafeArrayAsOutParam(aKeys)));
+
+                for (size_t i = 0;
+                    i < aKeys.size();
+                    ++i)
+                {
+                    Bstr bstrKey(aKeys[i]);
+                    Bstr bstrValue;
+                    CHECK_ERROR(machine, GetExtraData(bstrKey, bstrValue.asOutParam()));
+
+                    RTPrintf("Key: %lS, Value: %lS\n", bstrKey.raw(), bstrValue.raw());
+                }
             }
             else
@@ -1697 +1695 @@
 #endif /* !VBOX_ONLY_DOCS */
 
-enum ConvertSettings
-{
-    ConvertSettings_No      = 0,
-    ConvertSettings_Yes     = 1,
-    ConvertSettings_Backup  = 2,
-    ConvertSettings_Ignore  = 3,
-};
-
-#ifndef VBOX_ONLY_DOCS
-/**
- * Checks if any of the settings files were auto-converted and informs the
- * user if so.
- *
- * @return @false if the program should terminate and @true otherwise.
- */
-static bool checkForAutoConvertedSettings (ComPtr<IVirtualBox> virtualBox,
-                                           ComPtr<ISession> session,
-                                           ConvertSettings fConvertSettings)
-{
-    /* return early if nothing to do */
-    if (fConvertSettings == ConvertSettings_Ignore)
-        return true;
-
-    HRESULT rc;
-
-    do
-    {
-        Bstr formatVersion;
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFormatVersion) (formatVersion.asOutParam()));
-
-        bool isGlobalConverted = false;
-        std::list <ComPtr <IMachine> > cvtMachines;
-        std::list <Utf8Str> fileList;
-        Bstr version;
-        Bstr filePath;
-
-        com::SafeIfaceArray <IMachine> machines;
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(Machines)(ComSafeArrayAsOutParam (machines)));
-
-        for (size_t i = 0; i < machines.size(); ++ i)
-        {
-            BOOL accessible;
-            CHECK_ERROR_BREAK(machines[i], COMGETTER(Accessible) (&accessible));
-            if (!accessible)
-                continue;
-
-            CHECK_ERROR_BREAK(machines[i], COMGETTER(SettingsFileVersion) (version.asOutParam()));
-
-            if (version != formatVersion)
-            {
-                cvtMachines.push_back (machines [i]);
-                Bstr filePath;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(SettingsFilePath) (filePath.asOutParam()));
-                fileList.push_back (Utf8StrFmt ("%ls  (%ls)", filePath.raw(),
-                                                version.raw()));
-            }
-        }
-
-        if (FAILED(rc))
-            break;
-
-        CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFileVersion) (version.asOutParam()));
-        if (version != formatVersion)
-        {
-            isGlobalConverted = true;
-            CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFilePath) (filePath.asOutParam()));
-            fileList.push_back (Utf8StrFmt ("%ls  (%ls)", filePath.raw(),
-                                            version.raw()));
-        }
-
-        if (fileList.size() > 0)
-        {
-            switch (fConvertSettings)
-            {
-                case ConvertSettings_No:
-                {
-                    RTPrintf (
-"WARNING! The following VirtualBox settings files have been automatically\n"
-"converted to the new settings file format version '%ls':\n"
-"\n",
-                              formatVersion.raw());
-
-                    for (std::list <Utf8Str>::const_iterator f = fileList.begin();
-                         f != fileList.end(); ++ f)
-                        RTPrintf ("  %S\n", (*f).raw());
-                    RTPrintf (
-"\n"
-"The current command was aborted to prevent overwriting the above settings\n"
-"files with the results of the auto-conversion without your permission.\n"
-"Please put one of the following command line switches to the beginning of\n"
-"the VBoxManage command line and repeat the command:\n"
-"\n"
-"  --convertSettings       - to save all auto-converted files (it will not\n"
-"                            be possible to use these settings files with an\n"
-"                            older version of VirtualBox in the future);\n"
-"  --convertSettingsBackup - to create backup copies of the settings files in\n"
-"                            the old format before saving them in the new format;\n"
-"  --convertSettingsIgnore - to not save the auto-converted settings files.\n"
-"\n"
-"Note that if you use --convertSettingsIgnore, the auto-converted settings files\n"
-"will be implicitly saved in the new format anyway once you change a setting or\n"
-"start a virtual machine, but NO backup copies will be created in this case.\n");
-                    return false;
-                }
-                case ConvertSettings_Yes:
-                case ConvertSettings_Backup:
-                {
-                    break;
-                }
-                default:
-                    AssertFailedReturn (false);
-            }
-
-            for (std::list <ComPtr <IMachine> >::const_iterator m = cvtMachines.begin();
-                 m != cvtMachines.end(); ++ m)
-            {
-                Bstr id;
-                CHECK_ERROR_BREAK((*m), COMGETTER(Id) (id.asOutParam()));
-
-                /* open a session for the VM */
-                CHECK_ERROR_BREAK (virtualBox, OpenSession (session, id));
-
-                ComPtr <IMachine> sm;
-                CHECK_ERROR_BREAK(session, COMGETTER(Machine) (sm.asOutParam()));
-
-                Bstr bakFileName;
-                if (fConvertSettings == ConvertSettings_Backup)
-                    CHECK_ERROR (sm, SaveSettingsWithBackup (bakFileName.asOutParam()));
-                else
-                    CHECK_ERROR (sm, SaveSettings());
-
-                session->Close();
-
-                if (FAILED(rc))
-                    break;
-            }
-
-            if (FAILED(rc))
-                break;
-
-            if (isGlobalConverted)
-            {
-                Bstr bakFileName;
-                if (fConvertSettings == ConvertSettings_Backup)
-                    CHECK_ERROR (virtualBox, SaveSettingsWithBackup (bakFileName.asOutParam()));
-                else
-                    CHECK_ERROR (virtualBox, SaveSettings());
-            }
-
-            if (FAILED(rc))
-                break;
-        }
-    }
-    while (0);
-
-    return SUCCEEDED (rc);
-}
-#endif /* !VBOX_ONLY_DOCS */
-
 // main
 ///////////////////////////////////////////////////////////////////////////////
@@ -1871 +1710 @@
     int  iCmdArg;
 
-    ConvertSettings fConvertSettings = ConvertSettings_No;
-
     /* global options */
     for (int i = 1; i < argc || argc <= iCmd; i++)
@@ -1912 +1749 @@
             iCmd++;
         }
-        else if (   !strcmp(argv[i], "--convertSettings")
-                 || !strcmp(argv[i], "-convertSettings"))
-        {
-            fConvertSettings = ConvertSettings_Yes;
-            iCmd++;
-        }
-        else if (   !strcmp(argv[i], "--convertSettingsBackup")
-                 || !strcmp(argv[i], "-convertSettingsBackup"))
-        {
-            fConvertSettings = ConvertSettings_Backup;
-            iCmd++;
-        }
-        else if (   !strcmp(argv[i], "--convertSettingsIgnore")
-                 || !strcmp(argv[i], "-convertSettingsIgnore"))
-        {
-            fConvertSettings = ConvertSettings_Ignore;
-            iCmd++;
-        }
         else
         {
@@ -2013 +1832 @@
     NS_GetMainEventQ(getter_AddRefs(eventQ));
 #endif
-
-    if (!checkForAutoConvertedSettings (virtualBox, session, fConvertSettings))
-        break;
 
 #ifdef USE_XPCOM_QUEUE

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

@@ -616 +616 @@
         {
             char szFilenameAbs[RTPATH_MAX] = "";
-            int vrc = RTPathAbs(Utf8Str(src), szFilenameAbs, sizeof(szFilenameAbs));
+            int vrc = RTPathAbs(Utf8Str(src).c_str(), szFilenameAbs, sizeof(szFilenameAbs));
             if (RT_FAILURE(vrc))
             {
@@ -650 +650 @@
                 {
                     char szFilenameAbs[RTPATH_MAX] = "";
-                    int vrc = RTPathAbs(Utf8Str(dst), szFilenameAbs, sizeof(szFilenameAbs));
+                    int vrc = RTPathAbs(Utf8Str(dst).c_str(), szFilenameAbs, sizeof(szFilenameAbs));
                     if (RT_FAILURE(vrc))
                     {