Changeset 19610 in vbox for trunk

Timestamp:

May 12, 2009 12:10:14 PM (16 years ago)

Author:

vboxsync

Message:

Main/Machine: add extradata key to suppress deleting saved state on discarding it.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (5 diffs)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2484 +2484 @@
         return S_OK;
 
+    Utf8Str val;
+    HRESULT rc = getExtraData(Utf8Str(aKey), val);
+    if (SUCCEEDED(rc))
+        val.cloneTo (aValue);
+
+    return rc;
+}
+
+HRESULT Machine::getExtraData(const Utf8Str &aKey, Utf8Str &aValue)
+{
     HRESULT rc = S_OK;
 
@@ -2498 +2508 @@
         rc = VirtualBox::loadSettingsTree_Again (tree, file);
         CheckComRCReturnRC (rc);
-
-        const Utf8Str key = aKey;
 
         Key machineNode = tree.rootKey().key ("Machine");
@@ -2511 +2519 @@
                  it != items.end(); ++ it)
             {
-                if (key == (*it).stringValue ("name"))
+                if (aKey == (*it).stringValue ("name"))
                 {
-                    Bstr val = (*it).stringValue ("value");
-                    val.cloneTo (aValue);
+                    aValue = (*it).stringValue ("value");
                     break;
                 }
@@ -7587 +7594 @@
         }
 
-        if (RT_FAILURE(vrc)) 
-        {    
+        if (RT_FAILURE(vrc))
+        {
             mData->mHandleCfgFile = NIL_RTFILE;
             mData->mConfigFileReadonly = FALSE;
@@ -11261 +11268 @@
     if (deleteSavedState == true)
     {
-        Assert (!mSSData->mStateFilePath.isEmpty());
-        RTFileDelete (Utf8Str (mSSData->mStateFilePath));
+        /** @todo remove this API hack, and provide a clean way for
+         * detaching a saved state without deleting. */
+        Utf8Str val;
+        HRESULT rc2 = getExtraData("API/DiscardSavedStateKeepFile", val);
+        if (FAILED(rc2) || val != "1")
+        {
+            Assert (!mSSData->mStateFilePath.isEmpty());
+            RTFileDelete (Utf8Str (mSSData->mStateFilePath));
+        }
         mSSData->mStateFilePath.setNull();
         stsFlags |= SaveSTS_StateFilePath;

trunk/src/VBox/Main/include/MachineImpl.h

@@ -794 +794 @@
     HRESULT saveStateSettings (int aFlags);
 
+    HRESULT getExtraData(const Utf8Str &aKey, Utf8Str &aValue);
+
     HRESULT createImplicitDiffs (const Bstr &aFolder,
                                  ComObjPtr <Progress> &aProgress,