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

Re: [PATCH v3 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors(). - approved

by Huw Davies (＠huw)

This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/303

June 24, 2022

[PATCH v3 1/1] win32u: Don't report cloned monitors in EnumDisplayMonitors().

by Arkadiusz Hiler

From: Arkadiusz Hiler <ahiler(a)codeweavers.com> Based on: ca39b1c22dfa ("user32: Don't report mirrored slave monitors in EnumDisplayMonitors.") 2affb854e524 ("user32: Change slave to a more neutral word.") Which seem to got lost during: 318673405c62 ("win32u: Move NtUserEnumDisplayMonitors implementation from user32.") Fixes regression with Elite Dangerous launcher freezing when cloned displays are present. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/win32u/sysparams.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index a8c1d977c7d..884c9588b51 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -223,6 +223,7 @@ struct monitor unsigned int flags; RECT rc_monitor; RECT rc_work; + BOOL is_clone; }; static struct list adapters = LIST_INIT(adapters); @@ -1249,7 +1250,7 @@ static BOOL update_display_cache_from_registry(void) DWORD adapter_id, monitor_id, monitor_count = 0, size; KEY_BASIC_INFORMATION key; struct adapter *adapter; - struct monitor *monitor; + struct monitor *monitor, *monitor2; HANDLE mutex = NULL; NTSTATUS status; BOOL ret; @@ -1295,6 +1296,15 @@ static BOOL update_display_cache_from_registry(void) break; } + LIST_FOR_EACH_ENTRY(monitor2, &monitors, struct monitor, entry) + { + if (EqualRect(&monitor2->rc_monitor, &monitor->rc_monitor)) + { + monitor->is_clone = TRUE; + break; + } + } + monitor->handle = UlongToHandle( ++monitor_count ); list_add_tail( &monitors, &monitor->entry ); } @@ -2016,6 +2026,7 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc get_thread_dpi() ); OffsetRect( &monrect, -origin.x, -origin.y ); if (!intersect_rect( &monrect, &monrect, &limit )) continue; + if (monitor->is_clone) continue; enum_info[count].handle = monitor->handle; enum_info[count].rect = monrect; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/303

June 24, 2022

