June 2017 - Wine-commits - list.winehq.org

Sebastian Lackner : server: Do not shutdown server in persistent mode when creation of first process fails.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4fc5d8873ca3b1bd0a4029e331f9292564ac86c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc5d8873ca3b1bd0a4029e33… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 18 01:54:16 2017 +0200 server: Do not shutdown server in persistent mode when creation of first process fails. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 4f38ae1..3e962ca 100644 --- a/server/process.c +++ b/server/process.c @@ -592,7 +592,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit error: if (process) release_object( process ); /* if we failed to start our first process, close everything down */ - if (!running_processes) close_master_socket( 0 ); + if (!running_processes && master_socket_timeout != TIMEOUT_INFINITE) close_master_socket( 0 ); return NULL; }

1 0

Sebastian Lackner : wined3d: Avoid NULL pointer dereference when using GDI renderer.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a2c0d2bb37244d1bece3ddd411981aaf06f3c842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c0d2bb37244d1bece3ddd41… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:04 2017 +0200 wined3d: Avoid NULL pointer dereference when using GDI renderer. Fixes a regression introduced in 62ca4f38269139ef2a8b9842ec538d9e7f7a0e76. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0f60542..fbc73ca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2703,12 +2703,13 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; BYTE *memory; if (!data->buffer_object) return data->addr; + gl_info = context->gl_info; context_bind_bo(context, binding, data->buffer_object); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) @@ -2731,11 +2732,12 @@ void *context_map_bo_address(struct wined3d_context *context, void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; + gl_info = context->gl_info; context_bind_bo(context, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); context_bind_bo(context, binding, 0);

1 0

Sebastian Lackner : wined3d: Create CPU blitter also for GDI render.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 6dd1ca28bfea0d2dcee368a70ba196bc25ec8d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd1ca28bfea0d2dcee368a70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:34 2017 +0200 wined3d: Create CPU blitter also for GDI render. Fixes a regression introduced in cad4badbcf25992e0c61521aa15e639c2611f5d6. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ded4af6..3d12e41 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1164,6 +1164,15 @@ HRESULT CDECL wined3d_device_init_gdi(struct wined3d_device *device, goto err_out; } device->swapchains[0] = swapchain; + + if (!(device->blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + HeapFree(GetProcessHeap(), 0, device->swapchains); + device->swapchain_count = 0; + goto err_out; + } + return WINED3D_OK; err_out: @@ -1252,6 +1261,8 @@ HRESULT CDECL wined3d_device_uninit_gdi(struct wined3d_device *device) { unsigned int i; + device->blitter->ops->blitter_destroy(device->blitter, NULL); + for (i = 0; i < device->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i);

1 0

Sebastian Lackner : wined3d: Fix memory leaks in blitter_destroy callbacks.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a77d957da8777c690972dfa99e7956f18d06ba0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77d957da8777c690972dfa99… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:58 2017 +0200 wined3d: Fix memory leaks in blitter_destroy callbacks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index abdeb9c..af8b5b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2394,6 +2394,8 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, @@ -2476,6 +2478,8 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, @@ -2766,6 +2770,8 @@ static void cpu_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data,

1 0

André Hentschel : kernel32: Fix EscapeCommFunction prototype.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 1ab9c9d8490e54991ef13e4ce2961605d88d6772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab9c9d8490e54991ef13e4ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 16 18:45:07 2017 +0200 kernel32: Fix EscapeCommFunction prototype. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index f6c1270..b5de654 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -592,7 +592,7 @@ BOOL WINAPI ClearCommBreak(HANDLE handle) * false if the device is not present cannot execute the command * or the command failed. */ -BOOL WINAPI EscapeCommFunction(HANDLE handle, UINT func) +BOOL WINAPI EscapeCommFunction(HANDLE handle, DWORD func) { DWORD ioc; DWORD dwBytesReturned; diff --git a/include/winbase.h b/include/winbase.h index 1347f8c..d634c86 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1899,7 +1899,7 @@ WINBASEAPI BOOL WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME); WINBASEAPI BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD,BOOL,DWORD); WINADVAPI BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE); WINADVAPI BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); -WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,UINT); +WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,DWORD); WINBASEAPI void * WINAPI EncodePointer(void *); WINBASEAPI void * WINAPI EncodeSystemPointer(void *); WINADVAPI BOOL WINAPI EncryptFileA(LPCSTR);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: aab1fb88db61e8fa81c77664e948024aab9b4272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab1fb88db61e8fa81c77664e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 17 09:44:57 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index e8dbdd2..0633ad6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-14 08:17+0300\n" +"PO-Revision-Date: 2017-06-17 09:44+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12068,10 +12068,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Neatpažinta kaitos seka [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Nepalaikomas registro duomenų tipas [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n"

1 0

Michael Müller : advapi32/tests: Show that tokens do not inherit security descriptors during duplication.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4bd10fbd1a77c065f94956d1aab64eab47aa1801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd10fbd1a77c065f94956d1a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:33 2017 +0200 advapi32/tests: Show that tokens do not inherit security descriptors during duplication. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 09c6a72..65e9758 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6722,11 +6722,11 @@ static void test_token_security_descriptor(void) SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; char buffer_acl[256]; ACL *acl = (ACL *)&buffer_acl, *acl2; - BOOL defaulted, present, ret; + BOOL defaulted, present, ret, found; + HANDLE token, token2, token3; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; - HANDLE token, token2; - DWORD size; + DWORD size, index; PSID psid; if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce @@ -6789,8 +6789,47 @@ static void test_token_security_descriptor(void) HeapFree(GetProcessHeap(), 0, sd2); + /* Duplicate token without security attributes. + * Tokens do not inherit the security descriptor in DuplicateToken. */ + ret = pDuplicateTokenEx(token2, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenImpersonation, &token3); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token3, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token3, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine + ok(present, "DACL not present\n"); + + if (present) + { + ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + index = 0; + found = FALSE; + while (pGetAce(acl2, index++, (void **)&ace)) + { + if (ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE && EqualSid(&ace->SidStart, psid)) + found = TRUE; + } + ok(!found, "Access allowed ACE was inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd2); + LocalFree(psid); + CloseHandle(token3); CloseHandle(token2); CloseHandle(token); }

1 0

Michael Müller : advapi32/tests: Show that tokens do not inherit the DACL while creating child processes.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 7e68ccff8787206f54e403b19a51a32ddf328806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e68ccff8787206f54e403b19… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:34 2017 +0200 advapi32/tests: Show that tokens do not inherit the DACL while creating child processes. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 121 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 65e9758..a25a601 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6720,13 +6720,16 @@ static void test_token_security_descriptor(void) { char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; - char buffer_acl[256]; - ACL *acl = (ACL *)&buffer_acl, *acl2; + char buffer_acl[256], buffer[MAX_PATH]; + ACL *acl = (ACL *)&buffer_acl, *acl2, *acl_child; BOOL defaulted, present, ret, found; HANDLE token, token2, token3; + EXPLICIT_ACCESSW exp_access; + PROCESS_INFORMATION info; + DWORD size, index, retd; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; - DWORD size, index; + STARTUPINFOA startup; PSID psid; if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce @@ -6827,6 +6830,62 @@ static void test_token_security_descriptor(void) HeapFree(GetProcessHeap(), 0, sd2); + /* When creating a child process, the process does inherit the token of + * the parent but not the DACL of the token */ + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine + ok(present, "DACL not present\n"); + ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + exp_access.grfAccessPermissions = GENERIC_ALL; + exp_access.grfAccessMode = GRANT_ACCESS; + exp_access.grfInheritance = NO_PROPAGATE_INHERIT_ACE; + exp_access.Trustee.pMultipleTrustee = NULL; + exp_access.Trustee.TrusteeForm = TRUSTEE_IS_SID; + exp_access.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + exp_access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + exp_access.Trustee.ptstrName = (void*)psid; + + retd = pSetEntriesInAclW(1, &exp_access, acl2, &acl_child); + ok(retd == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", retd); + + memset(sd, 0, sizeof(buffer_sd)); + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(sd, TRUE, acl_child, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd); + ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + + /* Start child process with our modified token */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + sprintf(buffer, "%s tests/security.c test_token_sd", myARGV[0]); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess failed with error %u\n", GetLastError()); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + LocalFree(acl_child); LocalFree(psid); CloseHandle(token3); @@ -6834,6 +6893,55 @@ static void test_token_security_descriptor(void) CloseHandle(token); } +static void test_child_token_sd(void) +{ + BOOL ret, present, defaulted; + ACCESS_ALLOWED_ACE *acc_ace; + SECURITY_DESCRIPTOR *sd; + DWORD size, i; + HANDLE token; + PSID psid; + ACL *acl; + + ret = pConvertStringSidToSidA("S-1-5-6", &psid); + ok(ret, "ConvertStringSidToSidA failed with error %u\n", GetLastError()); + + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "DACL not present\n"); + + if (present && acl) + { + ok(acl != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + ok(acl->AceCount, "Expected at least one ACE\n"); + for (i = 0; i < acl->AceCount; i++) + { + ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); + ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), + "ACE inherited from the parent\n"); + } + } + + LocalFree(psid); + HeapFree(GetProcessHeap(), 0, sd); +} + START_TEST(security) { init(); @@ -6841,7 +6949,10 @@ START_TEST(security) if (myARGC >= 3) { - test_process_security_child(); + if (!strcmp(myARGV[2], "test_token_sd")) + test_child_token_sd(); + else + test_process_security_child(); return; } test_kernel_objects_security(); @@ -6883,5 +6994,7 @@ START_TEST(security) test_GetSidIdentifierAuthority(); test_pseudo_tokens(); test_maximum_allowed(); + + /* Must be the last test, modifies process token */ test_token_security_descriptor(); }

1 0

Michael Müller : advapi32/tests: Show that child processes do not inherit mandatory labels.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 08f3fef34caa324dac999bd716c006cb96de8439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f3fef34caa324dac999bd71… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:35 2017 +0200 advapi32/tests: Show that child processes do not inherit mandatory labels. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a25a601..3a8e7e9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6718,6 +6718,8 @@ static void test_maximum_allowed(void) static void test_token_security_descriptor(void) { + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; char buffer_acl[256], buffer[MAX_PATH]; @@ -6872,6 +6874,28 @@ static void test_token_security_descriptor(void) ret = SetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd); ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + /* The security label is also not inherited */ + if (pAddMandatoryAce) + { + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with error %u\n", GetLastError()); + + ret = pAddMandatoryAce(acl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level); + ok(ret, "AddMandatoryAce failed with error %u\n", GetLastError()); + + memset(sd, 0, sizeof(buffer_sd)); + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorSacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd); + ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + } + else + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + /* Start child process with our modified token */ memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -6895,6 +6919,9 @@ static void test_token_security_descriptor(void) static void test_child_token_sd(void) { + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; + SYSTEM_MANDATORY_LABEL_ACE *ace_label; BOOL ret, present, defaulted; ACCESS_ALLOWED_ACE *acc_ace; SECURITY_DESCRIPTOR *sd; @@ -6940,6 +6967,43 @@ static void test_child_token_sd(void) LocalFree(psid); HeapFree(GetProcessHeap(), 0, sd); + + if (!pAddMandatoryAce) + { + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + return; + } + + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "SACL not present\n"); + + if (present && acl) + { + ok(acl != (void *)0xdeadbeef, "Got invalid SACL\n"); + ok(!defaulted, "SACL defaulted\n"); + + ok(acl->AceCount == 1, "Expected exactly one ACE\n"); + ret = pGetAce(acl, 0, (void **)&ace_label); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace_label->Header.AceType); + ok(!EqualSid(&ace_label->SidStart, &low_level), + "Low integrity level should not have been inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd); } START_TEST(security)

