April 2022 - Wine-Devel - list.winehq.org

[PATCH] dlls/d3dxof: don't cast ptrdiff_t to ULONG in traces, use %I instead
by Eric Pouech April 11, 2022

April 11, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dxof/parsing.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 8431078949f9..7688e846bf51 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -274,8 +274,8 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) } if ((decomp_buffer - *decomp_buffer_ptr) != decomp_file_size) - ERR("Size of all decompressed chunks (%u) does not match decompressed file size (%u)\n", - (DWORD)(decomp_buffer - *decomp_buffer_ptr), decomp_file_size); + ERR("Size of all decompressed chunks (%Iu) does not match decompressed file size (%u)\n", + decomp_buffer - *decomp_buffer_ptr, decomp_file_size); /* Use decompressed data */ buf->buffer = *decomp_buffer_ptr;

1 0

[PATCH v3 1/4] ntdll/tests: Add some tests for NtQueryDirectoryObject().
by Zebediah Figura April 11, 2022

April 11, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 222 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a0702a580b7..b86d1e003a2 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -78,6 +78,16 @@ static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) #define DESKTOP_ALL_ACCESS 0x01ff +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) +static void check_unicode_string_( int line, const UNICODE_STRING *string, const WCHAR *expect ) +{ + size_t len = wcslen( expect ) * sizeof(WCHAR); + + ok_(__FILE__, line)( !wcscmp( string->Buffer, expect ), "got string %s\n", debugstr_w( string->Buffer )); + ok_(__FILE__, line)( string->Length == len, "got length %u\n", string->Length ); + ok_(__FILE__, line)( string->MaximumLength == len + sizeof(WCHAR), "got max length %u\n", string->MaximumLength ); +} + static void test_case_sensitive (void) { NTSTATUS status; @@ -2500,6 +2510,217 @@ static void test_object_identity(void) pNtClose( h1 ); } +static void test_query_directory(void) +{ + static const DIRECTORY_BASIC_INFORMATION empty_info; + char buffer[200]; + DIRECTORY_BASIC_INFORMATION *info = (void *)buffer; + ULONG context, size, needed_size; + const WCHAR *name1, *name2; + HANDLE dir, child1, child2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); + InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); + status = NtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( !status, "got %#lx\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + if (size == sizeof(*info)) + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + if (size == sizeof(*info)) + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Telamon" ); + status = NtCreateMutant( &child1, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#lx\n", status ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Oileus" ); + status = NtCreateMutant( &child2, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#lx\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == 0xdeadbeef || broken(!size) /* WoW64 */, "got size %lu\n", size); + + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); + ok( status == STATUS_ACCESS_VIOLATION, "got %#lx\n", status ); + ok( size == 0xdeadbeef, "got size %lu\n", size); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + ok( size && size < sizeof(buffer), "got size %lu\n", size ); + if (!wcscmp( info[0].ObjectName.Buffer, L"Oileus" )) + { + name1 = L"Oileus"; + name2 = L"Telamon"; + } + else + { + name1 = L"Telamon"; + name2 = L"Oileus"; + } + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name2 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + needed_size = size; + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); + ok( !status, "got %#lx\n", status ); + + context = 0; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( !status, "got %#lx\n", status ); + if (!status) + { + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + check_unicode_string( &info[1].ObjectName, name2 ); + check_unicode_string( &info[1].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[2], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + needed_size = size; + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( context == 1, "got context %#lx\n", context ); + ok( size > 0 && size < needed_size, "got size %lu\n", size ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(*info), FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES + || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( !context, "got context %#lx\n", context ); + ok( size == sizeof(*info), "got size %lu\n", size ); + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES + || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( !context, "got context %#lx\n", context ); + ok( size == sizeof(*info), "got size %lu\n", size ); + } + + context = 1; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, FALSE, &context, &size ); + todo_wine ok( !status, "got %#lx\n", status ); + if (!status) + { + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name2 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + NtClose( child1 ); + NtClose( child2 ); + NtClose( dir ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2561,4 +2782,5 @@ START_TEST(om) test_get_next_thread(); test_globalroot(); test_object_identity(); + test_query_directory(); } -- 2.34.1

