Changeset 75380 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Nov 9, 2018 10:25:30 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126515

Message:

Main,VBoxManage,FE/Qt: Extended the createSharedFolder and ISharedFolder methods with a mount poit parameter/attribute for use when auto-mounting. This is especially useful for Windows and OS/2 guests which operates with drive letters. The change has not yet trickled down to the guest interface and VBoxService.

File:

• trunk/src/VBox/Main/src-all/SharedFolderImpl.cpp (modified) (16 diffs)

trunk/src/VBox/Main/src-all/SharedFolderImpl.cpp

@@ -46 +46 @@
     bool            fWritable;
     bool            fAutoMount;
+    const Utf8Str   strAutoMountPoint;
     Utf8Str         strLastAccessError;
 };
@@ -95 +96 @@
  *  @param aWritable    writable if true, readonly otherwise
  *  @param aAutoMount   if auto mounted by guest true, false otherwise
+ *  @param aAutoMountPoint Where the guest should try auto mount it.
  *  @param fFailOnError Whether to fail with an error if the shared folder path is bad.
  *
@@ -104 +106 @@
                            bool aWritable,
                            bool aAutoMount,
+                           const Utf8Str &aAutoMountPoint,
                            bool fFailOnError)
 {
@@ -112 +115 @@
     unconst(mMachine) = aMachine;
 
-    HRESULT rc = i_protectedInit(aMachine, aName, aHostPath, aWritable, aAutoMount, fFailOnError);
+    HRESULT rc = i_protectedInit(aMachine, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
@@ -146 +149 @@
                                  aThat->m->fWritable,
                                  aThat->m->fAutoMount,
+                                 aThat->m->strAutoMountPoint,
                                  false /* fFailOnError */ );
 
@@ -166 +170 @@
  *  @param aHostPath    full path to the shared folder on the host
  *  @param aWritable    writable if true, readonly otherwise
+ *  @param aAutoMountPoint Where the guest should try auto mount it.
  *  @param fFailOnError Whether to fail with an error if the shared folder path is bad.
  *
@@ -175 +180 @@
                            bool aWritable,
                            bool aAutoMount,
+                           const Utf8Str &aAutoMountPoint
                            bool fFailOnError)
 {
@@ -183 +189 @@
     unconst(mVirtualBox) = aVirtualBox;
 
-    HRESULT rc = protectedInit(aVirtualBox, aName, aHostPath, aWritable, aAutoMount);
+    HRESULT rc = protectedInit(aVirtualBox, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
@@ -205 +211 @@
  *  @param aHostPath    full path to the shared folder on the host
  *  @param aWritable    writable if true, readonly otherwise
+ *  @param aAutoMountPoint Where the guest should try auto mount it.
  *  @param fFailOnError Whether to fail with an error if the shared folder path is bad.
  *
@@ -214 +221 @@
                            bool aWritable,
                            bool aAutoMount,
+                           const Utf8Str &aAutoMountPoint,
                            bool fFailOnError)
 {
@@ -222 +230 @@
     unconst(mConsole) = aConsole;
 
-    HRESULT rc = i_protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, fFailOnError);
+    HRESULT rc = i_protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
@@ -243 +251 @@
                                       bool aWritable,
                                       bool aAutoMount,
+                                      const Utf8Str &aAutoMountPoint,
                                       bool fFailOnError)
 {
@@ -260 +269 @@
      * accept both the slashified paths and not. */
 #if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
-    if (hostPathLen > 2 &&
-        RTPATH_IS_SEP (hostPath.c_str()[hostPathLen - 1]) &&
-        RTPATH_IS_VOLSEP (hostPath.c_str()[hostPathLen - 2]))
+    if (   hostPathLen > 2
+        && RTPATH_IS_SEP(hostPath.c_str()[hostPathLen - 1])
+        && RTPATH_IS_VOLSEP(hostPath.c_str()[hostPathLen - 2]))
         ;
 #else
@@ -292 +301 @@
     m->fWritable = aWritable;
     m->fAutoMount = aAutoMount;
+    unconst(m->strAutoMountPoint) = aAutoMountPoint;
 
     return S_OK;
@@ -385 +395 @@
 }
 
+HRESULT SharedFolder::getAutoMountPoint(com::Utf8Str &aAutoMountPoint)
+{
+    /* strAutoMountPoint is constant during life time, no need to lock. */
+    aAutoMountPoint = m->strAutoMountPoint;
+    return S_OK;
+}
+
+
 HRESULT SharedFolder::getLastAccessError(com::Utf8Str &aLastAccessError)
 {
@@ -415 +433 @@
 }
 
+const Utf8Str &SharedFolder::i_getAutoMountPoint() const
+{
+    return m->strAutoMountPoint;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */