[PATCH 4/5] kernel32: MoveFile(source, source) should succeed.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/kernel32/path.c                     | 15 ++++++++++-----
 dlls/kernel32/tests/file.c               |  2 +-
 dlls/msvcp120/tests/msvcp120.c           |  2 +-
 programs/cmd/tests/test_builtins.cmd.exp |  4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index 48a3e336ec..33b2358f1e 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -1281,7 +1281,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest,
     OBJECT_ATTRIBUTES attr;
     IO_STATUS_BLOCK io;
     NTSTATUS status;
-    HANDLE source_handle = 0, dest_handle;
+    HANDLE source_handle = 0, dest_handle = 0;
     ANSI_STRING source_unix, dest_unix;
     DWORD options;
 
@@ -1341,18 +1341,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest,
     status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, options );
     if (status == STATUS_SUCCESS)  /* destination exists */
     {
-        NtClose( dest_handle );
         if (!(flag & MOVEFILE_REPLACE_EXISTING))
         {
-            SetLastError( ERROR_ALREADY_EXISTS );
-            RtlFreeUnicodeString( &nt_name );
-            goto error;
+            if (!is_same_file( source_handle, dest_handle ))
+            {
+                SetLastError( ERROR_ALREADY_EXISTS );
+                RtlFreeUnicodeString( &nt_name );
+                goto error;
+            }
         }
         else if (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) /* cannot replace directory */
         {
             SetLastError( ERROR_ACCESS_DENIED );
             goto error;
         }
+
+        NtClose( dest_handle );
     }
     else if (status != STATUS_OBJECT_NAME_NOT_FOUND)
     {
@@ -1412,6 +1416,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest,
 
 error:
     if (source_handle) NtClose( source_handle );
+    if (dest_handle) NtClose( dest_handle );
     RtlFreeAnsiString( &source_unix );
     RtlFreeAnsiString( &dest_unix );
     return FALSE;
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 433a2e5511..87e722b723 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -1894,7 +1894,7 @@ static void test_MoveFileA(void)
     ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError());
 
     ret = MoveFileA(source, source);
-    todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError());
+    ok(ret, "MoveFileA: failed, error %d\n", GetLastError());
 
     ret = MoveFileA(source, dest);
     ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS,
diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c
index 2e63555f2e..ac38aa61a0 100644
--- a/dlls/msvcp120/tests/msvcp120.c
+++ b/dlls/msvcp120/tests/msvcp120.c
@@ -1529,7 +1529,7 @@ static void test_tr2_sys__Rename(void)
     CloseHandle(file);
 
     ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1");
-    todo_wine ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret);
+    ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret);
     for(i=0; i<ARRAY_SIZE(tests); i++) {
         errno = 0xdeadbeef;
         if(tests[i].val == ERROR_SUCCESS) {
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 797a9cc8ae..bb27c6d390 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -1313,8 +1313,8 @@ file move succeeded
 @todo_wine(a)bar@or_broken(a)baz
 read-only files are moveable
 file moved in subdirectory
-(a)todo_wine@moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op!
-(a)todo_wine@ErrorLevel: 0(a)or_broken@ErrorLevel: 1
+moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op!
+ErrorLevel: 0(a)or_broken@ErrorLevel: 1
 --- directory move
 simple directory move succeeded
 moving a directory to itself gives error; errlevel 1
-- 
2.17.1

[Alex Henrie]

Hi Dimitry, thanks for working on this! I made and am attaching a
modified version of patch 3 that is a little simpler, in my opinion.

Alexandre: Patches 2 and 3 of this series can be applied independently
of patches 1, 4, and 5.

-Alex

[Alex Henrie]

On Sun, Oct 14, 2018 at 3:04 PM Alex Henrie <alexhenrie24(a)gmail.com> wrote:
> Alexandre: Patches 2 and 3 of this series can be applied independently
> of patches 1, 4, and 5.

Sorry, I meant patches 3 and 4 can be applied independently, and my
submission is a modified version of patch 4.

-Alex

[Dmitry Timoshkov]

Hi Alex,

Alex Henrie <alexhenrie24(a)gmail.com> wrote:
> Hi Dimitry, thanks for working on this! I made and am attaching a
> modified version of patch 3 that is a little simpler, in my opinion.

Thanks for the review. I'd say that's mostly a matter of personal
preference, and I don't care at all which version will be accepted.

-- 
Dmitry.