儲存庫 vbox 的更動 46351

時間撮記:

2013-5-31 下午08:25:22 (11 年 以前)

作者:

vboxsync

訊息:

The ICON data isn't required, it's optional so dont fail in copyMachineDataToSettings because of this. For the same reason, don't save the <Icon> element unconditionally, only when there is actual data. Because, we have to bump the settings version when using <Icon>.

位置:

trunk/src/VBox/Main

檔案:

• src-server/MachineImpl.cpp (修改) (4 筆差異)
• xml/Settings.cpp (修改) (2 筆差異)

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

@@ -1290 +1290 @@
         // We must not throw away entries yet, otherwise settings are lost
         // without a way to roll back.
-        uint32_t newCount = Global::getMaxNetworkAdapters(aChipsetType);
-        uint32_t oldCount = mNetworkAdapters.size();
+        size_t newCount = Global::getMaxNetworkAdapters(aChipsetType);
+        size_t oldCount = mNetworkAdapters.size();
         if (newCount > oldCount)
         {
@@ -9979 +9979 @@
 void Machine::copyMachineDataToSettings(settings::MachineConfigFile &config)
 {
-    Utf8Str aStr;
-
     // deep copy extradata
     config.mapExtraDataItems = mData->pMachineConfigFile->mapExtraDataItems;
@@ -9993 +9991 @@
     COMGETTER(Icon)(ComSafeArrayAsOutParam(iconByte));
     ssize_t cbData = iconByte.size();
-    if (cbData == 0)
-        throw setError(E_FAIL,
-                       tr("Icon Data length is zero. '%d'"),
-                       cbData);
-    ssize_t cchOut = RTBase64EncodedLength(cbData);
-    aStr.reserve(cchOut+1);
-    HRESULT rc = RTBase64Encode(iconByte.raw(), cbData,
-                                aStr.mutableRaw(), aStr.capacity(),
-                                NULL);
-    if (FAILED(rc))
-        throw setError(E_FAIL,
-                       tr("Failure to Encode Icon Data. '%s' (%d)"),
-                       aStr.mutableRaw(),
-                       rc);
-    aStr.jolt();
-    config.machineUserData.ovIcon = aStr.c_str();
+    if (cbData > 0)
+    {
+        ssize_t cchOut = RTBase64EncodedLength(cbData);
+        Utf8Str strIconData;
+        strIconData.reserve(cchOut+1);
+        int vrc = RTBase64Encode(iconByte.raw(), cbData,
+                                 strIconData.mutableRaw(), strIconData.capacity(),
+                                 NULL);
+        if (RT_FAILURE(vrc))
+            throw setError(E_FAIL, tr("Failure to Encode Icon Data. '%s' (%Rrc)"), strIconData.mutableRaw(), vrc);
+        strIconData.jolt();
+        config.machineUserData.ovIcon = strIconData;
+    }
+    else
+        config.machineUserData.ovIcon.setNull();
 
     if (    mData->mMachineState == MachineState_Saved
@@ -10040 +10037 @@
     /// @todo Live Migration:        config.fTeleported = (mData->mMachineState == MachineState_Teleported);
 
-    rc = saveHardware(config.hardwareMachine, &config.debugging, &config.autostart);
+    HRESULT rc = saveHardware(config.hardwareMachine, &config.debugging, &config.autostart);
     if (FAILED(rc)) throw rc;
 

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4849 +4849 @@
     if (machineUserData.strDescription.length())
         elmMachine.createChild("Description")->addContent(machineUserData.strDescription);
-    elmMachine.setAttribute("Icon", machineUserData.ovIcon);
+    if (machineUserData.ovIcon.length())
+        elmMachine.setAttribute("Icon", machineUserData.ovIcon);
     elmMachine.setAttribute("OSType", machineUserData.strOsType);
     if (    strStateFile.length()
@@ -5051 +5052 @@
         if (   !hardwareMachine.strDefaultFrontend.isEmpty()
             || hardwareMachine.graphicsControllerType != GraphicsControllerType_VBoxVGA
-            || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy)
+            || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy
+            || machineUserData.ovIcon.length() > 0)
             m->sv = SettingsVersion_v1_14;
     }