February 2018 - Wine-Commits

Hans Leidekker : bcrypt: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 2b2b8418c6bce0ad7b31ce7b6df4a6d0af3e41c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b2b8418c6bce0ad7b31ce7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 20 12:06:07 2018 +0100 bcrypt: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c064b63..72b5df2 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -39,6 +39,7 @@ #include "bcrypt_internal.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/library.h" #include "wine/unicode.h" @@ -294,7 +295,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR return STATUS_NOT_IMPLEMENTED; } - if (!(alg = HeapAlloc( GetProcessHeap(), 0, sizeof(*alg) ))) return STATUS_NO_MEMORY; + if (!(alg = heap_alloc( sizeof(*alg) ))) return STATUS_NO_MEMORY; alg->hdr.magic = MAGIC_ALG; alg->id = alg_id; alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; @@ -310,7 +311,7 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider( BCRYPT_ALG_HANDLE handle, DWORD fl TRACE( "%p, %08x\n", handle, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; - HeapFree( GetProcessHeap(), 0, alg ); + heap_free( alg ); return STATUS_SUCCESS; } @@ -630,7 +631,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash) ))) return STATUS_NO_MEMORY; + if (!(hash = heap_alloc( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; hash->hmac = alg->hmac; @@ -662,7 +663,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL end: if (status != STATUS_SUCCESS) { - HeapFree( GetProcessHeap(), 0, hash ); + heap_free( hash ); return status; } @@ -682,7 +683,7 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND if (!handle_copy) return STATUS_INVALID_PARAMETER; if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash_copy) ))) + if (!(hash_copy = heap_alloc( sizeof(*hash_copy) ))) return STATUS_NO_MEMORY; memcpy( hash_copy, hash_orig, sizeof(*hash_orig) ); @@ -698,7 +699,7 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) TRACE( "%p\n", handle ); if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; - HeapFree( GetProcessHeap(), 0, hash ); + heap_free( hash ); return STATUS_SUCCESS; } @@ -804,7 +805,7 @@ static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, } if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); key->alg_id = id; @@ -892,8 +893,8 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le static NTSTATUS key_destroy( struct key *key ) { if (key->handle) pgnutls_cipher_deinit( key->handle ); - HeapFree( GetProcessHeap(), 0, key->secret ); - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key->secret ); + heap_free( key ); return STATUS_SUCCESS; } #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 @@ -923,7 +924,7 @@ static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, } if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); key->alg_id = id; @@ -1000,8 +1001,8 @@ static NTSTATUS key_destroy( struct key *key ) { if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); if (key->ref_decrypt) CCCryptorRelease( key->ref_decrypt ); - HeapFree( GetProcessHeap(), 0, key->secret ); - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key->secret ); + heap_free( key ); return STATUS_SUCCESS; } #else @@ -1057,12 +1058,12 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(key = HeapAlloc( GetProcessHeap(), 0, sizeof(*key) ))) return STATUS_NO_MEMORY; + if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; if ((status = key_init( key, alg->id, secret, secret_len ))) { - HeapFree( GetProcessHeap(), 0, key ); + heap_free( key ); return status; } @@ -1128,11 +1129,11 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = HeapAlloc( GetProcessHeap(), 0, key->block_size ))) return STATUS_NO_MEMORY; + if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; memcpy( buf, src, bytes_left ); memset( buf + bytes_left, key->block_size - bytes_left, key->block_size - bytes_left ); status = key_encrypt( key, buf, key->block_size, dst, key->block_size ); - HeapFree( GetProcessHeap(), 0, buf ); + heap_free( buf ); } return status; @@ -1189,7 +1190,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (flags & BCRYPT_BLOCK_PADDING) { - if (!(buf = HeapAlloc( GetProcessHeap(), 0, key->block_size ))) return STATUS_NO_MEMORY; + if (!(buf = heap_alloc( key->block_size ))) return STATUS_NO_MEMORY; status = key_decrypt( key, src, key->block_size, buf, key->block_size ); if (!status && buf[ key->block_size - 1 ] <= key->block_size) { @@ -1199,7 +1200,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp } else status = STATUS_UNSUCCESSFUL; /* FIXME: invalid padding */ - HeapFree( GetProcessHeap(), 0, buf ); + heap_free( buf ); } return status;

1 0

Hans Leidekker : fusion: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: e76066bedaf14e8a6d9ca405cbb08e45f4a92163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76066bedaf14e8a6d9ca405… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 20 12:06:08 2018 +0100 fusion: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmcache.c | 50 +++++++++++++++++++++--------------------------- dlls/fusion/asmenum.c | 17 +++++++--------- dlls/fusion/asmname.c | 34 ++++++++++++++++---------------- dlls/fusion/assembly.c | 39 +++++++++++++++---------------------- dlls/fusion/fusionpriv.h | 4 ++-- 5 files changed, 62 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e76066bedaf14e8a6d9c…

1 0

Jacek Caban : mshtml: Use get_element helper in IHTMLDocument2:: elementFromPoint implementation.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 567f911fcf95993d0fb1d6e8cf1f3d4d163ae3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=567f911fcf95993d0fb1d6e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 13:24:51 2018 +0100 mshtml: Use get_element helper in IHTMLDocument2::elementFromPoint implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0fc96a5..ec4771d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1594,11 +1594,11 @@ static HRESULT WINAPI HTMLDocument_get_onselectstart(IHTMLDocument2 *iface, VARI } static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG x, LONG y, - IHTMLElement **elementHit) + IHTMLElement **elementHit) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); nsIDOMElement *nselem; - HTMLDOMNode *node; + HTMLElement *element; nsresult nsres; HRESULT hres; @@ -1615,14 +1615,13 @@ static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG return S_OK; } - hres = get_node((nsIDOMNode*)nselem, TRUE, &node); + hres = get_element(nselem, &element); nsIDOMElement_Release(nselem); if(FAILED(hres)) return hres; - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)elementHit); - node_release(node); - return hres; + *elementHit = &element->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTMLWindow2 **p)

1 0

Hans Leidekker : wldap32: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 7de7f9af9fca72498f2be379b812644a1558d878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de7f9af9fca72498f2be379… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 20 12:06:10 2018 +0100 wldap32: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/control.c | 3 +- dlls/wldap32/init.c | 19 +++--- dlls/wldap32/page.c | 8 +-- dlls/wldap32/value.c | 10 ++- dlls/wldap32/wldap32.h | 175 ++++++++++++++++++------------------------------- 5 files changed, 81 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7de7f9af9fca72498f2b…

1 0

Nikolay Sivov : shell32/tests: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: a6ad34f855a0c3cf6007852ff9e8cafb53853758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6ad34f855a0c3cf6007852f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 20 09:38:00 2018 +0300 shell32/tests: Use the global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 5 +++-- dlls/shell32/tests/autocomplete.c | 8 +++++--- dlls/shell32/tests/ebrowser.c | 13 +++++++------ dlls/shell32/tests/msg.h | 13 ++++++------- dlls/shell32/tests/shelldispatch.c | 6 ++++-- dlls/shell32/tests/shelllink.c | 6 ++++-- dlls/shell32/tests/shlexec.c | 10 ++++++---- dlls/shell32/tests/shlfolder.c | 19 ++++++++++--------- dlls/shell32/tests/shlview.c | 21 +++++++++------------ 9 files changed, 54 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6ad34f855a0c3cf6007…

1 0

