June 2014 - Wine-commits - list.winehq.org

Francois Gouget : testbot/lib: Improve the PropertyDescriptor methods argument handling.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: tools Branch: master Commit: 7c18f6d54ce2686fd869fb0d4054502402be47e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7c18f6d54ce2686fd869fb0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:19:51 2014 +0200 testbot/lib: Improve the PropertyDescriptor methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 30 +++++++++----------- .../lib/ObjectModel/DetailrefPropertyDescriptor.pm | 22 +++++++------- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 25 ++++++++-------- .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 26 ++++++++--------- testbot/lib/ObjectModel/PropertyDescriptor.pm | 26 +++++++++-------- 5 files changed, 64 insertions(+), 65 deletions(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 2e83b60..e355aa6 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -37,44 +37,41 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateBasicPropertyDescriptor); -sub _initialize +sub _initialize($$$) { - my $self = shift; - my $Type = shift; - my $MaxLength = shift; + my ($self, $Type, $MaxLength) = @_; $self->{Class} = "Basic"; $self->{Type} = $Type; $self->{MaxLength} = $MaxLength; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetType +sub GetType($) { - my $self = shift; + my ($self) = @_; return $self->{Type}; } -sub GetMaxLength +sub GetMaxLength($) { - my $self = shift; + my ($self) = @_; return $self->{MaxLength}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return [$self->{Name}]; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired()) { @@ -104,9 +101,10 @@ sub ValidateValue return undef; } -sub CreateBasicPropertyDescriptor +sub CreateBasicPropertyDescriptor($$$$$$) { - return ObjectModel::BasicPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Type, $MaxLength) = @_; + return ObjectModel::BasicPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Type, $MaxLength); } 1; diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index 4832dd7..9575466 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -30,37 +30,39 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateDetailrefPropertyDescriptor); -sub _initialize +sub _initialize($$) { - my $self = shift; - my $Creator = shift; + my ($self, $Creator) = @_; $self->{Class} = "Detailref"; $self->{Creator} = $Creator; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetColNames +sub GetColNames($) { + #my ($self) = @_; return []; } -sub GetCreator +sub GetCreator($) { - my $self = shift; + my ($self) = @_; return $self->{Creator}; } -sub ValidateValue +sub ValidateValue($$$) { + #my ($self, $Value, $IsNew) = @_; return undef; } -sub CreateDetailrefPropertyDescriptor +sub CreateDetailrefPropertyDescriptor($$$$$) { - return ObjectModel::DetailrefPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator) = @_; + return ObjectModel::DetailrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator); } 1; diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index 3373c47..29c618b 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -37,35 +37,33 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateEnumPropertyDescriptor); -sub _initialize +sub _initialize($$) { - my $self = shift; - my $Values = shift; + my ($self, $Values) = @_; $self->{Class} = "Enum"; $self->{Values} = $Values; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetValues +sub GetValues($) { - my $self = shift; + my ($self) = @_; return $self->{Values}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return [$self->{Name}]; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired()) { @@ -82,9 +80,10 @@ sub ValidateValue return $self->GetDisplayName() . ": Is not valid"; } -sub CreateEnumPropertyDescriptor +sub CreateEnumPropertyDescriptor($$$$$) { - return ObjectModel::EnumPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Values) = @_; + return ObjectModel::EnumPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Values); } 1; diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index bf2a548..64b577a 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -30,37 +30,34 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateItemrefPropertyDescriptor); -sub _initialize +sub _initialize($$$) { - my $self = shift; - my $Creator = shift; - my $ColNames = shift; + my ($self, $Creator, $ColNames) = @_; $self->{Class} = "Itemref"; $self->{Creator} = $Creator; $self->{ColNames} = $ColNames; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetCreator +sub GetCreator($) { - my $self = shift; + my ($self) = @_; return $self->{Creator}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return $self->{ColNames}; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired() && ! defined($Value)) { @@ -70,9 +67,10 @@ sub ValidateValue return undef; } -sub CreateItemrefPropertyDescriptor +sub CreateItemrefPropertyDescriptor($$$$$$) { - return ObjectModel::ItemrefPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $ColNames) = @_; + return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $ColNames); } 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 5b5cbc4..a8a7271 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -36,7 +36,7 @@ use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -sub new +sub new($$$$$@) { my $class = shift; my $Name = shift; @@ -54,41 +54,43 @@ sub new return $self; } -sub _initialize +sub _initialize($) { + #my ($self) = @_; } -sub GetName +sub GetName($) { - my $self = shift; + my ($self) = @_; return $self->{Name}; } -sub GetDisplayName +sub GetDisplayName($) { - my $self = shift; + my ($self) = @_; return $self->{DisplayName}; } -sub GetIsKey +sub GetIsKey($) { - my $self = shift; + my ($self) = @_; return $self->{IsKey}; } -sub GetIsRequired +sub GetIsRequired($) { - my $self = shift; + my ($self) = @_; + return $self->{IsRequired}; } -sub GetClass +sub GetClass($) { - my $self = shift; + my ($self) = @_; return $self->{Class}; }

1 0

Francois Gouget : testbot/bin: Standardize handling of the Engine' s function arguments and add prototypes.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: tools Branch: master Commit: 8c390b93891db0b59adc94044ca8bdb43f10fb90 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8c390b93891db0b59adc9404… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:20:06 2014 +0200 testbot/bin: Standardize handling of the Engine's function arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The exception to the rule is the HandleXxx() functions due to the way they are called. The prototypes also document which arguments are optional. --- testbot/bin/Engine.pl | 46 ++++++++++++++++-------------- testbot/lib/WineTestBot/Engine/Events.pm | 12 ++++---- testbot/lib/WineTestBot/Engine/Notify.pm | 30 +++++++++---------- 3 files changed, 45 insertions(+), 43 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ccaadc1..29dc919 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -56,7 +56,7 @@ use WineTestBot::VMs; my $RunEngine = 1; -sub FatalError +sub FatalError(@) { LogMsg @_; LogMsg "Shutdown following a fatal error\n"; @@ -215,7 +215,7 @@ sub Cleanup(;$$) } -sub HandleShutdown +sub HandleShutdown($$) { my ($KillTasks, $KillVMs) = @_; @@ -252,12 +252,12 @@ sub HandleShutdown return "1OK\n"; } -sub HandlePing +sub HandlePing() { return "1pong\n"; } -sub HandleJobStatusChange +sub HandleJobStatusChange($$$) { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -297,9 +297,9 @@ sub HandleJobStatusChange return "1OK"; } -sub HandleJobCancel +sub HandleJobCancel($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Job = CreateJobs()->GetItem($JobKey); if (! $Job) @@ -327,9 +327,9 @@ sub HandleJobCancel return "1OK"; } -sub HandleJobRestart +sub HandleJobRestart($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Job = CreateJobs()->GetItem($JobKey); if (! $Job) @@ -357,7 +357,7 @@ sub HandleJobRestart return "1OK"; } -sub HandleRescheduleJobs +sub HandleRescheduleJobs() { my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) @@ -368,7 +368,7 @@ sub HandleRescheduleJobs return "1OK"; } -sub HandleVMStatusChange +sub HandleVMStatusChange($$$) { my ($VMKey, $OldStatus, $NewStatus) = @_; @@ -392,7 +392,7 @@ sub HandleVMStatusChange return "1OK"; } -sub HandleWinePatchMLSubmission +sub HandleWinePatchMLSubmission() { my $dh; if (!opendir($dh, "$DataDir/staging")) @@ -443,7 +443,7 @@ sub HandleWinePatchMLSubmission return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } -sub HandleWinePatchWebSubmission +sub HandleWinePatchWebSubmission() { my $LatestWebPatchId = 0; my $Patches = CreatePatches(); @@ -514,15 +514,17 @@ sub HandleWinePatchWebSubmission return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } -sub HandleGetScreenshot +sub HandleGetScreenshot($) { + my ($VMName) = @_; + # Validate VM name - if ($_[0] !~ m/^(\w+)$/) + if ($VMName !~ m/^(\w+)$/) { LogMsg "Invalid VM name for screenshot\n"; return "0Invalid VM name"; } - my $VMName = $1; + $VMName = $1; my $VM = CreateVMs()->GetItem($VMName); if (! defined($VM)) @@ -554,7 +556,7 @@ my %Handlers=( "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, ); -sub HandleClientCmd +sub HandleClientCmd(@) { my $Cmd = shift; @@ -565,9 +567,9 @@ sub HandleClientCmd return "0Unknown command $Cmd\n"; } -sub ClientRead +sub ClientRead($) { - my $Client = shift; + my ($Client) = @_; my $Buf; my $GotSomething = !1; @@ -596,7 +598,7 @@ checks whether any pending patchsets are now complete and thus can be scheduled. =back =cut -sub SafetyNet +sub SafetyNet() { CheckJobs(); ScheduleJobs(); @@ -610,9 +612,9 @@ sub SafetyNet } } -sub PrepareSocket +sub PrepareSocket($) { - my $Socket = $_[0]; + my ($Socket) = @_; my $Flags = 0; if (fcntl($Socket, F_GETFL, $Flags)) @@ -663,7 +665,7 @@ sub REAPER $SIG{CHLD} = \&REAPER; # still loathe SysV } -sub main +sub main() { my ($Shutdown, $KillTasks, $KillVMs); while (@ARGV) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index 9a8da83..584a7e5 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -34,7 +34,7 @@ require Exporter; my %Events; -sub AddEvent +sub AddEvent($$$$) { my ($Name, $Timeout, $Repeat, $HandlerFunc) = @_; @@ -44,21 +44,21 @@ sub AddEvent HandlerFunc => $HandlerFunc}; } -sub DeleteEvent +sub DeleteEvent($) { - my $Name = $_[0]; + my ($Name) = @_; delete $Events{$Name}; } -sub EventScheduled +sub EventScheduled($) { - my $Name = $_[0]; + my ($Name) = @_; return defined($Events{$Name}); } -sub RunEvents +sub RunEvents() { my $Now = time(); my $Next = undef; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index d0d4890..3063e99 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -39,9 +39,9 @@ require Exporter; @EXPORT_OK = qw($RunningInEngine); -sub SendCmdReceiveReply +sub SendCmdReceiveReply($) { - my $Cmd = shift; + my ($Cmd) = @_; if (defined($RunningInEngine)) { @@ -74,7 +74,7 @@ sub SendCmdReceiveReply return $Reply; } -sub Shutdown +sub Shutdown($$) { my ($KillTasks, $KillVMs) = @_; @@ -93,13 +93,13 @@ sub Shutdown return substr($Reply, 1); } -sub PingEngine +sub PingEngine() { my $Reply = SendCmdReceiveReply("ping\n"); return 1 <= length($Reply) && substr($Reply, 0, 1) eq "1"; } -sub JobStatusChange +sub JobStatusChange($$$) { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -116,9 +116,9 @@ sub JobStatusChange return substr($Reply, 1); } -sub JobCancel +sub JobCancel($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Reply = SendCmdReceiveReply("jobcancel $JobKey\n"); if (length($Reply) < 1) @@ -133,9 +133,9 @@ sub JobCancel return substr($Reply, 1); } -sub JobRestart +sub JobRestart($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); if (length($Reply) < 1) @@ -150,7 +150,7 @@ sub JobRestart return substr($Reply, 1); } -sub RescheduleJobs +sub RescheduleJobs() { my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) @@ -165,7 +165,7 @@ sub RescheduleJobs return substr($Reply, 1); } -sub VMStatusChange +sub VMStatusChange($$$) { my ($VMKey, $OldStatus, $NewStatus) = @_; @@ -182,7 +182,7 @@ sub VMStatusChange return substr($Reply, 1); } -sub WinePatchMLSubmission +sub WinePatchMLSubmission() { my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) @@ -197,7 +197,7 @@ sub WinePatchMLSubmission return substr($Reply, 1); } -sub WinePatchWebSubmission +sub WinePatchWebSubmission() { my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) @@ -212,9 +212,9 @@ sub WinePatchWebSubmission return substr($Reply, 1); } -sub GetScreenshot +sub GetScreenshot($) { - my $VMName = $_[0]; + my ($VMName) = @_; my $Reply = SendCmdReceiveReply("getscreenshot $VMName\n"); if (length($Reply) < 1)

1 0

Francois Gouget : testbot/web: Fix the vertical-align CSS statements so the form labels and inputs align correctly.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: tools Branch: master Commit: d56366da8ee186c474b17cfd2fb599bbb8dcc44b URL: http://source.winehq.org/git/tools.git/?a=commit;h=d56366da8ee186c474b17cfd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:21:38 2014 +0200 testbot/web: Fix the vertical-align CSS statements so the form labels and inputs align correctly. --- testbot/web/WineTestBot.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index a64584b..5d25c42 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -191,7 +191,7 @@ h2 { width: 45%; display: inline-block; - vertical-align: center; + vertical-align: middle; text-align: right; padding-right: 6px; } @@ -199,6 +199,7 @@ h2 .ItemValue { display: inline-block; + vertical-align: middle; /* The joys of IE. Got the following 2 lines from http://blog.mozilla.com/webdev/2009/02/20/cross-browser-inline-block/ */ zoom: 1;

1 0

Francois Gouget : testbot/web: Recognize 'textarea' properties and use the appropriate input type.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: tools Branch: master Commit: 197a4e91f94c36b02be16355355708bfd7626375 URL: http://source.winehq.org/git/tools.git/?a=commit;h=197a4e91f94c36b02be16355… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:22:17 2014 +0200 testbot/web: Recognize 'textarea' properties and use the appropriate input type. This simplifies the code for web pages that have multiline input fields. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 15 ++++----------- testbot/web/Feedback.pl | 14 +------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index dc4a58a..77c02b3 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -221,17 +221,10 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetClass() eq "Enum") - { - return "select"; - } - - if ($PropertyDescriptor->GetType() eq "B") - { - return "checkbox"; - } - - return "text"; + return $PropertyDescriptor->GetClass() eq "Enum" ? "select" : + $PropertyDescriptor->GetType() eq "B" ? "checkbox" : + $PropertyDescriptor->GetType() eq "textarea" ? "textarea" : + "text"; } sub GenerateField($$$) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 39558da..f0ae921 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -34,7 +34,7 @@ sub _initialize($$$) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), CreateBasicPropertyDescriptor("EMail", "Email", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "A", 1024), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "textarea", 1024), ); $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); @@ -79,18 +79,6 @@ sub GetHeaderText($) "or email address."; } -sub GetInputType($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if (substr($PropertyDescriptor->GetName(), 0, 8) eq "Remarks") - { - return "textarea"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); -} - sub GetActions($) { my ($self) = @_;

1 0

Francois Gouget : testbot/web: Simplify the FeedBack page by using GetParam() to set suitable defaults.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: tools Branch: master Commit: 5e34ba480fac9e561253ca91c1ea9530a4bd1e0e URL: http://source.winehq.org/git/tools.git/?a=commit;h=5e34ba480fac9e561253ca91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:23:32 2014 +0200 testbot/web: Simplify the FeedBack page by using GetParam() to set suitable defaults. --- testbot/web/Feedback.pl | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index f0ae921..5d3e2e6 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -42,27 +42,11 @@ sub _initialize($$$) my $Session = $self->GetCurrentSession(); if (defined($Session)) { + # Provide default values my $User = $Session->User; - $self->{Name} = $User->RealName; - $self->{EMail} = $User->EMail; + $self->GetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); + $self->GetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); } - else - { - $self->{Name} = undef; - $self->{EMail} = undef; - } -} - -sub GetPropertyValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if (defined($self->{$PropertyDescriptor->GetName()})) - { - return $self->{$PropertyDescriptor->GetName()}; - } - - return $self->SUPER::GetPropertyValue($PropertyDescriptor); } sub GetTitle($)

1 0

Francois Gouget : testbot/CGI: Let FormPage::GenerateField() print the label as well as the input tag.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: tools Branch: master Commit: b49b22c6654e6699f04ceac3096ee8c8f0857427 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b49b22c6654e6699f04ceac3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:27:10 2014 +0200 testbot/CGI: Let FormPage::GenerateField() print the label as well as the input tag. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 77c02b3..740b97e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -148,14 +148,7 @@ sub GenerateFields($) foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { my $Display = $self->DisplayProperty($PropertyDescriptor); - if ($Display) - { - print "<div class='ItemProperty'><label>", - $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) . - "</label>"; - $self->GenerateField($PropertyDescriptor, $Display); - print "</div>\n"; - } + $self->GenerateField($PropertyDescriptor, $Display) if ($Display); } } @@ -231,6 +224,10 @@ sub GenerateField($$$) { my ($self, $PropertyDescriptor, $Display) = @_; + print "<div class='ItemProperty'><label>", + $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) . + "</label>"; + my $Value = $self->GetDisplayValue($PropertyDescriptor); if ($Display eq "rw") { @@ -303,6 +300,8 @@ sub GenerateField($$$) print " "; } } + + print "</div>\n"; } sub GenerateRequired($$)

