- Wine-devel - list.winehq.org

[PATCH 01/10] win32u: Return LRESULT from NtUserMessageCall.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 3 +- dlls/user32/winproc.c | 4 +- dlls/win32u/message.c | 20 +++----- dlls/win32u/tests/win32u.c | 97 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 4 +- dlls/win32u/window.c | 8 ++- dlls/win32u/wrappers.c | 4 +- include/ntuser.h | 29 ++++++++--- 8 files changed, 138 insertions(+), 31 deletions(-)

3 2

[PATCH v2 1/3] kernel32/tests: Add some GlobalMemoryStatusEx tests.
by Rémi Bernon 05 Apr '22

05 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Relax ullAvailPageFile check a bit, it's not always synced. dlls/kernel32/tests/heap.c | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index c597ff9590b..fc4ece81e00 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1264,6 +1264,67 @@ static void test_GlobalMemoryStatus(void) wine_dbgstr_longlong(mem.dwAvailVirtual), wine_dbgstr_longlong(memex.ullAvailVirtual)); } +static void test_GlobalMemoryStatusEx(void) +{ + char buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* some Win 7 versions need a larger info */ + SYSTEM_PERFORMANCE_INFORMATION *perf_info = (void *)buffer; + SYSTEM_BASIC_INFORMATION basic_info; + MEMORYSTATUSEX memex = {0}, expect; + VM_COUNTERS_EX vmc; + NTSTATUS status; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = GlobalMemoryStatusEx( &memex ); + ok( !ret, "GlobalMemoryStatusEx succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + do + { + status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); + ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); + memex.dwLength = sizeof(MEMORYSTATUSEX); + ret = GlobalMemoryStatusEx( &memex ); + ok( ret, "GlobalMemoryStatusEx succeeded\n" ); + } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize); + + ok( basic_info.PageSize, "got 0 PageSize\n" ); + ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" ); + ok( !!basic_info.HighestUserAddress, "got 0 HighestUserAddress\n" ); + ok( !!basic_info.LowestUserAddress, "got 0 LowestUserAddress\n" ); + ok( perf_info->TotalCommittedPages, "got 0 TotalCommittedPages\n" ); + ok( perf_info->TotalCommitLimit, "got 0 TotalCommitLimit\n" ); + ok( perf_info->AvailablePages, "got 0 AvailablePages\n" ); + + expect.dwMemoryLoad = (memex.ullTotalPhys - memex.ullAvailPhys) / (memex.ullTotalPhys / 100); + expect.ullTotalPhys = (ULONGLONG)basic_info.MmNumberOfPhysicalPages * basic_info.PageSize; + expect.ullAvailPhys = (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize; + expect.ullTotalPageFile = (ULONGLONG)perf_info->TotalCommitLimit * basic_info.PageSize; + expect.ullAvailPageFile = (ULONGLONG)(perf_info->TotalCommitLimit - perf_info->TotalCommittedPages) * basic_info.PageSize; + expect.ullTotalVirtual = (ULONG_PTR)basic_info.HighestUserAddress - (ULONG_PTR)basic_info.LowestUserAddress + 1; + expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */; + expect.ullAvailExtendedVirtual = 0; + + ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad ); + todo_wine + ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys ); + ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); + todo_wine + ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile ); + /* allow some variability, page file is not always in sync on Windows */ + ok( memex.ullAvailPageFile - expect.ullAvailPageFile + 32 * basic_info.PageSize <= 64 * basic_info.PageSize, + "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); + todo_wine + ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual ); + todo_wine + ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual ); + ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); +} + START_TEST(heap) { int argc; @@ -1298,6 +1359,7 @@ START_TEST(heap) test_HeapQueryInformation(); test_GetPhysicallyInstalledSystemMemory(); test_GlobalMemoryStatus(); + test_GlobalMemoryStatusEx(); if (pRtlGetNtGlobalFlags) { -- 2.35.1

2 4

[PATCH 1/6] include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Rémi Bernon 05 Apr '22

05 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index ae2a42419b4..4ad965ab3d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -45,6 +45,11 @@ coclass CMSH264DecoderMFT {} ] coclass CWMADecMediaObject {}; +[ + uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) +] +coclass CWMAEncMediaObject {}; + [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] -- 2.35.1

3 12

[PATCH] dlls/mciavi32: use I width modifier instead of casting to DWORD
by Eric Pouech 05 Apr '22

