Merge remote-tracking branch 'origin/2.7' into master

3 files changed, 9 insertions, 14 deletions

diff --git a/src/common/filesystembase.cpp b/src/common/filesystembase.cpp
index 733b75f76..e1b7facee 100644
--- a/src/common/filesystembase.cpp
+++ b/src/common/filesystembase.cpp
@@ -205,14 +205,8 @@ bool FileSystem::uncheckedRenameReplace(const QString &originFileName,
         (wchar_t *)dest.utf16(),
         MOVEFILE_REPLACE_EXISTING + MOVEFILE_COPY_ALLOWED + MOVEFILE_WRITE_THROUGH);
     if (!ok) {
-        wchar_t *string = 0;
-        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-            NULL, ::GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-            (LPWSTR)&string, 0, NULL);
-
-        *errorString = QString::fromWCharArray(string);
+        *errorString = Utility::formatWinError(GetLastError());
         qCWarning(lcFileSystem) << "Renaming temp file to final failed: " << *errorString;
-        LocalFree((HLOCAL)string);
         return false;
     }
 #endif
@@ -449,13 +443,13 @@ bool FileSystem::moveToTrash(const QString &fileName, QString *errorString)
 bool FileSystem::isFileLocked(const QString &fileName)
 {
 #ifdef Q_OS_WIN
-    const wchar_t *wuri = reinterpret_cast<const wchar_t *>(fileName.utf16());
     // Check if file exists
-    DWORD attr = GetFileAttributesW(wuri);
+    const QString fName = longWinPath(fileName);
+    DWORD attr = GetFileAttributesW(reinterpret_cast<const wchar_t *>(fName.utf16()));
     if (attr != INVALID_FILE_ATTRIBUTES) {
         // Try to open the file with as much access as possible..
         HANDLE win_h = CreateFileW(
-            wuri,
+            reinterpret_cast<const wchar_t *>(fName.utf16()),
             GENERIC_READ | GENERIC_WRITE,
             FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
             NULL, OPEN_EXISTING,
@@ -485,7 +479,7 @@ bool FileSystem::isJunction(const QString &filename)
 {
 #ifdef Q_OS_WIN
     WIN32_FIND_DATA findData;
-    HANDLE hFind = FindFirstFileEx((const wchar_t *)filename.utf16(), FindExInfoBasic, &findData, FindExSearchNameMatch, NULL, 0);
+    HANDLE hFind = FindFirstFileEx(reinterpret_cast<const wchar_t *>(longWinPath(filename).utf16()), FindExInfoBasic, &findData, FindExSearchNameMatch, NULL, 0);
     if (hFind != INVALID_HANDLE_VALUE) {
         FindClose(hFind);
         return false;
diff --git a/src/common/utility.cpp b/src/common/utility.cpp
index d0dc3d018..b800c7ef8 100644
--- a/src/common/utility.cpp
+++ b/src/common/utility.cpp
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include "common/utility.h"
+#include "common/filesystembase.h"
 #include "version.h"
 
 // Note:  This file must compile without QtGui
@@ -222,7 +223,7 @@ qint64 Utility::freeDiskSpace(const QString &path)
 #elif defined(Q_OS_WIN)
     ULARGE_INTEGER freeBytes;
     freeBytes.QuadPart = 0L;
-    if (GetDiskFreeSpaceEx(reinterpret_cast<const wchar_t *>(path.utf16()), &freeBytes, NULL, NULL)) {
+    if (GetDiskFreeSpaceEx(reinterpret_cast<const wchar_t *>(FileSystem::longWinPath(path).utf16()), &freeBytes, NULL, NULL)) {
         return freeBytes.QuadPart;
     }
 #endif
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index b349a4d9f..87dbbde16 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -534,7 +534,7 @@ bool OwncloudPropagator::localFileNameClash(const QString &relFile)
         WIN32_FIND_DATA FindFileData;
         HANDLE hFind;
 
-        hFind = FindFirstFileW((wchar_t *)file.utf16(), &FindFileData);
+        hFind = FindFirstFileW(reinterpret_cast<const wchar_t *>(FileSystem::longWinPath(file).utf16()), &FindFileData);
         if (hFind == INVALID_HANDLE_VALUE) {
             // returns false.
         } else {
@@ -568,7 +568,7 @@ bool OwncloudPropagator::hasCaseClashAccessibilityProblem(const QString &relfile
     WIN32_FIND_DATA FindFileData;
     HANDLE hFind;
 
-    hFind = FindFirstFileW(reinterpret_cast<const wchar_t *>(file.utf16()), &FindFileData);
+    hFind = FindFirstFileW(reinterpret_cast<const wchar_t *>(FileSystem::longWinPath(file).utf16()), &FindFileData);
     if (hFind != INVALID_HANDLE_VALUE) {
         QString firstFile = QString::fromWCharArray(FindFileData.cFileName);
         if (FindNextFile(hFind, &FindFileData)) {