May 2014 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/VMs: Fix a couple of indentation bugs.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 3b7db0fc973933eccb3aa3b1eb9876b401c76f87 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3b7db0fc973933eccb3aa3b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:35:09 2014 +0200 testbot/VMs: Fix a couple of indentation bugs. --- testbot/lib/WineTestBot/VMs.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 55c7c6c..be95bcc 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -416,11 +416,11 @@ my %StreamData; sub _Stream2Image($$$) { - my ($Stream, $Data, $Size) = @_; - my $Image=$StreamData{$Stream}; - $Image->{Size} += $Size; - $Image->{Bytes} .= $Data; - return $Size; + my ($Stream, $Data, $Size) = @_; + my $Image = $StreamData{$Stream}; + $Image->{Size} += $Size; + $Image->{Bytes} .= $Data; + return $Size; } sub CaptureScreenImage($) @@ -507,7 +507,7 @@ sub Validate if ($self->Type ne "win32" && $self->Type ne "win64" && ($self->Role eq "winetest" || $self->Role eq "extra")) { - return ("Role", "Only win32 and win64 VMs can have a role of '" . $self->Role . "'"); + return ("Role", "Only win32 and win64 VMs can have a role of '" . $self->Role . "'"); } return $self->SUPER::Validate(@_); }

1 0

Francois Gouget : testbot/lib: Remove an unused variable from ObjectModel: :Item::ValidateProperty().
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: f3c254d85a74e053758ba6f6b27e7071c3ab8081 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f3c254d85a74e053758ba6f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:37:37 2014 +0200 testbot/lib: Remove an unused variable from ObjectModel::Item::ValidateProperty(). --- testbot/lib/ObjectModel/Item.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index f988a46..c718783 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -345,10 +345,8 @@ sub ValidateProperty my $PropertyDescriptor = shift; my $PropertyName = $PropertyDescriptor->GetName(); - my $Value = $self->$PropertyName; - return $PropertyDescriptor->ValidateValue($self->$PropertyName, - $self->GetIsNew()); + $self->GetIsNew()); } sub Validate

1 0

Francois Gouget : testbot/CGI: Remove an unused variable.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 0d41b6cba9042a1d4271cd7ab48666fc345304bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=0d41b6cba9042a1d4271cd7a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:23:30 2014 +0200 testbot/CGI: Remove an unused variable. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index eb859a0..c9dfb04 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -223,7 +223,6 @@ sub GetInputType my $self = shift; my $PropertyDescriptor = shift; - my $Class=$PropertyDescriptor->GetClass(); if ($PropertyDescriptor->GetClass() eq "Enum") { return "select";

1 0

Francois Gouget : testbot/lib: Fix the call to ValuesDiffer() in Item:: AUTOLOAD.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 9fee4992ceafb7c547b9bd7d7bc3c30d2e9ff4e6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9fee4992ceafb7c547b9bd7d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:36:25 2014 +0200 testbot/lib: Fix the call to ValuesDiffer() in Item::AUTOLOAD. ValuesDiffer() is a method, not a function! --- testbot/lib/ObjectModel/Item.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 48864f4..f988a46 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012, 2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -218,8 +218,8 @@ sub AUTOLOAD if (@_) { $self->{Itemrefs}{$PropertyName} = shift; - if (ValuesDiffer($self->{ColValues}{@{$ColNames}[0]}, - $self->{Itemrefs}{$PropertyName}->GetKey())) + if ($self->ValuesDiffer($self->{ColValues}{@{$ColNames}[0]}, + $self->{Itemrefs}{$PropertyName}->GetKey())) { $self->{IsModified} = 1; $self->{ColValues}{@{$ColNames}[0]} = $self->{Itemrefs}{$PropertyName}->GetKey();

1 0