Zebediah Figura : kernel32: Don't fail ReplaceFile() if unable to delete a generated backup.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bae4776c571cf975be1689594f4caf93ad23e0ca
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=bae4776c571cf975be1689594...

Author: Zebediah Figura 
Date:   Sat Mar 28 23:09:35 2020 -0500

kernel32: Don't fail ReplaceFile() if unable to delete a generated backup.

Windows will just leave the file if unable to delete it.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/kernel32/file.c       | 6 +-----
 dlls/kernel32/tests/file.c | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 2a2ace5dd8..3b2d82cc37 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -507,11 +507,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa
                 || !MoveFileExW( lpReplacedFileName, temp_file, MOVEFILE_REPLACE_EXISTING ))
             return FALSE;

-        if (!DeleteFileW( temp_file ))
-        {
-            SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED );
-            return FALSE;
-        }
+        DeleteFileW( temp_file );
     }

/*
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 41d03c14fa..e8a31c6e74 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -3841,12 +3841,12 @@ static void test_ReplaceFileA(void)
     ok(ret, "got error %u\n", GetLastError());

ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0);
-    todo_wine ok(ret, "got error %u\n", GetLastError());
+    ok(ret, "got error %u\n", GetLastError());

CloseHandle(mapping);
     CloseHandle(hReplacedFile);
     ret = DeleteFileA(replaced);
-    todo_wine ok(ret, "got error %u\n", GetLastError());
+    ok(ret, "got error %u\n", GetLastError());
 }

/*