ntdll/tests: Use official path for temporary files instead of current directory.
Dmitry Timoshkov
dmitry at baikal.ru
Tue Sep 24 03:12:39 CDT 2013
---
dlls/ntdll/tests/file.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 66299ea..9f1f12e 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -1302,7 +1302,7 @@ static void test_file_both_information(void)
static void test_file_disposition_information(void)
{
- char buffer[MAX_PATH + 16];
+ char tmp_path[MAX_PATH], buffer[MAX_PATH + 16];
DWORD dirpos;
HANDLE handle, handle2;
NTSTATUS res;
@@ -1310,8 +1310,10 @@ static void test_file_disposition_information(void)
FILE_DISPOSITION_INFORMATION fdi;
BOOL fileDeleted;
+ GetTempPathA( MAX_PATH, tmp_path );
+
/* cannot set disposition on file not opened with delete access */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
res = pNtQueryInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
@@ -1326,7 +1328,7 @@ static void test_file_disposition_information(void)
DeleteFileA( buffer );
/* can set disposition on file opened with proper access */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0);
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fdi.DoDeleteFile = TRUE;
@@ -1340,7 +1342,7 @@ static void test_file_disposition_information(void)
DeleteFileA( buffer );
/* cannot set disposition on readonly file */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0);
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fdi.DoDeleteFile = TRUE;
@@ -1354,7 +1356,7 @@ static void test_file_disposition_information(void)
DeleteFileA( buffer );
/* can set disposition on file and then reset it */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0);
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fdi.DoDeleteFile = TRUE;
@@ -1371,7 +1373,7 @@ static void test_file_disposition_information(void)
DeleteFileA( buffer );
/* Delete-on-close flag doesn't change file disposition until a handle is closed */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0);
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fdi.DoDeleteFile = FALSE;
@@ -1384,7 +1386,7 @@ static void test_file_disposition_information(void)
DeleteFileA( buffer );
/* Delete-on-close flag sets disposition when a handle is closed and then it could be changed back */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0);
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" );
@@ -1399,7 +1401,7 @@ static void test_file_disposition_information(void)
DeleteFileA( buffer );
/* can set disposition on a directory opened with proper access */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
DeleteFileA( buffer );
ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" );
handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
@@ -1415,7 +1417,7 @@ static void test_file_disposition_information(void)
RemoveDirectoryA( buffer );
/* RemoveDirectory sets directory disposition and it can be undone */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
DeleteFileA( buffer );
ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" );
handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
@@ -1431,7 +1433,7 @@ static void test_file_disposition_information(void)
RemoveDirectoryA( buffer );
/* cannot set disposition on a non-empty directory */
- GetTempFileNameA( ".", "dis", 0, buffer );
+ GetTempFileNameA( tmp_path, "dis", 0, buffer );
DeleteFileA( buffer );
ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" );
handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
--
1.8.3.4
More information about the wine-patches
mailing list