Changeset 6400 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Jan 21, 2008 10:35:19 AM (17 years ago)

Author:

vboxsync

Message:

shared folders: store 'writable' attribute, do it backward compatible

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -787 +787 @@
 const char *Console::sSSMConsoleUnit = "ConsoleData";
 //static
-uint32_t Console::sSSMConsoleVer = 0x00010000;
+uint32_t Console::sSSMConsoleVer = 0x00010001;
 
 /**
@@ -815 +815 @@
         uint32_t version = 0;
         vrc = SSMR3Seek (ssm, sSSMConsoleUnit, 0 /* iInstance */, &version);
-        if (version == sSSMConsoleVer)
+        if (SSM_VERSION_MAJOR(version)  == SSM_VERSION_MAJOR(sSSMConsoleVer))
         {
             if (VBOX_SUCCESS (vrc))
@@ -883 +883 @@
         AssertRC (vrc);
 
-//        XXX
-//        vrc = SSMR3PutBool (pSSM, folder->writable());
-//        AssertRC (vrc);
+        vrc = SSMR3PutBool (pSSM, folder->writable());
+        AssertRC (vrc);
     }
 
@@ -908 +907 @@
     LogFlowFunc (("\n"));
 
-    if (u32Version != 0 && u32Version != sSSMConsoleVer)
+    if (u32Version != 0 && SSM_VERSION_MAJOR_CHANGED(u32Version, sSSMConsoleVer))
         return VERR_VERSION_MISMATCH;
 
@@ -935 +934 @@
         Bstr name;
         Bstr hostPath;
+        bool writable = true;
 
         uint32_t szBuf = 0;
@@ -955 +955 @@
         delete[] buf;
 
+        if (u32Version > 0x00010000)
+            SSMR3GetBool (pSSM, &writable);
+
         ComObjPtr <SharedFolder> sharedFolder;
         sharedFolder.createObject();
-        HRESULT rc = sharedFolder->init (that, name, hostPath, true); /* TODO: fWritable */
+        HRESULT rc = sharedFolder->init (that, name, hostPath, writable);
         AssertComRCReturn (rc, VERR_INTERNAL_ERROR);