- Wine-Commits - list.winehq.org

Sven Baars : ntdll/tests: Factor out the NtEnumerateKey() tests.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 0f8b90a7de681ce8302cd886502f3e8d68ad82c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f8b90a7de681ce8302cd886502f3e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Sep 29 10:56:26 2022 +0200 ntdll/tests: Factor out the NtEnumerateKey() tests. --- dlls/ntdll/tests/reg.c | 268 +++++++++++++++---------------------------------- 1 file changed, 83 insertions(+), 185 deletions(-)

1 0

Sven Baars : server: Don't return the actual 32-bit Software\Classes key.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: fe8b10f8c88078ab77c983d7940954c906366b80 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe8b10f8c88078ab77c983d7940954… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Sep 19 14:36:53 2022 +0200 server: Don't return the actual 32-bit Software\Classes key. --- dlls/ntdll/tests/reg.c | 16 ++++++++-------- server/registry.c | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 4dfdfb87391..30044d4e1f2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2125,7 +2125,7 @@ static void test_redirection(void) status = pNtQueryKey( root32, KeyFullInformation, full_info, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryKey failed: 0x%08lx\n", status ); - todo_wine_if(ptr_size == 32) ok( full_info->SubKeys == subkeys64, "wrong number of subkeys: %lu\n", full_info->SubKeys ); + ok( full_info->SubKeys == subkeys64, "wrong number of subkeys: %lu\n", full_info->SubKeys ); subkeys = full_info->SubKeys; found = FALSE; @@ -2137,7 +2137,7 @@ static void test_redirection(void) if (basic_info->NameLength == sizeof(wineW) && !memcmp(basic_info->Name, wineW, sizeof(wineW) )) found = TRUE; } - todo_wine_if(ptr_size == 32) ok( ptr_size == 32 ? found : !found, "key not found\n" ); + ok( ptr_size == 32 ? found : !found, "key not found\n" ); pNtClose( root32 ); status = pNtOpenKey( &root64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr ); @@ -2165,7 +2165,7 @@ static void test_redirection(void) status = pNtQueryKey( root64, KeyFullInformation, full_info, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryKey failed: 0x%08lx\n", status ); - todo_wine_if(ptr_size == 32) ok( full_info->SubKeys == subkeys64, "wrong number of subkeys: %lu\n", full_info->SubKeys ); + ok( full_info->SubKeys == subkeys64, "wrong number of subkeys: %lu\n", full_info->SubKeys ); subkeys = full_info->SubKeys; found = FALSE; @@ -2177,7 +2177,7 @@ static void test_redirection(void) if (basic_info->NameLength == sizeof(wineW) && !memcmp(basic_info->Name, wineW, sizeof(wineW) )) found = TRUE; } - todo_wine_if(ptr_size == 32) ok( ptr_size == 32 ? found : !found, "key not found\n" ); + ok( ptr_size == 32 ? found : !found, "key not found\n" ); pNtClose( root64 ); pRtlInitUnicodeString( &str, L"\\Registry\\Machine\\Software\\Classes\\Wow6432Node" ); @@ -2247,7 +2247,7 @@ static void test_redirection(void) status = pNtQueryKey( root32, KeyFullInformation, full_info, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryKey failed: 0x%08lx\n", status ); - todo_wine_if(ptr_size == 32) ok( full_info->SubKeys == (ptr_size == 32 ? subkeys64 : subkeys32), "wrong number of subkeys: %lu\n", full_info->SubKeys ); + ok( full_info->SubKeys == (ptr_size == 32 ? subkeys64 : subkeys32), "wrong number of subkeys: %lu\n", full_info->SubKeys ); subkeys = full_info->SubKeys; found = FALSE; @@ -2259,7 +2259,7 @@ static void test_redirection(void) if (basic_info->NameLength == sizeof(wineW) && !memcmp(basic_info->Name, wineW, sizeof(wineW) )) found = TRUE; } - todo_wine_if(ptr_size == 32) ok( found, "key not found\n" ); + ok( found, "key not found\n" ); pNtClose( root32 ); status = pNtOpenKey( &root64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr ); @@ -2287,7 +2287,7 @@ static void test_redirection(void) status = pNtQueryKey( root64, KeyFullInformation, full_info, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NQtueryKey failed: 0x%08lx\n", status ); - todo_wine_if(ptr_size == 32) ok( full_info->SubKeys == (ptr_size == 32 ? subkeys64 : subkeys32), "wrong number of subkeys: %lu\n", full_info->SubKeys ); + ok( full_info->SubKeys == (ptr_size == 32 ? subkeys64 : subkeys32), "wrong number of subkeys: %lu\n", full_info->SubKeys ); subkeys = full_info->SubKeys; found = FALSE; @@ -2299,7 +2299,7 @@ static void test_redirection(void) if (basic_info->NameLength == sizeof(wineW) && !memcmp(basic_info->Name, wineW, sizeof(wineW) )) found = TRUE; } - todo_wine_if(ptr_size == 32) ok( found, "key not found\n" ); + ok( found, "key not found\n" ); pNtClose( root64 ); pNtDeleteKey( key32 ); diff --git a/server/registry.c b/server/registry.c index d112987b2b9..03e5f20cae5 100644 --- a/server/registry.c +++ b/server/registry.c @@ -516,6 +516,15 @@ static struct object *key_lookup_name( struct object *obj, struct unicode_str *n set_error( STATUS_OBJECT_NAME_NOT_FOUND ); } } + + key = (struct key *)obj; + if (key && (key->flags & KEY_WOWSHARE) && (attr & OBJ_KEY_WOW64) && !name->str) + { + key = get_parent( key ); + release_object( obj ); + return grab_object( key ); + } + return obj; } @@ -768,6 +777,7 @@ static struct key *grab_wow6432node( struct key *key ) struct key *ret = key->wow6432node; if (!ret) return key; + if (ret->flags & KEY_WOWSHARE) return key; grab_object( ret ); release_object( key ); return ret; @@ -810,9 +820,10 @@ static struct key *open_key( struct key *parent, const struct unicode_str *name, return NULL; } - if (parent && (access & KEY_WOW64_32KEY) && !is_wow6432node( name->str, name->len )) + if (parent && !(access & KEY_WOW64_64KEY) && !is_wow6432node( name->str, name->len )) { - if ((key = get_wow6432node( parent ))) + key = get_wow6432node( parent ); + if (key && ((access & KEY_WOW64_32KEY) || (key->flags & KEY_WOWSHARE))) parent = key; } @@ -835,9 +846,10 @@ static struct key *create_key( struct key *parent, const struct unicode_str *nam if (options & REG_OPTION_CREATE_LINK) attributes = (attributes & ~OBJ_OPENIF) | OBJ_OPENLINK; - if (parent && (access & KEY_WOW64_32KEY) && !is_wow6432node( name->str, name->len )) + if (parent && !(access & KEY_WOW64_64KEY) && !is_wow6432node( name->str, name->len )) { - if ((key = get_wow6432node( parent ))) + key = get_wow6432node( parent ); + if (key && ((access & KEY_WOW64_32KEY) || (key->flags & KEY_WOWSHARE))) parent = key; }

1 0

Sven Baars : ntdll/tests: Add some some Software\Classes query and enumerate tests.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 0edf023bc622036d30826a070f9ac7f4c987e5c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/0edf023bc622036d30826a070f9ac7… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Sep 19 13:40:05 2022 +0200 ntdll/tests: Add some some Software\Classes query and enumerate tests. --- dlls/ntdll/tests/reg.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+)