1 0

Francois Gouget : testbot/TestLauncher: Trace the time it takes to run each test.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: tools Branch: master Commit: baf733def7e39a18d020dd50f060c870a60be1ac URL: http://source.winehq.org/git/tools.git/?a=commit;h=baf733def7e39a18d020dd50… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 18 13:48:42 2017 +0200 testbot/TestLauncher: Trace the time it takes to run each test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 2e9a62f..1d0abac 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -283,7 +283,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName) int main(int argc, char *argv[]) { int Arg; - DWORD TimeOut; + DWORD Start, TimeOut; BOOL UsageError; char TestExeFullName[_MAX_PATH]; char *TestExeFileName; @@ -375,12 +375,14 @@ int main(int argc, char *argv[]) exit(1); } + Start = GetTickCount(); printf("%s:%s start - -\n", TestName, Subtest); if (! AllImportedDllsPresent(TestExeFullName)) { printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", TestName, Failures, Failures, Skips); - printf("%s:%s done (%u)\n", TestName, Subtest, Failures); + printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, + (GetTickCount() - Start) / 1000); exit(0); } @@ -449,7 +451,8 @@ int main(int argc, char *argv[]) } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s done (%lu)\n", TestName, Subtest, ExitCode); + printf("%s:%s done (%lu) in %lds\n", TestName, Subtest, ExitCode, + (GetTickCount() - Start) / 1000); return 0; }

1 0