Changeset 75458 in vbox for trunk/src/VBox

Timestamp:

Nov 14, 2018 6:20:05 PM (6 years ago)

Author:

vboxsync

Message:

Main: Stubbed three ISharedFolder attribute setters. bugref:9295

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (5 diffs)
• include/SharedFolderImpl.h (modified) (1 diff)
• src-all/SharedFolderImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -20538 +20538 @@
   <interface
     name="ISharedFolder" extends="$unknown"
-    uuid="e02c0f1e-15f4-440e-3814-bbf613f8448b"
+    uuid="cc98ec47-9555-42d6-671f-bb0093c052a7"
     wsmap="struct"
     reservedAttributes="4"
@@ -20604 +20604 @@
         Whether the folder defined by the host path is currently
         accessible or not.
+
         For example, the folder can be inaccessible if it is placed
         on the network share that is not available by the time
@@ -20610 +20611 @@
     </attribute>
 
-    <attribute name="writable" type="boolean" readonly="yes">
+    <attribute name="writable" type="boolean">
       <desc>
         Whether the folder defined by the host path is writable or
@@ -20617 +20618 @@
     </attribute>
 
-    <attribute name="autoMount" type="boolean" readonly="yes">
+    <attribute name="autoMount" type="boolean">
       <desc>
         Whether the folder gets automatically mounted by the guest or not.
@@ -20623 +20624 @@
     </attribute>
 
-    <attribute name="autoMountPoint" type="wstring" readonly="yes">
+    <attribute name="autoMountPoint" type="wstring">
       <desc>
         Desired mount point in the guest for automatically mounting the folder
         when <link to="ISharedFolder::autoMount"/> is set.  For Windows and
         OS/2 guests this should be a drive letter, while other guests it should
-        be a absolute directory.
+        be a absolute directory.  It is possible to combine the two, e.g.
+        "T:/mnt/testrsrc" will be attached to "T:" by windows and OS/2 while
+        the unixy guests will mount it at "/mnt/testrsrc".
 
         When empty the guest will choose a mount point.  The guest may do so

trunk/src/VBox/Main/include/SharedFolderImpl.h

@@ -92 +92 @@
     HRESULT getAccessible(BOOL *aAccessible);
     HRESULT getWritable(BOOL *aWritable);
+    HRESULT setWritable(BOOL aWritable);
     HRESULT getAutoMount(BOOL *aAutoMount);
+    HRESULT setAutoMount(BOOL aAutoMount);
     HRESULT getAutoMountPoint(com::Utf8Str &aAutoMountPoint);
+    HRESULT setAutoMountPoint(com::Utf8Str const &aAutoMountPoint);
     HRESULT getLastAccessError(com::Utf8Str &aLastAccessError);
 

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

@@ -335 +335 @@
     /* mName is constant during life time, no need to lock */
     aName = m->strName;
-
     return S_OK;
 }
@@ -343 +342 @@
     /* mHostPath is constant during life time, no need to lock */
     aHostPath = m->strHostPath;
-
     return S_OK;
 }
@@ -380 +378 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aWritable = !!m->fWritable;
-
-    return S_OK;
+    *aWritable = m->fWritable;
+    return S_OK;
+}
+
+HRESULT SharedFolder::setWritable(BOOL aWritable)
+{
+    RT_NOREF(aWritable);
+    return E_NOTIMPL;
 }
 
@@ -389 +391 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aAutoMount = !!m->fAutoMount;
-
-    return S_OK;
+    *aAutoMount = m->fAutoMount;
+    return S_OK;
+}
+
+HRESULT SharedFolder::setAutoMount(BOOL aAutoMount)
+{
+    RT_NOREF(aAutoMount);
+    return E_NOTIMPL;
 }
 
 HRESULT SharedFolder::getAutoMountPoint(com::Utf8Str &aAutoMountPoint)
 {
-    /* strAutoMountPoint is constant during life time, no need to lock. */
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
     aAutoMountPoint = m->strAutoMountPoint;
     return S_OK;
 }
 
+HRESULT SharedFolder::setAutoMountPoint(com::Utf8Str const &aAutoMountPoint)
+{
+    RT_NOREF(aAutoMountPoint);
+    return E_NOTIMPL;
+}
 
 HRESULT SharedFolder::getLastAccessError(com::Utf8Str &aLastAccessError)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     aLastAccessError = m->strLastAccessError;
-
     return S_OK;
 }