Merge pull request #10860 from nextcloud/backport/10846/stable-34.0

[stable-34.0] fix(windows): Pass extended \\?\ paths to QFile for ordinary files in Filesystem::rename

Author: claucambra

shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/xcshareddata/xcschemes/desktopclient.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C2B573B01B1CD91E00303B36"
+               BuildableName = "desktopclient.app"
+               BlueprintName = "desktopclient"
+               ReferencedContainer = "container:NextcloudIntegration.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C2B573B01B1CD91E00303B36"
+            BuildableName = "desktopclient.app"
+            BlueprintName = "desktopclient"
+            ReferencedContainer = "container:NextcloudIntegration.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C2B573B01B1CD91E00303B36"
+            BuildableName = "desktopclient.app"
+            BlueprintName = "desktopclient"
+            ReferencedContainer = "container:NextcloudIntegration.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

src/common/filesystembase.cpp

@@ -206,25 +206,24 @@ bool FileSystem::rename(const QString &originFileName,
     bool success = false;
     QString error;
 #ifdef Q_OS_WIN
-    QString orig = longWinPath(originFileName);
-    QString dest = longWinPath(destinationFileName);
-
-    if (isLnkFile(originFileName) || isLnkFile(destinationFileName)) {
-        success = MoveFileEx((wchar_t *)orig.utf16(),
-            (wchar_t *)dest.utf16(),
-            MOVEFILE_COPY_ALLOWED | MOVEFILE_WRITE_THROUGH);
-        if (!success) {
-            error = Utility::formatWinError(GetLastError());
-        }
-    } else
-#endif
+    // Use the extended paths directly so Win32 does not normalize trailing periods or spaces.
+    const auto originPath = longWinPath(originFileName);
+    const auto destinationPath = longWinPath(destinationFileName);
+    success = MoveFileExW(reinterpret_cast<const wchar_t *>(originPath.utf16()),
+                          reinterpret_cast<const wchar_t *>(destinationPath.utf16()),
+                          MOVEFILE_COPY_ALLOWED | MOVEFILE_WRITE_THROUGH);
+    if (!success) {
+        error = Utility::formatWinError(GetLastError());
+    }
+#else
     {
-        QFile orig(originFileName);
-        success = orig.rename(destinationFileName);
+        QFile file(originFileName);
+        success = file.rename(destinationFileName);
         if (!success) {
-            error = orig.errorString();
+            error = file.errorString();
         }
     }
+#endif
 
     if (!success) {
         qCWarning(lcFileSystem) << "Error renaming file" << originFileName

test/testfilesystem.cpp

@@ -17,9 +17,9 @@
 #include "libsync/filesystem.h"
 
 #ifdef Q_OS_WIN
-#include <securitybaseapi.h>
 #include <aclapi.h>
 #include <sddl.h>
+#include <securitybaseapi.h>
 #endif
 
 using namespace OCC;
@@ -161,6 +161,39 @@ private Q_SLOTS:
     }
 
 #ifdef Q_OS_WIN
+    // Regression for issue #10836: a trailing period must remain addressable during a rename.
+    void testRenameFileWithTrailingPeriod()
+    {
+        QTemporaryDir tempDir;
+        QVERIFY(tempDir.isValid());
+
+        const auto sourcePath = tempDir.filePath(u"trailing-period."_s);
+        const auto destinationPath = tempDir.filePath(u"renamed-file"_s);
+        const auto pathExists = [](const QString &path) {
+            const auto extendedPath = FileSystem::longWinPath(path);
+            return GetFileAttributesW(reinterpret_cast<const wchar_t *>(extendedPath.utf16())) != INVALID_FILE_ATTRIBUTES;
+        };
+        const auto sourcePathLong = FileSystem::longWinPath(sourcePath);
+
+        Utility::UniqueHandle fileHandle;
+        fileHandle.reset(CreateFileW(reinterpret_cast<const wchar_t *>(sourcePathLong.utf16()),
+                                     GENERIC_WRITE,
+                                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                                     nullptr,
+                                     CREATE_NEW,
+                                     FILE_ATTRIBUTE_NORMAL,
+                                     nullptr));
+        QVERIFY2(fileHandle.get() != INVALID_HANDLE_VALUE, qPrintable(Utility::formatWinError(GetLastError())));
+        fileHandle.reset();
+
+        QVERIFY2(pathExists(sourcePath), qPrintable(u"Source file does not exist: "_s + sourcePath));
+
+        QString error;
+        QVERIFY2(FileSystem::rename(sourcePath, destinationPath, &error), qPrintable(error));
+        QVERIFY(!pathExists(sourcePath));
+        QVERIFY(pathExists(destinationPath));
+    }
+
     void testAclWithManyDeniedAces()
     {
         // Regression from client versions < 4.0.2; see GH issue nextcloud/desktop#8860