From fa6b621042cf9d66bd0220949b075f091b607c33 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Mon, 3 Oct 2016 16:16:09 -0700 Subject: [PATCH] tst: winfsp-tests: stream testing --- tst/winfsp-tests/stream-tests.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tst/winfsp-tests/stream-tests.c b/tst/winfsp-tests/stream-tests.c index 4c1d3c50..2ebdbce6 100644 --- a/tst/winfsp-tests/stream-tests.c +++ b/tst/winfsp-tests/stream-tests.c @@ -599,7 +599,6 @@ static void stream_getsecurity_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoT { void *memfs = memfs_start_ex(Flags, FileInfoTimeout); -#if 0 static PWSTR Sddl = L"D:P(A;;GA;;;SY)(A;;GA;;;BA)(A;;GA;;;WD)"; PSECURITY_DESCRIPTOR SecurityDescriptor, FileSecurityDescriptor; SECURITY_ATTRIBUTES SecurityAttributes = { 0 }; @@ -617,7 +616,7 @@ static void stream_getsecurity_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoT SecurityAttributes.nLength = sizeof SecurityAttributes; SecurityAttributes.lpSecurityDescriptor = SecurityDescriptor; - StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\file0", + StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\file0:foo", Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Handle = CreateFileW(FilePath, @@ -626,6 +625,9 @@ static void stream_getsecurity_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoT ASSERT(INVALID_HANDLE_VALUE != Handle); CloseHandle(Handle); + StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\file0", + Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); + Handle = CreateFileW(FilePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, 0); ASSERT(INVALID_HANDLE_VALUE != Handle); @@ -678,7 +680,6 @@ static void stream_getsecurity_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoT CloseHandle(Handle); LocalFree(SecurityDescriptor); -#endif memfs_stop(memfs); }