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 <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: Don't fail ReplaceFile() if unable to delete a generated backup.
bae4776c · Zebediah Figura · Alexandre Julliard · faebd0ce · bae4776c · bae4776c
Commit bae4776c authored Mar 28, 2020 by Zebediah Figura Committed by Alexandre Julliard Mar 30, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

file.c dlls/kernel32/file.c +1 -5

file.c dlls/kernel32/tests/file.c +2 -2

No files found.
--- 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 );
    }

    /*

--- 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());
 }

 /*