1 0

Sven Baars : server: Recursively obtain the Wow6432Node parent.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: b8d7434e337105f0d092e4a278436e6e4870c796 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8d7434e337105f0d092e4a278436e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Sep 20 13:42:58 2022 +0200 server: Recursively obtain the Wow6432Node parent. --- dlls/advapi32/tests/registry.c | 2 +- dlls/ntdll/tests/reg.c | 5 ++--- server/registry.c | 36 +++++++++++++++++++++++++++++++----- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 55a8074f1b7..b4f0398b358 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2721,7 +2721,7 @@ static void test_redirection(void) check_key_value( key, "Winetest", 0, 64 ); check_key_value( key, "Winetest", KEY_WOW64_64KEY, 64 ); dw = get_key_value( key, "Winetest", KEY_WOW64_32KEY ); - todo_wine ok( dw == 32, "wrong value %lu\n", dw ); + todo_wine_if (ptr_size == 64) ok( dw == 32, "wrong value %lu\n", dw ); RegCloseKey( key ); err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 12b243f77de..383397bd9da 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1630,8 +1630,7 @@ static void test_redirection(void) ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); check_key_value( key, "Winetest", 0, 64 ); check_key_value( key, "Winetest", KEY_WOW64_64KEY, 64 ); - dw = get_key_value( key, "Winetest", KEY_WOW64_32KEY ); - todo_wine_if (ptr_size == 32) ok( dw == ptr_size, "wrong value %lu\n", dw ); + check_key_value( key, "Winetest", KEY_WOW64_32KEY, ptr_size ); pNtClose( key ); status = pNtCreateKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); @@ -1993,7 +1992,7 @@ static void test_redirection(void) if (!status) pNtClose( key ); status = pNtOpenKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); - todo_wine_if(ptr_size == 32) ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status ); if (!status) pNtClose( key ); attr.RootDirectory = root32; diff --git a/server/registry.c b/server/registry.c index 96ba18a0a5a..d112987b2b9 100644 --- a/server/registry.c +++ b/server/registry.c @@ -773,6 +773,31 @@ static struct key *grab_wow6432node( struct key *key ) return ret; } +/* recursively obtain the wow6432node parent key if any */ +static struct key *get_wow6432node( struct key *key ) +{ + struct key *parent, *ret; + struct unicode_str name; + int index; + + if (!key) + return NULL; + + if (key->wow6432node) + return key->wow6432node; + + parent = get_parent( key ); + if (parent && key == parent->wow6432node) + return key; + + if (!(ret = get_wow6432node( parent ))) + return key; + + name.str = key->obj.name->name; + name.len = key->obj.name->len; + return find_subkey( ret, &name, &index ); +} + /* open a subkey */ static struct key *open_key( struct key *parent, const struct unicode_str *name, unsigned int access, unsigned int attributes ) @@ -785,10 +810,10 @@ static struct key *open_key( struct key *parent, const struct unicode_str *name, return NULL; } - if (parent && (access & KEY_WOW64_32KEY)) + if (parent && (access & KEY_WOW64_32KEY) && !is_wow6432node( name->str, name->len )) { - if (parent->wow6432node && !is_wow6432node( name->str, name->len )) - parent = parent->wow6432node; + if ((key = get_wow6432node( parent ))) + parent = key; } if (!(access & KEY_WOW64_64KEY)) attributes |= OBJ_KEY_WOW64; @@ -810,9 +835,10 @@ static struct key *create_key( struct key *parent, const struct unicode_str *nam if (options & REG_OPTION_CREATE_LINK) attributes = (attributes & ~OBJ_OPENIF) | OBJ_OPENLINK; - if (parent && (access & KEY_WOW64_32KEY)) + if (parent && (access & KEY_WOW64_32KEY) && !is_wow6432node( name->str, name->len )) { - if (parent->wow6432node && !is_wow6432node( name->str, name->len )) parent = parent->wow6432node; + if ((key = get_wow6432node( parent ))) + parent = key; } if (!(access & KEY_WOW64_64KEY)) attributes |= OBJ_KEY_WOW64;

1 0

Sven Baars : ntdll/tests: Refactor the Software\Classes tests.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: ca4c6f115023ade3c3c488885cc223af22fc08b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca4c6f115023ade3c3c488885cc223… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Oct 19 13:27:57 2022 +0200 ntdll/tests: Refactor the Software\Classes tests. And add some extra ones. --- dlls/ntdll/tests/reg.c | 251 ++++++++++++++----------------------------------- 1 file changed, 72 insertions(+), 179 deletions(-)

1 0

Sven Baars : ntdll/tests: Test that NtCreateKeyEx() also recursively obtains the Wow6432Node parent.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: b1a9039c17f5826a4350e4fd5cd50332b0d9d473 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1a9039c17f5826a4350e4fd5cd503… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Sep 23 15:23:52 2022 +0200 ntdll/tests: Test that NtCreateKeyEx() also recursively obtains the Wow6432Node parent. --- dlls/ntdll/tests/reg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 383397bd9da..fb08a4e5650 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1648,6 +1648,22 @@ static void test_redirection(void) ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status ); pNtClose( key64 ); + pRtlInitUnicodeString( &str, L"Winetest" ); + attr.RootDirectory = root64; + status = pNtCreateKey( &key32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + + pRtlInitUnicodeString( &str, L"\\Registry\\Machine\\Software\\Wow6432Node\\Wine\\Winetest" ); + attr.RootDirectory = 0; + status = pNtOpenKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); + ok( status == (ptr_size == 64 ? STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS), + "NtOpenKey failed: 0x%08lx\n", status ); + pNtClose( key ); + + status = pNtDeleteKey( key32 ); + ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status ); + pNtClose( key32 ); + pNtDeleteKey( root32 ); pNtClose( root32 ); pNtDeleteKey( root64 );

