January 2021 - Wine-devel - list.winehq.org

[PATCH] msi: Also set "MsiRunningElevated" installer property.
by Dmitry Timoshkov 21 Jan '21

21 Jan '21

This property is supposed to be set starting from Windows Installer 4.0 targeting Windows Vista. This patch fixes the installer that checks this property in addition to VersionNT and ALLUSERS. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2483d99e2b..25e22f040a 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -737,6 +737,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ msi_set_property( package->db, L"AdminUser", L"1", -1 ); msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); @@ -963,6 +964,8 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, L"ALLUSERS", L"1", -1 ); } msi_set_property( package->db, L"AdminUser", L"1", -1 ); + msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) -- 2.29.2

2 1

[PATCH 1/3] gdi32/tests: Test GetDeviceCaps() for DCs on multiple monitor systems.
by Zhiyi Zhang 21 Jan '21

21 Jan '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/dc.c | 220 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 04703288302..aa6917d432d 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1672,6 +1672,225 @@ static void test_clip_box(void) DeleteObject(bitmap); } +static void test_multi_monitor_dc(void) +{ + INT value, count, old_count; + DWORD device_idx, mode_idx; + DEVMODEA dm, dm2, dm3; + DISPLAY_DEVICEA dd; + BOOL ret; + LONG res; + HDC hdc; + + /* Test DCs covering the entire virtual screen */ + hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + ok(!!hdc, "CreateDCA failed.\n"); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + + value = GetDeviceCaps(hdc, HORZRES); + ok(value == dm.dmPelsWidth, "Expected %d, got %d.\n", dm.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + ok(value == dm.dmPelsHeight, "Expected %d, got %d.\n", dm.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm.dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok(value == dm.dmPelsWidth, "Expected %d, got %d.\n", dm.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm.dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok(value == dm.dmPelsHeight, "Expected %d, got %d.\n", dm.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm.dmDisplayFrequency && value == 1) + ok(value == dm.dmDisplayFrequency, "Expected %d, got %d.\n", dm.dmDisplayFrequency, value); + + /* Test GetDeviceCaps() values after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution.\n"); + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + value = GetDeviceCaps(hdc, HORZRES); + ok(value == dm2.dmPelsWidth, "Expected %d, got %d.\n", dm2.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + ok(value == dm2.dmPelsHeight, "Expected %d, got %d.\n", dm2.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm2.dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok(value == dm2.dmPelsWidth, "Expected %d, got %d.\n", dm2.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm2.dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok(value == dm2.dmPelsHeight, "Expected %d, got %d.\n", dm2.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm2.dmDisplayFrequency && value == 1) + ok(value == dm2.dmDisplayFrequency, "Expected %d, got %d.\n", dm2.dmDisplayFrequency, value); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + + DeleteDC(hdc); + + /* Test DCs covering a specific monitor */ + dd.cb = sizeof(dd); + for (device_idx = 0; EnumDisplayDevicesA(NULL, device_idx, &dd, 0); ++device_idx) + { + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); + ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); + + value = GetDeviceCaps(hdc, HORZRES); + todo_wine_if(dm.dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) + ok(value == dm.dmPelsWidth, "Expected %d, got %d.\n", dm.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + todo_wine_if(dm.dmPelsHeight != GetSystemMetrics(SM_CYSCREEN)) + ok(value == dm.dmPelsHeight, "Expected %d, got %d.\n", dm.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm.dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok(value == dm.dmPelsWidth, "Expected %d, got %d.\n", dm.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm.dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok(value == dm.dmPelsHeight, "Expected %d, got %d.\n", dm.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm.dmDisplayFrequency && value == 1) + ok(value == dm.dmDisplayFrequency, "Expected %d, got %d.\n", dm.dmDisplayFrequency, value); + + /* Test GetDeviceCaps() values after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution for %s.\n", dd.DeviceName); + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", dd.DeviceName, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", dd.DeviceName); + DeleteDC(hdc); + continue; + } + + value = GetDeviceCaps(hdc, HORZRES); + todo_wine_if(dm2.dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) + ok(value == dm2.dmPelsWidth, "Expected %d, got %d.\n", dm2.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + todo_wine_if(dm2.dmPelsHeight != GetSystemMetrics(SM_CYSCREEN)) + ok(value == dm2.dmPelsHeight, "Expected %d, got %d.\n", dm2.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm2.dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok(value == dm2.dmPelsWidth, "Expected %d, got %d.\n", dm2.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm2.dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok(value == dm2.dmPelsHeight, "Expected %d, got %d.\n", dm2.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm2.dmDisplayFrequency && value == 1) + ok(value == dm2.dmDisplayFrequency, "Expected %d, got %d.\n", dm2.dmDisplayFrequency, value); + + /* Test GetDeviceCaps() values after monitor detach */ + if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm3); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + dm3.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm3.dmPelsWidth = 0; + dm3.dmPelsHeight = 0; + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm3, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(dd.DeviceName, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count - 1, "Expected monitor count %d, got %d.\n", old_count - 1, count); + + /* Should report the same values before detach */ + value = GetDeviceCaps(hdc, HORZRES); + todo_wine_if(dm2.dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) + ok(value == dm2.dmPelsWidth, "Expected %d, got %d.\n", dm2.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + todo_wine_if(dm2.dmPelsHeight != GetSystemMetrics(SM_CYSCREEN)) + ok(value == dm2.dmPelsHeight, "Expected %d, got %d.\n", dm2.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm2.dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok(value == dm2.dmPelsWidth, "Expected %d, got %d.\n", dm2.dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm2.dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok(value == dm2.dmPelsHeight, "Expected %d, got %d.\n", dm2.dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm2.dmDisplayFrequency && value == 1) + ok(value == dm2.dmDisplayFrequency, "Expected %d, got %d.\n", dm2.dmDisplayFrequency, value); + } + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + DeleteDC(hdc); + } +} + START_TEST(dc) { test_dc_values(); @@ -1688,4 +1907,5 @@ START_TEST(dc) test_printer_dc(); test_pscript_printer_dc(); test_clip_box(); + test_multi_monitor_dc(); } -- 2.27.0

2 3

[PATCH] ntdll: Check event type on creation.
by Daniel Lehman 21 Jan '21

21 Jan '21

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- fails on my Windows 10 20H2: om.c:466: Test failed: 0: NtCreateEvent failed c000000d om.c:374: Test failed: 541: NtCreateEvent failed c000000d om.c:374: Test failed: 547: NtCreateEvent failed c000000d om.c:374: Test failed: 562: NtCreateEvent failed c000000d om.c:374: Test failed: 563: NtCreateEvent failed c000000d om.c:374: Test failed: 571: NtCreateEvent failed c000000d om.c:585: Test failed: NULL: NtCreateEvent failed c000000d om.c:938: Test failed: NtCreateEvent failed c000000d om.c:940: Test failed: NtOpenEvent failed c0000034 --- dlls/ntdll/tests/om.c | 50 +++++++++++++++++++++++++++++------------- dlls/ntdll/unix/sync.c | 1 + 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 6e0db98c658..8570fe4c094 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -26,7 +26,7 @@ #include "stdlib.h" static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); -static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN, BOOLEAN); +static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, EVENT_TYPE, BOOLEAN); static NTSTATUS (WINAPI *pNtOpenEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtPulseEvent) ( HANDLE, PLONG ); static NTSTATUS (WINAPI *pNtQueryEvent) ( HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); @@ -92,12 +92,12 @@ static void test_case_sensitive (void) status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Test"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_SUCCESS, "Failed to create Event(%08x)\n", status); pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\TEst"); @@ -113,7 +113,7 @@ static void test_case_sensitive (void) status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); - status = pNtCreateEvent(&h, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&h, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION, "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08x)\n", status); @@ -292,7 +292,7 @@ static void test_name_collisions(void) h = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); ok(h != 0, "CreateEventA failed got ret=%p (%d)\n", h, GetLastError()); - status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, "NtCreateEvent should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); h2 = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); @@ -370,7 +370,7 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ok( status2 == open_expect, "%u: NtOpenSemaphore failed %x\n", line, status2 ); if (!status) pNtClose( ret ); if (!status2) pNtClose( ret2 ); - status = pNtCreateEvent( &ret, GENERIC_ALL, attr, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, attr, SynchronizationEvent, 0 ); ok( status == create_expect, "%u: NtCreateEvent failed %x\n", line, status ); status2 = pNtOpenEvent( &ret2, GENERIC_ALL, attr ); ok( status2 == open_expect, "%u: NtOpenEvent failed %x\n", line, status2 ); @@ -462,7 +462,7 @@ static void test_name_limits(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenSemaphore failed %x\n", str.Length, status ); pNtClose( ret ); - status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "%u: NtCreateEvent failed %x\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr ); @@ -581,7 +581,7 @@ static void test_name_limits(void) pNtClose( ret ); status = pNtOpenSemaphore( &ret, GENERIC_ALL, NULL ); ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSemaphore failed %x\n", status ); - status = pNtCreateEvent( &ret, GENERIC_ALL, NULL, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, NULL, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "NULL: NtCreateEvent failed %x\n", status ); pNtClose( ret ); status = pNtOpenEvent( &ret, GENERIC_ALL, NULL ); @@ -934,7 +934,7 @@ static void test_directory(void) RtlInitUnicodeString( &str, L"om.c-event" ); InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); - status = pNtCreateEvent( &h, GENERIC_ALL, &attr, 1, 0 ); + status = pNtCreateEvent( &h, GENERIC_ALL, &attr, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); @@ -1569,7 +1569,7 @@ static void test_type_mismatch(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - res = pNtCreateEvent( &h, 0, &attr, 0, 0 ); + res = pNtCreateEvent( &h, 0, &attr, NotificationEvent, 0 ); ok(!res, "can't create event: %x\n", res); res = pNtReleaseSemaphore( h, 30, NULL ); @@ -1591,16 +1591,29 @@ static void test_event(void) pRtlInitUnicodeString( &str, L"\\BaseNamedObjects\\testEvent" ); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 1, 0); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 2, 0); + ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08x\n", status ); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == NotificationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 0 0, got %d %d\n", info.EventType, info.EventState ); + pNtClose(Event); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, SynchronizationEvent, 0); ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); status = pNtPulseEvent(Event, &prev_state); ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); ok( !prev_state, "prev_state = %x\n", prev_state ); + memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == 1 && info.EventState == 0, + ok( info.EventType == SynchronizationEvent && info.EventState == 0, "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); @@ -1609,15 +1622,22 @@ static void test_event(void) pNtClose(Event); Event = Event2; + memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == 1 && info.EventState == 0, + ok( info.EventType == SynchronizationEvent && info.EventState == 0, "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); status = pNtSetEvent( Event, &prev_state ); ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); ok( !prev_state, "prev_state = %x\n", prev_state ); + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 1, + "NtQueryEvent failed, expected 1 1, got %d %d\n", info.EventType, info.EventState ); + status = pNtSetEvent( Event, &prev_state ); ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); ok( prev_state == 1, "prev_state = %x\n", prev_state ); @@ -1823,13 +1843,13 @@ static void test_keyed_events(void) status = pNtPulseEvent( handle, NULL ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, "CreateEvent %x\n", status ); NtClose( handle ); - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); ok( status == 0, "CreateEvent %x\n", status ); status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index dcc8c5447ef..3a3080463d7 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -427,6 +427,7 @@ NTSTATUS WINAPI NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ data_size_t len; struct object_attributes *objattr; + if (type != NotificationEvent && type != SynchronizationEvent) return STATUS_INVALID_PARAMETER; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; SERVER_START_REQ( create_event ) -- 2.25.1

