[PATCH 1/2] kernel32/tests: Add more tests for deleting and replacing open files.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/file.c | 70 +++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 90338f52d1c..41d03c14fa2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1795,7 +1795,8 @@ static void test_DeleteFileA( void ) { BOOL ret; char temp_path[MAX_PATH], temp_file[MAX_PATH]; - HANDLE hfile; + HANDLE hfile, mapping; + char **argv; ret = DeleteFileA(NULL); ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || @@ -1842,6 +1843,28 @@ static void test_DeleteFileA( void ) "Expected ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); ret = RemoveDirectoryA("testdir"); ok(ret, "Remove a directory failed, got error %d\n", GetLastError()); + + winetest_get_mainargs(&argv); + + ret = CopyFileA(argv[0], temp_file, FALSE); + ok(ret, "got error %u\n", GetLastError()); + hfile = CreateFileA(temp_file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + mapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL); + ok(!!mapping, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteFileA(temp_file); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + CloseHandle(mapping); + + ret = DeleteFileA(temp_file); + ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(hfile); } static void test_DeleteFileW( void ) @@ -3540,7 +3563,7 @@ static BOOL check_file_time( const FILETIME *ft1, const FILETIME *ft2, UINT tole static void test_ReplaceFileA(void) { char replaced[MAX_PATH], replacement[MAX_PATH], backup[MAX_PATH]; - HANDLE hReplacedFile, hReplacementFile, hBackupFile; + HANDLE hReplacedFile, hReplacementFile, hBackupFile, mapping; static const char replacedData[] = "file-to-replace"; static const char replacementData[] = "new-file"; static const char backupData[] = "backup-file"; @@ -3549,6 +3572,7 @@ static void test_ReplaceFileA(void) char temp_path[MAX_PATH]; DWORD ret; BOOL retok, removeBackup = FALSE; + char **argv; if (!pReplaceFileA) { @@ -3786,6 +3810,43 @@ static void test_ReplaceFileA(void) broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ "DeleteFileA: error (backup) %d\n", GetLastError()); } + + ret = GetTempFileNameA(temp_path, prefix, 0, replaced); + ok(ret, "got error %u\n", GetLastError()); + hReplacedFile = CreateFileA(replaced, 0, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret, "got error %u\n", GetLastError()); + + ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(hReplacedFile); + ret = DeleteFileA(replaced); + ok(ret, "got error %u\n", GetLastError()); + + winetest_get_mainargs(&argv); + + ret = CopyFileA(argv[0], replaced, FALSE); + ok(ret, "got error %u\n", GetLastError()); + hReplacedFile = CreateFileA(replaced, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + mapping = CreateFileMappingA(hReplacedFile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL); + ok(!!mapping, "got error %u\n", GetLastError()); + + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret, "got error %u\n", GetLastError()); + + ret = ReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + todo_wine ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(mapping); + CloseHandle(hReplacedFile); + ret = DeleteFileA(replaced); + todo_wine ok(ret, "got error %u\n", GetLastError()); } /* @@ -3847,9 +3908,10 @@ static void test_ReplaceFileW(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesW: error setting to read only %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = pReplaceFileW(replaced, replacement, backup, 0, 0, 0); - ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, - "ReplaceFileW: unexpected error %d\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); ret = SetFileAttributesW(replaced, FILE_ATTRIBUTE_NORMAL); ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesW: error setting to normal %d\n", GetLastError()); -- 2.25.1
Windows will just leave the file if unable to delete it. Fixes: 5e218fe758fe6beed5c7ad73405eccf33c307e6d Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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 2a2ace5dd81..3b2d82cc37e 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 41d03c14fa2..e8a31c6e749 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()); } /* -- 2.25.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=68352 Your paranoid android. === w1064v1809_he (32 bit report) === kernel32: file.c:2810: Test failed: FindFirstFile failed (err=5) file.c:2811: Test failed: First entry should be '.', is file.c:2814: Test failed: Fetching second file failed file.c:2815: Test failed: Second entry should be '..' is file.c:2818: Test failed: Fetching third file failed file.c:2819: Test failed: Invalid third entry - file.c:2834: Test failed: Fetching fourth file failed file.c:2835: Test failed: Invalid fourth entry - file.c:2838: Test failed: Fetching fifth file failed file.c:2839: Test failed: Invalid fifth entry - file.c:2862: Test failed: Unexpected error 5, expected valid handle file.c:2810: Test failed: FindFirstFile failed (err=5) file.c:2811: Test failed: First entry should be '.', is file.c:2814: Test failed: Fetching second file failed file.c:2815: Test failed: Second entry should be '..' is file.c:2818: Test failed: Fetching third file failed file.c:2819: Test failed: Invalid third entry - file.c:2834: Test failed: Fetching fourth file failed file.c:2835: Test failed: Invalid fourth entry - file.c:2838: Test failed: Fetching fifth file failed file.c:2839: Test failed: Invalid fifth entry - file.c:2856: Test failed: Unexpected error 5, expected valid handle or ERROR_PATH_NOT_FOUND file.c:2810: Test failed: FindFirstFile failed (err=5) file.c:2811: Test failed: First entry should be '.', is file.c:2814: Test failed: Fetching second file failed file.c:2815: Test failed: Second entry should be '..' is file.c:2818: Test failed: Fetching third file failed file.c:2819: Test failed: Invalid third entry - file.c:2834: Test failed: Fetching fourth file failed file.c:2835: Test failed: Invalid fourth entry - file.c:2838: Test failed: Fetching fifth file failed file.c:2839: Test failed: Invalid fifth entry - file.c:2862: Test failed: Unexpected error 5, expected valid handle file.c:2810: Test failed: FindFirstFile failed (err=5) file.c:2811: Test failed: First entry should be '.', is file.c:2812: Test failed: FindFirstFile unexpectedly returned an alternate filename file.c:2814: Test failed: Fetching second file failed file.c:2815: Test failed: Second entry should be '..' is file.c:2816: Test failed: FindFirstFile unexpectedly returned an alternate filename file.c:2818: Test failed: Fetching third file failed file.c:2819: Test failed: Invalid third entry - file.c:2820: Test failed: FindFirstFile unexpectedly returned an alternate filename file.c:2834: Test failed: Fetching fourth file failed file.c:2835: Test failed: Invalid fourth entry - file.c:2836: Test failed: FindFirstFile unexpectedly returned an alternate filename file.c:2838: Test failed: Fetching fifth file failed file.c:2839: Test failed: Invalid fifth entry - file.c:2840: Test failed: FindFirstFile unexpectedly returned an alternate filename file.c:2862: Test failed: Unexpected error 3, expected valid handle
participants (2)
-
Marvin -
Zebediah Figura