1 0

Brendan Shanks : ntdll: Add native thread renaming for macOS.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 8ae70731b148258fdb0efb37ea4f7e0bbfb28d89 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ae70731b148258fdb0efb37ea4f7e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 7 12:07:33 2022 -0800 ntdll: Add native thread renaming for macOS. --- dlls/ntdll/unix/thread.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 43de6cefad3..711cb4cb13c 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -59,6 +59,10 @@ #include <libprocstat.h> #endif +#ifdef __APPLE__ +#include <mach/mach.h> +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "ntstatus.h" @@ -1876,6 +1880,40 @@ static void set_native_thread_name( HANDLE handle, const UNICODE_STRING *name ) write( fd, nameA, len ); close( fd ); } +#elif defined(__APPLE__) + /* pthread_setname_np() silently fails if the name is longer than 63 characters + null terminator */ + char nameA[64]; + NTSTATUS status; + int unix_pid, unix_tid, len, current_tid; + + SERVER_START_REQ( get_thread_times ) + { + req->handle = wine_server_obj_handle( handle ); + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + unix_pid = reply->unix_pid; + unix_tid = reply->unix_tid; + } + } + SERVER_END_REQ; + + if (status != STATUS_SUCCESS || unix_pid == -1 || unix_tid == -1) + return; + + current_tid = mach_thread_self(); + mach_port_deallocate(mach_task_self(), current_tid); + + if (unix_tid != current_tid) + { + static int once; + if (!once++) FIXME("setting other thread name not supported\n"); + return; + } + + len = ntdll_wcstoumbs( name->Buffer, name->Length / sizeof(WCHAR), nameA, sizeof(nameA) - 1, FALSE ); + nameA[len] = '\0'; + pthread_setname_np(nameA); #else static int once; if (!once++) FIXME("not implemented on this platform\n");