1 0

Francois Gouget : testbot/web: Use a PropertyDescriptor and FormPage:: GenerateField() to handle the Remarks field.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: tools Branch: master Commit: 421c5c8ad65b350c27a50fa759d365211b02b3bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=421c5c8ad65b350c27a50fa7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:28:53 2014 +0200 testbot/web: Use a PropertyDescriptor and FormPage::GenerateField() to handle the Remarks field. This increases code reuse and avoids losing that field if some other field was invalid. --- testbot/web/Register.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 1e18e23..70d8868 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -21,6 +21,8 @@ use strict; package RegisterPage; use URI::Escape; + +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::ItemPage; use WineTestBot::Config; use WineTestBot::Users; @@ -33,6 +35,11 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); + + $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); + $self->{ExtraProperties} = [ + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 200) + ]; } sub GetTitle($) @@ -81,8 +88,10 @@ sub GenerateFields($) my ($self) = @_; print "<div><input type='hidden' name='Status' value='active'></div>\n"; + $self->SUPER::GenerateFields(); - print "<div class='DetailProperty'><label>Remarks</label><textarea name='Remarks' cols='40' rows='4'></textarea></div>\n"; + map { $self->GenerateField($_, "rw") } @{$self->{ExtraProperties}}; + $self->GenerateRequiredLegend(); $self->{HasRequired} = !1; }

