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

Re: Gitlab experiment wrapup

by Jeremy Newman

On 6/14/2022 5:55 AM, Alexandre Julliard wrote: > - The mailing list gateway creates too much noise; mixing comments from > Gitlab and mailing list isn't very clean (Jacek, Rémi, Alex). We can > make some tweaks, or use a separate list, or even rethink the approach > of the mail gateway. I'd be in favor of a new mailing list for this. I think all this noise on wine-devel has stopped all other technical discussion here. With the communication being done in Gitlab itself. I know some deplore web interfaces, so we will need need to keep some form of terminal based communication for them. If we go with a new list, let me get mailman3 setup on WineHQ first. We need to migrate to it anyway, and it would be one less list to convert. -N

June 14, 2022

Re: [PATCH v3 2/5] d2d1: Partially implement RegisterEffectFromStream().

by Nikolay Sivov

On 6/14/22 07:08, Ziqing Hui wrote: > + /* Loop inside effect node */ > + while (next_xml_node(xml_reader, &node_type, &node_name) == S_OK) > + { > + if (node_type == XmlNodeType_Element) > + { > + if (!wcscmp(node_name, L"Property")) > + hr = parse_property(xml_reader, reg); > + else if (!wcscmp(node_name, L"Inputs")) > + hr = parse_inputs(xml_reader, reg); > + > + if (FAILED(hr)) > + { > + IXmlReader_Release(xml_reader); > + return hr; > + } > + } > + else if (node_type == XmlNodeType_EndElement) > + { > + IXmlReader_Release(xml_reader); > + return S_OK; > + } > + } This should properly skip EndElement of Property and Inputs, so explicit check for EndElement here belongs to "Effect" and not some nested node. Easier way would be to error out on unrecognized element names, and like I said before, returning from parse_property or parse_inputs should already skip nested EndElement. Regarding error handling, you might as well create xml_reader at the caller of this helper, so you don't have to release it all the time. Note that return type of next_xml_node() is incorrect. This patch also has some stray file attached to it. > @@ -1,6 +1,6 @@ > MODULE = d2d1.dll > IMPORTLIB = d2d1 > -IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 > +IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 ole32 xmllite > DELAYIMPORTS = dwrite New imports might as well go to DELAYIMPORTS, I don't think we necessarily will have to go through xml parsing for builtin effects.

June 14, 2022

Re: How to identify the primary battery (for Wine)

by Sebastian Reichel

Hi Alex, On Mon, Jun 13, 2022 at 07:54:49PM -0600, Alex Henrie wrote: > I've been working to improve battery status reporting for applications > running on Wine on Linux. However, we Wine developers are not sure > what the best way is to determine which battery is the computer's > primary battery. Could you take a look at > https://gitlab.winehq.org/wine/wine/-/merge_requests/134 and leave a > comment there or on the wine-devel mailing list? /sys/class/power_supply/*/scope is set to 'Device' for all batteries, that are not powering the main system. There can still be multiple batteries; for example Thinkpads in the 2014-2018 era used to have an internal and a removable battery. For a single "X %/hours left" info the data from all 'System' level batteries must be aggregated. > Wouldn't it make sense for Wine to use the UPower provided > DisplayDevice that can be queried through DBus? UPower does the required data aggregation for the 'DisplayDevice'. I don't know enough about the Wine codebase to recommend for or against using UPower. -- Sebastian

June 14, 2022

Re: Gitlab experiment wrapup

by Giovanni Mascellani

Hi, Il 14/06/22 12:55, Alexandre Julliard ha scritto: > - Signoffs are a bit cumbersome (Rémi). We should change the > requirements to something better adapted to Gitlab. I don't remember if this point has already been made, but we're using the Signed-off-by pseudo-header in a rather peculiar fashion. The standard meaning of Signed-off-by is something like "I have checked that I have the legal right to submit this patch for inclusion" (more specifically, see [1]), while we use it as "I have checked that this patch is technically sound". Other projects use other pseudo-headers for the latter, like "Reviewed-by" or "Acked-by". [1] https://developercertificate.org/ Could we take the occasion to switch to something more standard? Giovanni.

June 14, 2022

