July 2022 - Wine-commits - list.winehq.org

Zebediah Figura : wineusb.sys: Move the event queue and device list to the Unix library.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: e4cefae1269d3d79d4638d3488a0264a19b1e442 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4cefae1269d3d79d4638d3488a026… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 5 23:53:45 2022 -0500 wineusb.sys: Move the event queue and device list to the Unix library. Since the device hotplug callbacks both queue events and create unix_device objects, we need to move both at the same time. --- dlls/wineusb.sys/unixlib.c | 415 ++++++++++++++++++++++++++++++++++++++++++ dlls/wineusb.sys/unixlib.h | 47 +++++ dlls/wineusb.sys/wineusb.c | 435 ++------------------------------------------- 3 files changed, 480 insertions(+), 417 deletions(-)

1 0

Francois Gouget : testbot/web: Highlight both the 32 and 64-bit checkboxes in case of error.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: tools Branch: master Commit: f3351e249f7ac4e4e72fcebcbebdfd851e3b5938 URL: https://gitlab.winehq.org/winehq/tools/-/commit/f3351e249f7ac4e4e72fcebcbeb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 12 15:22:22 2022 +0200 testbot/web: Highlight both the 32 and 64-bit checkboxes in case of error. The comment was wrong since the code explicitly checks that both ShowRun32 and ShowRun64 are true. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 4368aeeb..2e6c3cc7 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -410,8 +410,7 @@ sub Validate($) !$self->{Run32} and $self->{ShowRun32} and !$self->{Run64} and $self->{ShowRun64}) { - # Don't set ErrField since Run32 and Run64 may be hidden - $self->AddError("You must at least pick one of the 32 or 64 bit tests to run on the selected Windows VMs."); + $self->AddError("You must at least pick one of the 32 or 64 bit tests to run on the selected Windows VMs.", "Run32", "Run64"); return undef; }

1 0

Francois Gouget : testbot/web: Directly report multiple special job errors using AddError().
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: tools Branch: master Commit: a61608621ddafa517d2b16d2fc3ec34122dfac89 URL: https://gitlab.winehq.org/winehq/tools/-/commit/a61608621ddafa517d2b16d2fc3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 12 15:22:28 2022 +0200 testbot/web: Directly report multiple special job errors using AddError(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/SpecialJobs.pl | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index d8294c1a..066c41be 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -158,7 +158,6 @@ sub OnSubmit($) { my ($self) = @_; my $VMKey; - my @Errors = (); # Update Build VMs $VMKey = $self->{JobTemplates}->{Build}->{VMKey}; @@ -166,9 +165,8 @@ sub OnSubmit($) { $VMKey = undef if ($VMKey eq "*All Build VMs"); my $VMs = GetReconfigVMs($VMKey, "build"); - push @Errors, "Found no build VM to update" if (!@$VMs); - my $ErrMessage = AddReconfigJob($VMs, $VMKey, "build"); - push @Errors, $ErrMessage if (defined $ErrMessage); + $self->AddError("Found no build VM to update") if (!@$VMs); + $self->AddError(AddReconfigJob($VMs, $VMKey, "build")); } # Run 32 bit WineTest @@ -183,9 +181,8 @@ sub OnSubmit($) foreach my $BaseJob (@BaseJobs) { my $VMs = GetWindowsTestVMs($VMKey, "exe32", $BaseJob); - push @Errors, "Found no $BaseJob VM to run WineTest on" if (!@$VMs); - my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe32", $BaseJob, "winetest-latest.exe"); - push @Errors, $ErrMessage if (defined $ErrMessage); + $self->AddError("Found no $BaseJob VM to run WineTest on") if (!@$VMs); + $self->AddError(AddWindowsTestJob($VMs, $VMKey, "exe32", $BaseJob, "winetest-latest.exe")); } } @@ -201,9 +198,8 @@ sub OnSubmit($) undef; $VMKey = undef if ($VMKey eq "*All Base and WineTest VMs"); my $VMs = GetWindowsTestVMs($VMKey, "exe64", $BaseJob); - push @Errors, "Found no 64 bit VM to run WineTest on" if (!@$VMs); - my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, "exe64", $BaseJob, "winetest64-latest.exe"); - push @Errors, $ErrMessage if (defined $ErrMessage); + $self->AddError("Found no 64 bit VM to run WineTest on") if (!@$VMs); + $self->AddError(AddWindowsTestJob($VMs, $VMKey, "exe64", $BaseJob, "winetest64-latest.exe")); } # Update Wine VMs @@ -212,9 +208,8 @@ sub OnSubmit($) { $VMKey = undef if ($VMKey eq "*All Wine VMs"); my $VMs = GetReconfigVMs($VMKey, "wine"); - push @Errors, "Found no Wine VM to update" if (!@$VMs); - my $ErrMessage = AddReconfigJob($VMs, $VMKey, "wine"); - push @Errors, $ErrMessage if (defined $ErrMessage); + $self->AddError("Found no Wine VM to update") if (!@$VMs); + $self->AddError(AddReconfigJob($VMs, $VMKey, "wine")); } # Run WineTest on Wine @@ -223,21 +218,14 @@ sub OnSubmit($) { $VMKey = undef if ($VMKey eq "*All Wine VMs"); my $VMs = GetWineTestVMs($VMKey); - push @Errors, "Found no Wine VM to run WineTest on" if (!@$VMs); - my $ErrMessage = AddWineTestJob($VMs, $VMKey); - push @Errors, $ErrMessage if (defined $ErrMessage); + $self->AddError("Found no Wine VM to run WineTest on") if (!@$VMs); + $self->AddError(AddWineTestJob($VMs, $VMKey)); } # Notify engine - my $ErrMessage = RescheduleJobs(); - push @Errors, $ErrMessage if (defined $ErrMessage); - - if (@Errors) - { - $self->AddError(join("\n", @Errors)); - return undef; - } + $self->AddError(RescheduleJobs()); + return undef if ($self->GetErrMessage()); exit($self->Redirect("/")); }

1 0

Francois Gouget : testbot/cgi: Report all of a form's invalid fields at once.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: tools Branch: master Commit: ebb6e5bb15356e429c669f432fb1dc8b7e91e514 URL: https://gitlab.winehq.org/winehq/tools/-/commit/ebb6e5bb15356e429c669f432fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 12 15:22:25 2022 +0200 testbot/cgi: Report all of a form's invalid fields at once. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c299d54b..d6ded1b0 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -599,6 +599,7 @@ sub Validate($) { my ($self) = @_; + my $Ret = 1; foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) { my $Value = $self->GetParam($PropertyDescriptor->GetName()); @@ -606,11 +607,11 @@ sub Validate($) if ($ErrMessage) { $self->AddError($ErrMessage, $PropertyDescriptor->GetName()); - return !1; + $Ret = !1; } } - return 1; + return $Ret; } sub SaveProperty($$$)

1 0

Jeremy Newman : cleanup and reorg english forums/ml page
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: website Branch: master Commit: f4a98f1b077da3ef6d5a1e1a8f632e66dcf97480 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/f4a98f1b077da3ef6d5a1e1a8f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 12 14:30:38 2022 -0500 cleanup and reorg english forums/ml page --- templates/en/forums.template | 59 ++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index f0b55ad9..648a35ee 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -1,42 +1,40 @@ - + -<h1 class="title">Key Mailing Lists / Forums</h1> +<h1 class="title">Forums and Mailing Lists</h1> -<p>Wine has many mailing lists and forums. -Here are the most useful ones for users:</p> +<h2>WineHQ Forums</h2> -<ul> - <li>The <a href="//forum.winehq.org">WineHQ Forums</a></li> +<p>Wine has many mailing lists and forums. Here are the most useful ones for users:</p> - <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> +<ul class="roomy"> - <li>If you want to be notified about new releases, subscribe to the <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li> -</ul> + <li><a href="https://forum.winehq.org">WineHQ Forums</a></li> + + <li><a href="https://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> -<p>Please don't create another English language Wine forum (except perhaps -a Wine area in a popular distro's main forum).</p> +</ul> <p>If you know of another active Wine forum - especially a non-English one -- please let us know so we can add it to the list. -(Email to dank(a)kegel.com would do.)</p> +- please <a href="mailto:web-admin(a)winehq.org">let us know</a> so we can add it to the list.</p> + +<p class="text-muted"><i class="fa fa-info-circle"></i> If you only want to be notified about new releases, subscribe to the <a href="https://www.winehq.org/mailman3/postorius/lists/wine-announce.winehq.org/">Wine-Announce</a> mailing list</p> + +<h2>WineHQ Mailing Lists</h2> -<h2>All WineHQ Mailing Lists</h2> +<p>WineHQ has mailing lists for submitting patches, tracking Git commits, and discussing Wine development.</p> -<p>WineHQ has mailing lists for submitting patches, tracking Git -commits, and discussing Wine. They feature a very customizable user -subscription config, and can be managed via -<a href="https://www.winehq.org/mailman3/postorius/lists/?all-lists">the Mailman web interface</a>.</p> +<p class="text-muted"><i class="fa fa-info-circle"></i> You need to subscribe to the lists before you can post +to them, otherwise your posting will be discarded.<br> +You can set your subscription to not send you email, or send as a digest.</p> -<p><b>Note:</b> You should be subscribed to the lists before you post -to them, otherwise your posting will be treated as possible spam by the -mailing list software.</p> +<h3>User Mailing Lists</h3> <ul class="roomy"> <li> <b><a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a></b><br> [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-announce.winehq.org/">(Un-)Subscribe</a>] - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-announce(a)winehq.org/">Archive</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-announce(a)winehq.org/">Archive</a>]<br> A low traffic (2/month) read-only list for announcing releases and other major Wine or WineHQ news. </li> @@ -48,24 +46,31 @@ mailing list software.</p> A low traffic (10/day) open list for end-user discussions in Chinese. </li> +</ul> + +<h3>Developer Mailing Lists</h3> + +<ul class="roomy"> + <li> <b><a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a></b><br> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-devel/">Archive</a>] + [<a href="//www.winehq.org/pipermail/wine-devel/">Archive</a>]<br> A medium traffic (50/day) open list for discussing Wine development, WineHQ, patches or anything else of interest to Wine developers. </li> <li> <b><a href="mailto:wine-devel(a)winehq.org">wine-gitlab(a)winehq.org</a></b><br> - [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-gitlab(a)winehq.org/">Archive 1</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-gitlab.winehq.org/">(Un-)Subscribe</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-gitlab(a)winehq.org/">Archive</a>]<br> A medium traffic (50/day) read only list for patches and merge requests from <a href="https://gitlab.winehq.org/">Wine Gitlab</a>. </li> <li> <b><a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a></b><br> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive</a>] + [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive</a>]<br> A medium traffic (25/day) read only list which tracks commits to the Git tree. </li> @@ -81,9 +86,9 @@ mailing list software.</p> <li> <b><a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a></b><br> [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive</a>] + [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive</a>]<br> A high traffic (100/day) read-only list for monitoring activity on the - <a href="//bugs.winehq.org/">Bug Tracking Database</a>. + <a href="https://bugs.winehq.org/">Bug Tracking Database</a>. </li> </ul>

1 0

Jeremy Newman : lists update, add wine-gitlab, remove gmane
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: website Branch: master Commit: 0d7a48fb4ffa525b8d8861719d2a3416d9bc8b90 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/0d7a48fb4ffa525b8d8861719d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 12 11:50:19 2022 -0500 lists update, add wine-gitlab, remove gmane The gmane archives not longer exist in the current place, and have a new owner. --- templates/en/forums.template | 31 ++++++++---------------- templates/fr/forums.template | 49 +++++++++---------------------------- templates/ko/forums.template | 39 +++++------------------------- templates/nl/forums.template | 15 +++++------- templates/pl/forums.template | 53 +++++++++++++---------------------------- templates/pt/forums.template | 47 +++++++++++------------------------- templates/tr/forums.template | 33 +++++-------------------- templates/zh-cn/forums.template | 20 ++++------------ 8 files changed, 75 insertions(+), 212 deletions(-)

1 0

Alexandre Julliard : git-notify: Remove support for obsolete CIA notifications.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: tools Branch: master Commit: f3e6f9d6ee8857631f41360cc7bc803bab1b854c URL: https://gitlab.winehq.org/winehq/tools/-/commit/f3e6f9d6ee8857631f41360cc7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 13:08:35 2022 +0200 git-notify: Remove support for obsolete CIA notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- git-notify | 66 -------------------------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/git-notify b/git-notify index 9918117c..91f29a65 100755 --- a/git-notify +++ b/git-notify @@ -14,7 +14,6 @@ # # Usage: git-notify [options] [--] old-sha1 new-sha1 refname # -# -c name Send CIA notifications under specified project name # -m addr Send mail notifications to specified address # -n max Set max number of individual mails to send # -r name Set the git repository name @@ -41,9 +40,6 @@ sub get_repos_name(); # set this to something that takes "-s" my $mailer = "/usr/bin/mail"; -# CIA notification address -my $cia_address = "cia\(a)cia.vc"; - # debug mode my $debug = 0; @@ -61,9 +57,6 @@ my $max_diff_size = git_config( "notify.maxdiff" ) || 10000; # address for mail notices (can be set with -m option) my $commitlist_address = git_config( "notify.mail" ); -# project name for CIA notices (can be set with -c option) -my $cia_project_name = git_config( "notify.cia" ); - # max number of individual notices before falling back to a single global notice (can be set with -n option) my $max_individual_notices = git_config( "notify.maxnotices" ) || 100; @@ -79,7 +72,6 @@ my @revlist_options; sub usage() { print "Usage: $0 [options] [--] old-sha1 new-sha1 refname\n"; - print " -c name Send CIA notifications under specified project name\n"; print " -m addr Send mail notifications to specified address\n"; print " -n max Set max number of individual mails to send\n"; print " -r name Set the git repository name\n"; @@ -141,7 +133,6 @@ sub parse_options() my $arg = shift @ARGV; if ($arg eq '--') { last; } - elsif ($arg eq '-c') { $cia_project_name = shift @ARGV; } elsif ($arg eq '-m') { $commitlist_address = shift @ARGV; } elsif ($arg eq '-n') { $max_individual_notices = shift @ARGV; } elsif ($arg eq '-r') { $repos_name = shift @ARGV; } @@ -296,62 +287,6 @@ sub send_commit_notice($$) mail_notification($commitlist_address, $subject, "text/plain; charset=UTF-8", @notice); } -# send a commit notice to the CIA server -sub send_cia_notice($$) -{ - my ($ref,$commit) = @_; - my %info = get_object_info($commit); - my @cia_text = (); - - return if $info{"type"} ne "commit"; - - push @cia_text, - "<message>", - " <generator>", - " <name>git-notify script for CIA</name>", - " </generator>", - " <source>", - " <project>" . xml_escape($cia_project_name) . "</project>", - " <module>" . xml_escape($repos_name) . "</module>", - " <branch>" . xml_escape($ref). "</branch>", - " </source>", - " <body>", - " <commit>", - " <revision>" . substr($commit,0,10) . "</revision>", - " <author>" . xml_escape($info{"author"}) . "</author>", - " <log>" . xml_escape(join "\n", @{$info{"log"}}) . "</log>", - " <files>"; - - open COMMIT, "-|" or exec "git", "diff-tree", "--name-status", "-r", "-M", $commit or die "cannot run git-diff-tree"; - while (<COMMIT>) - { - chomp; - if (/^([AMD])\t(.*)$/) - { - my ($action, $file) = ($1, $2); - my %actions = ( "A" => "add", "M" => "modify", "D" => "remove" ); - next unless defined $actions{$action}; - push @cia_text, " <file action=\"$actions{$action}\">" . xml_escape($file) . "</file>"; - } - elsif (/^R\d+\t(.*)\t(.*)$/) - { - my ($old, $new) = ($1, $2); - push @cia_text, " <file action=\"rename\" to=\"" . xml_escape($new) . "\">" . xml_escape($old) . "</file>"; - } - } - close COMMIT; - - push @cia_text, - " </files>", - $gitweb_url ? " <url>" . xml_escape("$gitweb_url/?a=commit;h=$commit") . "</url>" : "", - " </commit>", - " </body>", - " <timestamp>" . $info{"author_date"} . "</timestamp>", - "</message>"; - - mail_notification($cia_address, "DeliverXML", "text/xml", @cia_text); -} - # send a global commit notice when there are too many commits for individual mails sub send_global_notice($$$) { @@ -406,7 +341,6 @@ sub send_all_notices($$$) foreach my $commit (@commits) { send_commit_notice( $ref, $commit ) if $commitlist_address; - send_cia_notice( $ref, $commit ) if $cia_project_name; } }