05 Apr '22

--- dlls/mciavi32/mciavi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 64a1a0fbd7d0..dcd07032fecb 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -1063,11 +1063,11 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SAVE: case MCI_UNDO: case MCI_UNFREEZE: - TRACE("Unsupported function [0x%x] flags=%08lx\n", wMsg, (DWORD)dwParam1); + TRACE("Unsupported function [0x%x] flags=%08Ix\n", wMsg, dwParam1); return MCIERR_UNSUPPORTED_FUNCTION; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [0x%x] %08lx\n", wMsg, (DWORD)dwParam1); + WARN("Unsupported command [0x%x] %08Ix\n", wMsg, dwParam1); break; case MCI_OPEN: case MCI_CLOSE:

1 0

[PATCH] dlls/comdlg32: use I width modifier instead of casting to LONG
by Eric Pouech 05 Apr '22

05 Apr '22

--- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 03c712c6bc2e..4bf041e85b3c 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } } - TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam); + TRACE("WM_COMMAND wParam=%08IX lParam=%08IX\n", wParam, lParam); switch (LOWORD(wParam)) { case cmb1:

1 0

[v4 PATCH] dwrite/tests: Add some fallback tests for Segoe UI Symbol.
by Nikolay Sivov 05 Apr '22

05 Apr '22

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: removed parts that are not relevant for tested functionality, fixed compilation warnings. dlls/dwrite/tests/layout.c | 81 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..43b6efa107b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4747,6 +4747,86 @@ if (font) { IDWriteFactory2_Release(factory2); } +static void get_font_name(IDWriteFont *font, WCHAR *name, UINT32 size) +{ + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(index != UINT_MAX && exists, "Name was not found.\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_system_fallback(void) +{ + static const struct fallback_test + { + const WCHAR text[2]; + const WCHAR *name; + } + tests[] = + { + { { 0x25d4, 0}, L"Segoe UI Symbol" }, + }; + IDWriteFontFallback *fallback; + IDWriteFactory2 *factory; + IDWriteFont *font; + UINT32 i, length; + WCHAR name[256]; + BOOL exists; + float scale; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory2))) + { + win_skip("System font fallback API is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + g_source = tests[i].text; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; + ok(length == 1, "Unexpected length %u\n", length); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); + todo_wine + ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFactory2_Release(factory); +} + static void test_FontFallbackBuilder(void) { IDWriteFontFallback *fallback, *fallback2; @@ -6529,6 +6609,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_system_fallback(); test_FontFallbackBuilder(); test_SetTypography(); test_SetLastLineWrapping(); -- 2.35.1

1 0

[PATCH 1/2] winex11: Invoke Key event handlers immediately, keeping pace with the XFilterEvent().
by Byeongsik Jeon 05 Apr '22

05 Apr '22

1. GCS_COMPSTR: XFilterEvent() True case, XIMPreeditDrawCallCallback() is invoked by XFilterEvent() internally. immediately processing. GCS_RESULTSTR: XFilterEvent() False case. X11DRV_XIMLookupChars() is invoked by KeyPress event handler. delayed processing. So, delayed event handler processing causes GCS_COMPSTR, GCS_RESULTSTR pair sequence inverting. In Hangul IME, one key often generates GCS_COMPSTR, GCS_RESULTSTR pairs. The XIM server sends the correct order pair, but the message order inverted through the process_events(). Japanese input system can also produce similar situation. 2. Copying event variable does not guarantee complete state preservation. At the time of delayed processing, the global information that the event handler must refer to may be changed. Ex. XFilterEvent(), KeyPress event handler confirmed. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/winex11.drv/event.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 170111e9c28..149069b0d29 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -445,6 +445,19 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + if (event.type == KeyPress || event.type == KeyRelease) + { + if (prev_event.type) + { + queued |= call_event_handler( display, &prev_event ); + free_event_data( &prev_event ); + prev_event.type = 0; + action = MERGE_DISCARD; + } + queued |= call_event_handler( display, &event ); + continue; + } + get_event_data( &event ); if (prev_event.type) action = merge_events( &prev_event, &event ); switch( action ) -- 2.35.1

1 2

[PATCH 1/6] ntdll/tests: Add some tests for NtQueryDirectoryObject().
by Zebediah Figura 05 Apr '22

05 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 170 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a0702a580b7..f18afa05ae9 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,165 @@ static void test_object_identity(void) pNtClose( h1 ); } +static void test_query_directory(void) +{ + 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 %#x\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( !size, "got size %u\n", size ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Telamon" ); + status = NtCreateMutant( &child1, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#x\n", status ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Oileus" ); + status = NtCreateMutant( &child2, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#x\n", status ); + + status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_INVALID_HANDLE, "got %#x\n", status ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); + ok( status == STATUS_ACCESS_VIOLATION, "got %#x\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + ok( size && size < sizeof(buffer), "got size %u\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine + { + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + ok( !info[1].ObjectName.Length, "got length %u\n", info[1].ObjectName.Length ); + ok( !info[1].ObjectName.MaximumLength, "got max length %u\n", info[1].ObjectName.MaximumLength ); + ok( !info[1].ObjectTypeName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + ok( !info[1].ObjectTypeName.Length, "got length %u\n", info[1].ObjectTypeName.Length ); + ok( !info[1].ObjectTypeName.MaximumLength, "got max length %u\n", info[1].ObjectTypeName.MaximumLength ); + } + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 2, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#x\n", status ); + ok( context == 2, "got context %#x\n", context ); + todo_wine ok( !size, "got size %u\n", size ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + 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 %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( size == needed_size, "expected size %u, got %u\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 %#x\n", status ); + todo_wine ok( size == needed_size, "expected size %u, got %u\n", needed_size, size ); + ok( info[0].ObjectName.Length == 0xcccc, "got length %u\n", info[0].ObjectName.Length ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); + ok( !status, "got %#x\n", status ); + + context = 0; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( !status, "got %#x\n", status ); + if (!status) + { + ok( context == 2, "got context %#x\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( !info[2].ObjectName.Buffer, "got string %p\n", info[2].ObjectName.Buffer ); + } + + 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 %#x\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( context == 1, "got context %#x\n", context ); + ok( size > 0 && size < needed_size, "got size %u\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( size == needed_size, "expected size %u, got %u\n", needed_size, size ); + ok( info[0].ObjectName.Length == 0xcccc, "got length %u\n", info[0].ObjectName.Length ); + } + + context = 1; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, FALSE, &context, &size ); + todo_wine ok( !status, "got %#x\n", status ); + if (!status) + { + ok( context == 2, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + } + + NtClose( child1 ); + NtClose( child2 ); + NtClose( dir ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2561,4 +2730,5 @@ START_TEST(om) test_get_next_thread(); test_globalroot(); test_object_identity(); + test_query_directory(); } -- 2.35.1

2 11

[PATCH 1/2] mscoree/tests: Build loadpaths.exe as GUI instead of CUI.
by Esme Povirk 04 Apr '22

04 Apr '22

This prevents unnecessary console windows from being created for it if mscoree_test.exe does not have a console. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index b49465fb16f..a2bb3449839 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -709,7 +709,7 @@ static void test_loadpaths(BOOL neutral) ret = write_resource(exe_source, exe_source); ok(ret, "Could not write resource: %lu\n", GetLastError()); DeleteFileW(exe_name); - ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + ret = compile_cs(exe_source, exe_name, L"winexe", L"/reference:libloadpaths.dll"); if (!ret) return; ret = DeleteFileW(exe_source); ok(ret, "DeleteFileW failed: %lu\n", GetLastError()); -- 2.32.0

1 1

[PATCH 1/4] winegstreamer: Disconnect source pins before calling wg_parser_disconnect().
by Zebediah Figura 04 Apr '22

04 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index bb7a71283c3..f38a0c16215 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1629,6 +1629,15 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) if (!This->sink_connected) return S_OK; + /* Disconnecting source pins triggers a call to wg_parser_stream_disable(). + * The stream pointers are no longer valid after wg_parser_disconnect(), so + * make sure we disable the streams first. */ + for (i = 0; i < This->source_count; ++i) + { + if (This->sources[i]) + free_source_pin(This->sources[i]); + } + wg_parser_disconnect(This->wg_parser); /* read_thread() needs to stay alive to service any read requests GStreamer @@ -1637,12 +1646,6 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) WaitForSingleObject(This->read_thread, INFINITE); CloseHandle(This->read_thread); - for (i = 0; i < This->source_count; ++i) - { - if (This->sources[i]) - free_source_pin(This->sources[i]); - } - This->source_count = 0; free(This->sources); This->sources = NULL; -- 2.35.1

1 3