[PATCH v3 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors().

by Arek Hiler (＠ivyl)

Based on: ca39b1c22dfa ("user32: Don't report mirrored slave monitors in EnumDisplayMonitors.") 2affb854e524 ("user32: Change slave to a more neutral word.") Which seems to got lost during: 318673405c62 ("win32u: Move NtUserEnumDisplayMonitors implementation from user32.") Fixes regression with Elite Dangerous launcher freezing when cloned displays are present. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> CC: @zhiyi @jacek -- v3: win32u: Don't report cloned monitors in EnumDisplayMonitors(). https://gitlab.winehq.org/wine/wine/-/merge_requests/303

June 24, 2022

Re: [PATCH v3 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Paul Gofman (＠gofman)

v3: - get luids from nsi_enumerate_all() and use them when adding static addresses instead of index -> luid conversion. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2655

June 24, 2022

[PATCH v3 1/1] nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Paul Gofman

From: Paul Gofman <pgofman(a)codeweavers.com> Some apps (Roon or SCP: Secret Laboratory are examples) depend on ARP table always containing some entries if there is a network adapter present. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/iphlpapi/tests/iphlpapi.c | 52 ++++++++++++++++- dlls/nsiproxy.sys/ip.c | 96 +++++++++++++++++++++++++++++++- dlls/nsiproxy.sys/unix_private.h | 6 ++ 3 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 84d5143ba8e..1a0cb76bcf5 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -120,6 +120,11 @@ static const char *ntoa6( IN6_ADDR *ip ) return buffers[i]; } +static DWORD ipv4_addr( BYTE b1, BYTE b2, BYTE b3, BYTE b4 ) +{ + return htonl( (b1 << 24) | (b2 << 16) | (b3 << 8) | b4 ); +} + /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -369,10 +374,16 @@ static void testGetIpForwardTable(void) static void testGetIpNetTable(void) { - DWORD apiReturn; + DWORD apiReturn, ret, prev_idx; + BOOL igmp3_found, ssdp_found; + DWORD igmp3_addr, ssdp_addr; + MIB_IPNET_TABLE2 *table2; ULONG dwSize = 0; unsigned int i; + igmp3_addr = ipv4_addr( 224, 0, 0, 22 ); + ssdp_addr = ipv4_addr( 239, 255, 255, 250 ); + apiReturn = GetIpNetTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpNetTable is not supported\n"); @@ -406,6 +417,45 @@ static void testGetIpNetTable(void) ok(ntohl(buf->table[i].dwAddr) <= ntohl(buf->table[i + 1].dwAddr), "Entries are not sorted by address, i %u.\n", i ); } + + igmp3_found = ssdp_found = FALSE; + prev_idx = ~0ul; + for (i = 0; i < buf->dwNumEntries; ++i) + { + if (buf->table[i].dwIndex != prev_idx) + { + if (prev_idx != ~0ul) + { + ok( igmp3_found, "%s not found, iface index %lu.\n", ntoa( igmp3_addr ), prev_idx); + ok( ssdp_found || broken(!ssdp_found) /* 239.255.255.250 is always present since Win10 */, + "%s not found.\n", ntoa( ssdp_addr )); + } + prev_idx = buf->table[i].dwIndex; + igmp3_found = ssdp_found = FALSE; + } + if (buf->table[i].dwAddr == igmp3_addr) + igmp3_found = TRUE; + else if (buf->table[i].dwAddr == ssdp_addr) + ssdp_found = TRUE; + } + ok( igmp3_found, "%s not found.\n", ntoa( igmp3_addr )); + ok( ssdp_found || broken(!ssdp_found) /* 239.255.255.250 is always present since Win10 */, + "%s not found.\n", ntoa( ssdp_addr )); + + ret = GetIpNetTable2( AF_INET, &table2 ); + ok( !ret, "got ret %lu.\n", ret ); + for (i = 0; i < table2->NumEntries; ++i) + { + MIB_IPNET_ROW2 *row = &table2->Table[i]; + if (row->Address.Ipv4.sin_addr.s_addr == igmp3_addr + || row->Address.Ipv4.sin_addr.s_addr == ssdp_addr) + { + ok( row->State == NlnsPermanent, "got state %d.\n", row->State ); + ok( !row->IsRouter, "IsRouter is set.\n" ); + ok( !row->IsUnreachable, "IsUnreachable is set.\n" ); + } + } + FreeMibTable( table2 ); } if (apiReturn == NO_ERROR && winetest_debug > 1) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 79f3bd80bfe..c61e821cc56 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -1000,18 +1000,75 @@ static void ipv4_neighbour_fill_entry( struct ipv4_neighbour_data *entry, struct } } +/* ARP entries for these multicast addresses are always present on Windows for each interface. */ +static DWORD ipv4_multicast_addresses[] = +{ + IPV4_ADDR(224, 0, 0, 22), + IPV4_ADDR(239, 255, 255, 250), +}; + +static void update_static_address_found( DWORD address, UINT if_index, struct nsi_ndis_ifinfo_static *iface, + unsigned int iface_count ) +{ + unsigned int i, j; + + for (i = 0; i < ARRAY_SIZE(ipv4_multicast_addresses); ++i) + if (ipv4_multicast_addresses[i] == address) break; + + if (i == ARRAY_SIZE(ipv4_multicast_addresses)) return; + + for (j = 0; j < iface_count; ++j) + { + if (iface[j].if_index == if_index) + { + iface[j].unk |= 1 << i; + return; + } + } +} + static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, void *rw_data, UINT rw_size, void *dynamic_data, UINT dynamic_size, void *static_data, UINT static_size, UINT_PTR *count ) { - UINT num = 0; + UINT num = 0, iface_count; NTSTATUS status = STATUS_SUCCESS; BOOL want_data = key_size || rw_size || dynamic_size || static_size; + struct nsi_ndis_ifinfo_static *iface_static; struct ipv4_neighbour_data entry; + NET_LUID *luid_tbl; + unsigned int i, j; TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + iface_count = 0; + if ((status = nsi_enumerate_all( 1, 0, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &iface_count ))) + return status; + + if (!(luid_tbl = malloc( iface_count * sizeof(*luid_tbl) ))) + return STATUS_NO_MEMORY; + + if (!(iface_static = malloc( iface_count * sizeof(*iface_static) ))) + { + free( luid_tbl ); + return STATUS_NO_MEMORY; + } + + if ((status = nsi_enumerate_all( 1, 0, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl, sizeof(*luid_tbl), + NULL, 0, NULL, 0, iface_static, sizeof(*iface_static), &iface_count )) + && status != STATUS_BUFFER_OVERFLOW) + { + free( luid_tbl ); + free( iface_static ); + return status; + } + + /* Use unk field to indicate whether we found mandatory multicast addresses in the host ARP table. */ + for (i = 0; i < iface_count; ++i) + iface_static[i].unk = 0; + #ifdef __linux__ { char buf[512], *ptr, *s; @@ -1059,6 +1116,8 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, voi if (!convert_unix_name_to_luid( ptr, &entry.luid )) continue; if (!convert_luid_to_index( &entry.luid, &entry.if_index )) continue; + update_static_address_found( entry.addr.s_addr, entry.if_index, iface_static, iface_count ); + if (num < *count) { ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); @@ -1119,6 +1178,8 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, voi #endif entry.is_unreachable = 0; /* FIXME */ + update_static_address_found( entry.addr.s_addr, entry.if_index, iface_static, iface_count ); + if (num < *count) { ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); @@ -1136,9 +1197,42 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, UINT key_size, voi } #else FIXME( "not implemented\n" ); + free( luid_tbl ); + free( iface_static ); return STATUS_NOT_IMPLEMENTED; #endif + if (!want_data || num <= *count) + { + /* Certain ipv4 multicast addresses are always present on Windows for each interface. + * Add those if they weren't added already. */ + memset( &entry, 0, sizeof(entry) ); + entry.state = NlnsPermanent; + for (i = 0; i < iface_count; ++i) + { + entry.if_index = iface_static[i].if_index; + entry.luid = luid_tbl[i]; + for (j = 0; j < ARRAY_SIZE(ipv4_multicast_addresses); ++j) + { + if (iface_static[i].unk & (1 << i)) continue; + if (num <= *count) + { + entry.addr.s_addr = ipv4_multicast_addresses[j]; + ipv4_neighbour_fill_entry( &entry, key_data, rw_data, dynamic_data, static_data ); + + if (key_data) key_data = (BYTE *)key_data + key_size; + if (rw_data) rw_data = (BYTE *)rw_data + rw_size; + if (dynamic_data) dynamic_data = (BYTE *)dynamic_data + dynamic_size; + if (static_data) static_data = (BYTE *)static_data + static_size; + } + ++num; + } + } + } + + free( luid_tbl ); + free( iface_static ); + if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 8ab56f6d9a3..84fea0c42d2 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -18,6 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef WORDS_BIGENDIAN +#define IPV4_ADDR(b1, b2, b3, b4) (((unsigned int)b1 << 24) | (b2 << 16) | (b3 << 8) | b4) +#else +#define IPV4_ADDR(b1, b2, b3, b4) (((unsigned int)b4 << 24) | (b3 << 16) | (b2 << 8) | b1) +#endif + NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/296

June 24, 2022

[PATCH v3 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Paul Gofman (＠gofman)

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- v3: nsiproxy.sys: Add static ARP entries which are always present on Windows. https://gitlab.winehq.org/wine/wine/-/merge_requests/296

June 24, 2022

[tools] testbot/web: The task failures list is read-only.

by Francois Gouget

Manually adding and removing task failures is not supported. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index f39af5ac91..ae4ccb4041 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -167,7 +167,7 @@ sub GenerateBody($) { print "<h2><a name='TaskFailures'></a>Task Failures</h2>\n"; my $TaskFailuresBlock = new TaskFailuresBlock($self->{Item}->TaskFailures, $self); - $TaskFailuresBlock->SetReadWrite(0) if (!$self->{RW}); + $TaskFailuresBlock->SetReadWrite(0); $TaskFailuresBlock->GenerateList(); } } -- 2.30.2

June 24, 2022

[tools] testbot/UpdateFailures: Truncate the bug status and description if needed.

by Francois Gouget

They have to fit otherwise Failure::Validate() will prevent saving to the database. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateFailures.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateFailures.pl b/testbot/bin/UpdateFailures.pl index 7c89b7b99b..f324cca280 100755 --- a/testbot/bin/UpdateFailures.pl +++ b/testbot/bin/UpdateFailures.pl @@ -157,6 +157,7 @@ foreach my $FailureId (@FailureIds) # Update the failures bug information my $Bugs = CollectBugInfo([keys %$BugIds]); +my ($MaxStatusLen, $MaxDescriptionLen); foreach my $FailureId (@FailureIds) { my $Failure = $Failures->GetItem($FailureId); @@ -167,9 +168,19 @@ foreach my $FailureId (@FailureIds) { my $Resolution = $Bug->{Resolution} || " ---"; $Resolution = $Resolution eq " ---" ? "" : " $Resolution"; - $Failure->BugStatus("$Bug->{Status}$Resolution"); + if (!defined $MaxStatusLen) + { + my $PropertyDescriptor = $Failure->GetPropertyDescriptorByName("BugStatus"); + $MaxStatusLen = $PropertyDescriptor->GetMaxLength(); + } + $Failure->BugStatus(substr("$Bug->{Status}$Resolution", 0, $MaxStatusLen)); + } + if (!defined $MaxDescriptionLen) + { + my $PropertyDescriptor = $Failure->GetPropertyDescriptorByName("BugDescription"); + $MaxDescriptionLen = $PropertyDescriptor->GetMaxLength(); } - $Failure->BugDescription($Bug->{Description}); + $Failure->BugDescription(substr($Bug->{Description}, 0, $MaxDescriptionLen)); } else { -- 2.30.2

June 24, 2022

[tools] testbot: Sort failures on their notes as a last resort.

by Francois Gouget

Sometimes a bug is spread across multiple failures and the Notes field normally describes what each one corresponds to. Sorting on the Notes field as a last resort typically ensures that all the parts are in an order that makes sense. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Failures.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 21b1610ca9..4a65374988 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -50,11 +50,11 @@ sub Compare($$) # Sort deleted entries last my %StatusOrders = ("deleted" => 1); - my $Cmp = ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || + return ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || $self->GetColValue("ErrorGroup") cmp $B->GetColValue("ErrorGroup") || $self->GetColValue("TestUnit") cmp $B->GetColValue("TestUnit") || - $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription"); - return $Cmp + $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription") || + $self->GetColValue("Notes") cmp $B->GetColValue("Notes"); } sub BugId($;$) -- 2.30.2

June 24, 2022

[tools] testbot: Treat regular expression warnings as errors.

by Francois Gouget

In particular do so when validating failures so errors are caught when the failure is created / modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Failures.pm | 1 + testbot/lib/WineTestBot/LogUtils.pm | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 4a65374988..dee8b68558 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -104,6 +104,7 @@ sub Validate($) my ($Field, $Name) = @$Pair; my $RegExp = $self->$Field; my $ErrMessage = eval { + use warnings FATAL => qw(regexp); if ($RegExp and "" =~ /$RegExp/) { return "The $Name regular expression should not match empty strings"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 99941b54a1..651c1d0a47 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1391,7 +1391,10 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/; + }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; @@ -1413,7 +1416,10 @@ sub MatchLogFailures($$) foreach my $UnitFailure (@$UnitFailures) { my $RegExp = $UnitFailure->FailureRegExp; - my $Match = eval { $RegExp and $Line =~ /$RegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + $RegExp and $Line =~ /$RegExp/; + }; next if (!$Match); my $LineFailures = $Group->{Failures}->{$ErrIndex} ||= []; -- 2.30.2

June 24, 2022