wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Hugh McMaster : regedit/tests: Output "(Default)" when referring to the default registry value.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: c414b2b570973a6e448219163f93bd98631b94d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c414b2b570973a6e448219163… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:38 2017 +0000 regedit/tests: Output "(Default)" when referring to the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b7d6de3..6800380 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -154,13 +154,10 @@ static void r_verify_reg_wsz(unsigned line, HKEY key, const char *value_name, co static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_name) { LONG lr; - DWORD fnd_type, fnd_len; - char fnd_value[32]; - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(key, value_name, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len); - lok(lr == ERROR_FILE_NOT_FOUND, "Reg value shouldn't exist: %s\n", - value_name); + lr = RegQueryValueExA(key, value_name, NULL, NULL, NULL, NULL); + lok(lr == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", + (value_name && *value_name) ? value_name : "(Default)", lr); } #define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s)

1 0

Hugh McMaster : reg/tests: Test whether "" is interpreted as the default registry value.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 103c8bb6d40e64f50647847b37cdae10fa2e3321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=103c8bb6d40e64f50647847b3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:30 2017 +0000 reg/tests: Test whether "" is interpreted as the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 36ec730..2c1cc67 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1320,9 +1320,11 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n", &r); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default Value Name\"\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default Value Name", 19, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2160,9 +2162,11 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n", &r); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default registry value\"\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default registry value", 23, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Output "(Default)" when referring to the default registry value.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: c882a064299a0ad39f6c91144138858961f903c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c882a064299a0ad39f6c91144… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 15 11:58:21 2017 +0000 reg/tests: Output "(Default)" when referring to the default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d285910..36ec730 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -88,7 +88,7 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) err = RegQueryValueExA(hkey, value, NULL, NULL, NULL, NULL); lok(err == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", - value, err); + (value && *value) ? value : "(Default)", err); } #define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s)

1 0

Alistair Leslie-Hughes : include/wmsdkidl.idl: Add IWMLanguageList, IWMReaderPlaylistBurn interfaces.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: fd6442f43116ccb56730fe9eac7c8c60ec15904a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6442f43116ccb56730fe9ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 14 23:27:39 2017 +0000 include/wmsdkidl.idl: Add IWMLanguageList, IWMReaderPlaylistBurn interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index ea8d63b..b4bd600 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1571,6 +1571,51 @@ interface IWMReaderTypeNegotiation : IUnknown [in] IWMOutputMediaProps *props); }; +[ + object, + uuid(df683f00-2d49-4d8e-92b7-fb19f6a0dc57), + pointer_default(unique), + local +] +interface IWMLanguageList : IUnknown +{ + HRESULT GetLanguageCount( + [out] WORD *count); + + HRESULT GetLanguageDetails( + [in] WORD index, + [out, size_is( *length )] WCHAR *language, + [in, out] WORD *length); + + HRESULT AddLanguageByRFC1766String( + [in] LPCWSTR_WMSDK_TYPE_SAFE language, + [out] WORD *index); +}; + +[ + object, + uuid(f28c0300-9baa-4477-a846-1744d9cbf533), + pointer_default(unique), + local +] +interface IWMReaderPlaylistBurn : IUnknown +{ + HRESULT InitPlaylistBurn( + [in] DWORD count, + [in] LPCWSTR_WMSDK_TYPE_SAFE *filenames, + [in] IWMStatusCallback *callback, + [in] void *context); + + HRESULT GetInitResults( + [in] DWORD count, + [out] HRESULT *stat); + + HRESULT Cancel(); + + HRESULT EndPlaylistBurn([in] HRESULT result); +}; + + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

André Hentschel : include: Remove duplicate declaration of PFXVerifyPassword.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 0d6906bf21a77fb17abcb972ada9da2cf4b12c10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6906bf21a77fb17abcb972a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 14 23:33:16 2017 +0200 include: Remove duplicate declaration of PFXVerifyPassword. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 2af6a57..abbe99f 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4584,8 +4584,6 @@ BOOL WINAPI PFXExportCertStoreEx(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, void *pvReserved, DWORD dwFlags); BOOL WINAPI PFXExportCertStore(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags); -BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, - DWORD dwFlags); /* cryptnet.dll functions */ BOOL WINAPI CryptCancelAsyncRetrieval(HCRYPTASYNC hAsyncRetrieval);

1 0

