Changeset 39643 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 16, 2011 10:54:38 AM (13 years ago)

Author:

vboxsync

Message:

SharedFolders: more fixes

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -7212 +7212 @@
     AssertReturn(m_pVMMDev && m_pVMMDev->isShFlActive(), E_FAIL);
 
-    VBOXHGCMSVCPARM parms[SHFL_CPARMS_ADD_MAPPING2];
+    VBOXHGCMSVCPARM parms[SHFL_CPARMS_ADD_MAPPING];
     SHFLSTRING *pFolderName, *pMapName;
     size_t cbString;
+
+    Bstr value;
+    HRESULT hrc = mMachine->GetExtraData(BstrFmt("VBoxInternal/SharedFoldersEnableSymlinksCreate/%s",
+                                                 strName.c_str()).raw(),
+                                         value.asOutParam());
+    bool fSymlinksCreate = hrc == S_OK && value == "1";
 
     Log(("Adding shared folder '%s' -> '%s'\n", strName.c_str(), aData.m_strHostPath.c_str()));
@@ -7275 +7281 @@
 
     parms[2].type = VBOX_HGCM_SVC_PARM_32BIT;
-    parms[2].u.uint32 = aData.m_fWritable;
-
-    /*
-     * Auto-mount flag; is indicated by using the SHFL_CPARMS_ADD_MAPPING2
-     * define below.  This shows the host service that we have supplied
-     * an additional parameter (auto-mount) and keeps the actual command
-     * backwards compatible.
-     */
-    parms[3].type = VBOX_HGCM_SVC_PARM_32BIT;
-    parms[3].u.uint32 = aData.m_fAutoMount;
+    parms[2].u.uint32 = (aData.m_fWritable ? SHFL_ADD_MAPPING_F_WRITABLE : 0)
+                      | (aData.m_fAutoMount ? SHFL_ADD_MAPPING_F_AUTOMOUNT : 0)
+                      | (fSymlinksCreate ? SHFL_ADD_MAPPING_F_CREATE_SYMLINKS : 0);
 
     vrc = m_pVMMDev->hgcmHostCall("VBoxSharedFolders",
                                   SHFL_FN_ADD_MAPPING,
-                                  SHFL_CPARMS_ADD_MAPPING2, &parms[0]);
+                                  SHFL_CPARMS_ADD_MAPPING, &parms[0]);
     RTMemFree(pFolderName);
     RTMemFree(pMapName);