1 0

[PATCH 1/5] winegstreamer: Flush connected pins directly in SetPositions().
by Zebediah Figura 21 Jan '21

21 Jan '21

Instead of propagating GStreamer flush events to corresponding DirectShow pins. This is mainly to avoid more callbacks from GStreamer and further separate the Win32 and Unix code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 130 ++++++++++++++++++++++------------ 1 file changed, 86 insertions(+), 44 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 30f6fbca168..a1be51472ba 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -65,7 +65,7 @@ struct parser /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ - bool streaming; + bool streaming, flushing; BOOL initial, ignore_flush; GstElement *container; @@ -111,8 +111,9 @@ struct parser_source GstCaps *caps; SourceSeeking seek; - CONDITION_VARIABLE event_cv, event_empty_cv, flushing_cv, flush_stop_cv; - bool flushing, thread_blocked; + CRITICAL_SECTION flushing_cs; + CONDITION_VARIABLE event_cv, event_empty_cv; + bool flushing; struct parser_event event; HANDLE thread; }; @@ -630,8 +631,6 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) tevent = gst_event_new_flush_start(); gst_event_set_seqnum(tevent, seqnum); gst_pad_push_event(This->my_src, tevent); - if (This->reader) - IAsyncReader_BeginFlush(This->reader); if (thread) gst_pad_set_active(This->my_src, 1); } @@ -643,8 +642,6 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) tevent = gst_event_new_flush_stop(TRUE); gst_event_set_seqnum(tevent, seqnum); gst_pad_push_event(This->my_src, tevent); - if (This->reader) - IAsyncReader_EndFlush(This->reader); if (thread) gst_pad_set_active(This->my_src, 1); } @@ -659,25 +656,18 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) TRACE("filter %p, type \"%s\".\n", This, GST_EVENT_TYPE_NAME(event)); - switch (event->type) { + switch (event->type) + { case GST_EVENT_SEEK: ret = gst_base_src_perform_seek(This, event); break; + case GST_EVENT_FLUSH_START: - EnterCriticalSection(&This->filter.filter_cs); - if (This->reader) - IAsyncReader_BeginFlush(This->reader); - LeaveCriticalSection(&This->filter.filter_cs); - break; case GST_EVENT_FLUSH_STOP: - EnterCriticalSection(&This->filter.filter_cs); - if (This->reader) - IAsyncReader_EndFlush(This->reader); - LeaveCriticalSection(&This->filter.filter_cs); - break; case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: break; + default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); ret = FALSE; @@ -757,19 +747,11 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } if (pin->pin.pin.peer) { - IPin_BeginFlush(pin->pin.pin.peer); - EnterCriticalSection(&filter->cs); pin->flushing = true; - WakeConditionVariable(&pin->event_cv); WakeConditionVariable(&pin->event_empty_cv); - /* Wait for the thread to pause itself, to ensure that no stale - * samples are sent. */ - while (!pin->thread_blocked) - SleepConditionVariableCS(&pin->flushing_cv, &filter->cs, INFINITE); - /* And flush out any buffered event. */ switch (pin->event.type) { case PARSER_EVENT_NONE: @@ -797,9 +779,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) EnterCriticalSection(&filter->cs); pin->flushing = false; LeaveCriticalSection(&filter->cs); - WakeConditionVariable(&pin->flush_stop_cv); - - IPin_EndFlush(pin->pin.pin.peer); } break; @@ -1058,32 +1037,31 @@ static DWORD CALLBACK stream_thread(void *arg) { struct parser_event event; + EnterCriticalSection(&pin->flushing_cs); EnterCriticalSection(&filter->cs); - while (filter->streaming && !pin->flushing && pin->event.type == PARSER_EVENT_NONE) + while (filter->streaming && !filter->flushing && pin->event.type == PARSER_EVENT_NONE) SleepConditionVariableCS(&pin->event_cv, &filter->cs, INFINITE); - if (pin->flushing) + if (filter->flushing) { - TRACE("Filter is flushing; pausing thread.\n"); - pin->thread_blocked = true; - WakeConditionVariable(&pin->flushing_cv); - do - SleepConditionVariableCS(&pin->flush_stop_cv, &filter->cs, INFINITE); - while (pin->flushing); - pin->thread_blocked = false; - TRACE("Filter is no longer flushing; resuming thread.\n"); + LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); + TRACE("Filter is flushing.\n"); + continue; } if (!filter->streaming) { LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); break; } if (!pin->event.type) { LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); continue; } @@ -1128,6 +1106,8 @@ static DWORD CALLBACK stream_thread(void *arg) case PARSER_EVENT_NONE: assert(0); } + + LeaveCriticalSection(&pin->flushing_cs); } TRACE("Streaming stopped; exiting.\n"); @@ -2154,7 +2134,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; struct parser_source *pin = impl_from_IMediaSeeking(iface); + struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); GstSeekFlags flags = 0; + HRESULT hr = S_OK; + int i; TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", pin, current ? debugstr_time(*current) : "<null>", current_flags, @@ -2162,9 +2145,40 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, mark_wine_thread(); - SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); if (pin->pin.pin.filter->state == State_Stopped) + { + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); return S_OK; + } + + if (!(current_flags & AM_SEEKING_NoFlush)) + { + EnterCriticalSection(&filter->cs); + filter->flushing = true; + LeaveCriticalSection(&filter->cs); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + { + WakeConditionVariable(&pin->event_cv); + IPin_BeginFlush(filter->sources[i]->pin.pin.peer); + } + } + + if (filter->reader) + IAsyncReader_BeginFlush(filter->reader); + } + + /* Acquire the flushing locks. This blocks the streaming threads, and + * ensures the seek is serialized between flushes. */ + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + EnterCriticalSection(&pin->flushing_cs); + } + + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); if (current_flags & AM_SEEKING_SeekToKeyFrame) flags |= GST_SEEK_FLAG_KEY_UNIT; @@ -2183,9 +2197,33 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { ERR("Failed to seek (current %s, stop %s).\n", debugstr_time(pin->seek.llCurrent), debugstr_time(pin->seek.llStop)); - return E_FAIL; + hr = E_FAIL; } - return S_OK; + + if (!(current_flags & AM_SEEKING_NoFlush)) + { + EnterCriticalSection(&filter->cs); + filter->flushing = false; + LeaveCriticalSection(&filter->cs); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + IPin_EndFlush(filter->sources[i]->pin.pin.peer); + } + + if (filter->reader) + IAsyncReader_EndFlush(filter->reader); + } + + /* Release the flushing locks. */ + for (i = filter->source_count - 1; i >= 0; --i) + { + if (filter->sources[i]->pin.pin.peer) + LeaveCriticalSection(&pin->flushing_cs); + } + + return hr; } static const IMediaSeekingVtbl GST_Seeking_Vtbl = @@ -2398,6 +2436,9 @@ static void free_source_pin(struct parser_source *pin) CloseHandle(pin->eos_event); gst_segment_free(pin->segment); + pin->flushing_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pin->flushing_cs); + strmbase_seeking_cleanup(&pin->seek); strmbase_source_cleanup(&pin->pin); heap_free(pin); @@ -2435,10 +2476,11 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name GST_ChangeCurrent, GST_ChangeRate); InitializeConditionVariable(&pin->event_cv); InitializeConditionVariable(&pin->event_empty_cv); - InitializeConditionVariable(&pin->flushing_cv); - InitializeConditionVariable(&pin->flush_stop_cv); BaseFilterImpl_IncrementPinVersion(&filter->filter); + InitializeCriticalSection(&pin->flushing_cs); + pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); + sprintf(pad_name, "qz_sink_%u", filter->source_count); pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(pin->my_sink, pin); -- 2.30.0