1 0

Alexandre Julliard : git-notify: Add support for using Gitlab URLs in notifications.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: tools Branch: master Commit: 49820276eb62e54265aa99a424c5be80a19817d2 URL: https://gitlab.winehq.org/winehq/tools/-/commit/49820276eb62e54265aa99a424c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 11 13:08:54 2022 +0200 git-notify: Add support for using Gitlab URLs in notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- git-notify | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git-notify b/git-notify index 91f29a65..7bfb2139 100755 --- a/git-notify +++ b/git-notify @@ -48,6 +48,9 @@ my $debug = 0; # base URL of the gitweb repository browser (can be set with the -u option) my $gitweb_url = git_config( "notify.baseurl" ); +# URL of the gitlab repository (can be set with the -g option) +my $gitlab_url = git_config( "notify.gitlab" ); + # default repository name (can be changed with the -r option) my $repos_name = git_config( "notify.repository" ) || get_repos_name(); @@ -76,7 +79,8 @@ sub usage() print " -n max Set max number of individual mails to send\n"; print " -r name Set the git repository name\n"; print " -s bytes Set the maximum diff size in bytes (-1 for no limit)\n"; - print " -u url Set the URL to the gitweb browser\n"; + print " -g url Set the URL of the gitlab project\n"; + print " -u url Set the URL of the gitweb browser\n"; print " -i branch If at least one -i is given, report only for specified branches\n"; print " -x branch Exclude changes to the specified branch from reports\n"; print " -X Exclude merge commits\n"; @@ -137,6 +141,7 @@ sub parse_options() elsif ($arg eq '-n') { $max_individual_notices = shift @ARGV; } elsif ($arg eq '-r') { $repos_name = shift @ARGV; } elsif ($arg eq '-s') { $max_diff_size = shift @ARGV; } + elsif ($arg eq '-g') { $gitlab_url = shift @ARGV; } elsif ($arg eq '-u') { $gitweb_url = shift @ARGV; } elsif ($arg eq '-i') { push @include_list, shift @ARGV; } elsif ($arg eq '-x') { push @exclude_list, shift @ARGV; } @@ -242,6 +247,7 @@ sub send_commit_notice($$) "Module: $repos_name", "Branch: $ref", "Tag: $obj", + $gitlab_url ? "URL: $gitlab_url/tags/$obj\n" : $gitweb_url ? "URL: $gitweb_url/?a=tag;h=$obj\n" : "", "Tagger: " . $info{"tagger"}, "Date: " . format_date($info{"tagger_date"},$info{"tagger_tz"}), @@ -255,6 +261,7 @@ sub send_commit_notice($$) "Module: $repos_name", "Branch: $ref", "Commit: $obj", + $gitlab_url ? "URL: $gitlab_url/commit/$obj\n" : $gitweb_url ? "URL: $gitweb_url/?a=commit;h=$obj\n" : "", "Author: " . $info{"author"}, "Date: " . format_date($info{"author_date"},$info{"author_tz"}), @@ -298,6 +305,7 @@ sub send_global_notice($$$) while (<LIST>) { chomp; + s/^commit /URL: $gitlab_url\/commit\// if $gitlab_url; s/^commit /URL: $gitweb_url\/?a=commit;h=/ if $gitweb_url; push @notice, $_; } @@ -348,6 +356,7 @@ parse_options(); # append repository path to URL $gitweb_url .= "/$repos_name.git" if $gitweb_url; +$gitlab_url .= "/-" if $gitlab_url; if (@ARGV) {

