Index: src/libchcore/TSubTaskCopyMove.h =================================================================== diff -u -N -r479ad4e8f81a68cbf6d1623cd9b1f3342d8cfdcc -rdb818324a61602e118506ca8b3973e44d997c8de --- src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision 479ad4e8f81a68cbf6d1623cd9b1f3342d8cfdcc) +++ src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision db818324a61602e118506ca8b3973e44d997c8de) @@ -67,8 +67,6 @@ ESubOperationResult OpenSrcAndDstFilesFB(const IFeedbackHandlerPtr& spFeedbackHandler, CUSTOM_COPY_PARAMS* pData, const IFilesystemFilePtr& spFileSrc, const IFilesystemFilePtr& spFileDst, bool& bSkip); - void AdjustTotalSize(unsigned long long ullNewSize, unsigned long long ullOldSize); - ESubOperationResult OpenSourceFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& fileSrc); ESubOperationResult OpenDestinationFileFB(const IFeedbackHandlerPtr& spFeedbackHandler, const IFilesystemFilePtr& fileDst, const TFileInfoPtr& spSrcFileInfo, unsigned long long& ullSeekTo, bool& bFreshlyCreated); @@ -94,7 +92,9 @@ ESubOperationResult CheckForFreeSpaceFB(const IFeedbackHandlerPtr& spFeedbackHandler); - void AdjustProcessedSize(file_size_t fsIncludedProcessedSize, file_size_t fsNewProcessedSize); + void AdjustProcessedSize(file_size_t fsWritten, const TFileInfoPtr& spSrcFileInfo, const IFilesystemFilePtr& spSrcFile); + void AdjustFinalSize(const TFileInfoPtr& spSrcFileInfo, const IFilesystemFilePtr& spSrcFile); + void AdjustProcessedSizeForSkip(const TFileInfoPtr& spSrcFileInfo); private: #pragma warning(push)