Skip to content

Commit 9127a53

Browse files
authored
[KERNEL32_WINETEST] Move ReactOS-specific tests down a bit
Avoid hitting ReactOS interprocess file sharing bugs that are not fixed yet and use a pair of fresh temporary files for testing the function. Addendum to 4e3729f (reactos#9145). CORE-10271
1 parent 77d883a commit 9127a53

1 file changed

Lines changed: 15 additions & 4 deletions

File tree

  • modules/rostests/winetests/kernel32

‎modules/rostests/winetests/kernel32/file.c‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,10 +1237,24 @@ static void test_CopyFileEx(void)
12371237
ok(!retok, "CopyFileExA unexpectedly succeeded\n");
12381238
ok(GetLastError() == ERROR_PATH_NOT_FOUND, "expected ERROR_PATH_NOT_FOUND, got %ld\n", GetLastError());
12391239

1240+
ret = DeleteFileA(source);
1241+
ok(ret, "DeleteFileA failed with error %ld\n", GetLastError());
1242+
ret = DeleteFileA(dest);
1243+
ok(!ret, "DeleteFileA unexpectedly succeeded\n");
12401244
#ifdef __REACTOS__
12411245
/* Cover ReactOS bug in CORE-10271:
12421246
* BasepCopyFileExW was handling any set flags as COPY_FILE_FAIL_IF_EXISTS.
12431247
* This affected CopyFileEx, PrivCopyFileEx, and MoveFileWithProgress */
1248+
ret = GetTempFileNameA(temp_path, prefix, 0, source);
1249+
ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError());
1250+
1251+
ret = GetTempFileNameA(temp_path, prefix, 0, dest);
1252+
ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError());
1253+
1254+
/* Only use the file name as target */
1255+
ret = DeleteFileA(dest);
1256+
ok(ret, "DeleteFileA unexpectedly failed\n");
1257+
12441258
retok = CopyFileExA(source, dest, NULL, NULL, FALSE, 0);
12451259
ok(retok, "CopyFileExA unexpectedly failed\n");
12461260
ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError());
@@ -1284,12 +1298,9 @@ static void test_CopyFileEx(void)
12841298
ok(!retok, "CopyFileExA unexpectedly succeeded\n");
12851299
ok(GetLastError() == ERROR_FILE_EXISTS, "expected ERROR_FILE_EXISTS, got %ld\n", GetLastError());
12861300

1301+
DeleteFileA(source);
12871302
DeleteFileA(dest);
12881303
#endif
1289-
ret = DeleteFileA(source);
1290-
ok(ret, "DeleteFileA failed with error %ld\n", GetLastError());
1291-
ret = DeleteFileA(dest);
1292-
ok(!ret, "DeleteFileA unexpectedly succeeded\n");
12931304
}
12941305

12951306
/*

0 commit comments

Comments
 (0)