From 17056b4f3f9a9251cb5cde60b2cc8c9fa7d41aeb Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Wed, 26 Oct 2016 12:48:30 -0700 Subject: [PATCH] tst: winfsp-tests: always use CreateDirectoryW --- tst/winfsp-tests/create-test.c | 22 +++++++++++----------- tst/winfsp-tests/stream-tests.c | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tst/winfsp-tests/create-test.c b/tst/winfsp-tests/create-test.c index f1ee048a..26ac2b90 100644 --- a/tst/winfsp-tests/create-test.c +++ b/tst/winfsp-tests/create-test.c @@ -109,10 +109,10 @@ void create_dotest(ULONG Flags, PWSTR Prefix) StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, 0); + Success = CreateDirectoryW(FilePath, 0); ASSERT(Success); - Success = CreateDirectory(FilePath, 0); + Success = CreateDirectoryW(FilePath, 0); ASSERT(!Success); 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) { - Success = CreateDirectory(FilePath, 0); + Success = CreateDirectoryW(FilePath, 0); ASSERT(!Success); ASSERT(ERROR_INVALID_NAME == GetLastError()); } @@ -187,7 +187,7 @@ void create_dotest(ULONG Flags, PWSTR Prefix) StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, 0); + Success = CreateDirectoryW(FilePath, 0); ASSERT(Success); 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", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, 0); + Success = CreateDirectoryW(FilePath, 0); ASSERT(Success); DirHandle = CreateFileW(FilePath, @@ -316,7 +316,7 @@ void create_sd_dotest(ULONG Flags, PWSTR Prefix) StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, &SecurityAttributes); + Success = CreateDirectoryW(FilePath, &SecurityAttributes); ASSERT(Success); Handle = CreateFileW(FilePath, @@ -360,7 +360,7 @@ void create_sd_dotest(ULONG Flags, PWSTR Prefix) StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, &SecurityAttributes); + Success = CreateDirectoryW(FilePath, &SecurityAttributes); ASSERT(Success); Handle = CreateFileW(FilePath, @@ -410,13 +410,13 @@ void create_notraverse_dotest(ULONG Flags, PWSTR Prefix) StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, &SecurityAttributes); + Success = CreateDirectoryW(FilePath, &SecurityAttributes); ASSERT(Success); StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, &SecurityAttributes); + Success = CreateDirectoryW(FilePath, &SecurityAttributes); ASSERT(Success); 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", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, &SecurityAttributes); + Success = CreateDirectoryW(FilePath, &SecurityAttributes); ASSERT(!Success); 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", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, &SecurityAttributes); + Success = CreateDirectoryW(FilePath, &SecurityAttributes); ASSERT(Success); StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\dir2\\dir3", diff --git a/tst/winfsp-tests/stream-tests.c b/tst/winfsp-tests/stream-tests.c index 84e714b2..69f9711d 100644 --- a/tst/winfsp-tests/stream-tests.c +++ b/tst/winfsp-tests/stream-tests.c @@ -205,7 +205,7 @@ static void stream_create_dotest(ULONG Flags, PWSTR Prefix) StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, 0); + Success = CreateDirectoryW(FilePath, 0); ASSERT(Success); 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", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, 0); + Success = CreateDirectoryW(FilePath, 0); ASSERT(!Success); 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", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); - Success = CreateDirectory(FilePath, 0); + Success = CreateDirectoryW(FilePath, 0); ASSERT(!Success); ASSERT(ERROR_DIRECTORY == GetLastError());