Michael Müller : advapi32/tests: Add basic tests for token security descriptors.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 3ef07ac9dd9eddb14a3e05e1be7ee0b2d188346d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef07ac9dd9eddb14a3e05e1b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:44 2017 +0200 advapi32/tests: Add basic tests for token security descriptors. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 82 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7842d0e..0c145a4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -229,6 +229,7 @@ static void init(void) pGetAce = (void *)GetProcAddress(hmod, "GetAce"); pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); + pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -3012,7 +3013,6 @@ static void test_impersonation_level(void) HKEY hkey; DWORD error; - pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx"); if( !pDuplicateTokenEx ) { win_skip("DuplicateTokenEx is not available\n"); return; @@ -6715,6 +6715,85 @@ static void test_maximum_allowed(void) CloseHandle(handle); } +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; + BOOL defaulted, present, ret; + ACCESS_ALLOWED_ACE *ace; + SECURITY_ATTRIBUTES sa; + HANDLE token, token2; + DWORD size; + PSID psid; + + if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce + || !pSetEntriesInAclW) + { + win_skip("Some functions not available\n"); + return; + } + + /* Test whether we can create tokens with security descriptors */ + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with error %u\n", GetLastError()); + + ret = pConvertStringSidToSidA("S-1-5-6", &psid); + ok(ret, "ConvertStringSidToSidA failed with error %u\n", GetLastError()); + + ret = pAddAccessAllowedAceEx(acl, ACL_REVISION, NO_PROPAGATE_INHERIT_ACE, GENERIC_ALL, psid); + ok(ret, "AddAccessAllowedAceEx failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + + ret = pDuplicateTokenEx(token, MAXIMUM_ALLOWED, &sa, SecurityImpersonation, TokenImpersonation, &token2); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token2, 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(token2, 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()); + ok(present, "acl2 not present\n"); + ok(acl2 != (void *)0xdeadbeef, "acl2 not set\n"); + ok(acl2->AceCount == 1, "Expected 1 ACE, got %d\n", acl2->AceCount); + ok(!defaulted, "acl2 defaulted\n"); + + ret = pGetAce(acl2, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(EqualSid(&ace->SidStart, psid), "Expected access allowed ACE\n"); + ok(ace->Header.AceFlags == NO_PROPAGATE_INHERIT_ACE, + "Expected NO_PROPAGATE_INHERIT_ACE as flags, got %x\n", ace->Header.AceFlags); + + HeapFree(GetProcessHeap(), 0, sd2); + + LocalFree(psid); + + CloseHandle(token2); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -6764,4 +6843,5 @@ START_TEST(security) test_GetSidIdentifierAuthority(); test_pseudo_tokens(); test_maximum_allowed(); + test_token_security_descriptor(); }

1 0

Michael Müller : server: Implement setting a security descriptor when duplicating tokens.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 7c08e787b1a0381a4741cd8710834bfbae29e32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c08e787b1a0381a4741cd871… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:43 2017 +0200 server: Implement setting a security descriptor when duplicating tokens. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 7 ++++++- include/wine/server_protocol.h | 5 +++-- server/process.c | 2 +- server/protocol.def | 2 +- server/request.h | 5 ++--- server/security.h | 2 +- server/token.c | 14 +++++++++++--- server/trace.c | 2 +- 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 86beb03..8938d5d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -83,11 +83,15 @@ NTSTATUS WINAPI NtDuplicateToken( OUT PHANDLE NewToken) { NTSTATUS status; + data_size_t len; + struct object_attributes *objattr; TRACE("(%p,0x%08x,%s,0x%08x,0x%08x,%p)\n", ExistingToken, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes), ImpersonationLevel, TokenType, NewToken); + if ((status = alloc_object_attributes( ObjectAttributes, &objattr, &len ))) return status; + if (ObjectAttributes && ObjectAttributes->SecurityQualityOfService) { SECURITY_QUALITY_OF_SERVICE *SecurityQOS = ObjectAttributes->SecurityQualityOfService; @@ -102,14 +106,15 @@ NTSTATUS WINAPI NtDuplicateToken( { req->handle = wine_server_obj_handle( ExistingToken ); req->access = DesiredAccess; - req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; req->primary = (TokenType == TokenPrimary); req->impersonation_level = ImpersonationLevel; + wine_server_add_data( req, objattr, len ); status = wine_server_call( req ); if (!status) *NewToken = wine_server_ptr_handle( reply->new_handle ); } SERVER_END_REQ; + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d7a7cd..d31579c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4732,9 +4732,10 @@ struct duplicate_token_request struct request_header __header; obj_handle_t handle; unsigned int access; - unsigned int attributes; int primary; int impersonation_level; + /* VARARG(objattr,object_attributes); */ + char __pad_28[4]; }; struct duplicate_token_reply { @@ -6418,6 +6419,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 532 +#define SERVER_PROTOCOL_VERSION 533 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 5eabbbe..4f38ae1 100644 --- a/server/process.c +++ b/server/process.c @@ -565,7 +565,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ - process->token = token_duplicate( parent->token, TRUE, 0 ); + process->token = token_duplicate( parent->token, TRUE, 0, NULL ); process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; diff --git a/server/protocol.def b/server/protocol.def index 7eaaec2..1f88c6a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3316,9 +3316,9 @@ enum caret_state @REQ(duplicate_token) obj_handle_t handle; /* handle to the token to duplicate */ unsigned int access; /* access rights to the new token */ - unsigned int attributes; /* object attributes */ int primary; /* is the new token to be a primary one? */ int impersonation_level; /* impersonation level of the new token */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t new_handle; /* duplicated handle */ @END diff --git a/server/request.h b/server/request.h index ad89f30..30d2234 100644 --- a/server/request.h +++ b/server/request.h @@ -2113,9 +2113,8 @@ C_ASSERT( FIELD_OFFSET(struct check_token_privileges_reply, has_privileges) == 8 C_ASSERT( sizeof(struct check_token_privileges_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, attributes) == 20 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, primary) == 24 ); -C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, impersonation_level) == 28 ); +C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, primary) == 20 ); +C_ASSERT( FIELD_OFFSET(struct duplicate_token_request, impersonation_level) == 24 ); C_ASSERT( sizeof(struct duplicate_token_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct duplicate_token_reply, new_handle) == 8 ); C_ASSERT( sizeof(struct duplicate_token_reply) == 16 ); diff --git a/server/security.h b/server/security.h index 5c76821..3cbfcb9 100644 --- a/server/security.h +++ b/server/security.h @@ -53,7 +53,7 @@ extern const PSID security_builtin_admins_sid; extern struct token *token_create_admin(void); extern struct token *token_duplicate( struct token *src_token, unsigned primary, - int impersonation_level ); + int impersonation_level, const struct security_descriptor *sd ); extern int token_check_privileges( struct token *token, int all_required, const LUID_AND_ATTRIBUTES *reqprivs, unsigned int count, LUID_AND_ATTRIBUTES *usedprivs); diff --git a/server/token.c b/server/token.c index 9183595..f518544 100644 --- a/server/token.c +++ b/server/token.c @@ -622,7 +622,7 @@ static struct token *create_token( unsigned primary, const SID *user, } struct token *token_duplicate( struct token *src_token, unsigned primary, - int impersonation_level ) + int impersonation_level, const struct security_descriptor *sd ) { const luid_t *modified_id = primary || (impersonation_level == src_token->impersonation_level) ? @@ -672,6 +672,9 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, return NULL; } + if (sd) default_set_sd( &token->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); + return token; } @@ -1240,15 +1243,20 @@ DECL_HANDLER(get_token_privileges) DECL_HANDLER(duplicate_token) { struct token *src_token; + struct unicode_str name; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); + + if (!objattr) return; if ((src_token = (struct token *)get_handle_obj( current->process, req->handle, TOKEN_DUPLICATE, &token_ops ))) { - struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level ); + struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level, sd ); if (token) { - reply->new_handle = alloc_handle( current->process, token, req->access, req->attributes); + reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes ); release_object( token ); } release_object( src_token ); diff --git a/server/trace.c b/server/trace.c index 6e23184..962b122 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3927,9 +3927,9 @@ static void dump_duplicate_token_request( const struct duplicate_token_request * { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", primary=%d", req->primary ); fprintf( stderr, ", impersonation_level=%d", req->impersonation_level ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_duplicate_token_reply( const struct duplicate_token_reply *req )

1 0

Michael Müller : server: Do not set SE_{D, S}ACL_PRESENT if no {D, S}ACL was set.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 187b53e5a5b13b85356a3b564565c45a101690ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=187b53e5a5b13b85356a3b564… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:42 2017 +0200 server: Do not set SE_{D, S}ACL_PRESENT if no {D, S}ACL was set. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- server/handle.c | 2 -- server/object.c | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index dfc0a23..7842d0e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6207,8 +6207,8 @@ static void test_AddMandatoryAce(void) present = TRUE; ret = GetSecurityDescriptorSacl(sd2, &present, &sacl, &defaulted); ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); - todo_wine ok(!present, "SACL is present\n"); - todo_wine ok(sacl == (void *)0xdeadbeef, "SACL is set\n"); + ok(!present, "SACL is present\n"); + ok(sacl == (void *)0xdeadbeef, "SACL is set\n"); HeapFree(GetProcessHeap(), 0, sd2); CloseHandle(handle); diff --git a/server/handle.c b/server/handle.c index faa3a9f..35ab860 100644 --- a/server/handle.c +++ b/server/handle.c @@ -734,7 +734,6 @@ DECL_HANDLER(get_security_object) else req_sd.group_len = 0; - req_sd.control |= SE_SACL_PRESENT; sacl = sd_get_sacl( sd, &present ); if (req->security_info & SACL_SECURITY_INFORMATION && present) req_sd.sacl_len = sd->sacl_len; @@ -747,7 +746,6 @@ DECL_HANDLER(get_security_object) else req_sd.sacl_len = 0; - req_sd.control |= SE_DACL_PRESENT; dacl = sd_get_dacl( sd, &present ); if (req->security_info & DACL_SECURITY_INFORMATION && present) req_sd.dacl_len = sd->dacl_len; diff --git a/server/object.c b/server/object.c index 70872e8..4455718 100644 --- a/server/object.c +++ b/server/object.c @@ -583,15 +583,18 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri } else new_sd.group_len = 0; - new_sd.control |= SE_SACL_PRESENT; sacl = sd_get_sacl( sd, &present ); if (set_info & SACL_SECURITY_INFORMATION && present) + { + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = sd->sacl_len; + } else if (set_info & LABEL_SECURITY_INFORMATION && present) { const ACL *old_sacl = NULL; if (obj->sd && obj->sd->control & SE_SACL_PRESENT) old_sacl = sd_get_sacl( obj->sd, &present ); if (!(replaced_sacl = replace_security_labels( old_sacl, sacl ))) return 0; + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = replaced_sacl->AclSize; sacl = replaced_sacl; } @@ -600,24 +603,33 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri if (obj->sd) sacl = sd_get_sacl( obj->sd, &present ); if (obj->sd && present) + { + new_sd.control |= SE_SACL_PRESENT; new_sd.sacl_len = obj->sd->sacl_len; + } else new_sd.sacl_len = 0; } - new_sd.control |= SE_DACL_PRESENT; dacl = sd_get_dacl( sd, &present ); if (set_info & DACL_SECURITY_INFORMATION && present) + { + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = sd->dacl_len; + } else { if (obj->sd) dacl = sd_get_dacl( obj->sd, &present ); if (obj->sd && present) + { + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = obj->sd->dacl_len; + } else if (token) { dacl = token_get_default_dacl( token ); + new_sd.control |= SE_DACL_PRESENT; new_sd.dacl_len = dacl->AclSize; } else new_sd.dacl_len = 0;

1 0

Michael Müller : server: Implement changing the label of a security descriptor.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: af2d01c2fac1065382d162cdc7c6b2390e0b4b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2d01c2fac1065382d162cdc… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:41 2017 +0200 server: Implement changing the label of a security descriptor. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 151 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/sec.c | 3 +- server/handle.c | 3 +- server/object.c | 16 ++++- server/security.h | 1 + server/token.c | 69 +++++++++++++++++++ 6 files changed, 239 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af2d01c2fac1065382d16…

1 0

Michael Müller : server: Implement querying the security label of a security descriptor.
by Alexandre Julliard 15 Jun '17

15 Jun '17

Module: wine Branch: master Commit: 2ebe67963803d46cce77c770696f3b733a627fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebe67963803d46cce77c7706… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 14 20:20:40 2017 +0200 server: Implement querying the security label of a security descriptor. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 84 ++++++++++++++++++++++++++++++++++++++---- include/winnt.h | 35 +++++++++--------- server/handle.c | 9 +++++ server/security.h | 1 + server/token.c | 41 +++++++++++++++++++++ 5 files changed, 146 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ebe67963803d46cce77c…

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017