Re: [PATCH v2 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches. - approved

by Huw Davies (＠huw)

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

June 14, 2022

[tools] testbot/web: Tweak GenerateFullLog() in the job details page.

by Francois Gouget

Rename %ErrLineNos to %ErrCategory since it contains the error's category indexed by the full log line number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 36bba0d04..7860a4c9d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -400,16 +400,14 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my %ErrLineNos; + my %ErrCategory; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - my $ErrCount = @{$Group->{Errors}}; - next if (!$ErrCount); - for my $ErrIndex (0..$ErrCount-1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { - $ErrLineNos{$Group->{LineNos}->[$ErrIndex]} = \ - $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; } } @@ -432,7 +430,7 @@ sub GenerateFullLog($$$$) } my $Html = $self->escapeHTML($Line); - my $Category = $ErrLineNos{$LineNo} || $GetCategory->($Line); + my $Category = $ErrCategory{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; -- 2.30.2

June 14, 2022

[tools] testbot/web: Fix hiding the branch column on the main page.

by Francois Gouget

It is hidden when only one branch exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Branches are not really supported: there is a table for them, they are referenced by the jobs, but they have never been used in any of the scripts or in the TestBot code. In particular the Reconfig scripts only update and rebuild one Wine tree. But support for multiple branches may work by having one Wine source tree and set of build trees per branch. So I'm keeping what branch support we have around for the day we need it. --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 2073b1e6f..a3b26ea91 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -41,7 +41,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : $PropertyName eq "Submitted" ? ("ro", "timetipdate") : - ($PropertyName eq "Branch" and !CreateBranches()->MultipleBranchesPresent) ? "" : + ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent) ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); } -- 2.30.2

June 14, 2022

[tools] testbot: Include the filename in LoadLogErrors() error messages.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Otherwise there is no way to know which file was bad in case of errors, for instance in UpdateTaskLogs. --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17cfc3525..2e3de83b8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1016,6 +1016,10 @@ sub LoadLogErrors($) if (open(my $ErrorsFile, "<", "$LogPath.errors")) { LoadLogErrorsFromFh($LogInfo, $ErrorsFile); + if ($LogInfo->{BadLog}) + { + $LogInfo->{BadLog} = "$LogInfo->{LogName}.errors: $LogInfo->{BadLog}"; + } delete $LogInfo->{CurGroup}; close($ErrorsFile); } -- 2.30.2

June 14, 2022

[PATCH 1/1] winhttp: Fix default port corner cases in WinHttpCrackUrl().

by Hans Leidekker

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/url.c | 9 ++++++++- dlls/winhttp/url.c | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 5f137dc6365..da51117e41e 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -61,6 +61,7 @@ static const WCHAR url18[] = L"http://%0D%1F%20%0A%7F%0D%0A"; static const WCHAR url19[] = L"http://?text=\xfb00"; static const WCHAR url20[] = L"http:///text=\xfb00"; static const WCHAR url21[] = L"https://nba2k19-ws.2ksports.com:19133/nba/v4/Accounts/get_account?x=3789526…"; +static const WCHAR url22[] = L"http://winehq.org:/"; static const WCHAR url_k1[] = L"http://username:password(a)www.winehq.org/site/about"; static const WCHAR url_k2[] = L"http://www.winehq.org"; @@ -807,7 +808,13 @@ static void WinHttpCrackUrl_test( void ) uc.nPort = 1; ret = WinHttpCrackUrl( url17, 0, 0, &uc ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); + ok( uc.nPort == 80, "got %u\n", uc.nPort ); + + reset_url_components( &uc ); + uc.nPort = 1; + ret = WinHttpCrackUrl( url22, 0, 0, &uc ); + ok( ret, "got %lu\n", GetLastError() ); + ok( uc.nPort == 80, "got %u\n", uc.nPort ); memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 9e7f5478dfe..4d10a17f6a0 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -280,13 +280,18 @@ BOOL WINAPI WinHttpCrackUrl( const WCHAR *url, DWORD len, DWORD flags, URL_COMPO { if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; - if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; + if (!(q - r)) + { + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + } + else if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; } else { if ((err = set_component( &hostname, p, q - p, flags, &overflow ))) goto exit; if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((r = wmemchr( q, '?', len - (q - url) ))) @@ -310,13 +315,18 @@ BOOL WINAPI WinHttpCrackUrl( const WCHAR *url, DWORD len, DWORD flags, URL_COMPO { if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; - if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; + if (!*r) + { + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + } + else if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; } else { if ((err = set_component( &hostname, p, len - (p - url), flags, &overflow ))) goto exit; if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((err = set_component( &path, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; if ((err = set_component( &extra, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/243

June 14, 2022

[PATCH 0/1] MR243: winhttp: Fix default port corner cases in WinHttpCrackUrl().

by Hans Leidekker (＠hans)

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/243

June 14, 2022