1 0

Francois Gouget : testbot/web: Add a simple 'captcha' on the registration page.
by Alexandre Julliard 16 Jun '14

16 Jun '14

Module: tools Branch: master Commit: a83696fd675954763053ea193f09977b6d452625 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a83696fd675954763053ea19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:32:32 2014 +0200 testbot/web: Add a simple 'captcha' on the registration page. The captcha is in the form of a simple configurable question where the answer should be obvious to Wine developers. --- testbot/lib/WineTestBot/Config.pm | 6 ++++-- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 5 +++++ testbot/web/Register.pl | 20 +++++++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index fbf2b0b..db7f18d 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -33,7 +33,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName + $RegistrationQ $RegistrationARE); require Exporter; @ISA = qw(Exporter); @@ -45,7 +46,8 @@ require Exporter; $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName + $RegistrationQ $RegistrationARE); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); if ($::RootDir !~ m=^/=) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 260d79e..6d8128b 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -49,6 +49,11 @@ $WineTestBot::Config::WinePatchCc = ""; # Host name of the web interface $WineTestBot::Config::WebHostName = undef; +# The question to ask to filter out bots trying to register, and the regular +# expression that the answer must match. +$RegistrationQ = "What is the software project being tested?"; +$RegistrationARE = "(?i:wine)"; + # Prefix of the tag used for sending winetest reports $WineTestBot::Config::TagPrefix = undef; diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 70d8868..eb0f1ec 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -35,11 +35,15 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); + $self->{ExtraProperties} = []; + if ($RegistrationQ) + { + $self->GetParam("RegA", "") if (!defined $self->GetParam("RegA")); + push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("RegA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); + } $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); - $self->{ExtraProperties} = [ - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 200) - ]; + push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 160); } sub GetTitle($) @@ -110,6 +114,16 @@ sub OnSendRequest($) { my ($self) = @_; + if ($RegistrationQ) + { + my $RegA = $self->GetParam("RegA"); + if ($RegA !~ /$RegistrationARE/) + { + $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; + $self->{ErrField} = "Captcha"; + return !1; + } + } if (! $self->Save()) { return !1;

