Changeset 31002 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jul 22, 2010 2:45:41 PM (15 years ago)

Author:

vboxsync

Message:

First support for auto-mounted Shared Folders (Windows only yet).

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• mappings.cpp (modified) (6 diffs)
• mappings.h (modified) (3 diffs)
• service.cpp (modified) (8 diffs)

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

@@ -171 +171 @@
 
 /*
- *
  * We are always executed from one specific HGCM thread. So thread safe.
- *
  */
-int vbsfMappingsAdd (PSHFLSTRING pFolderName, PSHFLSTRING pMapName, uint32_t fWritable)
+int vbsfMappingsAdd (PSHFLSTRING pFolderName, PSHFLSTRING pMapName,
+                     uint32_t    fWritable,   uint32_t    fAutoMount)
 {
     unsigned i;
@@ -218 +217 @@
             memcpy(FolderMapping[i].pMapName->String.ucs2, pMapName->String.ucs2, pMapName->u16Size);
 
-            FolderMapping[i].fValid    = true;
-            FolderMapping[i].cMappings = 0;
-            FolderMapping[i].fWritable = !!fWritable;
+            FolderMapping[i].fValid     = true;
+            FolderMapping[i].cMappings  = 0;
+            FolderMapping[i].fWritable  = !!fWritable;
+            FolderMapping[i].fAutoMount = !!fAutoMount;
 
             /* Check if the host file system is case sensitive */
@@ -343 +343 @@
     {
         MAPPING *pFolderMapping = vbsfMappingGetByRoot(i);
-        if (pFolderMapping != NULL && pFolderMapping->fValid == true)
-        {
+        if (   pFolderMapping != NULL
+            && pFolderMapping->fValid == true)
+        {
+            /* Skip mappings which are not marked for auto-mounting if
+             * the SHFL_MF_AUTOMOUNT flag ist set. */
+            if (   (pClient->fu32Flags & SHFL_MF_AUTOMOUNT)
+                && !pFolderMapping->fAutoMount)
+                continue;
+
             pMappings[*pcMappings].u32Status = SHFL_MS_NEW;
             pMappings[*pcMappings].root = i;
@@ -350 +357 @@
         }
     }
-
     LogFlow(("vbsfMappingsQuery: return rc = %Rrc\n", rc));
-
     return rc;
 }
@@ -371 +376 @@
     if (BIT_FLAG(pClient->fu32Flags, SHFL_CF_UTF8))
     {
-        /* not implemented */
+        /* Not implemented. */
         AssertFailed();
         return VERR_INVALID_PARAMETER;
@@ -412 +417 @@
 }
 
+int vbsfMappingsQueryAutoMount (SHFLCLIENTDATA *pClient, SHFLROOT root, bool *fAutoMount)
+{
+    int rc = VINF_SUCCESS;
+
+    LogFlow(("vbsfMappingsQueryAutoMount: pClient = %p, root = %d\n",
+             pClient, root));
+
+    MAPPING *pFolderMapping = vbsfMappingGetByRoot(root);
+    if (pFolderMapping == NULL)
+    {
+        return VERR_INVALID_PARAMETER;
+    }
+
+    if (pFolderMapping->fValid == true)
+        *fAutoMount = pFolderMapping->fAutoMount;
+    else
+        rc = VERR_FILE_NOT_FOUND;
+
+    LogFlow(("vbsfMappingsQueryAutoMount:Writable return rc = %Rrc\n", rc));
+
+    return rc;
+}
+
 int vbsfMapFolder (SHFLCLIENTDATA *pClient, PSHFLSTRING pszMapName, RTUTF16 delimiter, bool fCaseSensitive, SHFLROOT *pRoot)
 {

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

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
     bool        fGuestCaseSensitive;
     bool        fWritable;
+    bool        fAutoMount;
 } MAPPING, *PMAPPING;
 
@@ -36 +37 @@
 bool vbsfMappingQuery(uint32_t iMapping, PMAPPING *pMapping);
 
-int vbsfMappingsAdd (PSHFLSTRING pFolderName, PSHFLSTRING pMapName, uint32_t fWritable);
-int vbsfMappingsRemove (PSHFLSTRING pMapName);
+int vbsfMappingsAdd(PSHFLSTRING pFolderName, PSHFLSTRING pMapName, uint32_t fWritable, uint32_t fAutoMount);
+int vbsfMappingsRemove(PSHFLSTRING pMapName);
 
-int vbsfMappingsQuery (SHFLCLIENTDATA *pClient, SHFLMAPPING *pMappings, uint32_t *pcMappings);
-int vbsfMappingsQueryName (SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pString);
-int vbsfMappingsQueryWritable (SHFLCLIENTDATA *pClient, SHFLROOT root, bool *fWritable);
+int vbsfMappingsQuery(SHFLCLIENTDATA *pClient, SHFLMAPPING *pMappings, uint32_t *pcMappings);
+int vbsfMappingsQueryName(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pString);
+int vbsfMappingsQueryWritable(SHFLCLIENTDATA *pClient, SHFLROOT root, bool *fWritable);
 
-int vbsfMapFolder (SHFLCLIENTDATA *pClient, PSHFLSTRING pszMapName, RTUTF16 delimiter, bool fCaseSensitive, SHFLROOT *pRoot);
-int vbsfUnmapFolder (SHFLCLIENTDATA *pClient, SHFLROOT root);
+int vbsfMapFolder(SHFLCLIENTDATA *pClient, PSHFLSTRING pszMapName, RTUTF16 delimiter, bool fCaseSensitive, SHFLROOT *pRoot);
+int vbsfUnmapFolder(SHFLCLIENTDATA *pClient, SHFLROOT root);
 
-PCRTUTF16     vbsfMappingsQueryHostRoot (SHFLROOT root, uint32_t *pcbRoot);
-bool          vbsfIsGuestMappingCaseSensitive (SHFLROOT root);
-bool          vbsfIsHostMappingCaseSensitive (SHFLROOT root);
+PCRTUTF16 vbsfMappingsQueryHostRoot (SHFLROOT root, uint32_t *pcbRoot);
+bool vbsfIsGuestMappingCaseSensitive (SHFLROOT root);
+bool vbsfIsHostMappingCaseSensitive (SHFLROOT root);
 
 int vbsfMappingLoaded (const MAPPING *pLoadedMapping, SHFLROOT root);

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

@@ -310 +310 @@
 
                 /* Verify parameters values. */
-                if (   (fu32Flags & ~SHFL_MF_UTF8) != 0
-                    || cbMappings / sizeof (SHFLMAPPING) < cMappings
+                if (   (fu32Flags & ~SHFL_MF_MASK) != 0
+                    || cbMappings / sizeof (SHFLMAPPING) != cMappings
                    )
                 {
@@ -320 +320 @@
                     /* Execute the function. */
                     if (fu32Flags & SHFL_MF_UTF8)
-                    {
                         pClient->fu32Flags |= SHFL_CF_UTF8;
-                    }
-
-                    rc = vbsfMappingsQuery (pClient, pMappings, &cMappings);
-
-                    if (RT_SUCCESS(rc))
-                    {
-                        /* Update parameters.*/
+                    if (fu32Flags & SHFL_MF_AUTOMOUNT)
+                        pClient->fu32Flags |= SHFL_MF_AUTOMOUNT;
+
+                    rc = vbsfMappingsQuery(pClient, pMappings, &cMappings);
+                    if (RT_SUCCESS(rc))
+                    {
+                        /* Update parameters. */
                         paParms[1].u.uint32 = cMappings;
                     }
@@ -346 +345 @@
                 rc = VERR_INVALID_PARAMETER;
             }
-            else if (   paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT /* root */
-                     || paParms[1].type != VBOX_HGCM_SVC_PARM_PTR     /* name */
+            else if (   paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT /* Root. */
+                     || paParms[1].type != VBOX_HGCM_SVC_PARM_PTR   /* Name. */
                     )
             {
@@ -366 +365 @@
                 {
                     /* Execute the function. */
-                    rc = vbsfMappingsQueryName (pClient, root, pString);
+                    rc = vbsfMappingsQueryName(pClient, root, pString);
 
                     if (RT_SUCCESS(rc))
                     {
                         /* Update parameters.*/
-                        ; /* none */
+                        ; /* None. */
                     }
                 }
@@ -1162 +1161 @@
 
         /* Verify parameter count and types. */
-        if (cParms != SHFL_CPARMS_ADD_MAPPING)
+        if (   (cParms != SHFL_CPARMS_ADD_MAPPING)
+            && (cParms != SHFL_CPARMS_ADD_MAPPING2) /* With auto-mount flag. */
+           )
         {
             rc = VERR_INVALID_PARAMETER;
@@ -1169 +1170 @@
                  || paParms[1].type != VBOX_HGCM_SVC_PARM_PTR     /* guest map name */
                  || paParms[2].type != VBOX_HGCM_SVC_PARM_32BIT   /* fWritable */
-                )
+                 /* With auto-mount flag? */
+                 || (   cParms == SHFL_CPARMS_ADD_MAPPING2
+                     && paParms[3].type != VBOX_HGCM_SVC_PARM_32BIT))
         {
             rc = VERR_INVALID_PARAMETER;
@@ -1179 +1182 @@
             SHFLSTRING *pMapName    = (SHFLSTRING *)paParms[1].u.pointer.addr;
             uint32_t fWritable      = paParms[2].u.uint32;
+            uint32_t fAutoMount     = 0; /* Disabled by default. */
+
+            /* Handle auto-mount flag if present. */
+            if (cParms == SHFL_CPARMS_ADD_MAPPING2)
+                fAutoMount = paParms[3].u.uint32;
 
             /* Verify parameters values. */
@@ -1190 +1198 @@
             {
                 /* Execute the function. */
-                rc = vbsfMappingsAdd (pFolderName, pMapName, fWritable);
-
+                rc = vbsfMappingsAdd(pFolderName, pMapName, fWritable, fAutoMount);
                 if (RT_SUCCESS(rc))
                 {