diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:28:01 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:28:01 +0200 |
| commit | fe9eb89ebc1b3c33cbac00a3fa095a14faef9113 (patch) | |
| tree | 8a3bb620a9acb83fe0057061a86e8f2cb91a9fe1 /zen/IFileOperation/file_op.cpp | |
| parent | 5.21 (diff) | |
| download | FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.tar.gz FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.tar.bz2 FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.zip | |
5.22
Diffstat (limited to 'zen/IFileOperation/file_op.cpp')
| -rw-r--r-- | zen/IFileOperation/file_op.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/zen/IFileOperation/file_op.cpp b/zen/IFileOperation/file_op.cpp index 218c6f99..27a2565b 100644 --- a/zen/IFileOperation/file_op.cpp +++ b/zen/IFileOperation/file_op.cpp @@ -229,7 +229,7 @@ void moveToRecycleBin(const wchar_t* fileNames[], //throw SysError if (!somethingExists(fileNames[i])) continue; } - throw SysError(formatComError(std::wstring(L"Error calling \"SHCreateItemFromParsingName\" for file:\n") + L"\'" + fileNames[i] + L"\'.", hr)); + throw SysError(formatComError(std::wstring(L"Error calling \"SHCreateItemFromParsingName\" for file:\n") + L"\"" + fileNames[i] + L"\".", hr)); } ZEN_COM_CHECK(fileOp->DeleteItem(psiFile.get(), nullptr)); @@ -256,11 +256,11 @@ void moveToRecycleBin(const wchar_t* fileNames[], //throw SysError if (!processes.empty()) { - std::wstring errorMsg = L"The file \'" + lastError->first + L"\' is locked by another process:"; + std::wstring errorMsg = L"The file \"" + lastError->first + L"\" is locked by another process:"; std::for_each(processes.begin(), processes.end(), [&](const std::wstring& proc) { errorMsg += L'\n'; errorMsg += proc; }); throw SysError(errorMsg); //message is descriptive enough, no need to evaluate HRESULT! } - throw SysError(formatComError(std::wstring(L"Error during \"PerformOperations\" for file:\n") + L"\'" + lastError->first + L"\'.", lastError->second)); + throw SysError(formatComError(std::wstring(L"Error during \"PerformOperations\" for file:\n") + L"\"" + lastError->first + L"\".", lastError->second)); } throw; } @@ -298,7 +298,7 @@ void copyFile(const wchar_t* sourceFile, //throw SysError nullptr, IID_PPV_ARGS(psiSourceFile.init())); if (FAILED(hr)) - throw SysError(formatComError(std::wstring(L"Error calling \"SHCreateItemFromParsingName\" for file:\n") + L"\'" + sourceFile + L"\'.", hr)); + throw SysError(formatComError(std::wstring(L"Error calling \"SHCreateItemFromParsingName\" for file:\n") + L"\"" + sourceFile + L"\".", hr)); } const size_t pos = std::wstring(targetFile).find_last_of(L'\\'); @@ -315,7 +315,7 @@ void copyFile(const wchar_t* sourceFile, //throw SysError nullptr, IID_PPV_ARGS(psiTargetFolder.init())); if (FAILED(hr)) - throw SysError(formatComError(std::wstring(L"Error calling \"SHCreateItemFromParsingName\" for folder:\n") + L"\'" + targetFolder + L"\'.", hr)); + throw SysError(formatComError(std::wstring(L"Error calling \"SHCreateItemFromParsingName\" for folder:\n") + L"\"" + targetFolder + L"\".", hr)); } //schedule file copy operation @@ -440,7 +440,7 @@ std::vector<std::wstring> getLockingProcesses(const wchar_t* filename) //throw S &buffer[0], //__out LPTSTR lpExeName, &bufferSize)) //__inout PDWORD lpdwSize if (bufferSize < buffer.size()) - processName += std::wstring(L", ") + L"\'" + &buffer[0] + L"\'"; + processName += std::wstring(L", ") + L"\"" + &buffer[0] + L"\""; } } output.push_back(processName); |