1 0

Francois Gouget : testbot/cgi: Remove Page::SetError(): it is not used anymore.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: tools Branch: master Commit: db32e3d2608f0a5e6a7561215c4c1e263332305c URL: https://gitlab.winehq.org/winehq/tools/-/commit/db32e3d2608f0a5e6a7561215c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 11 18:46:11 2022 +0200 testbot/cgi: Remove Page::SetError(): it is not used anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index a8268754..1d8a59fe 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -382,13 +382,6 @@ sub AddError($$;$) return $ErrMessage; } -# FIXME: For legacy code, to be removed. -sub SetError($$$) -{ - my ($self, $ErrField, $ErrMessage) = @_; - $self->AddError($ErrMessage, $ErrField); -} - sub ResetErrors($) { my ($self) = @_;

1 0

Francois Gouget : testbot/cgi: Allow reporting multiple errors and multiple invalid fields.
by Alexandre Julliard 11 Jul '22

11 Jul '22

Module: tools Branch: master Commit: fa86aee33b575eafca5fb63e06ebc676348fc23c URL: https://gitlab.winehq.org/winehq/tools/-/commit/fa86aee33b575eafca5fb63e06e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 11 18:46:13 2022 +0200 testbot/cgi: Allow reporting multiple errors and multiple invalid fields. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 8 ++--- testbot/lib/ObjectModel/CGI/Page.pm | 56 +++++++++++++++++++++++---------- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 67b3fa00..688ee13a 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -505,17 +505,15 @@ sub GenerateBody($) $self->GenerateFields(); $self->GenerateRequiredLegend(); - my $ErrMessage = $self->GetErrMessage(); - if (defined $ErrMessage) + if (defined $self->GetErrMessage()) { - my $ErrField = $self->GetErrField(); - if (defined $ErrField) + foreach my $ErrField (sort $self->GetErrFields()) { my $PropertyDescriptor = $self->GetPropertyDescriptorByName($ErrField); if ($PropertyDescriptor and !($self->DisplayProperty($PropertyDescriptor))[0]) { # The hidden fields should not be invalid - $self->AddError("Internal error?\n$ErrMessage", $ErrField); + $self->AddError("The hidden $ErrField field is invalid (internal error?)", $ErrField); } } $self->GenerateErrorPopup(); diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1d8a59fe..37b19c8b 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -313,9 +313,9 @@ sub GetErrMessage($) =pod =over 12 -=head1 C<GetErrField()> +=head1 C<GetFirstErrField()> -Returns the name of the invalid field, undef otherwise. +Returns the name of the first invalid field if any, undef otherwise. Note that if the error does not concern a specific field this may return undef even though an error has been set. @@ -323,10 +323,29 @@ undef even though an error has been set. =back =cut -sub GetErrField($) +sub GetFirstErrField($) { my ($self) = @_; - return $self->{ErrField}; + return $self->{ErrFields} ? (sort keys %{$self->{ErrFields}})[0] : undef; +} + +=pod +=over 12 + +=head1 C<GetErrFields()> + +Returns a list containing the names of the invalid field(s). + +Note that if the error does not concern a specific field this may return +an empty list even though an error has been set. + +=back +=cut + +sub GetErrFields($) +{ + my ($self) = @_; + return $self->{ErrFields} ? keys %{$self->{ErrFields}} : (); } =pod @@ -334,7 +353,7 @@ sub GetErrField($) =head1 C<IsErrField()> -Returns true if the error concerns the specified field. +Returns true if the specified field needs to be fixed. =back =cut @@ -342,7 +361,7 @@ Returns true if the error concerns the specified field. sub IsErrField($$) { my ($self, $FieldName) = @_; - return (defined $self->{ErrField} and $self->{ErrField} eq $FieldName); + return $self->{ErrFields}->{$FieldName}; } =pod @@ -350,17 +369,18 @@ sub IsErrField($$) =head1 C<AddError()> -Sets the error message to be shown to the user. +Adds an error message to be shown to the user. =over =item ErrMessage A message to be shown on the page that describes why the form data is invalid. This should include the display name of the field(s) that need to be fixed. -If this parameter is false the error message is not modified. +If this parameter is false, the error message and the list of invalid fields +are not modified. -=item ErrField -If the error concerns a specific field, the name of that field. This can be -used by the page to highlight the field that needs to be corrected. +=item ErrFields +A list of field names related to the error. This can be used by the page to +highlight the field(s) that needs to be corrected. =back @@ -370,14 +390,18 @@ was actually added. =back =cut -sub AddError($$;$) +sub AddError($$@) { - my ($self, $ErrMessage, $ErrField) = @_; + my $self = shift; + my $ErrMessage = shift; if ($ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = $ErrField; + $self->{ErrMessage} = "$self->{ErrMessage}\n$ErrMessage"; + foreach my $ErrField (@_) + { + $self->{ErrFields}->{$ErrField} = 1; + } } return $ErrMessage; } @@ -387,7 +411,7 @@ sub ResetErrors($) my ($self) = @_; delete $self->{ErrMessage}; - delete $self->{ErrField}; + delete $self->{ErrFields}; } sub GenerateErrorDiv($) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index bcfbdb80..e3cf7469 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -375,7 +375,7 @@ sub GenerateErrorPopup($$) print "<script type='text/javascript'>\n"; print "<!--\n"; print "function ShowError() { alert(", $Page->JsQuote($ErrMessage), "); }\n"; - my $ErrField = $Page->GetErrField(); + my $ErrField = $Page->GetFirstErrField(); if ($ErrField) { print "document.forms[0].", $ErrField, ".focus();\n";

1 0