Changeset 78903 in vbox for trunk/src/VBox/HostServices/SharedFolders

Timestamp:

May 31, 2019 7:20:16 PM (6 years ago)

Author:

vboxsync

Message:

SharedFolderSvc: Fixed shared folder duplication after restoring state with root id gaps. bugref:9402

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• VBoxSharedFoldersSvc.cpp (modified) (2 diffs)
• mappings.cpp (modified) (3 diffs)
• mappings.h (modified) (1 diff)

trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFoldersSvc.cpp

@@ -300 +300 @@
                                  "Saved SHFLCLIENTDATA enmErrorStyle value %d is not known/valid!", pClient->enmErrorStyle);
 
+    /* Drop the root IDs of all configured mappings before restoring: */
+    vbsfMappingLoadingStart();
+
     /* We don't actually (fully) restore the state; we simply check if the current state is as we it expect it to be. */
     for (SHFLROOT i = 0; i < SHFL_MAX_MAPPINGS; i++)
@@ -418 +421 @@
         }
     }
+
+    /* Make sure all mappings have root IDs (global folders changes, VM
+       config changes (paranoia)): */
+    vbsfMappingLoadingDone();
+
     Log(("SharedFolders host service: successfully loaded state\n"));
 #else

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -96 +96 @@
 }
 
+/**
+ * Called before loading mappings from saved state to drop the root IDs.
+ */
+void vbsfMappingLoadingStart(void)
+{
+    for (SHFLROOT idRoot = 0; idRoot < RT_ELEMENTS(g_aIndexFromRoot); idRoot++)
+        g_aIndexFromRoot[idRoot] = SHFL_ROOT_NIL;
+
+    for (SHFLROOT i = 0; i < RT_ELEMENTS(g_FolderMapping); i++)
+        g_FolderMapping[i].fLoadedRootId = false;
+}
+
+/**
+ * Called when a mapping is loaded to restore the root ID and make sure it
+ * exists.
+ *
+ * @returns VBox status code.
+ */
 int vbsfMappingLoaded(const MAPPING *pLoadedMapping, SHFLROOT root)
 {
@@ -138 +156 @@
 
             /* Actual index is i. Remember that when the guest uses 'root' it is actually 'i'. */
-            /** @todo This will not work with global shared folders, as these can change
-             *        while state is saved and these blind assignments may hid new ones.  */
+            AssertLogRelMsg(g_aIndexFromRoot[root] == SHFL_ROOT_NIL,
+                            ("idRoot=%u: current %u ([%s]), new %u (%ls [%s])\n",
+                             root, g_aIndexFromRoot[root], g_FolderMapping[g_aIndexFromRoot[root]].pszFolderName,
+                             pLoadedMapping->pMapName->String.utf16, pLoadedMapping->pszFolderName));
             g_aIndexFromRoot[root] = i;
 
@@ -158 +178 @@
                            pLoadedMapping->fSymlinksCreate, /* fMissing = */ true, /* fPlaceholder = */ true);
 }
+
+/**
+ * Called after loading mappings from saved state to make sure every mapping has
+ * a root ID.
+ */
+void vbsfMappingLoadingDone(void)
+{
+    for (SHFLROOT iMapping = 0; iMapping < RT_ELEMENTS(g_FolderMapping); iMapping++)
+        if (g_FolderMapping[iMapping].fValid)
+        {
+            AssertLogRel(g_FolderMapping[iMapping].pMapName);
+            AssertLogRel(g_FolderMapping[iMapping].pszFolderName);
+
+            SHFLROOT idRoot;
+            for (idRoot = 0; idRoot < RT_ELEMENTS(g_aIndexFromRoot); idRoot++)
+                if (g_aIndexFromRoot[idRoot] == iMapping)
+                    break;
+            if (idRoot >= RT_ELEMENTS(g_aIndexFromRoot))
+            {
+                for (idRoot = 0; idRoot < RT_ELEMENTS(g_aIndexFromRoot); idRoot++)
+                    if (g_aIndexFromRoot[idRoot] == SHFL_ROOT_NIL)
+                        break;
+                if (idRoot < RT_ELEMENTS(g_aIndexFromRoot))
+                    g_aIndexFromRoot[idRoot] = iMapping;
+                else
+                    LogRel(("SharedFolders: Warning! No free root ID entry for mapping #%u: %ls [%s]\n", iMapping,
+                            g_FolderMapping[iMapping].pMapName->String.ucs2, g_FolderMapping[iMapping].pszFolderName));
+            }
+        }
+
+    /* Log the root ID mappings: */
+    if (LogRelIs2Enabled())
+        for (SHFLROOT idRoot = 0; idRoot < RT_ELEMENTS(g_aIndexFromRoot); idRoot++)
+        {
+            SHFLROOT const iMapping = g_aIndexFromRoot[idRoot];
+            if (iMapping != SHFL_ROOT_NIL)
+                LogRel2(("SharedFolders: idRoot %u: iMapping #%u: %ls [%s]\n", idRoot, iMapping,
+                         g_FolderMapping[iMapping].pMapName->String.ucs2, g_FolderMapping[iMapping].pszFolderName));
+        }
+}
+
 
 MAPPING *vbsfMappingGetByRoot(SHFLROOT root)

trunk/src/VBox/HostServices/SharedFolders/mappings.h

@@ -74 +74 @@
 bool vbsfIsHostMappingCaseSensitive(SHFLROOT root);
 
-int vbsfMappingLoaded(MAPPING const *pLoadedMapping, SHFLROOT root);
+void vbsfMappingLoadingStart(void);
+int  vbsfMappingLoaded(MAPPING const *pLoadedMapping, SHFLROOT root);
+void vbsfMappingLoadingDone(void);
 PMAPPING vbsfMappingGetByRoot(SHFLROOT root);