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

Timestamp:

Jan 18, 2008 5:37:39 PM (17 years ago)

Author:

vboxsync

Message:

backed out again, needs build fixes on Windows

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

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

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

@@ -28 +28 @@
  *
  */
-int vbsfMappingsAdd (PSHFLSTRING pFolderName, PSHFLSTRING pMapName, uint32_t fWritable)
+int vbsfMappingsAdd (PSHFLSTRING pFolderName, PSHFLSTRING pMapName)
 {
     int i;
@@ -73 +73 @@
             FolderMapping[i].fValid    = true;
             FolderMapping[i].cMappings = 0;
-            FolderMapping[i].fWritable = fWritable;
 
             /* Check if the host file system is case sensitive */
@@ -233 +232 @@
 }
 
-int vbsfMappingsQueryWritable (SHFLCLIENTDATA *pClient, SHFLROOT root, bool *fWritable)
-{
-    int rc = VINF_SUCCESS;
-
-    LogFlow(("vbsfMappingsQueryWritable: pClient = %p, root = %d\n",
-             pClient, root));
-
-    if (root >= SHFL_MAX_MAPPINGS)
-        return VERR_INVALID_PARAMETER;
-
-    if (FolderMapping[root].fValid == true)
-        *fWritable = FolderMapping[root].fWritable;
-    else
-        rc = VERR_FILE_NOT_FOUND;
-
-    LogFlow(("vbsfMappingsQuery:Writable return rc = %Vrc\n", rc));
-
-    return rc;
-}
-
 static int vbsfQueryMappingIndex (PRTUTF16 utf16Name, size_t *pIndex)
 {

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

@@ -31 +31 @@
     bool        fHostCaseSensitive;
     bool        fGuestCaseSensitive;
-    bool        fWritable;
 } MAPPING, *PMAPPING;
 
@@ -38 +37 @@
 bool vbsfMappingQuery(uint32_t iMapping, PMAPPING *pMapping);
 
-int vbsfMappingsAdd (PSHFLSTRING pFolderName, PSHFLSTRING pMapName, uint32_t fWritable);
+int vbsfMappingsAdd (PSHFLSTRING pFolderName, PSHFLSTRING pMapName);
 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 vbsfMapFolder (SHFLCLIENTDATA *pClient, PSHFLSTRING pszMapName, RTUCS2 delimiter, bool fCaseSensitive, SHFLROOT *pRoot);

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

@@ -1097 +1097 @@
         else if (   paParms[0].type != VBOX_HGCM_SVC_PARM_PTR     /* host folder name */
                  || paParms[1].type != VBOX_HGCM_SVC_PARM_PTR     /* guest map name */
-                 || paParms[2].type != VBOX_HGCM_SVC_PARM_32BIT   /* fWritable */
                 )
         {
@@ -1109 +1108 @@
             SHFLSTRING *pMapName    = (SHFLSTRING *)paParms[1].u.pointer.addr;
             uint32_t cbStringMap    = paParms[1].u.pointer.size;
-            uint32_t fWritable      = paParms[2].u.uint32;
 
             /* Verify parameters values. */
@@ -1123 +1121 @@
             {
                 /* Execute the function. */
-                rc = vbsfMappingsAdd (pFolderName, pMapName, fWritable);
+                rc = vbsfMappingsAdd (pFolderName, pMapName);
 
                 if (VBOX_SUCCESS(rc))

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

@@ -1018 +1018 @@
                 }
             }
-
-            /* write access requested? */
-            if (pParms->CreateFlags & (  SHFL_CF_ACT_REPLACE_IF_EXISTS
-                                       | SHFL_CF_ACT_OVERWRITE_IF_EXISTS
-                                       | SHFL_CF_ACT_CREATE_IF_NEW
-                                       | SHFL_CF_ACCESS_WRITE))
-            {
-                /* is the guest allowed to write to this share? */
-                bool fWritable;
-                rc = vbsfMappingsQueryWritable (pClient, root, &fWritable);
-                if (RT_FAILURE(rc) || !fWritable)
-                    return VERR_WRITE_PROTECT;
-            }
-
             if (BIT_FLAG(pParms->CreateFlags, SHFL_CF_DIRECTORY))
             {