1 0

Alexandre Julliard : Wine release 1.7.20
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: website Branch: master Commit: 379eab9862638a3df289d3a1a716b3427ce2146d URL: http://source.winehq.org/git/website.git/?a=commit;h=379eab9862638a3df289d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:53:01 2014 +0200 Wine release 1.7.20 --- news/en/2014061301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014061301.xml b/news/en/2014061301.xml new file mode 100644 index 0000000..8d72896 --- /dev/null +++ b/news/en/2014061301.xml @@ -0,0 +1,16 @@ +<news> +<date>June 13, 2014</date> +<title>Wine 1.7.20 Released</title> +<body> +<p> The Wine development release 1.7.20 is now available.</p> +<p> <a href="{$root}/announce/1.7.20">What's new</a> in this release: +<ul> + <li>X11 drag & drop fixes.</li> + <li>A few more C/C++ runtime functions.</li> + <li>Fixes for various memory issues found by Valgrind.</li> + <li>Some OLE storage fixes.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : Release 1.7.20.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: 56999940a37df73fd69d4ec9876eeb3e2015e4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56999940a37df73fd69d4ec98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:45:11 2014 +0200 Release 1.7.20. --- ANNOUNCE | 760 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 384 insertions(+), 401 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56999940a37df73fd69d4…

1 0