tst: winfsp-tests: always use CreateDirectoryW

This commit is contained in:
Bill Zissimopoulos 2016-10-26 12:48:30 -07:00
parent b19621233a
commit 17056b4f3f
2 changed files with 14 additions and 14 deletions

View File

@ -109,10 +109,10 @@ void create_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(Success); ASSERT(Success);
Success = CreateDirectory(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(!Success); ASSERT(!Success);
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\file2", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\file2",
@ -179,7 +179,7 @@ void create_dotest(ULONG Flags, PWSTR Prefix)
if (0 == OptMountPoint && 0 == OptShareName) if (0 == OptMountPoint && 0 == OptShareName)
{ {
Success = CreateDirectory(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(!Success); ASSERT(!Success);
ASSERT(ERROR_INVALID_NAME == GetLastError()); ASSERT(ERROR_INVALID_NAME == GetLastError());
} }
@ -187,7 +187,7 @@ void create_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(Success); ASSERT(Success);
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
@ -234,7 +234,7 @@ void create_related_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(Success); ASSERT(Success);
DirHandle = CreateFileW(FilePath, DirHandle = CreateFileW(FilePath,
@ -316,7 +316,7 @@ void create_sd_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, &SecurityAttributes); Success = CreateDirectoryW(FilePath, &SecurityAttributes);
ASSERT(Success); ASSERT(Success);
Handle = CreateFileW(FilePath, Handle = CreateFileW(FilePath,
@ -360,7 +360,7 @@ void create_sd_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, &SecurityAttributes); Success = CreateDirectoryW(FilePath, &SecurityAttributes);
ASSERT(Success); ASSERT(Success);
Handle = CreateFileW(FilePath, Handle = CreateFileW(FilePath,
@ -410,13 +410,13 @@ void create_notraverse_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, &SecurityAttributes); Success = CreateDirectoryW(FilePath, &SecurityAttributes);
ASSERT(Success); ASSERT(Success);
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, &SecurityAttributes); Success = CreateDirectoryW(FilePath, &SecurityAttributes);
ASSERT(Success); ASSERT(Success);
Success = LookupPrivilegeValueW(0, SE_CHANGE_NOTIFY_NAME, &Luid); Success = LookupPrivilegeValueW(0, SE_CHANGE_NOTIFY_NAME, &Luid);
@ -432,7 +432,7 @@ void create_notraverse_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2\\dir3", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2\\dir3",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, &SecurityAttributes); Success = CreateDirectoryW(FilePath, &SecurityAttributes);
ASSERT(!Success); ASSERT(!Success);
ASSERT(ERROR_ACCESS_DENIED == GetLastError()); ASSERT(ERROR_ACCESS_DENIED == GetLastError());
@ -445,7 +445,7 @@ void create_notraverse_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2\\dir3", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2\\dir3",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, &SecurityAttributes); Success = CreateDirectoryW(FilePath, &SecurityAttributes);
ASSERT(Success); ASSERT(Success);
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2\\dir3", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2\\dir3",

View File

@ -205,7 +205,7 @@ static void stream_create_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(Success); ASSERT(Success);
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1:foo", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1:foo",
@ -311,7 +311,7 @@ static void stream_create_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1:foo", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1:foo",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(!Success); ASSERT(!Success);
ASSERT(ERROR_DIRECTORY == GetLastError()); ASSERT(ERROR_DIRECTORY == GetLastError());
@ -329,7 +329,7 @@ static void stream_create_dotest(ULONG Flags, PWSTR Prefix)
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1::$DATA", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1::$DATA",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectory(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(!Success); ASSERT(!Success);
ASSERT(ERROR_DIRECTORY == GetLastError()); ASSERT(ERROR_DIRECTORY == GetLastError());