Changeset 75407 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

Timestamp:

Nov 12, 2018 8:06:57 PM (6 years ago)

Author:

vboxsync

Message:

VBoxSharedFolders,VBoxService,VBoxTray: New go at auto mounting shared folders, now also at runtime. bugref:3544

• Added three new functions to the shared folders service:
  1. query mountpoint and everything else about a shared folder.
  2. wait for folder (mappings) config changes.
  3. cancel such waits.
• Relaxed some of the check wrt placeholder folders so that the GUI can succesfully make changes to a folder while it is being used. The old code would end up failing if the guest was using the folder because of a (placeholder) duplicate.
• Ran into some weird weird flag passing between service.cpp and vbsfMappingsQuery via pClient->fu32Flags. Didn't make sense to me and clashed with a new flag I added for the wait cancellation, so I changed it to use a parameter (fOnlyAutoMounts) for the purpose.
• Pointed out that vbsfMappingsQuery is weird in a the way it doesn't return an overflow indicator, meaning that the guest library wrapper's checks for VINF_BUFFER_OVERFLOW is pointless.
• In VBoxService I've reimplemented the automounter subservice. Only tested with a windows 7 guest so far. Highlights:
  • Use host specified mount points / drive letters.
  • Adjust to changes in mapping configuration.
  • Mappings should be global on windows guests, given that VBoxService runs under the System user (only verified on Win7).
• One TODO is that I would like to try relocate a mapping that's not on the specified mount point once the mount point is freed up.
• VBoxTray no longer maps shared folder on startup.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -31 +31 @@
 #include "VBoxVRDP.h"
 #include "VBoxHostVersion.h"
-#include "VBoxSharedFolders.h"
+#ifdef VBOX_WITH_SHARED_FOLDERS
+# include "VBoxSharedFolders.h"
+#endif
 #ifdef VBOX_WITH_DRAG_AND_DROP
 # include "VBoxDnD.h"
@@ -825 +827 @@
             if (RT_SUCCESS(rc))
             {
+#ifdef VBOX_WITH_SHARED_FOLDERS
                 /* Do the Shared Folders auto-mounting stuff. */
                 rc = VBoxSharedFoldersAutoMount();
+#endif
                 if (RT_SUCCESS(rc))
                 {