1 4

[tools 1/3] testbot/TestWTBS: Allow restricting the range of jobs to check.
by Francois Gouget 20 Jan '21

20 Jan '21

This allows ignoring a previous test run that produced buggy results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is useful to only get the errors of the latest test suite run. testbot/tests/TestWTBS | 69 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 786d3692..6e1e7ede 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -87,10 +87,33 @@ p tests.TestFailures 1 =cut my $Usage; +sub check_opt_val($$) +{ + my ($option, $val) = @_; + + if (defined $val) + { + error("$option can only be specified once\n"); + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + error("missing value for $option\n"); + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +my $OptJobs; while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--help") + if ($Arg eq "--jobs") + { + $OptJobs = check_opt_val($Arg, $OptJobs); + } + elsif ($Arg eq "--help") { $Usage = 0; } @@ -101,6 +124,30 @@ while (@ARGV) } } +my @JobRanges; +if (!defined $Usage) +{ + if (defined $OptJobs) + { + foreach my $Range (split /,+/, $OptJobs) + { + if ($Range =~ /^([0-9]+)$/) + { + push @JobRanges, [$1, $1]; + } + elsif ($Range =~ /^([0-9]*)\.\.([0-9]*)/) + { + push @JobRanges, [$1 || 0, $2 || 0]; + } + else + { + error("'$Range' is not a valid job range\n"); + $Usage = 2; + } + } + } +} + if (defined $Usage) { if ($Usage) @@ -108,11 +155,15 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [--help]\n"; + print "Usage: $name0 [--jobs RANGES] [--help]\n"; print "\n"; print "Tests the Patches subject parser.\n"; print "\n"; print "Where:\n"; + print " --jobs RANGES Only check the jobs in one of the specified comma-separated\n"; + print " job id ranges. Each range is either a single job id, or of the\n"; + print " form 'FIRST..LAST' where FIRST and LAST are either the empty\n"; + print " string or a job id.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -369,6 +420,19 @@ sub CheckJob($$) } } +sub IsJobInRange($) +{ + my ($Job) = @_; + + return 1 if (!@JobRanges); + foreach my $Range (@JobRanges) + { + return 1 if (($Range->[0] == 0 or $Range->[0] <= $Job->Id) and + ($Range->[1] == 0 or $Job->Id <= $Range->[1])); + } + return 0; +} + =pod =item <tasks.HasTask> @@ -388,6 +452,7 @@ p win.HasTask 0 sub CheckJobTree($) { my ($Job) = @_; + return if (!IsJobInRange($Job)); my ($TestInfo, $HasTask); -- 2.20.1

1 3

[PATCH] msxml3/tests: Add mxwriter DOMDocument test.
by Jefferson Carpenter 20 Jan '21

20 Jan '21

Let me know what you think about this test. I could add a double for loop to check over the whole Cartesian product of CLSID_MXXMLWriter* and CLSID_DOMDocument* structs. P.S. We'll see what Marvin has to say about this. (If Marvin rejects it, which he probably will, I'll check support data).

2 3

[PATCH] dwrite: Zero-initialize run analysis object structure.
by Nikolay Sivov 20 Jan '21

20 Jan '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c10234e09fc..74e6b929ecd 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5931,7 +5931,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit if ((UINT32)desc->measuring_mode > DWRITE_MEASURING_MODE_GDI_NATURAL) return E_INVALIDARG; - analysis = heap_alloc(sizeof(*analysis)); + analysis = heap_alloc_zero(sizeof(*analysis)); if (!analysis) return E_OUTOFMEMORY; @@ -5945,10 +5945,6 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit else analysis->texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1; - analysis->flags = 0; - analysis->bitmap = NULL; - analysis->max_glyph_bitmap_size = 0; - SetRectEmpty(&analysis->bounds); analysis->run = *desc->run; IDWriteFontFace_AddRef(analysis->run.fontFace); analysis->glyphs = heap_calloc(desc->run->glyphCount, sizeof(*analysis->glyphs)); @@ -5970,12 +5966,8 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->m = *desc->transform; analysis->flags |= RUNANALYSIS_USE_TRANSFORM; } - else - memset(&analysis->m, 0, sizeof(analysis->m)); analysis->run.glyphIndices = analysis->glyphs; - analysis->run.glyphAdvances = NULL; - analysis->run.glyphOffsets = NULL; rtl_factor = desc->run->bidiLevel & 1 ? -1.0f : 1.0f; -- 2.29.2

1 0

[PATCH 2/2] ws2_32: Fix buffer size query in WSAAddressToStringW.
by Hans Leidekker 20 Jan '21

20 Jan '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 25 +++++-------------------- dlls/ws2_32/tests/sock.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5b9b8c27fb3..9fc913a819d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8518,30 +8518,15 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, LPWSAPROTOCOL_INFOW info, LPWSTR string, LPDWORD lenstr ) { - INT ret; - DWORD size; - WCHAR buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ - CHAR bufAddr[54]; + INT ret; + char buf[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - size = *lenstr; - ret = WSAAddressToStringA(sockaddr, len, NULL, bufAddr, &size); - - if (ret) return ret; + if ((ret = WSAAddressToStringA(sockaddr, len, NULL, buf, lenstr))) return ret; - MultiByteToWideChar(CP_ACP, 0, bufAddr, size, buffer, ARRAY_SIZE(buffer)); - - if (*lenstr < size) - { - *lenstr = size; - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - TRACE("=> %s,%u bytes\n", debugstr_w(buffer), size); - *lenstr = size; - lstrcpyW( string, buffer ); + MultiByteToWideChar(CP_ACP, 0, buf, *lenstr, string, *lenstr); + TRACE("=> %s,%u chars\n", debugstr_w(string), *lenstr); return 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 81536cb9dbe..cab25baf1d1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2923,11 +2923,29 @@ static void test_WSAAddressToString(void) sockaddr.sin_family = AF_INET; sockaddr.sin_addr.s_addr = 0; sockaddr.sin_port = 0; + WSASetLastError( 0xdeadbeef ); ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, output, &len ); ok( ret == SOCKET_ERROR, "WSAAddressToStringA() returned %d, expected SOCKET_ERROR\n", ret ); ok( WSAGetLastError() == WSAEFAULT, "WSAAddressToStringA() gave error %d, expected WSAEFAULT\n", WSAGetLastError() ); ok( len == 8, "WSAAddressToStringA() gave length %d, expected 8\n", len ); + len = 0; + sockaddr.sin_family = AF_INET; + sockaddr.sin_addr.s_addr = 0; + sockaddr.sin_port = 0; + WSASetLastError( 0xdeadbeef ); + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, NULL, &len ); + ok( ret == SOCKET_ERROR, "got %d\n", ret ); + ok( WSAGetLastError() == WSAEFAULT, "got %08x\n", WSAGetLastError() ); + ok( len == 8, "got %u\n", len ); + + len = ARRAY_SIZE(outputW); + memset( outputW, 0, sizeof(outputW) ); + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, outputW, &len ); + ok( !ret, "WSAAddressToStringW() returned %d\n", ret ); + ok( len == 8, "got %u\n", len ); + ok( !wcscmp(outputW, L"0.0.0.0"), "got %s\n", wine_dbgstr_w(outputW) ); + for (i = 0; i < 2; i++) { for (j = 0; j < ARRAY_SIZE(ipv4_tests); j++) -- 2.29.2

1 0

[PATCH 1/2] ws2_32: Avoid returning duplicate entries from WS_getaddrinfo.
by Hans Leidekker 20 Jan '21

20 Jan '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d865a5dd05f..5b9b8c27fb3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6528,6 +6528,21 @@ static char *get_fqdn(void) return ret; } +static BOOL addrinfo_in_list( const struct WS_addrinfo *list, const struct WS_addrinfo *ai ) +{ + const struct WS_addrinfo *cursor = list; + while (cursor) + { + if (ai->ai_flags == cursor->ai_flags && ai->ai_family == cursor->ai_family && + ai->ai_socktype == cursor->ai_socktype && ai->ai_protocol == cursor->ai_protocol && + ai->ai_addrlen == cursor->ai_addrlen && !memcmp(ai->ai_addr, cursor->ai_addr, ai->ai_addrlen) && + ((ai->ai_canonname && cursor->ai_canonname && !strcmp(ai->ai_canonname, cursor->ai_canonname)) + || (!ai->ai_canonname && !cursor->ai_canonname))) return TRUE; + cursor = cursor->ai_next; + } + return FALSE; +} + /*********************************************************************** * getaddrinfo (WS2_32.@) */ @@ -6654,7 +6669,6 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (!ai) goto outofmem; - *xai = ai;xai = &ai->ai_next; ai->ai_flags = convert_aiflag_u2w(xuai->ai_flags); ai->ai_family = convert_af_u2w(xuai->ai_family); /* copy whatever was sent in the hints */ @@ -6690,6 +6704,18 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr goto outofmem; ai->ai_addrlen = len; } while (1); + + if (addrinfo_in_list(*res, ai)) + { + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + HeapFree(GetProcessHeap(), 0, ai); + } + else + { + *xai = ai; + xai = &ai->ai_next; + } xuai = xuai->ai_next; } freeaddrinfo(unixaires); -- 2.29.2

1 0

[PATCH] dwrite: Fix feature mask for non-global features.
by Nikolay Sivov 20 Jan '21

20 Jan '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- BitScanReverse() returns zero-based position. dlls/dwrite/opentype.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7c30678234a..a025227dfda 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4518,7 +4518,10 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if ((feature->flags & FEATURE_GLOBAL) && feature->max_value == 1) bits_needed = 0; else + { BitScanReverse(&bits_needed, min(feature->max_value, 256)); + bits_needed++; + } if (!feature->max_value || next_bit + bits_needed > 8 * sizeof (feature->mask)) continue; -- 2.29.2

1 0