Changeset 72067 in vbox for trunk/src/VBox/Main/include

Timestamp:

Apr 30, 2018 10:27:37 AM (7 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Made IGuestSession::copyFromGuest() and IGuestSession::copyToGuest() more compatible by using a string array for the file / directory copy flags.

Location:

trunk/src/VBox/Main/include

Files:

• GuestSessionImpl.h (modified) (4 diffs)
• GuestSessionImplTasks.h (modified) (1 diff)

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

@@ -84 +84 @@
                           const std::vector<com::Utf8Str> &aFilters,
                           const std::vector<FsObjType_T> &aTypes,
-                          const std::vector<GuestCopyFlag_T> &aFlags,
+                          const std::vector<com::Utf8Str> &aFlags,
                           const com::Utf8Str &aDestination,
                           ComPtr<IProgress> &aProgress);
@@ -90 +90 @@
                         const std::vector<com::Utf8Str> &aFilters,
                         const std::vector<FsObjType_T> &aTypes,
-                        const std::vector<GuestCopyFlag_T> &aFlags,
+                        const std::vector<com::Utf8Str> &aFlags,
                         const com::Utf8Str &aDestination,
                         ComPtr<IProgress> &aProgress);
@@ -267 +267 @@
                                           ComPtr<IProgress> &pProgress);
     int                     i_closeSession(uint32_t uFlags, uint32_t uTimeoutMS, int *pGuestRc);
+    static int              i_directoryCopyFlagFromStr(const com::Utf8Str &strFlags, DirectoryCopyFlag_T *pfFlags);
     inline bool             i_directoryExists(uint32_t uDirID, ComObjPtr<GuestDirectory> *pDir);
     int                     i_directoryUnregister(GuestDirectory *pDirectory);
@@ -276 +277 @@
     int                     i_dispatchToObject(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     int                     i_dispatchToThis(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
+    static int              i_fileCopyFlagFromStr(const com::Utf8Str &strFlags, FileCopyFlag_T *pfFlags);
     inline bool             i_fileExists(uint32_t uFileID, ComObjPtr<GuestFile> *pFile);
     int                     i_fileUnregister(GuestFile *pFile);

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

@@ -42 +42 @@
 struct GuestSessionFsSourceSpec
 {
+    GuestSessionFsSourceSpec()
+        : enmType(FsObjType_Unknown)
+        , enmPathStyle(PathStyle_Unknown)
+        , fDryRun(false)
+        , fFollowSymlinks(false) { }
+
     Utf8Str     strSource;
     Utf8Str     strFilter;