1 0

Sven Baars : ntdll/tests: Add some Software\Classes subkey tests.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 3b77a8e4ea6fc0033355de80f491ae15392f768f URL: https://gitlab.winehq.org/wine/wine/-/commit/3b77a8e4ea6fc0033355de80f491ae… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Sep 19 15:39:48 2022 +0200 ntdll/tests: Add some Software\Classes subkey tests. --- dlls/ntdll/tests/reg.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 4b0e558e271..12b243f77de 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1472,7 +1472,7 @@ static void test_redirection(void) char buffer[1024]; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; DWORD dw, len; - HANDLE key, root32, root64, key32, key64; + HANDLE key, key32, key64, root, root32, root64; if (ptr_size != 64) { @@ -1760,6 +1760,12 @@ static void test_redirection(void) status = pNtCreateKey( &key64, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + attr.RootDirectory = key64; + status = pNtCreateKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pNtDeleteKey( key ); + pNtClose( key ); + attr.RootDirectory = root32; status = pNtOpenKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); @@ -1819,10 +1825,16 @@ static void test_redirection(void) status = pNtOpenKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status ); + attr.RootDirectory = root32; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status ); + + status = pNtOpenKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status ); + pNtDeleteKey( key64 ); pNtClose( key64 ); - attr.RootDirectory = root32; status = pNtCreateKey( &key32, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); dw = 32; @@ -1847,6 +1859,186 @@ static void test_redirection(void) ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status ); dw = *(DWORD *)info->Data; ok( dw == 32, "wrong value %lu\n", dw ); + pNtClose( key64 ); + + pNtDeleteKey( key32 ); + pNtClose( key32 ); + + pNtClose( root64 ); + pNtClose( root32 ); + + pRtlInitUnicodeString( &str, L"\\Registry\\Machine\\Software\\Classes" ); + attr.RootDirectory = 0; + status = pNtOpenKey( &root64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + + status = pNtOpenKey( &root32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + + status = pNtOpenKey( &root, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + + pRtlInitUnicodeString( &str, L"Interface" ); + attr.RootDirectory = root64; + status = pNtOpenKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + + attr.RootDirectory = root32; + status = pNtOpenKey( &key32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + + attr.RootDirectory = root; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + + pNtClose( root64 ); + pNtClose( root32 ); + pNtClose( root ); + + root64 = key64; + root32 = key32; + root = key; + + pRtlInitUnicodeString( &str, L"Wine" ); + attr.RootDirectory = root32; + status = pNtCreateKey( &key32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + + attr.RootDirectory = root; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + pNtClose( key ); + + pNtDeleteKey( key32 ); + pNtClose( key32 ); + + attr.RootDirectory = root64; + status = pNtCreateKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + + attr.RootDirectory = root; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == (ptr_size == 32 ? STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS), + "NtOpenKey failed: 0x%08lx\n", status ); + if (!status) pNtClose( key ); + + pNtDeleteKey( key64 ); + pNtClose( key64 ); + + pNtDeleteKey( root ); + pNtClose( root ); + + attr.RootDirectory = root64; + status = pNtCreateKey( &key64, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + + attr.RootDirectory = root32; + status = pNtOpenKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); + ok( status == (ptr_size == 32 ? STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS), + "NtOpenKey failed: 0x%08lx\n", status ); + if (!status) pNtClose( key ); + + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == (ptr_size == 32 ? STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS), + "NtOpenKey failed: 0x%08lx\n", status ); + if (!status) pNtClose( key ); + + status = pNtCreateKey( &key32, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + + dw = 32; + status = pNtSetValueKey( key32, &value_str, 0, REG_DWORD, &dw, sizeof(dw) ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status ); + pNtClose( key32 ); + + dw = 64; + status = pNtSetValueKey( key64, &value_str, 0, REG_DWORD, &dw, sizeof(dw) ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status ); + pNtClose( key64 ); + + attr.RootDirectory = root64; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + len = sizeof(buffer); + status = pNtQueryValueKey( key, &value_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status ); + dw = *(DWORD *)info->Data; + ok( dw == 64, "wrong value %lu\n", dw ); + pNtClose( key ); + + attr.RootDirectory = root64; + status = pNtOpenKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + len = sizeof(buffer); + status = pNtQueryValueKey( key64, &value_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status ); + dw = *(DWORD *)info->Data; + ok( dw == 64, "wrong value %lu\n", dw ); + + attr.RootDirectory = root32; + status = pNtOpenKey( &key32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + len = sizeof(buffer); + status = pNtQueryValueKey( key32, &value_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status ); + dw = *(DWORD *)info->Data; + ok( dw == ptr_size, "wrong value %lu\n", dw ); + pNtDeleteKey( key32 ); + pNtClose( key32 ); + + attr.RootDirectory = root64; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == (ptr_size == 64 ? STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS), + "NtOpenKey failed: 0x%08lx\n", status ); + if (!status) pNtClose( key ); + + status = pNtOpenKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); + todo_wine_if(ptr_size == 32) ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status ); + if (!status) pNtClose( key ); + + attr.RootDirectory = root32; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status ); + + status = pNtOpenKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status ); + + pNtDeleteKey( key64 ); + pNtClose( key64 ); + + status = pNtCreateKey( &key32, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + dw = 32; + status = pNtSetValueKey( key32, &value_str, 0, REG_DWORD, &dw, sizeof(dw) ); + ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status ); + + attr.RootDirectory = root64; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == (ptr_size == 32 ? STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS), + "NtOpenKey failed: 0x%08lx\n", status ); + if (!status) + { + len = sizeof(buffer); + status = pNtQueryValueKey( key, &value_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status ); + dw = *(DWORD *)info->Data; + ok( dw == 32, "wrong value %lu\n", dw ); + pNtClose( key ); + } + + attr.RootDirectory = root64; + status = pNtOpenKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr ); + ok( status == (ptr_size == 32 ? STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS), + "NtOpenKey failed: 0x%08lx\n", status ); + if (!status) + { + len = sizeof(buffer); + status = pNtQueryValueKey( key64, &value_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status ); + dw = *(DWORD *)info->Data; + ok( dw == 32, "wrong value %lu\n", dw ); + pNtClose( key64 ); + } pNtDeleteKey( key32 ); pNtClose( key32 );

1 0

Zebediah Figura : quartz: Use a single message thread for all filter graphs.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 0ad6d68873bf3d70955f62a2fe2d98221f586ef9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ad6d68873bf3d70955f62a2fe2d98… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 17 20:03:17 2022 -0600 quartz: Use a single message thread for all filter graphs. This matches native, as the test shows, but was motivated by bug 50779, which it may alleviate. --- dlls/quartz/filtergraph.c | 68 ++++++++++++++++++++++++----------------- dlls/quartz/quartz_private.h | 7 +++++ dlls/quartz/tests/filtergraph.c | 16 ++++++++-- 3 files changed, 61 insertions(+), 30 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1849174cf97..437691b5553 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -42,6 +42,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +DECLARE_CRITICAL_SECTION(message_cs); + +struct filter_create_params +{ + HRESULT hr; + IMoniker *moniker; + IBaseFilter *filter; +}; + +static HANDLE message_thread, message_thread_ret; +static DWORD message_thread_id; +static unsigned int message_thread_refcount; + struct media_event { struct list entry; @@ -132,9 +145,6 @@ struct filter_graph IUnknown *pSite; LONG version; - HANDLE message_thread, message_thread_ret; - DWORD message_thread_id; - /* Respectively: the last timestamp at which we started streaming, and the * current offset within the stream. */ REFERENCE_TIME stream_start, stream_elapsed; @@ -142,6 +152,7 @@ struct filter_graph LONGLONG current_pos; unsigned int needs_async_run : 1; + unsigned int threaded : 1; }; struct enum_filters @@ -465,14 +476,17 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) flush_media_events(This); CloseHandle(This->media_event_handle); - This->cs.DebugInfo->Spare[0] = 0; - if (This->message_thread) + EnterCriticalSection(&message_cs); + if (This->threaded && !--message_thread_refcount) { - PostThreadMessageW(This->message_thread_id, WM_USER + 1, 0, 0); - WaitForSingleObject(This->message_thread, INFINITE); - CloseHandle(This->message_thread); - CloseHandle(This->message_thread_ret); + PostThreadMessageW(message_thread_id, WM_USER + 1, 0, 0); + WaitForSingleObject(message_thread, INFINITE); + CloseHandle(message_thread); + CloseHandle(message_thread_ret); } + LeaveCriticalSection(&message_cs); + + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->event_cs); DeleteCriticalSection(&This->cs); free(This); @@ -1012,21 +1026,13 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) return hr; } -struct filter_create_params -{ - HRESULT hr; - IMoniker *moniker; - IBaseFilter *filter; -}; - static DWORD WINAPI message_thread_run(void *ctx) { - struct filter_graph *graph = ctx; MSG msg; /* Make sure we have a message queue. */ PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE); - SetEvent(graph->message_thread_ret); + SetEvent(message_thread_ret); CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1040,7 +1046,7 @@ static DWORD WINAPI message_thread_run(void *ctx) params->hr = IMoniker_BindToObject(params->moniker, NULL, NULL, &IID_IBaseFilter, (void **)&params->filter); - SetEvent(graph->message_thread_ret); + SetEvent(message_thread_ret); } else if (!msg.hwnd && msg.message == WM_USER + 1) { @@ -1059,13 +1065,17 @@ static DWORD WINAPI message_thread_run(void *ctx) static HRESULT create_filter(struct filter_graph *graph, IMoniker *moniker, IBaseFilter **filter) { - if (graph->message_thread) + if (graph->threaded) { struct filter_create_params params; params.moniker = moniker; - PostThreadMessageW(graph->message_thread_id, WM_USER, (WPARAM)&params, 0); - WaitForSingleObject(graph->message_thread_ret, INFINITE); + + EnterCriticalSection(&message_cs); + PostThreadMessageW(message_thread_id, WM_USER, (WPARAM)&params, 0); + WaitForSingleObject(message_thread_ret, INFINITE); + LeaveCriticalSection(&message_cs); + *filter = params.filter; return params.hr; } @@ -5654,14 +5664,16 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL object->name_index = 1; object->timeformatseek = TIME_FORMAT_MEDIA_TIME; - if (threaded) + object->threaded = !!threaded; + + EnterCriticalSection(&message_cs); + if (threaded && !message_thread_refcount++) { - object->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); - object->message_thread = CreateThread(NULL, 0, message_thread_run, object, 0, &object->message_thread_id); - WaitForSingleObject(object->message_thread_ret, INFINITE); + message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); + message_thread = CreateThread(NULL, 0, message_thread_run, object, 0, &message_thread_id); + WaitForSingleObject(message_thread_ret, INFINITE); } - else - object->message_thread = NULL; + LeaveCriticalSection(&message_cs); TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index c706d906a26..6414cd4a988 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -37,6 +37,13 @@ #include "wine/strmbase.h" #include "wine/list.h" +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; + static inline const char *debugstr_time(REFERENCE_TIME time) { ULONGLONG abstime = time >= 0 ? time : -time; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2c07dc49356..c06041b422f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5213,10 +5213,11 @@ static void test_window_threading(void) }; WCHAR *filename = load_resource(L"test.avi"); IFilterGraph2 *graph = create_graph(); + HWND hwnd, hwnd2, parent; + IFilterGraph2 *graph2; IVideoWindow *window; - HWND hwnd, parent; + DWORD tid, tid2; HRESULT hr; - DWORD tid; ULONG ref; BOOL ret; @@ -5253,6 +5254,17 @@ static void test_window_threading(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); IVideoWindow_Release(window); ok(!(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOPARENTNOTIFY), "Window has WS_EX_NOPARENTNOTIFY.\n"); + + graph2 = create_graph(); + hr = IFilterGraph2_RenderFile(graph2, filename, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hwnd2 = get_renderer_hwnd(graph); + ok(!!hwnd2, "Failed to get renderer window.\n"); + tid2 = GetWindowThreadProcessId(hwnd, NULL); + ok(tid2 == tid, "Expected thread to be shared.\n"); + + ref = IFilterGraph2_Release(graph2); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } else skip("Could not find renderer window.\n");

1 0

Zebediah Figura : configure: Override PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH for 32-bit builds on 64-bit hosts.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: c7a97b5d5d56ef00a0061b75412c6e0e489fdc99 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7a97b5d5d56ef00a0061b75412c6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 17 19:32:39 2022 -0600 configure: Override PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH for 32-bit builds on 64-bit hosts. This allows 32-bit packages to be found when the user has specified PKG_CONFIG_PATH for some other reason. This also mirrors the way e.g. i686-linux-gnu-pkg-config is implemented on Debian, and possibly other distributions as well. This also prevents 64-bit .pc files from being found. This was originally intended as a benefit [1], but can contribute to misdetection of headers which are not actually multiarch (e.g. GStreamer, although at the time that [1] was written that was a preëxisting problem). In general a distribution which provides .pc files for one architecture should be expected to provide them for any architecture that it actually provides libraries for; even if that was not true of Debian in 2017, it is now. I moreover assert it is better to fail to find a present library than to incorrectly find the wrong one. Note that we can't easily use i686-linux-gnu-pkg-config, as would otherwise be preferable, for reasons also described in [1]. [1] https://www.winehq.org/pipermail/wine-devel/2017-June/118002.html --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 5f1863246ea..ca543e4503e 100755 --- a/configure +++ b/configure @@ -6239,8 +6239,8 @@ printf "%s\n" "$wine_cv_cc_m32" >&6; } host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="$TARGETFLAGS -m32" - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} - export PKG_CONFIG_PATH + PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} + export PKG_CONFIG_LIBDIR with_unwind=${with_unwind:-no} else if test "x${GCC}" = "xyes" diff --git a/configure.ac b/configure.ac index 4e852da5ee7..c15df1090b4 100644 --- a/configure.ac +++ b/configure.ac @@ -129,8 +129,8 @@ case $host in host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="$TARGETFLAGS -m32" - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} - export PKG_CONFIG_PATH + PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} + export PKG_CONFIG_LIBDIR with_unwind=${with_unwind:-no} else if test "x${GCC}" = "xyes"

1 0