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

Timestamp:

Jun 25, 2024 11:06:29 AM (10 months ago)

Author:

vboxsync

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

163636

Message:

doc/manual,include/VBox,Frontends/VBoxManage,HostServices/SharedFolders,
Main/{include,SharedFolder,Console,Machine,VirtualBox.xidl}: Backout
changeset r163634 since it introduces a build dependency on
VirtualBox_XPCOM.h which needs to be built from the VirtualBox.xidl
changes before it can be referenced by the src/VBox/HostServices code.
Need to putback the changes in two parts. bugref:10619

Location:

trunk/src/VBox/Main/src-all

Files:

• ConsoleSharedFolderImpl.cpp (modified) (4 diffs)
• SharedFolderImpl.cpp (modified) (9 diffs)

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

@@ -44 +44 @@
     Data()
     : fWritable(false),
-      fAutoMount(false),
-      enmSymlinkPolicy(SymlinkPolicy_None)
+      fAutoMount(false)
     { }
 
@@ -54 +53 @@
     const Utf8Str   strAutoMountPoint;
     Utf8Str         strLastAccessError;
-    SymlinkPolicy_T enmSymlinkPolicy;
 };
 
@@ -307 +305 @@
 }
 
-HRESULT ConsoleSharedFolder::getSymlinkPolicy(SymlinkPolicy_T *aSymlinkPolicy)
-{
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    *aSymlinkPolicy = m->enmSymlinkPolicy;
-    return S_OK;
-}
-
-HRESULT ConsoleSharedFolder::setSymlinkPolicy(SymlinkPolicy_T aSymlinkPolicy)
-{
-    RT_NOREF(aSymlinkPolicy);
-    return E_NOTIMPL;
-}
 
 const Utf8Str& ConsoleSharedFolder::i_getName() const
@@ -345 +331 @@
 }
 
-const SymlinkPolicy_T ConsoleSharedFolder::i_getSymlinkPolicy() const
-{
-    return m->enmSymlinkPolicy;
-}
-
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -46 +46 @@
     Data()
     : fWritable(false),
-      fAutoMount(false),
-      enmSymlinkPolicy(SymlinkPolicy_None)
+      fAutoMount(false)
     { }
 
@@ -56 +55 @@
     const Utf8Str   strAutoMountPoint;
     Utf8Str         strLastAccessError;
-    SymlinkPolicy_T enmSymlinkPolicy;
 };
 
@@ -111 +109 @@
                            bool aAutoMount,
                            const Utf8Str &aAutoMountPoint,
-                           bool fFailOnError,
-                           SymlinkPolicy_T enmSymlinkPolicy)
+                           bool fFailOnError)
 {
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -120 +117 @@
     unconst(mMachine) = aMachine;
 
-    HRESULT hrc = i_protectedInit(aMachine, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError,
-                                  enmSymlinkPolicy);
+    HRESULT hrc = i_protectedInit(aMachine, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
@@ -156 +152 @@
                                   aThat->m->fAutoMount,
                                   aThat->m->strAutoMountPoint,
-                                  false /* fFailOnError */,
-                                  aThat->m->enmSymlinkPolicy);
+                                  false /* fFailOnError */ );
 
     /* Confirm a successful initialization when it's the case */
@@ -219 +214 @@
                                       bool aAutoMount,
                                       const Utf8Str &aAutoMountPoint,
-                                      bool fFailOnError,
-                                      SymlinkPolicy_T enmSymlinkPolicy)
-{
-    LogFlowThisFunc(("aName={%s}, aHostPath={%s}, aWritable={%d}, aAutoMount={%d} enmSymlinkPolicy={%d}\n",
-                      aName.c_str(), aHostPath.c_str(), aWritable, aAutoMount, enmSymlinkPolicy));
+                                      bool fFailOnError)
+{
+    LogFlowThisFunc(("aName={%s}, aHostPath={%s}, aWritable={%d}, aAutoMount={%d}\n",
+                      aName.c_str(), aHostPath.c_str(), aWritable, aAutoMount));
 
     ComAssertRet(aParent && aName.isNotEmpty() && aHostPath.isNotEmpty(), E_INVALIDARG);
@@ -277 +271 @@
     m->fAutoMount = aAutoMount;
     unconst(m->strAutoMountPoint) = aAutoMountPoint;
-    m->enmSymlinkPolicy = enmSymlinkPolicy;
 
     return S_OK;
@@ -392 +385 @@
 }
 
-HRESULT SharedFolder::getSymlinkPolicy(SymlinkPolicy_T *aSymlinkPolicy)
-{
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    *aSymlinkPolicy = m->enmSymlinkPolicy;
-    return S_OK;
-}
-
-HRESULT SharedFolder::setSymlinkPolicy(SymlinkPolicy_T aSymlinkPolicy)
-{
-    switch (aSymlinkPolicy)
-    {
-        case SymlinkPolicy_AllowedToAnyTarget:
-        case SymlinkPolicy_AllowedInShareSubtree:
-        case SymlinkPolicy_AllowedToRelativeTargets:
-        case SymlinkPolicy_Forbidden:
-            break;
-        default:
-            return setError(E_INVALIDARG, tr("The symbolic link policy specified (%d) is invalid."), aSymlinkPolicy);
-    }
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    m->enmSymlinkPolicy = aSymlinkPolicy;
-    return S_OK;
-}
 
 const Utf8Str& SharedFolder::i_getName() const
@@ -442 +411 @@
 }
 
-const SymlinkPolicy_T SharedFolder::i_getSymlinkPolicy() const
-{
-    return m->enmSymlinkPolicy;
-}
-
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */