October 2019 - Wine-Commits

Francois Gouget : testbot/SetWinLocale: Add and remove some country and keyboard codes.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: tools Branch: master Commit: 756637668ee6cdc8554fd5f8dd9dd6ca505905d9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=756637668ee6cdc8554fd5f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 1 03:34:52 2019 +0200 testbot/SetWinLocale: Add and remove some country and keyboard codes. The codes for Serbia seem to have changed after Windows 8.1. So remove them until they are needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index ca750b7..dc739d1 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -96,6 +96,8 @@ my %Countries = ( "AF" => 3, # Afganistan "AL" => 6, # Albania "AM" => 7, # Armenia + "AR" => 11, # Argentina + "AT" => 14, # Austria "AZ" => 5, # Azerbaijan "BA" => 25, # Bosnia and Herzegovina "BE" => 21, # Belgium @@ -103,9 +105,10 @@ my %Countries = ( "BN" => 37, # Brunei Darussalam "BR" => 32, # Brazil "BY" => 29, # Belarus + "CA" => 39, # Canada "CH" => 223, # Switzerland "CN" => 45, # China - "CS" => 271, # Serbia + "CX" => 12, # Australia "CZ" => 75, # Czech Republic "DE" => 94, # Germany "DK" => 61, # Denmark @@ -127,6 +130,7 @@ my %Countries = ( "IR" => 116, # Iran "IS" => 110, # Iceland "IT" => 118, # Italy + "KI" => 133, # Kiribati "JP" => 122, # Japan "KE" => 129, # Kenya "KG" => 130, # Kyrgyzstan @@ -141,6 +145,9 @@ my %Countries = ( "MY" => 167, # Malaysia "NL" => 176, # Netherlands "NO" => 177, # Norway + "NP" => 178, # Nepal + "PE" => 187, # Peru + "PF" => 318, # French Polynesia "PK" => 190, # Pakistan "PL" => 191, # Poland "PT" => 193, # Portugal @@ -152,6 +159,7 @@ my %Countries = ( "SK" => 143, # Slovakia "SN" => 210, # Senegal "TH" => 227, # Thailand + "TO" => 231, # Tonga "TR" => 235, # Turkey "TW" => 237, # Taiwan "UA" => 241, # Ukraine @@ -231,7 +239,6 @@ my %Keyboards = ( "sk-SK" => ["041b:0000041b"], # Slovak - Slovakia "sl-SI" => ["0424:00000424"], # Slovenian - Slovenia "sq-AL" => ["041c:0000041c"], # Albanian - Albania - "sr-Latn-RS" => ["241a:0000081a"], # Serbian - Serbia (Latin) "sv-FI" => ["081d:0000041d"], # Swedish - Finland "sv-SE" => ["041d:0000041d"], # Swedish - Sweden "sw-KE" => ["0441:00000409"], # Swahili - Kenya

1 0

Francois Gouget : testbot/SetWinLocale: Untaint the hostname if specified on the command line.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: tools Branch: master Commit: 5b9933e4ac114b63e4a6acafd6365bba0c90ee62 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5b9933e4ac114b63e4a6aca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 1 03:35:26 2019 +0200 testbot/SetWinLocale: Untaint the hostname if specified on the command line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index dc739d1..7ddbded 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -385,6 +385,7 @@ while (@ARGV) } } +# Check and untaint parameters my ($BaseVMName, $VMLocale, %AddLocales, $KeyboardIds, $CountryId); if (!defined $Usage) { @@ -449,7 +450,7 @@ if (!defined $Usage) Error("'$OptVM' should not be a locale VM\n"); $Usage = 2; } - $VMLocale = "$1_$2"; + $VMLocale = "$1_$2"; # untaint $OptDefault = $VMLocale eq "sr_RS" ? "sr-Latn-CS" : "$1-$2"; } elsif ($OptRefresh) @@ -471,6 +472,15 @@ if (!defined $Usage) Error("you must specify the Windows machine to work on\n"); $Usage = 2; } + elsif ($OptHostName =~ /^([a-zA-Z0-9.-]+)$/) + { + $OptHostName = $1; # untaint + } + else + { + Error("'$OptHostName' is not a valid hostname\n"); + $Usage = 2; + } } $OptLocale ||= $OptDefault;

1 0

Francois Gouget : testbot/Submit: Replace the "Toggle All" action with a more standard "master" checkbox.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: tools Branch: master Commit: 359f779f553b2d73b94ce5b4c58f61b6bb986e2a URL: https://source.winehq.org/git/tools.git/?a=commit;h=359f779f553b2d73b94ce5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 1 03:37:10 2019 +0200 testbot/Submit: Replace the "Toggle All" action with a more standard "master" checkbox. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 65 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index b9ead74..a51ace6 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -589,12 +589,10 @@ sub GenerateFields($) { $self->_GenerateStateField("ShowAll"); print "<div class='CollectionBlock'><table>\n"; - print "<thead><tr><th class='Record'></th>\n"; - print "<th class='Record'>VM Name</th>\n"; - print "<th class='Record'>Description</th>\n"; - print "</thead><tbody>\n"; + print "<thead><tr><th class='Record'>"; - my $Even = 1; + # Check which VMs are selected and set the master default + my $MasterChecked = " checked"; foreach my $VMRow (@{$self->{VMRows}}) { next if ($VMRow->{Incompatible}); @@ -602,15 +600,47 @@ sub GenerateFields($) next if ($VMRow->{Extra} and !$VMRow->{Checked} and !$self->{ShowAll}); # By default select the base VMs that are ready to run tasks - my $VM = $VMRow->{VM}; if (!$self->{UserVMSelection} and !$VMRow->{Extra} and - $VM->Status !~ /^(?:offline|maintenance)$/) + $VMRow->{VM}->Status !~ /^(?:offline|maintenance)$/) { $VMRow->{Checked} = 1; } + $MasterChecked = "" if (!$VMRow->{Checked}); + } + + # Add a "Toggle All" pseudo action + print <<EOF; +<script type='text/javascript'> + +</script> +EOF + print "</th>\n"; + print "<th class='Record'>VM Name</th>\n"; + print "<th class='Record'>Description</th>\n"; + print "</thead><tbody>\n"; + + my $Even = 1; + foreach my $VMRow (@{$self->{VMRows}}) + { + next if ($VMRow->{Incompatible}); + # Extra VMs may be hidden + next if ($VMRow->{Extra} and !$VMRow->{Checked} and !$self->{ShowAll}); + my $VM = $VMRow->{VM}; print "<tr class='", ($Even ? "even" : "odd"), - "'><td><input name='$VMRow->{Field}' type='checkbox'"; + "'><td><input class='vmcb' name='$VMRow->{Field}' type='checkbox'"; $Even = !$Even; print " checked='checked'" if ($VMRow->{Checked}); print "/></td>\n"; @@ -631,25 +661,6 @@ sub GenerateFields($) $self->_GenerateStateField("UserVMSelection"); print "</div>\n"; - # Add a "Toggle All" pseudo action - print <<EOF; -<script type='text/javascript'> - -</script> -EOF - # Add a Show base/all VMs button separate from the other actions print "<div class='ItemActions'>\n"; print "<input type='submit' name='Action' value='",

1 0

Francois Gouget : testbot/Submit: Preserve the uploaded file on the first submit page.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: tools Branch: master Commit: beec6fc67560b8a53c910e02fc8a43598e68081a URL: https://source.winehq.org/git/tools.git/?a=commit;h=beec6fc67560b8a53c910e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 1 03:36:59 2019 +0200 testbot/Submit: Preserve the uploaded file on the first submit page. The file input type cannot take an initial path for obvious security reasons. So when going back to the first page show the currently selected filename along with an option to unset it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 75 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 2cc9c80..b9ead74 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -58,7 +58,7 @@ sub _Upload($) { my ($self) = @_; - my $Src = $self->CGI->upload("FileName"); + my $Src = $self->CGI->upload("Upload"); if (defined $Src) { my $OldUMask = umask(002); @@ -76,7 +76,7 @@ sub _Upload($) { umask($OldUMask); delete $self->{FileName}; - $self->{ErrField} = "FileName"; + $self->{ErrField} = "Upload"; $self->{ErrMessage} = "Unable to save the uploaded file"; return undef; } @@ -84,7 +84,7 @@ sub _Upload($) else { delete $self->{FileName}; - $self->{ErrField} = "FileName"; + $self->{ErrField} = "Upload"; $self->{ErrMessage} = "Unable to upload the file"; return undef; } @@ -476,7 +476,8 @@ sub GetHeaderText($) } elsif ($self->{Page} == 1) { - return "Specify the patch file that you want to upload and submit " . + return defined $self->{FileName} ? "" : + "Specify the patch file that you want to upload and submit " . "for testing.<br>\n" . "You can also specify a Windows .exe file, this would normally be " . "a Wine test executable that you cross-compiled." @@ -539,9 +540,18 @@ sub GenerateFields($) elsif ($self->{Page} == 1) { print "<div class='ItemProperty'><label>File</label>", - "<div class='ItemValue'>", - "<input type='file' name='FileName' size='64' maxlength='64' />", - " <span class='Required'>*</span></div></div>\n"; + "<div class='ItemValue'>"; + if (defined $self->{FileName}) + { + $self->_GenerateStateField("FileName"); + print "<input type='submit' name='Action' value='Unset'/> $self->{FileName}"; + } + else + { + print "<input type='file' name='Upload' size='64' maxlength='64'/>", + " <span class='Required'>*</span>"; + } + print "</div></div>\n"; my $Branches = CreateBranches(); if (!defined $self->{Branch}) @@ -727,12 +737,42 @@ sub _SetPage($$) delete $self->{PropertyDescriptors}; } +sub OnUnset($) +{ + my ($self) = @_; + + if (!$self->_ValidateFileName()) + { + # Ignore the error. What counts is not using a suspicious FileName. + delete $self->{ErrField}; + delete $self->{ErrMessage}; + } + elsif (defined $self->{FileName}) + { + my $StagingFilePath = $self->_GetStagingFilePath(); + unlink($StagingFilePath) if ($StagingFilePath); + delete $self->{FileName}; + } + delete $self->{TestExecutable}; + delete $self->{CmdLineArg}; + + return 1; +} + sub OnPage1Next($) { my ($self) = @_; - if (!$self->_ValidateFileName() or !$self->_Upload() or !$self->Validate() or - !$self->_ValidateVMSelection("deselect")) + if (defined $self->{FileName}) + { + return undef if (!$self->_ValidateFileName()); + } + else + { + $self->{FileName} = $self->GetParam("Upload"); + return undef if (!$self->_ValidateFileName() or !$self->_Upload()); + } + if (!$self->Validate() or !$self->_ValidateVMSelection("deselect")) { return undef; } @@ -779,19 +819,6 @@ sub OnPage2Prev($) { my ($self) = @_; - if (!$self->_ValidateFileName()) - { - # Ignore the error. What counts is not using a suspicious FileName. - delete $self->{ErrField}; - delete $self->{ErrMessage}; - } - elsif (defined $self->{FileName}) - { - my $StagingFilePath = $self->_GetStagingFilePath(); - unlink($StagingFilePath) if ($StagingFilePath); - delete $self->{FileName}; - } - $self->_SetPage(1); return 1; } @@ -1076,6 +1103,10 @@ sub OnAction($$) { return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); } + elsif ($Action eq "Unset") + { + return $self->OnUnset(); + } elsif ($Action eq "Submit") { return $self->OnSubmit();

1 0