Index: src/libchcore/TFilesystemFileFeedbackWrapper.cpp
===================================================================
diff -u -N -r8a2ff3b2b71b45fb525e030167e62f316cb32869 -rb6a48931b8155a01d871d050f52d915abb2df8ca
--- src/libchcore/TFilesystemFileFeedbackWrapper.cpp	(.../TFilesystemFileFeedbackWrapper.cpp)	(revision 8a2ff3b2b71b45fb525e030167e62f316cb32869)
+++ src/libchcore/TFilesystemFileFeedbackWrapper.cpp	(.../TFilesystemFileFeedbackWrapper.cpp)	(revision b6a48931b8155a01d871d050f52d915abb2df8ca)
@@ -25,22 +25,28 @@
 
 namespace chcore
 {
-	TFilesystemFileFeedbackWrapper::TFilesystemFileFeedbackWrapper(const IFeedbackHandlerPtr& spFeedbackHandler, const logger::TLogFileDataPtr& spLogFileData,
+	TFilesystemFileFeedbackWrapper::TFilesystemFileFeedbackWrapper(const IFilesystemFilePtr& spFile, 
+		const IFeedbackHandlerPtr& spFeedbackHandler, const logger::TLogFileDataPtr& spLogFileData,
 		TWorkerThreadController& rThreadController, const IFilesystemPtr& spFilesystem) :
+		m_spFile(spFile),
 		m_spFeedbackHandler(spFeedbackHandler),
 		m_spLog(std::make_unique<logger::TLogger>(spLogFileData, L"Filesystem-File")),
 		m_rThreadController(rThreadController),
 		m_spFilesystem(spFilesystem)
 	{
-		if(!spFeedbackHandler || !spFilesystem)
-			throw TCoreException(eErr_InvalidArgument, L"Missing filesystem or feedback handler", LOCATION);
+		if (!spFeedbackHandler)
+			throw TCoreException(eErr_InvalidArgument, L"spFeedbackHandler is NULL", LOCATION);
+		if (!spFile)
+			throw TCoreException(eErr_InvalidArgument, L"spFile is NULL", LOCATION);
+		if (!spFilesystem)
+			throw TCoreException(eErr_InvalidArgument, L"spFilesystem is NULL", LOCATION);
 	}
 
-	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::OpenSourceFileFB(const IFilesystemFilePtr& fileSrc)
+	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::OpenSourceFileFB()
 	{
 		bool bRetry = false;
 
-		fileSrc->Close();
+		m_spFile->Close();
 
 		do
 		{
@@ -49,7 +55,7 @@
 
 			try
 			{
-				fileSrc->OpenExistingForReading();
+				m_spFile->OpenExistingForReading();
 
 				return TSubTaskBase::eSubResult_Continue;
 			}
@@ -58,7 +64,7 @@
 				dwLastError = e.GetNativeError();
 			}
 
-			TFeedbackResult frResult = m_spFeedbackHandler->FileError(fileSrc->GetFilePath().ToWString(), TString(), EFileError::eCreateError, dwLastError);
+			TFeedbackResult frResult = m_spFeedbackHandler->FileError(m_spFile->GetFilePath().ToWString(), TString(), EFileError::eCreateError, dwLastError);
 			switch (frResult.GetResult())
 			{
 			case EFeedbackResult::eResult_Skip:
@@ -69,7 +75,7 @@
 				// log
 				TString strFormat = _T("Cancel request [error %errno] while opening source file %path (OpenSourceFileFB)");
 				strFormat.Replace(_T("%errno"), boost::lexical_cast<std::wstring>(dwLastError).c_str());
-				strFormat.Replace(_T("%path"), fileSrc->GetFilePath().ToString());
+				strFormat.Replace(_T("%path"), m_spFile->GetFilePath().ToString());
 				LOG_ERROR(m_spLog) << strFormat.c_str();
 
 				return TSubTaskBase::eSubResult_CancelRequest;
@@ -83,7 +89,7 @@
 				// log
 				TString strFormat = _T("Retrying [error %errno] to open source file %path (OpenSourceFileFB)");
 				strFormat.Replace(_T("%errno"), boost::lexical_cast<std::wstring>(dwLastError).c_str());
-				strFormat.Replace(_T("%path"), fileSrc->GetFilePath().ToString());
+				strFormat.Replace(_T("%path"), m_spFile->GetFilePath().ToString());
 				LOG_ERROR(m_spLog) << strFormat.c_str();
 
 				bRetry = true;
@@ -103,12 +109,12 @@
 		return TSubTaskBase::eSubResult_Continue;
 	}
 
-	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::OpenExistingDestinationFileFB(const IFilesystemFilePtr& fileDst, bool bProtectReadOnlyFiles)
+	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::OpenExistingDestinationFileFB(bool bProtectReadOnlyFiles)
 	{
 		bool bRetry = false;
 		bool bAttributesChanged = false;
 
-		fileDst->Close();
+		m_spFile->Close();
 
 		do
 		{
@@ -117,7 +123,7 @@
 			DWORD dwLastError = ERROR_SUCCESS;
 			try
 			{
-				fileDst->OpenExistingForWriting();
+				m_spFile->OpenExistingForWriting();
 				return TSubTaskBase::eSubResult_Continue;
 			}
 			catch (const TFileException& e)
@@ -132,11 +138,11 @@
 				try
 				{
 					TFileInfoPtr spDstFileInfo(std::make_shared<TFileInfo>());
-					m_spFilesystem->GetFileInfo(fileDst->GetFilePath(), spDstFileInfo);
+					m_spFilesystem->GetFileInfo(m_spFile->GetFilePath(), spDstFileInfo);
 
 					if(spDstFileInfo->IsReadOnly())
 					{
-						m_spFilesystem->SetAttributes(fileDst->GetFilePath(), spDstFileInfo->GetAttributes() & ~FILE_ATTRIBUTE_READONLY);
+						m_spFilesystem->SetAttributes(m_spFile->GetFilePath(), spDstFileInfo->GetAttributes() & ~FILE_ATTRIBUTE_READONLY);
 						bRetry = true;
 						bAttributesChanged = true;
 						continue;
@@ -148,15 +154,15 @@
 				}
 			}
 
-			TFeedbackResult frResult = m_spFeedbackHandler->FileError(fileDst->GetFilePath().ToWString(), TString(), EFileError::eCreateError, dwLastError);
+			TFeedbackResult frResult = m_spFeedbackHandler->FileError(m_spFile->GetFilePath().ToWString(), TString(), EFileError::eCreateError, dwLastError);
 			switch (frResult.GetResult())
 			{
 			case EFeedbackResult::eResult_Retry:
 			{
 				// log
 				TString strFormat = _T("Retrying [error %errno] to open destination file %path (CustomCopyFileFB)");
 				strFormat.Replace(_T("%errno"), boost::lexical_cast<std::wstring>(dwLastError).c_str());
-				strFormat.Replace(_T("%path"), fileDst->GetFilePath().ToString());
+				strFormat.Replace(_T("%path"), m_spFile->GetFilePath().ToString());
 				LOG_ERROR(m_spLog) << strFormat.c_str();
 
 				bRetry = true;
@@ -167,7 +173,7 @@
 				// log
 				TString strFormat = _T("Cancel request [error %errno] while opening destination file %path (CustomCopyFileFB)");
 				strFormat.Replace(_T("%errno"), boost::lexical_cast<std::wstring>(dwLastError).c_str());
-				strFormat.Replace(_T("%path"), fileDst->GetFilePath().ToString());
+				strFormat.Replace(_T("%path"), m_spFile->GetFilePath().ToString());
 				LOG_ERROR(m_spLog) << strFormat.c_str();
 
 				return TSubTaskBase::eSubResult_CancelRequest;
@@ -192,8 +198,7 @@
 		return TSubTaskBase::eSubResult_Continue;
 	}
 
-	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::OpenDestinationFileFB(const IFilesystemFilePtr& fileDst,
-		const TFileInfoPtr& spSrcFileInfo,
+	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::OpenDestinationFileFB(const TFileInfoPtr& spSrcFileInfo,
 		unsigned long long& ullSeekTo,
 		bool& bFreshlyCreated,
 		bool& bSkip,
@@ -205,15 +210,15 @@
 		ullSeekTo = 0;
 		bFreshlyCreated = true;
 
-		fileDst->Close();
+		m_spFile->Close();
 		do
 		{
 			bRetry = false;
 
 			DWORD dwLastError = ERROR_SUCCESS;
 			try
 			{
-				fileDst->CreateNewForWriting();
+				m_spFile->CreateNewForWriting();
 				return TSubTaskBase::eSubResult_Continue;
 			}
 			catch (const TFileException& e)
@@ -226,18 +231,18 @@
 				bFreshlyCreated = false;
 
 				// pass it to the specialized method
-				TSubTaskBase::ESubOperationResult eResult = OpenExistingDestinationFileFB(fileDst, bProtectReadOnlyFiles);
+				TSubTaskBase::ESubOperationResult eResult = OpenExistingDestinationFileFB(bProtectReadOnlyFiles);
 				if (eResult != TSubTaskBase::eSubResult_Continue)
 					return eResult;
-				else if (!fileDst->IsOpen())
+				else if (!m_spFile->IsOpen())
 				{
 					bSkip = true;
 					return TSubTaskBase::eSubResult_Continue;
 				}
 
 				// read info about the existing destination file,
 				TFileInfoPtr spDstFileInfo(std::make_shared<TFileInfo>());
-				fileDst->GetFileInfo(*spDstFileInfo);
+				m_spFile->GetFileInfo(*spDstFileInfo);
 
 				// src and dst files are the same
 				TFeedbackResult frResult = m_spFeedbackHandler->FileAlreadyExists(*spSrcFileInfo, *spDstFileInfo);
@@ -259,7 +264,7 @@
 				{
 					// log
 					TString strFormat = _T("Cancel request while checking result of dialog before opening source file %path (CustomCopyFileFB)");
-					strFormat.Replace(_T("%path"), fileDst->GetFilePath().ToString());
+					strFormat.Replace(_T("%path"), m_spFile->GetFilePath().ToString());
 					LOG_INFO(m_spLog) << strFormat.c_str();
 
 					return TSubTaskBase::eSubResult_CancelRequest;
@@ -273,15 +278,15 @@
 				}
 			}
 
-			TFeedbackResult frResult = m_spFeedbackHandler->FileError(fileDst->GetFilePath().ToWString(), TString(), EFileError::eCreateError, dwLastError);
+			TFeedbackResult frResult = m_spFeedbackHandler->FileError(m_spFile->GetFilePath().ToWString(), TString(), EFileError::eCreateError, dwLastError);
 			switch (frResult.GetResult())
 			{
 			case EFeedbackResult::eResult_Retry:
 			{
 				// log
 				TString strFormat = _T("Retrying [error %errno] to open destination file %path (CustomCopyFileFB)");
 				strFormat.Replace(_T("%errno"), boost::lexical_cast<std::wstring>(dwLastError).c_str());
-				strFormat.Replace(_T("%path"), fileDst->GetFilePath().ToString());
+				strFormat.Replace(_T("%path"), m_spFile->GetFilePath().ToString());
 				LOG_ERROR(m_spLog) << strFormat.c_str();
 
 				bRetry = true;
@@ -293,7 +298,7 @@
 				// log
 				TString strFormat = _T("Cancel request [error %errno] while opening destination file %path (CustomCopyFileFB)");
 				strFormat.Replace(_T("%errno"), boost::lexical_cast<std::wstring>(dwLastError).c_str());
-				strFormat.Replace(_T("%path"), fileDst->GetFilePath().ToString());
+				strFormat.Replace(_T("%path"), m_spFile->GetFilePath().ToString());
 				LOG_ERROR(m_spLog) << strFormat.c_str();
 
 				return TSubTaskBase::eSubResult_CancelRequest;
@@ -319,7 +324,7 @@
 		return TSubTaskBase::eSubResult_Continue;
 	}
 
-	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::TruncateFileFB(const IFilesystemFilePtr& spFile, file_size_t fsNewSize, const TSmartPath& pathFile, bool& bSkip)
+	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::TruncateFileFB(file_size_t fsNewSize, const TSmartPath& pathFile, bool& bSkip)
 	{
 		bSkip = false;
 
@@ -330,7 +335,7 @@
 
 			try
 			{
-				spFile->Truncate(fsNewSize);
+				m_spFile->Truncate(fsNewSize);
 				return TSubTaskBase::eSubResult_Continue;
 			}
 			catch (const TFileException& e)
@@ -373,7 +378,7 @@
 		return TSubTaskBase::eSubResult_Continue;
 	}
 
-	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::ReadFileFB(const IFilesystemFilePtr& spFile, TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip)
+	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::ReadFileFB(TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip)
 	{
 		bSkip = false;
 		bool bRetry = false;
@@ -385,7 +390,7 @@
 
 			try
 			{
-				spFile->ReadFile(rBuffer);
+				m_spFile->ReadFile(rBuffer);
 				return TSubTaskBase::eSubResult_Continue;
 			}
 			catch (const TFileException& e)
@@ -429,7 +434,7 @@
 		return TSubTaskBase::eSubResult_Continue;
 	}
 
-	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::WriteFileFB(const IFilesystemFilePtr& spFile, TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip)
+	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::WriteFileFB(TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip)
 	{
 		bSkip = false;
 
@@ -442,7 +447,7 @@
 
 			try
 			{
-				spFile->WriteFile(rBuffer);
+				m_spFile->WriteFile(rBuffer);
 				return TSubTaskBase::eSubResult_Continue;
 			}
 			catch (const TFileException& e)
@@ -486,7 +491,7 @@
 		return TSubTaskBase::eSubResult_Continue;
 	}
 
-	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::FinalizeFileFB(const IFilesystemFilePtr& spFile, TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip)
+	TSubTaskBase::ESubOperationResult TFilesystemFileFeedbackWrapper::FinalizeFileFB(TOverlappedDataBuffer& rBuffer, const TSmartPath& pathFile, bool& bSkip)
 	{
 		bSkip = false;
 
@@ -499,7 +504,7 @@
 
 			try
 			{
-				spFile->FinalizeFile(rBuffer);
+				m_spFile->FinalizeFile(rBuffer);
 				return TSubTaskBase::eSubResult_Continue;
 			}
 			catch (const TFileException& e)