- Timestamp:
- Mar 6, 2018 10:08:58 AM (7 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
r71215 r71231 1869 1869 else if (RTDirExists(pszSrc)) 1870 1870 { 1871 SafeArray<DirectoryCopyFlag s_T> copyFlags;1872 copyFlags.push_back(DirectoryCopyFlag s_CopyIntoExisting);1871 SafeArray<DirectoryCopyFlag_T> copyFlags; 1872 copyFlags.push_back(DirectoryCopyFlag_CopyIntoExisting); 1873 1873 rc = pCtx->pGuestSession->DirectoryCopyToGuest(Bstr(pszSrc).raw(), Bstr(pszDst).raw(), 1874 1874 ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam()); -
trunk/src/VBox/Main/idl/VirtualBox.xidl
r71141 r71231 11028 11028 11029 11029 <enum 11030 name="FsObjMoveFlag s"11031 uuid=" 98fdd11f-4063-ac60-5737-e49092aab95f"11030 name="FsObjMoveFlag" 11031 uuid="2450a05d-80c6-4c96-9a17-94d73293ff86" 11032 11032 > 11033 11033 <desc> … … 11074 11074 11075 11075 <enum 11076 name="DirectoryCopyFlag s"11077 uuid=" cc500f0c-4a54-88c9-56b3-7e9310416da7"11076 name="DirectoryCopyFlag" 11077 uuid="b5901856-d064-4fbc-ab06-2909ba106154" 11078 11078 > 11079 11079 <desc> … … 11434 11434 11435 11435 <enum 11436 name="FileOpenExFlag s"11437 uuid=" 9d62017b-ddd3-4e5a-a08e-14d1c23bbac1"11436 name="FileOpenExFlag" 11437 uuid="4671abd4-f70c-42aa-8542-6c169cb87a5c" 11438 11438 > 11439 11439 <desc> … … 11858 11858 <interface 11859 11859 name="IGuestSession" extends="$unknown" 11860 uuid=" 486fd828-4c6b-239b-a846-c4bb69e41038"11860 uuid="049af4e1-9732-4815-b01a-d64d21c064fe" 11861 11861 wsmap="managed" 11862 11862 reservedMethods="8" reservedAttributes="8" … … 12026 12026 <param name="destination" type="wstring" dir="in"> 12027 12027 <desc>The path to the target directory (in the guest). Unless the 12028 <link to="DirectoryCopyFlag s_CopyIntoExisting"/> flag is given, the12028 <link to="DirectoryCopyFlag_CopyIntoExisting"/> flag is given, the 12029 12029 directory shall not already exist. Guest path style.</desc> 12030 12030 </param> 12031 <param name="flags" type="DirectoryCopyFlag s" dir="in" safearray="yes">12032 <desc>Zero or more <link to="DirectoryCopyFlag s"/> values.</desc>12031 <param name="flags" type="DirectoryCopyFlag" dir="in" safearray="yes"> 12032 <desc>Zero or more <link to="DirectoryCopyFlag"/> values.</desc> 12033 12033 </param> 12034 12034 <param name="progress" type="IProgress" dir="return"> … … 12051 12051 <param name="destination" type="wstring" dir="in"> 12052 12052 <desc>Where to put the directory on the host. Unless the 12053 <link to="DirectoryCopyFlag s_CopyIntoExisting"/> flag is given, the12053 <link to="DirectoryCopyFlag_CopyIntoExisting"/> flag is given, the 12054 12054 directory shall not already exist. Host path style.</desc> 12055 12055 </param> 12056 <param name="flags" type="DirectoryCopyFlag s" dir="in" safearray="yes">12057 <desc>Zero or more <link to="DirectoryCopyFlag s"/> values.</desc>12056 <param name="flags" type="DirectoryCopyFlag" dir="in" safearray="yes"> 12057 <desc>Zero or more <link to="DirectoryCopyFlag"/> values.</desc> 12058 12058 </param> 12059 12059 <param name="progress" type="IProgress" dir="return"> … … 12076 12076 <param name="destination" type="wstring" dir="in"> 12077 12077 <desc>Where to put the file in the guest. Unless the 12078 <link to="DirectoryCopyFlag s_CopyIntoExisting"/> flag is given, the12078 <link to="DirectoryCopyFlag_CopyIntoExisting"/> flag is given, the 12079 12079 directory shall not already exist. Guest style path.</desc> 12080 12080 </param> 12081 <param name="flags" type="DirectoryCopyFlag s" dir="in" safearray="yes">12082 <desc>Zero or more <link to="DirectoryCopyFlag s"/> values.</desc>12081 <param name="flags" type="DirectoryCopyFlag" dir="in" safearray="yes"> 12082 <desc>Zero or more <link to="DirectoryCopyFlag"/> values.</desc> 12083 12083 </param> 12084 12084 <param name="progress" type="IProgress" dir="return"> … … 12573 12573 </desc> 12574 12574 </param> 12575 <param name="flags" type="FileOpenExFlag s" dir="in" safearray="yes">12576 <desc>Zero or more <link to="FileOpenExFlag s"/> values. </desc>12575 <param name="flags" type="FileOpenExFlag" dir="in" safearray="yes"> 12576 <desc>Zero or more <link to="FileOpenExFlag"/> values. </desc> 12577 12577 </param> 12578 12578 <param name="file" type="IGuestFile" dir="return"> … … 12732 12732 style.</desc> 12733 12733 </param> 12734 <param name="flags" type="FsObjMoveFlag s" dir="in" safearray="yes">12735 <desc>Zero or more <link to="FsObjMoveFlag s"/> values.</desc>12734 <param name="flags" type="FsObjMoveFlag" dir="in" safearray="yes"> 12735 <desc>Zero or more <link to="FsObjMoveFlag"/> values.</desc> 12736 12736 </param> 12737 12737 <param name="progress" type="IProgress" dir="return"> -
trunk/src/VBox/Main/include/GuestSessionImpl.h
r71219 r71231 147 147 148 148 SessionTaskCopyDirFrom(GuestSession *pSession, const Utf8Str &strSource, const Utf8Str &strDest, const Utf8Str &strFilter, 149 DirectoryCopyFlag s_T enmDirCopyFlags);149 DirectoryCopyFlag_T enmDirCopyFlags); 150 150 virtual ~SessionTaskCopyDirFrom(void); 151 151 int Run(void); … … 157 157 protected: 158 158 159 Utf8Str 160 Utf8Str 161 Utf8Str 162 DirectoryCopyFlag s_T mDirCopyFlags;159 Utf8Str mSource; 160 Utf8Str mDest; 161 Utf8Str mFilter; 162 DirectoryCopyFlag_T mDirCopyFlags; 163 163 }; 164 164 … … 171 171 172 172 SessionTaskCopyDirTo(GuestSession *pSession, const Utf8Str &strSource, const Utf8Str &strDest, const Utf8Str &strFilter, 173 DirectoryCopyFlag s_T enmDirCopyFlags);173 DirectoryCopyFlag_T enmDirCopyFlags); 174 174 virtual ~SessionTaskCopyDirTo(void); 175 175 int Run(void); … … 181 181 protected: 182 182 183 Utf8Str 184 Utf8Str 185 Utf8Str 186 DirectoryCopyFlag s_T mDirCopyFlags;183 Utf8Str mSource; 184 Utf8Str mDest; 185 Utf8Str mFilter; 186 DirectoryCopyFlag_T mDirCopyFlags; 187 187 }; 188 188 … … 358 358 HRESULT directoryCopy(const com::Utf8Str &aSource, 359 359 const com::Utf8Str &aDestination, 360 const std::vector<DirectoryCopyFlag s_T> &aFlags,360 const std::vector<DirectoryCopyFlag_T> &aFlags, 361 361 ComPtr<IProgress> &aProgress); 362 362 HRESULT directoryCopyFromGuest(const com::Utf8Str &aSource, 363 363 const com::Utf8Str &aDestination, 364 const std::vector<DirectoryCopyFlag s_T> &aFlags,364 const std::vector<DirectoryCopyFlag_T> &aFlags, 365 365 ComPtr<IProgress> &aProgress); 366 366 HRESULT directoryCopyToGuest(const com::Utf8Str &aSource, 367 367 const com::Utf8Str &aDestination, 368 const std::vector<DirectoryCopyFlag s_T> &aFlags,368 const std::vector<DirectoryCopyFlag_T> &aFlags, 369 369 ComPtr<IProgress> &aProgress); 370 370 HRESULT directoryCreate(const com::Utf8Str &aPath, … … 425 425 FileSharingMode_T aSharingMode, 426 426 ULONG aCreationMode, 427 const std::vector<FileOpenExFlag s_T> &aFlags,427 const std::vector<FileOpenExFlag_T> &aFlags, 428 428 ComPtr<IGuestFile> &aFile); 429 429 HRESULT fileQuerySize(const com::Utf8Str &aPath, … … 442 442 HRESULT fsObjMove(const com::Utf8Str &aSource, 443 443 const com::Utf8Str &aDestination, 444 const std::vector<FsObjMoveFlag s_T> &aFlags,444 const std::vector<FsObjMoveFlag_T> &aFlags, 445 445 ComPtr<IProgress> &aProgress); 446 446 HRESULT fsObjSetACL(const com::Utf8Str &aPath, -
trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp
r71221 r71231 2591 2591 2592 2592 HRESULT GuestSession::directoryCopy(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, 2593 const std::vector<DirectoryCopyFlag s_T> &aFlags, ComPtr<IProgress> &aProgress)2593 const std::vector<DirectoryCopyFlag_T> &aFlags, ComPtr<IProgress> &aProgress) 2594 2594 { 2595 2595 RT_NOREF(aSource, aDestination, aFlags, aProgress); … … 2598 2598 2599 2599 HRESULT GuestSession::directoryCopyFromGuest(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, 2600 const std::vector<DirectoryCopyFlag s_T> &aFlags, ComPtr<IProgress> &aProgress)2600 const std::vector<DirectoryCopyFlag_T> &aFlags, ComPtr<IProgress> &aProgress) 2601 2601 { 2602 2602 RT_NOREF(aSource, aDestination, aFlags, aProgress); … … 2605 2605 2606 2606 HRESULT GuestSession::directoryCopyToGuest(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, 2607 const std::vector<DirectoryCopyFlag s_T> &aFlags, ComPtr<IProgress> &aProgress)2607 const std::vector<DirectoryCopyFlag_T> &aFlags, ComPtr<IProgress> &aProgress) 2608 2608 { 2609 2609 LogFlowThisFuncEnter(); … … 2618 2618 return setError(E_INVALIDARG, tr("Source directory \"%s\" does not exist"), aSource.c_str()); 2619 2619 2620 uint32_t fFlags = DirectoryCopyFlag s_None;2620 uint32_t fFlags = DirectoryCopyFlag_None; 2621 2621 if (aFlags.size()) 2622 2622 { … … 3131 3131 { 3132 3132 LogFlowThisFuncEnter(); 3133 const std::vector<FileOpenExFlag s_T> EmptyFlags;3133 const std::vector<FileOpenExFlag_T> EmptyFlags; 3134 3134 return fileOpenEx(aPath, aAccessMode, aOpenAction, FileSharingMode_All, aCreationMode, EmptyFlags, aFile); 3135 3135 } … … 3137 3137 HRESULT GuestSession::fileOpenEx(const com::Utf8Str &aPath, FileAccessMode_T aAccessMode, FileOpenAction_T aOpenAction, 3138 3138 FileSharingMode_T aSharingMode, ULONG aCreationMode, 3139 const std::vector<FileOpenExFlag s_T> &aFlags, ComPtr<IGuestFile> &aFile)3139 const std::vector<FileOpenExFlag_T> &aFlags, ComPtr<IGuestFile> &aFile) 3140 3140 { 3141 3141 LogFlowThisFuncEnter(); … … 3205 3205 fOpenEx = aFlags[i]; 3206 3206 if (fOpenEx) 3207 return setError(E_INVALIDARG, tr("Unsupported FileOpenExFlag s valuesin aFlags (%#x)"), fOpenEx);3207 return setError(E_INVALIDARG, tr("Unsupported FileOpenExFlag value(s) in aFlags (%#x)"), fOpenEx); 3208 3208 openInfo.mfOpenEx = fOpenEx; 3209 3209 … … 3422 3422 3423 3423 HRESULT GuestSession::fsObjMove(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, 3424 const std::vector<FsObjMoveFlag s_T> &aFlags, ComPtr<IProgress> &aProgress)3424 const std::vector<FsObjMoveFlag_T> &aFlags, ComPtr<IProgress> &aProgress) 3425 3425 { 3426 3426 RT_NOREF(aSource, aDestination, aFlags, aProgress); -
trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp
r71220 r71231 631 631 SessionTaskCopyDirTo::SessionTaskCopyDirTo(GuestSession *pSession, 632 632 const Utf8Str &strSource, const Utf8Str &strDest, const Utf8Str &strFilter, 633 DirectoryCopyFlag s_T enmDirCopyFlags)633 DirectoryCopyFlag_T enmDirCopyFlags) 634 634 : GuestSessionTask(pSession) 635 635 , mSource(strSource) … … 797 797 int rc = directoryCreate(mDest, DirectoryCreateFlag_None, uDirMode, fFollowSymlinks); 798 798 if ( rc == VWRN_ALREADY_EXISTS 799 && !(mDirCopyFlags & DirectoryCopyFlag s_CopyIntoExisting))799 && !(mDirCopyFlags & DirectoryCopyFlag_CopyIntoExisting)) 800 800 { 801 801 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
Note:
See TracChangeset
for help on using the changeset viewer.