Jacek Caban : ntdll/tests: Added pipe security descriptor tests.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: c0d08e13c8817104d9cba26be21a92aa49ac5863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0d08e13c8817104d9cba26b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 19 20:32:10 2018 +0100 ntdll/tests: Added pipe security descriptor tests. Based on patch by Jonathan Doron. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 2 +- dlls/ntdll/tests/pipe.c | 213 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index fc352dd..5c70f3f 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = ntdll.dll -IMPORTS = user32 +IMPORTS = user32 advapi32 C_SRCS = \ atom.c \ diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index a878d8a..235ab12 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1209,6 +1209,218 @@ static void test_file_info(void) CloseHandle( client ); } +static PSECURITY_DESCRIPTOR get_security_descriptor(HANDLE handle) +{ + SECURITY_DESCRIPTOR *sec_desc; + ULONG length = 0; + NTSTATUS status; + + status = NtQuerySecurityObject(handle, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, + NULL, 0, &length); + ok(status == STATUS_BUFFER_TOO_SMALL, + "Failed to query object security descriptor length: %08x\n", status); + ok(length != 0, "length = 0\n"); + + sec_desc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, length); + status = NtQuerySecurityObject(handle, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, + sec_desc, length, &length); + ok(status == STATUS_SUCCESS, "Failed to query object security descriptor: %08x\n", status); + + return sec_desc; +} + +static TOKEN_OWNER *get_current_owner(void) +{ + TOKEN_OWNER *owner; + ULONG length = 0; + HANDLE token; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token); + ok(ret, "Failed to get process token: %u\n", GetLastError()); + + ret = GetTokenInformation(token, TokenOwner, NULL, 0, &length); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation failed: %u\n", GetLastError()); + ok(length != 0, "Failed to get token owner information length: %u\n", GetLastError()); + + owner = HeapAlloc(GetProcessHeap(), 0, length); + ret = GetTokenInformation(token, TokenOwner, owner, length, &length); + ok(ret, "Failed to get token owner information: %u)\n", GetLastError()); + + CloseHandle(token); + return owner; +} + +static TOKEN_PRIMARY_GROUP *get_current_group(void) +{ + TOKEN_PRIMARY_GROUP *group; + ULONG length = 0; + HANDLE token; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token); + ok(ret, "Failed to get process token: %u\n", GetLastError()); + + ret = GetTokenInformation(token, TokenPrimaryGroup, NULL, 0, &length); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation failed: %u\n", GetLastError()); + ok(length != 0, "Failed to get primary group token information length: %u\n", GetLastError()); + + group = HeapAlloc(GetProcessHeap(), 0, length); + ret = GetTokenInformation(token, TokenPrimaryGroup, group, length, &length); + ok(ret, "Failed to get primary group token information: %u\n", GetLastError()); + + CloseHandle(token); + return group; +} + +static SID *well_known_sid(WELL_KNOWN_SID_TYPE sid_type) +{ + DWORD size = SECURITY_MAX_SID_SIZE; + SID *sid; + BOOL ret; + + sid = HeapAlloc(GetProcessHeap(), 0, size); + ret = CreateWellKnownSid(sid_type, NULL, sid, &size); + ok(ret, "CreateWellKnownSid failed: %u\n", GetLastError()); + return sid; +} + +#define test_group(a,b,c) _test_group(__LINE__,a,b,c) +static void _test_group(unsigned line, HANDLE handle, SID *expected_sid, BOOL todo) +{ + SECURITY_DESCRIPTOR *sec_desc; + BOOLEAN defaulted; + PSID group_sid; + NTSTATUS status; + + sec_desc = get_security_descriptor(handle); + + status = RtlGetGroupSecurityDescriptor(sec_desc, &group_sid, &defaulted); + ok_(__FILE__,line)(status == STATUS_SUCCESS, + "Failed to query group from security descriptor: %08x\n", status); + todo_wine_if(todo) + ok_(__FILE__,line)(EqualSid(group_sid, expected_sid), "SIDs are not equal\n"); + + HeapFree(GetProcessHeap(), 0, sec_desc); +} + +static void test_security_info(void) +{ + char sec_desc[SECURITY_DESCRIPTOR_MIN_LENGTH]; + TOKEN_PRIMARY_GROUP *process_group; + SECURITY_ATTRIBUTES sec_attr; + TOKEN_OWNER *process_owner; + HANDLE server, client, server2; + SID *world_sid, *local_sid; + ULONG length; + NTSTATUS status; + BOOL ret; + + trace("security tests...\n"); + + process_owner = get_current_owner(); + process_group = get_current_group(); + world_sid = well_known_sid(WinWorldSid); + local_sid = well_known_sid(WinLocalSid); + + ret = InitializeSecurityDescriptor(sec_desc, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed\n"); + + ret = SetSecurityDescriptorOwner(sec_desc, process_owner->Owner, FALSE); + ok(ret, "SetSecurityDescriptorOwner failed\n"); + + ret = SetSecurityDescriptorGroup(sec_desc, process_group->PrimaryGroup, FALSE); + ok(ret, "SetSecurityDescriptorGroup failed\n"); + + server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | WRITE_OWNER, PIPE_TYPE_BYTE, 10, + 0x20000, 0x20000, 0, NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); + + client = CreateFileA(PIPENAME, GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + test_group(server, process_group->PrimaryGroup, TRUE); + test_group(client, process_group->PrimaryGroup, TRUE); + + /* set server group, client changes as well */ + ret = SetSecurityDescriptorGroup(sec_desc, world_sid, FALSE); + ok(ret, "SetSecurityDescriptorGroup failed\n"); + status = NtSetSecurityObject(server, GROUP_SECURITY_INFORMATION, sec_desc); + ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08x\n", status); + + test_group(server, world_sid, FALSE); + test_group(client, world_sid, TRUE); + + /* new instance of pipe server has the same security descriptor */ + server2 = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE, 10, + 0x20000, 0x20000, 0, NULL); + ok(server2 != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); + test_group(server2, world_sid, TRUE); + + /* set client group, server changes as well */ + ret = SetSecurityDescriptorGroup(sec_desc, local_sid, FALSE); + ok(ret, "SetSecurityDescriptorGroup failed\n"); + status = NtSetSecurityObject(server, GROUP_SECURITY_INFORMATION, sec_desc); + ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08x\n", status); + + test_group(server, local_sid, FALSE); + test_group(client, local_sid, TRUE); + test_group(server2, local_sid, TRUE); + + CloseHandle(server); + /* SD is preserved after closing server object */ + test_group(client, local_sid, TRUE); + CloseHandle(client); + + server = server2; + client = CreateFileA(PIPENAME, GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + test_group(client, local_sid, TRUE); + + ret = DisconnectNamedPipe(server); + ok(ret, "DisconnectNamedPipe failed: %u\n", GetLastError()); + + /* disconnected server may be queried for security info, but client does not */ + test_group(server, local_sid, TRUE); + status = NtQuerySecurityObject(client, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, + NULL, 0, &length); + todo_wine + ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08x\n", status); + status = NtSetSecurityObject(client, GROUP_SECURITY_INFORMATION, sec_desc); + todo_wine + ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08x\n", status); + + /* attempting to create another pipe instance with specified sd fails */ + sec_attr.nLength = sizeof(sec_attr); + sec_attr.lpSecurityDescriptor = sec_desc; + sec_attr.bInheritHandle = FALSE; + ret = SetSecurityDescriptorGroup(sec_desc, local_sid, FALSE); + ok(ret, "SetSecurityDescriptorGroup failed\n"); + server2 = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | WRITE_OWNER, PIPE_TYPE_BYTE, 10, + 0x20000, 0x20000, 0, &sec_attr); + todo_wine + ok(server2 == INVALID_HANDLE_VALUE && GetLastError() == ERROR_ACCESS_DENIED, + "CreateNamedPipe failed: %u\n", GetLastError()); + if (server2 != INVALID_HANDLE_VALUE) CloseHandle(server2); + + CloseHandle(server); + CloseHandle(client); + + server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | WRITE_OWNER, PIPE_TYPE_BYTE, 10, + 0x20000, 0x20000, 0, &sec_attr); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); + test_group(server, local_sid, FALSE); + CloseHandle(server); + + HeapFree(GetProcessHeap(), 0, process_owner); + HeapFree(GetProcessHeap(), 0, process_group); + HeapFree(GetProcessHeap(), 0, world_sid); + HeapFree(GetProcessHeap(), 0, local_sid); +} + START_TEST(pipe) { if (!init_func_ptrs()) @@ -1253,4 +1465,5 @@ START_TEST(pipe) test_volume_info(); test_file_info(); + test_security_info(); }

