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

Francois Gouget : testbot/cgi: Add Page::SetError().
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: tools Branch: master Commit: 13b10bd2834fa8ac65389e56d69e79ba470abd36 URL: https://source.winehq.org/git/tools.git/?a=commit;h=13b10bd2834fa8ac65389e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 29 17:58:41 2022 +0200 testbot/cgi: Add Page::SetError(). This provides a proper API to set the page error, particularly for non-child classes. Use it in CollectionBlock. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 8 ++++++-- testbot/lib/ObjectModel/CGI/Page.pm | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 053b225..58ece69 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -617,8 +617,12 @@ sub OnItemAction($$$) if ($Action eq "Delete") { my $ErrMessage = $self->{Collection}->DeleteItem($Item); - $self->{EnclosingPage}->{ErrMessage} = $ErrMessage; - return ! defined($ErrMessage); + if (defined $ErrMessage) + { + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + return 1; } $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d587412..700268a 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -270,6 +270,14 @@ sub GetErrMessage($) return $self->{ErrMessage}; } +sub SetError($$$) +{ + my ($self, $ErrField, $ErrMessage) = @_; + + $self->{ErrField} = $ErrField; + $self->{ErrMessage} = $ErrMessage; +} + sub GenerateErrorDiv($) { my ($self) = @_;

1 0

Francois Gouget : testbot/cgi: Add an API to set the page refresh interval.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: tools Branch: master Commit: ec4067265bf29f770ace4119572c04067ce6bc7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=ec4067265bf29f770ace411… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 29 18:00:15 2022 +0200 testbot/cgi: Add an API to set the page refresh interval. It can be called early, removing the need to override GeneratePage() just for that purpose. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 19 +++++++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 15 ++++++++++++++- testbot/web/Activity.pl | 8 ++++---- testbot/web/JobDetails.pl | 16 ++++------------ testbot/web/PatchesList.pl | 10 +--------- testbot/web/index.pl | 15 ++++----------- 6 files changed, 46 insertions(+), 37 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 700268a..c5f8a33 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -141,6 +141,25 @@ sub escapeHTML($$) return $self->{CGIObj}->escapeHTML($String); } +=pod +=over 12 + +=head1 C<SetRefreshInterval()> + +Sets the page refresh interval in seconds. + +This can be called at any point before GenerateHttpHeaders(). + +=back +=cut + +sub SetRefreshInterval($$) +{ + my ($self, $Seconds) = @_; + + $self->{PageBase}->SetRefreshInterval($Seconds); +} + # # CGI parameters support diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 695dde3..e87e1d6 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -81,7 +81,8 @@ sub new($$$$@) my ($Page, $Request, $RequiredRole) = @_; my $self = {Request => $Request, - Session => undef}; + Session => undef, + Refresh => undef}; $self = bless $self, $class; if (defined($RequiredRole) && $RequiredRole ne "") @@ -111,6 +112,13 @@ sub CreatePageBase($$$@) return WineTestBot::CGI::PageBase->new(@_); } +sub SetRefreshInterval($$) +{ + my ($self, $Seconds) = @_; + + $self->{Refresh} = $Seconds; +} + # # Session management @@ -363,6 +371,11 @@ sub GenerateHttpHeaders($) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); + if ($self->{Refresh}) + { + $self->{Request}->headers_out->add("Refresh", $self->{Refresh}); + } + # Force char set $Request->content_type("text/html; charset=UTF-8"); diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d98f50a..cbe3f87 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -56,6 +56,10 @@ sub _initialize($$$) # either). $self->SetParam("Hours", $HOURS_DEFAULT); } + if ($self->GetParam("Hours") <= $HOURS_DEFAULT) + { + $self->SetRefreshInterval(60); + } } sub GetPageTitle($$) @@ -69,10 +73,6 @@ sub GeneratePage($) { my ($self) = @_; - if ($self->GetParam("Hours") <= $HOURS_DEFAULT) - { - $self->{Request}->headers_out->add("Refresh", "60"); - } $self->SUPER::GeneratePage(); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d93957..5e302c0 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -57,6 +57,10 @@ sub _initialize($$$) $self->{JobId} = $JobId; $self->SUPER::_initialize($Request, $RequiredRole, CreateStepsTasks(undef, $self->{Job})); + if ($self->{Job}->Status =~ /^(?:queued|running)$/) + { + $self->SetRefreshInterval(30); + } } sub GetPageTitle($) @@ -241,18 +245,6 @@ sub SortKeys($$$) return \@SortedKeys; } -sub GeneratePage($) -{ - my ($self) = @_; - - if ($self->{Job}->Status =~ /^(queued|running)$/) - { - $self->{Request}->headers_out->add("Refresh", "30"); - } - - $self->SUPER::GeneratePage(); -} - sub InitMoreInfo($) { my ($self) = @_; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 6728a28..04ca020 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -33,6 +33,7 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreatePatches()); + $self->SetRefreshInterval(60); } sub SortKeys($$$) @@ -65,15 +66,6 @@ sub GetActions($$) return []; } -sub GeneratePage($) -{ - my ($self) = @_; - - $self->{Request}->headers_out->add("Refresh", "60"); - - $self->SUPER::GeneratePage(); -} - sub GenerateDataCell($$$$$) { my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 451258e..1f362fc 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -268,6 +268,10 @@ sub _initialize($$$) # Replace with the default value so the cutoff can be calculated $self->SetParam("Days", $DAYS_DEFAULT); } + if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) + { + $self->SetRefreshInterval(60); + } # The action is a no-op so unset it to not need to redefine OnAction() $self->SetParam("Action", undef); } @@ -280,17 +284,6 @@ sub OutputDot($$) "width='20' height='20' />"; } -sub GeneratePage($) -{ - my ($self) = @_; - - if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) - { - $self->{Request}->headers_out->add("Refresh", "60"); - } - $self->SUPER::GeneratePage(); -} - sub GenerateBody($) { my ($self) = @_;

1 0

Francois Gouget : testbot/cgi: Add Page::jsQuote() to escape JavaScript strings.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: tools Branch: master Commit: 86784dc624557f4a09b9f95301b941965732d7b2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=86784dc624557f4a09b9f95… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 29 18:00:20 2022 +0200 testbot/cgi: Add Page::jsQuote() to escape JavaScript strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 20 ++++++++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 5 +---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index c5f8a33..a791559 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -144,6 +144,26 @@ sub escapeHTML($$) =pod =over 12 +=head1 C<jsQuote()> + +Quotes a string for JavaScript code. + +=back +=cut + +sub jsQuote($$) +{ + my ($self, $String) = @_; + + $String =~ s~\\~\\\\~g; + $String =~ s~"~\\\"~g; + $String =~ s~\n~\\n~g; + return "\"$String\""; +} + +=pod +=over 12 + =head1 C<SetRefreshInterval()> Sets the page refresh interval in seconds. diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index e87e1d6..19a5aec 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -323,10 +323,7 @@ sub GenerateErrorPopup($$) { print "<script type='text/javascript'>\n"; print "<!--\n"; - $ErrMessage =~ s~\\~\\\\~g; - $ErrMessage =~ s~"~\\\"~g; - $ErrMessage =~ s~\n~\\n~g; - print "function ShowError() { alert(\"$ErrMessage\"); }\n"; + print "function ShowError() { alert(", $Page->jsQuote($ErrMessage), "); }\n"; my $ErrField = $Page->GetErrField(); if ($ErrField) {

1 0

Francois Gouget : testbot/cgi: Fix handling of '0' in text fields.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: tools Branch: master Commit: 0044e4eda7fdbc8fdba23f341d8a79b7a5b12535 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0044e4eda7fdbc8fdba23f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 29 17:57:39 2022 +0200 testbot/cgi: Fix handling of '0' in text fields. '0' should be set as the field's initial value even though it evaluates to false. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 83b078b..f47d628 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -300,7 +300,7 @@ sub GenerateField($$$) print "50' rows='", int(($MaxLength + 49) / 50); } print "'>"; - if ($Value) + if (defined $Value) { print $self->CGI->escapeHTML($Value), "'"; } @@ -313,7 +313,7 @@ sub GenerateField($$$) $Size=45 if ($Size > 45); print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; - if ($Value && $InputType ne "password") + if (defined $Value && $InputType ne "password") { print " value='", $self->CGI->escapeHTML($Value), "'"; }

1 0

Francois Gouget : testbot/cgi: Simplify the default CollectionBlock::GetAction() implementation.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: tools Branch: master Commit: 85620f146d44f1c8bb3e546b36d60408214bb8a0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=85620f146d44f1c8bb3e546… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 29 17:57:56 2022 +0200 testbot/cgi: Simplify the default CollectionBlock::GetAction() implementation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 6f5c4d5..d0f44b9 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -649,13 +649,9 @@ sub GetActions($) { my ($self) = @_; - my @Actions; - if ($self->CallGetDetailsPage()) - { - $Actions[0] = "Add " . $self->{Collection}->GetItemName(); - } - - return \@Actions; + return $self->CallGetDetailsPage() ? + ["Add ". $self->{Collection}->GetItemName()] : + []; } =pod

1 0

Francois Gouget : testbot/cgi: Document and tweak the action error handling.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: tools Branch: master Commit: 6491c1c982927442dfca75b9e1668e5b2e9e32fc URL: https://source.winehq.org/git/tools.git/?a=commit;h=6491c1c982927442dfca75b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 29 17:58:33 2022 +0200 testbot/cgi: Document and tweak the action error handling. Fix OnAction() so it returns an error when OnItemAction() fails to apply an action to a selected item. OnItemAction() should not return success on unknown item actions. Also the action is a user-supplied parameter so a proper error message shoulf be displayed when it is invalid instead of having OnAction() and OnItemAction() just die. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 16 ++++++++++++---- testbot/lib/ObjectModel/CGI/FormPage.pm | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index d0f44b9..053b225 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -603,6 +603,10 @@ This method is called to apply $Action to each selected item. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. In case an error occurs while performing the action on +any of the selected items, the enclosing page's error message is set and +false is returned. + =back =cut @@ -617,7 +621,8 @@ sub OnItemAction($$$) return ! defined($ErrMessage); } - return 1; + $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + return 0; } @@ -664,6 +669,9 @@ Implements the "Add" and per-item actions. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. Otherwise the enclosing page's error message is set +and false is returned. + =back =cut @@ -688,15 +696,15 @@ sub OnAction($$) exit($self->{EnclosingPage}->Redirect($Target)); } - my $Ok = 1; foreach my $Key (@{$self->{Collection}->GetKeys()}) { - if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key))) { my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); + return 0 if (!$self->CallOnItemAction($Item, $Action)); } } + return 1; } 1; diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index f47d628..b85ccb2 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -596,6 +596,9 @@ actions. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. Otherwise sets the page's error message and returns +false. + =back =cut @@ -603,7 +606,8 @@ sub OnAction($$) { my ($self, $Action) = @_; - die "No action defined for $Action"; + $self->{EnclosingPage}->SetError(undef, "No action defined for $Action"); + return 0; } 1;

1 0

Huw Davies : winealsa: Add missing includes.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 43da2eac3d2bad9455371c0a57d4cf25d6f13930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43da2eac3d2bad9455371c0a… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Mar 26 20:25:30 2022 +0000 winealsa: Add missing includes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52728 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsamidi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 476ea383a25..4f3f5538891 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -30,6 +30,8 @@ #include <stdarg.h> #include <stdio.h> +#include <stdint.h> +#include <unistd.h> #include <pthread.h> #include <time.h> #include <alsa/asoundlib.h>

1 0

Rémi Bernon : kernel32/tests: Use 0xdeadbeef directly instead of a custom define.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: b4b097512f5ece93591b274def8770de1bfe7371 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b097512f5ece93591b274d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 11:35:54 2022 +0200 kernel32/tests: Use 0xdeadbeef directly instead of a custom define. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 110 ++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b097512f5ece93591b…

1 0

Rémi Bernon : kernel32/tests: Clean GlobalAlloc tests and move them together.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 60805ce139709f5fe0ade1c83b126181e34e960b URL: https://source.winehq.org/git/wine.git/?a=commit;h=60805ce139709f5fe0ade1c8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 11:35:55 2022 +0200 kernel32/tests: Clean GlobalAlloc tests and move them together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 692 +++++++++++++++++++++------------------------ 1 file changed, 329 insertions(+), 363 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60805ce139709f5fe0ad…

1 0

Rémi Bernon : kernel32/tests: Clean LocalAlloc tests and move them together.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 1f472e905caa6312cb50f5417266885c1b5c2ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f472e905caa6312cb50f541… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 11:35:56 2022 +0200 kernel32/tests: Clean LocalAlloc tests and move them together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 525 ++++++++++++++++++++++++++------------------- 1 file changed, 308 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f472e905caa6312cb50…

1 0