November 2013 - Wine-commits

Ken Thomases : winemac: Take WS_EX_TOOLWINDOW into account when computing how much of a window is replaced by the Mac decorations .
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: f6a8c5b50e9562ffea41dfbfe6749b21d4acdb5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a8c5b50e9562ffea41dfbfe… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 16:52:07 2013 -0600 winemac: Take WS_EX_TOOLWINDOW into account when computing how much of a window is replaced by the Mac decorations. --- dlls/winemac.drv/window.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index eac333a..1ad8ac2 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -137,7 +137,11 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT struct macdrv_window_features wf; get_cocoa_window_features(data, style, ex_style, &wf); - if (wf.title_bar) style_mask |= WS_CAPTION; + if (wf.title_bar) + { + style_mask |= WS_CAPTION; + ex_style_mask |= WS_EX_TOOLWINDOW; + } if (wf.shadow) { style_mask |= WS_DLGFRAME | WS_THICKFRAME;

1 0

Stefan Dösinger : d3d9/tests: Add a test for AddDirtyRect.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: cc138ba296aa2ca813357c97cd68e28f12e69cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc138ba296aa2ca813357c97c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 21 13:33:35 2013 +0100 d3d9/tests: Add a test for AddDirtyRect. --- dlls/d3d9/tests/visual.c | 358 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 344 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc138ba296aa2ca813357…

1 0

Stefan Dösinger : d3d8/tests: Add a test for AddDirtyRect.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: de60681b861ae9ca866d0f7818771a9e50972cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de60681b861ae9ca866d0f781… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 21 13:33:36 2013 +0100 d3d8/tests: Add a test for AddDirtyRect. --- dlls/d3d8/tests/visual.c | 357 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 357 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de60681b861ae9ca866d0…

1 0

Stefan Dösinger : wined3d: Don' t create a DIB section in gdi_surface_map.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 6bc69c271bf440b4ecad012dc57888fdffc075d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc69c271bf440b4ecad012dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 21 13:33:37 2013 +0100 wined3d: Don't create a DIB section in gdi_surface_map. --- dlls/wined3d/surface.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8f383a6..878b848 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1480,21 +1480,6 @@ static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, D { TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - - if (!(surface->flags & SFLAG_DIBSECTION)) - { - HRESULT hr; - - /* This happens on gdi surfaces if the application set a user pointer - * and resets it. Recreate the DIB section. */ - if (FAILED(hr = surface_create_dib_section(surface))) - { - ERR("Failed to create dib section, hr %#x.\n", hr); - return; - } - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } } static void gdi_surface_unmap(struct wined3d_surface *surface)

1 0

Alexandre Julliard : kernel32/tests: Make the page size a global variable.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 3dc1f20f03f73eac7ce774df0a42c0d1141288c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc1f20f03f73eac7ce774df0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 15:54:51 2013 +0100 kernel32/tests: Make the page size a global variable. --- dlls/kernel32/tests/loader.c | 86 +++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dc1f20f03f73eac7ce77…

1 0

Alexandre Julliard : kernel32/tests: Add a helper function for creating a test dll.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 70d490aa3d2b079da704a936a5f13416b2e4c265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d490aa3d2b079da704a936a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 17:30:18 2013 +0100 kernel32/tests: Add a helper function for creating a test dll. --- dlls/kernel32/tests/loader.c | 187 ++++++++++++++++++++++-------------------- 1 files changed, 97 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70d490aa3d2b079da704a…

1 0

Alexandre Julliard : kernel32/tests: Add some tests for invalid image section mappings.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 55eb7e56e8cf8c6bb00d01efa8f39f3cae39a4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=55eb7e56e8cf8c6bb00d01efa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 16:14:11 2013 +0100 kernel32/tests: Add some tests for invalid image section mappings. --- dlls/kernel32/tests/loader.c | 128 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6698fce..d44c052 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -47,6 +47,8 @@ static LONG *child_failures; static WORD cb_count; static DWORD page_size; +static NTSTATUS (WINAPI *pNtCreateSection)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, + const LARGE_INTEGER *, ULONG, ULONG, HANDLE ); static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); static NTSTATUS (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -216,6 +218,33 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, return size; } +/* helper to test image section mapping */ +static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header ) +{ + char temp_path[MAX_PATH]; + char dll_name[MAX_PATH]; + LARGE_INTEGER size; + HANDLE file, map; + NTSTATUS status; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "ldr", 0, dll_name); + + size.u.LowPart = create_test_dll( &dos_header, sizeof(dos_header), nt_header, dll_name ); + ok( size.u.LowPart, "could not create %s\n", dll_name); + size.u.HighPart = 0; + + file = CreateFileA(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ, NULL, &size, + PAGE_READONLY, SEC_IMAGE, file ); + if (map) CloseHandle( map ); + CloseHandle( file ); + DeleteFileA( dll_name ); + return status; +} + static void test_Loader(void) { @@ -351,6 +380,8 @@ static void test_Loader(void) char dll_name[MAX_PATH]; SIZE_T size; BOOL ret; + NTSTATUS status; + WORD orig_machine = nt_header.FileHeader.Machine; /* prevent displaying of the "Unable to load this DLL" message box */ SetErrorMode(SEM_FAILCRITICALERRORS); @@ -554,6 +585,102 @@ todo_wine ret = DeleteFileA(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); } + + nt_header.FileHeader.NumberOfSections = 1; + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + + nt_header.OptionalHeader.SectionAlignment = page_size; + nt_header.OptionalHeader.FileAlignment = page_size; + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); + nt_header.OptionalHeader.SizeOfImage = nt_header.OptionalHeader.SizeOfImage + page_size; + + status = map_image_section( &nt_header ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + + dos_header.e_magic = 0; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_NOT_MZ, "NtCreateSection error %08x\n", status ); + + dos_header.e_magic = IMAGE_DOS_SIGNATURE; + nt_header.Signature = IMAGE_OS2_SIGNATURE; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_NE_FORMAT, "NtCreateSection error %08x\n", status ); + + nt_header.Signature = 0xdeadbeef; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_PROTECT, "NtCreateSection error %08x\n", status ); + + nt_header.Signature = IMAGE_NT_SIGNATURE; + nt_header.OptionalHeader.Magic = 0xdead; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT, "NtCreateSection error %08x\n", status ); + + nt_header.OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; + nt_header.FileHeader.Machine = 0xdead; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ + "NtCreateSection error %08x\n", status ); + + nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_UNKNOWN; + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ + "NtCreateSection error %08x\n", status ); + + switch (orig_machine) + { + case IMAGE_FILE_MACHINE_I386: nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; break; + case IMAGE_FILE_MACHINE_AMD64: nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_I386; break; + case IMAGE_FILE_MACHINE_ARMNT: nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; break; + case IMAGE_FILE_MACHINE_ARM64: nt_header.FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; break; + } + status = map_image_section( &nt_header ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ + "NtCreateSection error %08x\n", status ); + + if (nt_header.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + IMAGE_NT_HEADERS64 nt64; + + memset( &nt64, 0, sizeof(nt64) ); + nt64.Signature = IMAGE_NT_SIGNATURE; + nt64.FileHeader.Machine = orig_machine; + nt64.FileHeader.NumberOfSections = 1; + nt64.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER64); + nt64.OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR64_MAGIC; + nt64.OptionalHeader.MajorLinkerVersion = 1; + nt64.OptionalHeader.ImageBase = 0x10000000; + nt64.OptionalHeader.MajorOperatingSystemVersion = 4; + nt64.OptionalHeader.MajorImageVersion = 1; + nt64.OptionalHeader.MajorSubsystemVersion = 4; + nt64.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt64) + sizeof(IMAGE_SECTION_HEADER); + nt64.OptionalHeader.SizeOfImage = nt64.OptionalHeader.SizeOfHeaders + 0x1000; + nt64.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt64 ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT, "NtCreateSection error %08x\n", status ); + } + else + { + IMAGE_NT_HEADERS32 nt32; + + memset( &nt32, 0, sizeof(nt32) ); + nt32.Signature = IMAGE_NT_SIGNATURE; + nt32.FileHeader.Machine = orig_machine; + nt32.FileHeader.NumberOfSections = 1; + nt32.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER32); + nt32.OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR32_MAGIC; + nt32.OptionalHeader.MajorLinkerVersion = 1; + nt32.OptionalHeader.ImageBase = 0x10000000; + nt32.OptionalHeader.MajorOperatingSystemVersion = 4; + nt32.OptionalHeader.MajorImageVersion = 1; + nt32.OptionalHeader.MajorSubsystemVersion = 4; + nt32.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt32) + sizeof(IMAGE_SECTION_HEADER); + nt32.OptionalHeader.SizeOfImage = nt32.OptionalHeader.SizeOfHeaders + 0x1000; + nt32.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt32 ); + todo_wine ok( status == STATUS_INVALID_IMAGE_FORMAT, "NtCreateSection error %08x\n", status ); + } + + nt_header.FileHeader.Machine = orig_machine; /* restore it for the next tests */ } /* Verify linking style of import descriptors */ @@ -2496,6 +2623,7 @@ START_TEST(loader) SYSTEM_INFO si; ntdll = GetModuleHandleA("ntdll.dll"); + pNtCreateSection = (void *)GetProcAddress(ntdll, "NtCreateSection"); pNtMapViewOfSection = (void *)GetProcAddress(ntdll, "NtMapViewOfSection"); pNtUnmapViewOfSection = (void *)GetProcAddress(ntdll, "NtUnmapViewOfSection"); pNtTerminateProcess = (void *)GetProcAddress(ntdll, "NtTerminateProcess");

