Changeset 6716 in vbox

Timestamp:

Feb 1, 2008 12:53:34 PM (17 years ago)

Author:

vboxsync

Message:

adapted BFE to readonly shared folders

Location:

trunk

Files:

• include/VBox/shflsvc.h (modified) (1 diff)
• src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp (modified) (5 diffs)
• src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp (modified) (1 diff)

trunk/include/VBox/shflsvc.h

@@ -946 +946 @@
      * True (default) if the folder is writable.
      */
+    HGCMFunctionParameter writable;
 
 } VBoxSFAddMapping;

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -177 +177 @@
 static const char *g_pszShareDir[MaxSharedFolders];
 static const char *g_pszShareName[MaxSharedFolders];
+static bool        g_fShareReadOnly[MaxSharedFolders];
 static unsigned    g_uNumShares;
 static bool        g_fPreAllocRam = false;
@@ -361 +362 @@
              "  -restore           Restore the VM if the statefile exists, normal start otherwise\n"
              "  -nofstoggle        Forbid switching to/from fullscreen mode\n"
-             "  -share <dir><name> Share directory <dir> as name <name>\n"
+             "  -share <dir> <name> [readonly]\n"
+             "                     Share directory <dir> as name <name>. Optionally read-only.\n"
              "  -nohostkey         Disable hostkey\n"
              "  -[no]acpi          Enable or disable ACPI (default: enabled)\n"
@@ -543 +545 @@
                 return SyntaxError("missing 2nd argument for share!\n");
             g_pszShareName[g_uNumShares] = argv[curArg];
+            if (curArg < argc-1 && strcmp(argv[curArg+1], "readonly") == 0)
+            {
+                g_fShareReadOnly[g_uNumShares] = true;
+                curArg++;
+            }
             g_uNumShares++;
         }
@@ -1172 +1179 @@
         for (unsigned i=0; i<g_uNumShares; i++)
         {
-            VBOXHGCMSVCPARM  parms[2];
+            VBOXHGCMSVCPARM  parms[SHFL_CPARMS_ADD_MAPPING];
             SHFLSTRING      *pFolderName, *pMapName;
             int              cbString;
@@ -1207 +1214 @@
             parms[1].u.pointer.size = sizeof (SHFLSTRING) + cbString;
 
+            parms[2].type = VBOX_HGCM_SVC_PARM_32BIT;
+            parms[2].u.uint32 = !g_fShareReadOnly[i];
+
             rc = gVMMDev->hgcmHostCall ("VBoxSharedFolders",
-                                        SHFL_FN_ADD_MAPPING, 2, &parms[0]);
+                                        SHFL_FN_ADD_MAPPING, SHFL_CPARMS_ADD_MAPPING, &parms[0]);
             AssertRC(rc);
             LogRel(("Added share %s: (%s)\n", g_pszShareName[i], g_pszShareDir[i]));

trunk/src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp

@@ -76 +76 @@
     STRUCT(VBoxSFRemove, 52);
     STRUCT(VBoxSFRename, 64);
-    STRUCT(VBoxSFAddMapping, 40);
+    STRUCT(VBoxSFAddMapping, 44); /* changed after 1.5.4, not critical since only used by the host */
     STRUCT(VBoxSFRemoveMapping, 28);