1 0

Alexandre Julliard : makefiles: Generate the clean rule using the subdirs file lists.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 11ecc76dd0df4ed1ae837b9dd4d376b0c98f4534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ecc76dd0df4ed1ae837b9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 21:24:59 2018 +0100 makefiles: Generate the clean rule using the subdirs file lists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 3 - aclocal.m4 | 51 +----- configure | 489 +++++++++++++++++++++++---------------------------- configure.ac | 438 +++++++++++++++++++++++---------------------- tools/make_makefiles | 16 +- tools/makedep.c | 5 + 6 files changed, 448 insertions(+), 554 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11ecc76dd0df4ed1ae83…

1 0

Alexandre Julliard : makefiles: Generate rules for installing l_intl.nls and wine.desktop.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: 1a49f2e044b525c40a27af63d653a9631af0c80f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a49f2e044b525c40a27af63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 20:57:15 2018 +0100 makefiles: Generate rules for installing l_intl.nls and wine.desktop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++------------ configure.ac | 15 ++------------- loader/Makefile.in | 14 ++++++-------- tools/make_makefiles | 2 +- tools/makedep.c | 22 ++++++++++++++++++++++ 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/configure b/configure index ff10f67..74935d8 100755 --- a/configure +++ b/configure @@ -19463,20 +19463,11 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else - WINELOADER_INSTALL="wine.inf" - - wine_fn_append_rule "install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -.PHONY: l_intl.nls/uninstall -l_intl.nls/uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -__uninstall__: l_intl.nls/uninstall" + WINELOADER_INSTALL="wine.inf l_intl.nls" + case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; - *) wine_fn_append_rule "install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;; + *) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;; esac fi diff --git a/configure.ac b/configure.ac index d06476e..41a020b 100644 --- a/configure.ac +++ b/configure.ac @@ -3957,21 +3957,10 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else - AC_SUBST(WINELOADER_INSTALL,"wine.inf") - WINE_APPEND_RULE( -[install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -.PHONY: l_intl.nls/uninstall -l_intl.nls/uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -__uninstall__: l_intl.nls/uninstall]) + AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls") case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; - *) WINE_APPEND_RULE( -[install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;; + *) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;; esac fi diff --git a/loader/Makefile.in b/loader/Makefile.in index 4fb91ff..b1eafd1 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -1,15 +1,13 @@ -C_SRCS = \ +SOURCES = \ + l_intl.nls \ main.c \ - preloader.c - -MANPAGES = \ + preloader.c \ wine.de.UTF-8.man.in \ + wine.desktop \ wine.fr.UTF-8.man.in \ - wine.man.in \ - wine.pl.UTF-8.man.in - -IN_SRCS = \ wine.inf.in \ + wine.man.in \ + wine.pl.UTF-8.man.in \ wine_info.plist.in PROGRAMS = $(WINELOADER_PROGRAMS) diff --git a/tools/make_makefiles b/tools/make_makefiles index 0cf2344..df41356 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -435,7 +435,7 @@ sub assign_sources_to_makefiles(@) { next unless defined ${$make}{"TESTDLL"}; } - else + elsif ($dir ne "loader") # loader dir contains misc files { next; } diff --git a/tools/makedep.c b/tools/makedep.c index 0083661..8cd3559 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2636,6 +2636,26 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, /******************************************************************* + * output_source_nls + */ +static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(datadir)/wine/%s", source->name )); +} + + +/******************************************************************* + * output_source_desktop + */ +static void output_source_desktop( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(datadir)/applications/%s", source->name )); +} + + +/******************************************************************* * output_source_po */ static void output_source_po( struct makefile *make, struct incl_file *source, const char *obj ) @@ -2843,6 +2863,8 @@ static const struct { "tlb", output_source_tlb }, { "sfd", output_source_sfd }, { "svg", output_source_svg }, + { "nls", output_source_nls }, + { "desktop", output_source_desktop }, { "po", output_source_po }, { "in", output_source_in }, { "x", output_source_x },

1 0

Dmitry Timoshkov : iphlpapi: Also check the IP address family before treating it as an IPv6 one.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: b4d0e56c93f66bcea48cdd79311568047727d1fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4d0e56c93f66bcea48cdd79… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 20 14:40:21 2018 +0800 iphlpapi: Also check the IP address family before treating it as an IPv6 one. On my local network there is no IPv6 DNS servers, and sin6_family == AF_INET. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 48a8387..97284ed 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1300,7 +1300,7 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) for (i = 0, addr = servers; addr < (servers + num) && i < _res.nscount; i++) { #ifdef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 - if (_res._u._ext.nsaddrs[i]) + if (_res._u._ext.nsaddrs[i] && _res._u._ext.nsaddrs[i]->sin6_family == AF_INET6) { if (ip4_only) continue; sockaddr_in6_to_WS_storage( addr, _res._u._ext.nsaddrs[i] );

1 0

Zebediah Figura : shlwapi/tests: Fix link order.
by Alexandre Julliard Feb. 20, 2018

Feb. 20, 2018

Module: wine Branch: master Commit: ea52b552d7c086f89f2a26cfd52965a3dab288cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea52b552d7c086f89f2a26cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 19 16:10:29 2018 -0600 shlwapi/tests: Fix link order. Some functions are declared both in shell32 and in shlwapi; we want to link to the latter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 2ec694c..450a395 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = shlwapi.dll -IMPORTS = shell32 shlwapi mlang oleaut32 ole32 user32 advapi32 +IMPORTS = shlwapi shell32 mlang oleaut32 ole32 user32 advapi32 C_SRCS = \ assoc.c \

1 0