1 0

Alexandre Julliard : server: Check PE file architecture at mapping creation time.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: e8eb781327457b39c3578f8f65167149939503d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8eb781327457b39c3578f8f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 17:29:51 2013 +0100 server: Check PE file architecture at mapping creation time. --- dlls/kernel32/tests/loader.c | 22 +++++----- dlls/ntdll/loader.c | 2 +- dlls/ntdll/virtual.c | 63 -------------------------- server/mapping.c | 101 +++++++++++++++++++++++++++++------------- 4 files changed, 82 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8eb781327457b39c3578…

1 0

Hans Leidekker : wininet: Reading past end-of-file in chunked mode returns success.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: a448bbf880ee27eaea87230823e52cfadd956230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a448bbf880ee27eaea8723082… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 21 17:52:54 2013 +0100 wininet: Reading past end-of-file in chunked mode returns success. Found by Andrew Eikum. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9c2d5d4..52b64f8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2761,7 +2761,7 @@ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) assert(!stream->chunk_size || stream->chunk_size == ~0u); - if (stream->end_of_data) return ERROR_NO_MORE_FILES; + if (stream->end_of_data) return ERROR_SUCCESS; /* read terminator for the previous chunk */ if(!stream->chunk_size && (res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7b7a33c..ffb5fdf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -734,7 +734,7 @@ static void InternetReadFile_chunked_test(void) { BOOL res; CHAR buffer[4000]; - DWORD length; + DWORD length, got; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -814,7 +814,6 @@ static void InternetReadFile_chunked_test(void) trace("got %u available\n",length); if (length) { - DWORD got; char *buffer = HeapAlloc(GetProcessHeap(),0,length+1); res = InternetReadFile(hor,buffer,length,&got); @@ -828,7 +827,13 @@ static void InternetReadFile_chunked_test(void) if (!got) break; } if (length == 0) + { + got = 0xdeadbeef; + res = InternetReadFile( hor, buffer, 1, &got ); + ok( res, "InternetReadFile failed: %u\n", GetLastError() ); + ok( !got, "got %u\n", got ); break; + } } abort: trace("aborting\n");

1 0

Erich E. Hoover : advapi32/tests: Add tests for creating directories with specific security attributes.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 95c414fea7dd17afe81de406f0a26a29e74cece6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c414fea7dd17afe81de406f… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Nov 8 12:01:49 2013 -0700 advapi32/tests: Add tests for creating directories with specific security attributes. --- dlls/advapi32/tests/security.c | 113 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 16f8837..4de623d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3003,6 +3003,118 @@ static void test_SetEntriesInAclA(void) HeapFree(GetProcessHeap(), 0, OldAcl); } +static void test_CreateDirectoryA(void) +{ + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; + DWORD sid_size = sizeof(admin_ptr), user_size; + PSID admin_sid = (PSID) admin_ptr, user_sid; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + PSECURITY_DESCRIPTOR pSD = &sd; + ACL_SIZE_INFORMATION acl_size; + ACCESS_ALLOWED_ACE *ace; + SECURITY_ATTRIBUTES sa; + char tmpdir[MAX_PATH]; + struct _SID *owner; + BOOL bret = TRUE; + HANDLE token; + DWORD error; + PACL pDacl; + + if (!pGetNamedSecurityInfoA || !pCreateWellKnownSid) + { + win_skip("Required functions are not available\n"); + return; + } + + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + bret = GetTokenInformation(token, TokenUser, NULL, 0, &user_size); + ok(!bret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + user = HeapAlloc(GetProcessHeap(), 0, user_size); + bret = GetTokenInformation(token, TokenUser, user, user_size, &user_size); + ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + CloseHandle( token ); + user_sid = ((TOKEN_USER *)user)->User.Sid; + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = TRUE; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + pDacl = HeapAlloc(GetProcessHeap(), 0, 100); + bret = InitializeAcl(pDacl, 100, ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, + GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, + GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + + GetTempPathA(MAX_PATH, tmpdir); + lstrcatA(tmpdir, "Please Remove Me"); + bret = CreateDirectoryA(tmpdir, &sa); + ok(bret == TRUE, "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError()); + HeapFree(GetProcessHeap(), 0, pDacl); + + SetLastError(0xdeadbeef); + error = pGetNamedSecurityInfoA(tmpdir, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner, + NULL, &pDacl, NULL, &pSD); + if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("GetNamedSecurityInfoA is not implemented\n"); + goto done; + } + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine ok(acl_size.AceCount == 2, + "GetAclInformation returned unexpected entry count (%d != 2).\n", + acl_size.AceCount); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), + "Current User ACE has unexpected flags (0x%x != 0x03)\n", + ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); + todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), + "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", + ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + +done: + HeapFree(GetProcessHeap(), 0, user); + bret = RemoveDirectoryA(tmpdir); + ok(bret == TRUE, "RemoveDirectoryA should always succeed\n"); +} + static void test_GetNamedSecurityInfoA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; @@ -4674,6 +4786,7 @@ START_TEST(security) test_impersonation_level(); test_SetEntriesInAclW(); test_SetEntriesInAclA(); + test_CreateDirectoryA(); test_GetNamedSecurityInfoA(); test_ConvertStringSecurityDescriptor(); test_ConvertSecurityDescriptorToString();

1 0