1 3

[PATCH v2 1/4] ntdll/tests: Add some tests for NtQueryDirectoryObject().
by Zebediah Figura April 11, 2022

April 11, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 211 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a0702a580b7..0fc53384a89 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -78,6 +78,16 @@ static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) #define DESKTOP_ALL_ACCESS 0x01ff +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) +static void check_unicode_string_( int line, const UNICODE_STRING *string, const WCHAR *expect ) +{ + size_t len = wcslen( expect ) * sizeof(WCHAR); + + ok_(__FILE__, line)( !wcscmp( string->Buffer, expect ), "got string %s\n", debugstr_w( string->Buffer )); + ok_(__FILE__, line)( string->Length == len, "got length %u\n", string->Length ); + ok_(__FILE__, line)( string->MaximumLength == len + sizeof(WCHAR), "got max length %u\n", string->MaximumLength ); +} + static void test_case_sensitive (void) { NTSTATUS status; @@ -2500,6 +2510,206 @@ static void test_object_identity(void) pNtClose( h1 ); } +static void test_query_directory(void) +{ + static const DIRECTORY_BASIC_INFORMATION empty_info; + char buffer[200]; + DIRECTORY_BASIC_INFORMATION *info = (void *)buffer; + ULONG context, size, needed_size; + HANDLE dir, child1, child2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); + InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); + status = NtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( !status, "got %#lx\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + if (size == sizeof(*info)) + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + if (size == sizeof(*info)) + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Telamon" ); + status = NtCreateMutant( &child1, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#lx\n", status ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Oileus" ); + status = NtCreateMutant( &child2, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#lx\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == 0xdeadbeef, "got size %lu\n", size); + + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); + ok( status == STATUS_ACCESS_VIOLATION, "got %#lx\n", status ); + ok( size == 0xdeadbeef, "got size %lu\n", size); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + ok( size && size < sizeof(buffer), "got size %lu\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + needed_size = size; + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); + ok( !status, "got %#lx\n", status ); + + context = 0; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( !status, "got %#lx\n", status ); + if (!status) + { + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + check_unicode_string( &info[1].ObjectName, L"Telamon" ); + check_unicode_string( &info[1].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[2], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + needed_size = size; + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( context == 1, "got context %#lx\n", context ); + ok( size > 0 && size < needed_size, "got size %lu\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(*info), FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES + || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( !context, "got context %#lx\n", context ); + ok( size == sizeof(*info), "got size %lu\n", size ); + ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES + || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( !context, "got context %#lx\n", context ); + ok( size == sizeof(*info), "got size %lu\n", size ); + } + + context = 1; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, FALSE, &context, &size ); + todo_wine ok( !status, "got %#lx\n", status ); + if (!status) + { + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + } + + NtClose( child1 ); + NtClose( child2 ); + NtClose( dir ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2561,4 +2771,5 @@ START_TEST(om) test_get_next_thread(); test_globalroot(); test_object_identity(); + test_query_directory(); } -- 2.34.1

2 7

[PATCH] user32: use SWP_NOACTIVATE flag when resizing etched static control
by Rafał Harabień April 10, 2022

April 10, 2022

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index e81e553f7d8..3c9b67b20ac 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -426,7 +426,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam rc.right = rc.left; AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); NtUserSetWindowPos( hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, - SWP_NOMOVE | SWP_NOZORDER ); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } switch (style) { -- 2.25.1

4 5

[PATCH] windowscodecs: pceltFetched is optional in IWICEnumMetadataItem.
by Esme Povirk April 9, 2022

April 9, 2022

Spotted by Eric Pouech. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/metadatahandler.c | 4 ++++ dlls/windowscodecs/tests/metadata.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index b0b682b6d9b..5bcca0f58c6 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -491,9 +491,13 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, ULONG new_index; HRESULT hr=S_FALSE; ULONG i; + ULONG fetched; TRACE("(%p,%li)\n", iface, celt); + if (!pceltFetched) + pceltFetched = &fetched; + EnterCriticalSection(&This->parent->lock); if (This->index >= This->parent->item_count) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 2ec9eb645e8..57d8e2b1bea 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -303,6 +303,21 @@ static void test_metadata_unknown(void) ok(hr == S_FALSE, "Next failed, hr=%lx\n", hr); ok(items_returned == 0, "unexpected item count %li\n", items_returned); + hr = IWICEnumMetadataItem_Reset(enumerator); + ok(hr == S_OK, "Reset failed, hr=%lx\n", hr); + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, NULL, NULL); + ok(hr == S_OK, "Next failed, hr=%lx\n", hr); + + if (hr == S_OK) + { + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + ok(id.vt == VT_EMPTY, "unexpected vt: %i\n", id.vt); + + PropVariantClear(&schema); + PropVariantClear(&id); + } + IWICEnumMetadataItem_Release(enumerator); } -- 2.32.0

1 0

[PATCH] gdiplus: Accept newer version in OpenType header.
by Esme Povirk April 9, 2022

April 9, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- Supersedes 232113. dlls/gdiplus/font.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6529f94bc1f..57849733a9c 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -106,7 +106,7 @@ typedef struct #define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) -#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))); +#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))) #endif #define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ @@ -1150,14 +1150,16 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCON #define NAME_ID_FULL_FONT_NAME 4 typedef struct { - USHORT major_version; - USHORT minor_version; + ULONG version; USHORT tables_no; USHORT search_range; USHORT entry_selector; USHORT range_shift; } tt_header; +#define TT_HEADER_VERSION_1 0x00010000 +#define TT_HEADER_VERSION_CFF 0x4f54544f + typedef struct { char tag[4]; /* table name */ ULONG check_sum; /* Check sum */ @@ -1402,7 +1404,8 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) header = (const tt_header*)mem; count = GET_BE_WORD(header->tables_no); - if (GET_BE_WORD(header->major_version) != 1 || GET_BE_WORD(header->minor_version) != 0) + if (GET_BE_DWORD(header->version) != TT_HEADER_VERSION_1 && + GET_BE_DWORD(header->version) != TT_HEADER_VERSION_CFF) return NULL; pos = sizeof(*header); -- 2.32.0

1 0

[PATCH v3] include: Add some math declarations.
by Daniel Lehman April 9, 2022

April 9, 2022

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v3: remove incorrect declarations and other unavailable functions v2: correct some declarations --- include/msvcrt/math.h | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index da07303bcd9..97ae6dfe240 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -69,12 +69,16 @@ _ACRTIMP double __cdecl fabs(double); _ACRTIMP double __cdecl ldexp(double, int); _ACRTIMP double __cdecl frexp(double, int*); _ACRTIMP double __cdecl modf(double, double*); +_ACRTIMP double __cdecl fdim(double, double); _ACRTIMP double __cdecl fmod(double, double); _ACRTIMP double __cdecl fmin(double, double); _ACRTIMP double __cdecl fmax(double, double); _ACRTIMP double __cdecl erf(double); +_ACRTIMP double __cdecl remainder(double, double); _ACRTIMP double __cdecl remquo(double, double, int*); _ACRTIMP float __cdecl remquof(float, float, int*); +_ACRTIMP double __cdecl lgamma(double); +_ACRTIMP double __cdecl tgamma(double); _ACRTIMP double __cdecl _hypot(double, double); _ACRTIMP double __cdecl _j0(double); @@ -86,18 +90,31 @@ _ACRTIMP double __cdecl _yn(int, double); _ACRTIMP double __cdecl cbrt(double); _ACRTIMP double __cdecl exp2(double); +_ACRTIMP double __cdecl expm1(double); +_ACRTIMP double __cdecl log1p(double); _ACRTIMP double __cdecl log2(double); +_ACRTIMP double __cdecl logb(double); _ACRTIMP double __cdecl rint(double); _ACRTIMP double __cdecl round(double); _ACRTIMP double __cdecl trunc(double); _ACRTIMP float __cdecl cbrtf(float); _ACRTIMP float __cdecl exp2f(float); +_ACRTIMP float __cdecl expm1f(float); +_ACRTIMP float __cdecl log1pf(float); _ACRTIMP float __cdecl log2f(float); +_ACRTIMP float __cdecl logbf(float); _ACRTIMP float __cdecl rintf(float); _ACRTIMP float __cdecl roundf(float); _ACRTIMP float __cdecl truncf(float); +_ACRTIMP int __cdecl ilogb(double); +_ACRTIMP int __cdecl ilogbf(float); + +_ACRTIMP long long __cdecl llrint(double); +_ACRTIMP long long __cdecl llrintf(float); +_ACRTIMP long long __cdecl llround(double); +_ACRTIMP long long __cdecl llroundf(float); _ACRTIMP __msvcrt_long __cdecl lrint(double); _ACRTIMP __msvcrt_long __cdecl lrintf(float); _ACRTIMP __msvcrt_long __cdecl lround(double); @@ -105,6 +122,8 @@ _ACRTIMP __msvcrt_long __cdecl lroundf(float); _ACRTIMP double __cdecl scalbn(double,int); _ACRTIMP float __cdecl scalbnf(float,int); +_ACRTIMP double __cdecl scalbln(double,__msvcrt_long); +_ACRTIMP float __cdecl scalblnf(float,__msvcrt_long); _ACRTIMP double __cdecl _copysign (double, double); _ACRTIMP double __cdecl _chgsign (double); @@ -115,6 +134,8 @@ _ACRTIMP int __cdecl _finite(double); _ACRTIMP int __cdecl _isnan(double); _ACRTIMP int __cdecl _fpclass(double); +_ACRTIMP double __cdecl nextafter(double, double); + #ifndef __i386__ _ACRTIMP float __cdecl sinf(float); @@ -199,15 +220,20 @@ _ACRTIMP float __cdecl _logbf(float); _ACRTIMP float __cdecl acoshf(float); _ACRTIMP float __cdecl asinhf(float); _ACRTIMP float __cdecl atanhf(float); +_ACRTIMP float __cdecl erff(float); +_ACRTIMP float __cdecl fdimf(float, float); +_ACRTIMP float __cdecl fmaxf(float, float); +_ACRTIMP float __cdecl fminf(float, float); +_ACRTIMP float __cdecl lgammaf(float); +_ACRTIMP float __cdecl nextafterf(float, float); +_ACRTIMP float __cdecl remainderf(float, float); +_ACRTIMP float __cdecl tgammaf(float); #else static inline float _chgsignf(float x) { return _chgsign(x); } static inline float _copysignf(float x, float y) { return _copysign(x, y); } static inline float _logbf(float x) { return _logb(x); } -static inline float acoshf(float x) { return acosh(x); } -static inline float asinhf(float x) { return asinh(x); } -static inline float atanhf(float x) { return atanh(x); } #endif -- 2.25.1

3 3

[PATCH] user32/tests: remove duplicated SS_*RECT static control tests
by Rafał Harabień April 9, 2022

April 9, 2022

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index a5af3315865..09e399990cd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME); -- 2.25.1

1 0

[v3 PATCH 1/2] mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader.
by Nikolay Sivov April 9, 2022

April 9, 2022

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> The stream sample allocator callback NotifyRelease() method assumes that the source reader is valid. Therefore it must own a reference to it, otherwise it might get called while the source reader is being destroyed, causing a crash. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index bdf2e7f5a6f..2d3da19db10 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2282,12 +2282,14 @@ static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAl static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) { - return 2; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_addref(stream->reader); } static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) { - return 1; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_release(stream->reader); } static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) -- 2.35.1

1 1

[PATCH] dlls/rtqwork: trace 64-bit integers with I64 width modifier
by Eric Pouech April 9, 2022

April 9, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rtworkq/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 35ba1e28d03c..d6c28ca45660 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -875,7 +875,7 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) CloseThreadpoolTimer(item->u.timer_object); else - WARN("Unknown item key mask %#lx.\n", (DWORD)key); + WARN("Unknown item key mask %#I64x.\n", key); queue_release_pending_item(item); hr = S_OK; break;

2 1