wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Alexandre Julliard : kernelbase: Reimplement misc locale info values in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 08a9dc503191b912b2251d5b77824a414338dbbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a9dc503191b912b2251d5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:10:54 2022 +0200 kernelbase: Reimplement misc locale info values in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index a0960703097..669e1b14290 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1276,7 +1276,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_strarray( locale->sduration, 0, type, buffer, len ); case LOCALE_SKEYBOARDSTOINSTALL: - return -1; + return locale_return_string( locale->skeyboardstoinstall, type, buffer, len ); case LOCALE_SSHORTESTDAYNAME1: case LOCALE_SSHORTESTDAYNAME2: @@ -1304,13 +1304,13 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sneginfinity, type, buffer, len ); case LOCALE_SSCRIPTS: - return -1; + return locale_return_string( locale->sscripts, type, buffer, len ); case LOCALE_SPARENT: return locale_return_string( locale->sparent, type, buffer, len ); case LOCALE_SCONSOLEFALLBACKNAME: - return -1; + return locale_return_string( locale->sconsolefallbackname, type, buffer, len ); case LOCALE_SLOCALIZEDLANGUAGENAME: /* FIXME: localization */ @@ -1320,7 +1320,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->ireadinglayout, type, buffer, len ); case LOCALE_INEUTRAL: - return -1; + return locale_return_number( !locale->inotneutral, type, buffer, len ); case LOCALE_SENGLISHDISPLAYNAME: return locale_return_string( locale->sengdisplayname, type, buffer, len ); @@ -1350,7 +1350,12 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sopentypelanguagetag, type, buffer, len ); case LOCALE_SSORTLOCALE: - return -1; + if (SORTIDFROMLCID(lcid)) /* custom sort locale */ + { + const NLS_LOCALE_LCID_INDEX *entry = find_lcid_entry( lcid & ~0x80000000 ); + if (entry) return locale_return_string( entry->name, type, buffer, len ); + } + return locale_return_string( locale->ssortlocale, type, buffer, len ); case LOCALE_SRELATIVELONGDATE: return locale_return_string( locale->srelativelongdate, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement currency formatting values in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 07cbbdeaaabd188c177c6ead3dbae2b4d06249fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=07cbbdeaaabd188c177c6ead… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:11:44 2022 +0200 kernelbase: Reimplement currency formatting values in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index f0db9cd0c43..a0960703097 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1118,23 +1118,23 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->sintlsymbol, type, buffer, len ); case LOCALE_SMONDECIMALSEP: - return -1; + return locale_return_string( locale->smondecimalsep, type, buffer, len ); case LOCALE_SMONTHOUSANDSEP: - return -1; + return locale_return_string( locale->smonthousandsep, type, buffer, len ); case LOCALE_SMONGROUPING: - return -1; + return locale_return_grouping( locale->smongrouping, type, buffer, len ); case LOCALE_ICURRDIGITS: case LOCALE_IINTLCURRDIGITS: - return -1; + return locale_return_number( locale->icurrdigits, type, buffer, len ); case LOCALE_ICURRENCY: - return -1; + return locale_return_number( locale->icurrency, type, buffer, len ); case LOCALE_INEGCURR: - return -1; + return locale_return_number( locale->inegcurr, type, buffer, len ); case LOCALE_SDATE: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement number formatting values in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: ba43e4cfca97a9bba3e6575af82acbf011685862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba43e4cfca97a9bba3e6575a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:11:32 2022 +0200 kernelbase: Reimplement number formatting values in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 54 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 31a81fc167c..f0db9cd0c43 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -887,6 +887,42 @@ static int locale_return_number( UINT val, LCTYPE type, WCHAR *buffer, int len ) } +static int locale_return_grouping( DWORD pos, LCTYPE type, WCHAR *buffer, int len ) +{ + WORD i, count = locale_strings[pos]; + const WCHAR *str = locale_strings + pos + 1; + int ret; + + if (type & LOCALE_RETURN_NUMBER) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + ret = 2 * count; + if (str[count - 1]) ret += 2; /* for final zero */ + + if (!len) return ret; + if (ret > len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + for (i = 0; i < count; i++) + { + if (!str[i]) /* explicit null termination */ + { + buffer[-1] = 0; + return ret; + } + *buffer++ = '0' + str[i]; + *buffer++ = ';'; + } + *buffer++ = '0'; + *buffer = 0; + return ret; +} + + static int locale_return_strarray( DWORD pos, WORD idx, LCTYPE type, WCHAR *buffer, int len ) { const DWORD *array = (const DWORD *)(locale_strings + pos + 1); @@ -1052,25 +1088,25 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( val, type, buffer, len ); case LOCALE_SLIST: - return -1; + return locale_return_string( locale->slist, type, buffer, len ); case LOCALE_IMEASURE: return locale_return_number( locale->imeasure, type, buffer, len ); case LOCALE_SDECIMAL: - return -1; + return locale_return_string( locale->sdecimal, type, buffer, len ); case LOCALE_STHOUSAND: - return -1; + return locale_return_string( locale->sthousand, type, buffer, len ); case LOCALE_SGROUPING: - return -1; + return locale_return_grouping( locale->sgrouping, type, buffer, len ); case LOCALE_IDIGITS: - return -1; + return locale_return_number( locale->idigits, type, buffer, len ); case LOCALE_ILZERO: - return -1; + return locale_return_number( locale->ilzero, type, buffer, len ); case LOCALE_SNATIVEDIGITS: return locale_return_strarray_concat( locale->snativedigits, type, buffer, len ); @@ -1192,10 +1228,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ type - LOCALE_SABBREVMONTHNAME1, type, buffer, len ); case LOCALE_SPOSITIVESIGN: - return -1; + return locale_return_string( locale->spositivesign, type, buffer, len ); case LOCALE_SNEGATIVESIGN: - return -1; + return locale_return_string( locale->snegativesign, type, buffer, len ); case LOCALE_IPOSSIGNPOSN: return -1; @@ -1379,7 +1415,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ 12, type, buffer, len ); case LOCALE_INEGNUMBER: - return -1; + return locale_return_number( locale->inegnumber, type, buffer, len ); case LOCALE_IDEFAULTMACCODEPAGE: val = locale->idefaultmaccodepage == CP_UTF8 ? CP_MACCP : locale->idefaultmaccodepage;

1 0

Francois Gouget : testbot/web: Use the page's escapeHTML() method.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: 923d62a76662296cdafce53a1c8288625dfee3fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=923d62a76662296cdafce53… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:06:55 2022 +0200 testbot/web: Use the page's escapeHTML() method. It should normally forward the call to CGI->escapeHTML() but there is no reason to assume it does. Also having a mix of both is confusing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 14 +++++++------- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 +++--- testbot/web/JobDetails.pl | 10 +++++----- testbot/web/Submit.pl | 15 +++++++-------- testbot/web/admin/SpecialJobs.pl | 6 +++--- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index b85ccb2..9ce9fa9 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -258,7 +258,7 @@ sub GenerateField($$$) my ($self, $PropertyDescriptor, $Display) = @_; print "<div class='ItemProperty'><label>", - $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) . + $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), "</label>"; my $Value = $self->GetDisplayValue($PropertyDescriptor); @@ -281,9 +281,9 @@ sub GenerateField($$$) print "<select name='", $PropertyDescriptor->GetName(), "'>\n"; foreach my $V (@{$PropertyDescriptor->GetValues()}) { - print " <option value='", $self->CGI->escapeHTML($V), "'"; + print " <option value='", $self->escapeHTML($V), "'"; print " selected='selected'" if ($Value eq $V); - print ">", $self->CGI->escapeHTML($V), "</option>\n"; + print ">", $self->escapeHTML($V), "</option>\n"; } print "</select>"; } @@ -302,7 +302,7 @@ sub GenerateField($$$) print "'>"; if (defined $Value) { - print $self->CGI->escapeHTML($Value), "'"; + print $self->escapeHTML($Value), "'"; } print "</textarea>"; $self->GenerateRequired($PropertyDescriptor); @@ -315,7 +315,7 @@ sub GenerateField($$$) "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; if (defined $Value && $InputType ne "password") { - print " value='", $self->CGI->escapeHTML($Value), "'"; + print " value='", $self->escapeHTML($Value), "'"; } print " />"; $self->GenerateRequired($PropertyDescriptor); @@ -326,7 +326,7 @@ sub GenerateField($$$) { if ($Value) { - print $self->CGI->escapeHTML($Value); + print $self->escapeHTML($Value); } else { @@ -355,7 +355,7 @@ sub GenerateTitle($) my $Title = $self->GetTitle(); if ($Title) { - print "<h1 id='PageTitle'>", $self->CGI->escapeHTML($Title), "</h1>\n"; + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; } } diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index e584bc9..f76a15f 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -313,7 +313,7 @@ sub GenerateErrorDiv($$) if ($ErrMessage) { print "<noscript>\n"; - print "<div id='errormessage'>", $Page->CGI->escapeHTML($ErrMessage), "</div>\n"; + print "<div id='errormessage'>", $Page->escapeHTML($ErrMessage), "</div>\n"; print "</noscript>\n"; } } @@ -399,7 +399,7 @@ sub GenerateHeader($$) { my ($self, $Page) = @_; - my $Title = $Page->CGI->escapeHTML($Page->GetPageTitle()); + my $Title = $Page->escapeHTML($Page->GetPageTitle()); print <<EOF; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> @@ -461,7 +461,7 @@ EOF print " <li><p><a href='", MakeSecureURL("/Logout.pl"), "'>Log out"; if (defined($Session)) { - print " ", $Page->CGI->escapeHTML($Session->User->Name); + print " ", $Page->escapeHTML($Session->User->Name); } print "</a></p></li>\n"; } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 5e302c0..5b8b701 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -320,7 +320,7 @@ sub GenerateMoreInfoLink($$$$;$$) my ($Action, $Url) = $self->GetMoreInfoLink($LinkKey, $Label, $Set, $Value); my $Title = ($Value =~ /^(.*)\.report$/) ? " title='$1'" : ""; - my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'$Title>$Action $Label</a>"; + my $Html = "<a href='". $self->escapeHTML($Url) ."'$Title>$Action $Label</a>"; if (defined $Value) { $Url = "/GetTaskFile.pl?Job=". uri_escape($self->{JobId}) @@ -474,8 +474,8 @@ EOF " <span class='right'><a class='title' href='#$Prev'>↑</a><a class='title' href='#$Next'>↓</a></span></h2>\n"; print "<details><summary>", - $self->CGI->escapeHTML($VM->Description || $VM->Name), "</summary>", - $self->CGI->escapeHTML($VM->Details || "No details!"), + $self->escapeHTML($VM->Description || $VM->Name), "</summary>", + $self->escapeHTML($VM->Details || "No details!"), ($StepTask->Missions ? "<br>Missions: ". $StepTask->Missions : ""), "</details>\n"; @@ -489,7 +489,7 @@ EOF "&StepKey=" . uri_escape($StepTask->StepNo) . "&TaskKey=" . uri_escape($StepTask->TaskNo); print "<div class='Screenshot'><img src='" . - $self->CGI->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; + $self->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; } $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } @@ -509,7 +509,7 @@ EOF # my ($Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($MoreInfo->{Full}), "Full", $MoreInfo->{Full}); - $Url = $self->CGI->escapeHTML($Url); + $Url = $self->escapeHTML($Url); my $HideLog = $Action eq "Hide" ? " ondblclick='HideLog(event, \"$Url\")'" : ""; my $LogIsEmpty = $self->GenerateFullLog($TaskDir, $MoreInfo->{Full}, $HideLog); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index ef7816b..3d49aae 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -494,7 +494,7 @@ sub _initialize($$$) } } - my $FieldBase = $self->CGI->escapeHTML($VMKey); + my $FieldBase = $self->escapeHTML($VMKey); foreach my $Build (sort @Builds) { my $VMRow = { @@ -537,7 +537,7 @@ sub _GenerateStateField($$) if (defined $self->{$Name}) { print "<input type='hidden' name='$Name' value='", - $self->CGI->escapeHTML($self->{$Name}), "'>\n"; + $self->escapeHTML($self->{$Name}), "'>\n"; } } @@ -758,12 +758,12 @@ sub GenerateFields($) foreach my $Key (@SortedKeys) { my $Branch = $Branches->GetItem($Key); - print "<option value='", $self->CGI->escapeHTML($Key), "'"; + print "<option value='", $self->escapeHTML($Key), "'"; if (defined $self->{Branch} and $Key eq $self->{Branch}) { print " selected"; } - print ">", $self->CGI->escapeHTML($Branch->Name), "</option>"; + print ">", $self->escapeHTML($Branch->Name), "</option>"; } print "</select> <span class='Required'>*</span></div></div>\n"; } @@ -839,7 +839,7 @@ EOF my $Name = $VM->Name; $Name .= " ($VMRow->{Build})" if ($VM->Type eq "wine"); - print "<td>", $self->CGI->escapeHTML($Name), "</td>\n"; + print "<td>", $self->escapeHTML($Name), "</td>\n"; print "<td>"; if ($VMRow->{Exe32} and $VMRow->{Exe64}) @@ -868,10 +868,9 @@ EOF print "</td>\n"; print "<td><details><summary>", - $self->CGI->escapeHTML($VM->Description || $VM->Name); + $self->escapeHTML($VM->Description || $VM->Name); print " [", $VM->Status ,"]" if ($VM->Status =~ /^(?:offline|maintenance)$/); - print "</summary>", - $self->CGI->escapeHTML($VM->Details || "No details!"), + print "</summary>", $self->escapeHTML($VM->Details || "No details!"), "</details></td>"; print "</tr>\n"; } diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 79160e4..49f80a0 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -117,14 +117,14 @@ sub GenerateJobFields($$$$$) foreach my $Option (@{$JobTemplate->{Options}}) { my $Selected = $JobTemplate->{VMKey} eq "*$Option" ? " selected" : ""; - print "<option value='*", $self->CGI->escapeHTML($Option), + print "<option value='*", $self->escapeHTML($Option), "'$Selected>$Option</option>\n"; } foreach my $VM (@{$JobTemplate->{VMs}}) { my $Selected = $JobTemplate->{VMKey} eq $VM->Name ? " selected" : ""; - print "<option value='", $self->CGI->escapeHTML($VM->Name), - "'$Selected>", $self->CGI->escapeHTML($VM->Name), "</option>\n"; + print "<option value='", $self->escapeHTML($VM->Name), + "'$Selected>", $self->escapeHTML($VM->Name), "</option>\n"; } print "</select> </div></div>\n"; }

1 0

Francois Gouget : testbot/web: Remove unneeded CGI imports.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: cdad6a990a00cb169b5b264b08736d36c70b35b1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cdad6a990a00cb169b5b264… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:06:53 2022 +0200 testbot/web: Remove unneeded CGI imports. Not only are they unneeded, but when combined with qw(:standard) they prevent calling $self->escapeHTML() (where $self is an ObjectModel::CGI::Page object). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Logout.pl | 1 - testbot/web/Submit.pl | 1 - 2 files changed, 2 deletions(-) diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 17e81d2..b0fd5cd 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -24,7 +24,6 @@ package LogoutPage; use ObjectModel::CGI::Page; our @ISA = qw(ObjectModel::CGI::Page); -use CGI qw(:standard); use WineTestBot::CGI::Sessions; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index e2173d8..ef7816b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -25,7 +25,6 @@ package SubmitPage; use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); -use CGI qw(:standard); use Fcntl qw(O_RDONLY); use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX

1 0

Francois Gouget : testbot/web: Document the Fcntl usage.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: d29fd0fddd8fde89e5b2fdf71ee38aefd096b601 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d29fd0fddd8fde89e5b2fdf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:06:50 2022 +0200 testbot/web: Document the Fcntl usage. Use Fcntl qw(O_RDONLY) for simple cases. This is better than adding a comment which may get out-of-date if more constants are needed. But still use a comment to avoid too much duplication in more complex cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- testbot/lib/WineTestBot/Utils.pm | 2 +- testbot/web/GetFile.pl | 2 +- testbot/web/GetTaskFile.pl | 2 +- testbot/web/Screenshot.pl | 2 +- testbot/web/Submit.pl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index db9d82d..7880b8e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -37,7 +37,7 @@ sub BEGIN } use Errno qw(EAGAIN); -use Fcntl; +use Fcntl; # For O_XXX and FD_XXX use MIME::Parser; use POSIX ":sys_wait_h"; use Socket; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 27b222f..5315c75 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BuildTag SanitizeTag LocaleName NotifyAdministrator BatchQuote ShQuote ShArgv2Cmd); -use Fcntl; +use Fcntl qw(O_CREAT O_EXCL O_WRONLY); use WineTestBot::Config; diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index a869949..59602bf 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -21,7 +21,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use WineTestBot::Jobs; diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 4111119..0b7f167 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # for O_READONLY +use Fcntl qw(O_RDONLY); use WineTestBot::Config; diff --git a/testbot/web/Screenshot.pl b/testbot/web/Screenshot.pl index a8a3d88..685c4a4 100644 --- a/testbot/web/Screenshot.pl +++ b/testbot/web/Screenshot.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; use CGI::Cookie; -use Fcntl; +use Fcntl qw(O_RDONLY); use WineTestBot::Config; use WineTestBot::CGI::Sessions; use WineTestBot::Engine::Notify; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 472622d..e2173d8 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -26,7 +26,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use CGI qw(:standard); -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename;

1 0

Francois Gouget : testbot/web: Document why ErrField is not set when failing to delete an item.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: 5adffdb0f644c9434fef9db53dcad9d5dcab251a URL: https://source.winehq.org/git/tools.git/?a=commit;h=5adffdb0f644c9434fef9db… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:02:45 2022 +0200 testbot/web: Document why ErrField is not set when failing to delete an item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UsersList.pl | 3 ++- testbot/web/admin/VMsList.pl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 019bc63..ae514e9 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -117,7 +117,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $User->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 0ed0b0d..1895225 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -59,7 +59,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $VM->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; }

1 0

Francois Gouget : testbot/web: Add an Apache module import for the Munin redirects.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: a132383bd4f771008757d2bbd9bf7358e9cd7fe9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a132383bd4f771008757d2b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:05:14 2022 +0200 testbot/web: Add an Apache module import for the Munin redirects. Fortunately it is only needed in the error case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Munin.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index c2464d0..513c690 100644 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -19,6 +19,7 @@ use strict; +use Apache2::Const -compile => qw(REDIRECT); use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::VMs;

1 0

Francois Gouget : testbot/cgi: Improve the title for multi-word collection / item class names.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: 1c90fd56e778b654da080b3cf39047d805e4f1f3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1c90fd56e778b654da080b3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:05:07 2022 +0200 testbot/cgi: Improve the title for multi-word collection / item class names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 4 +++- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index d59310b..ddbbd66 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -137,7 +137,9 @@ sub GetTitle($) { my ($self) = @_; - return ucfirst($self->{Collection}->GetCollectionName()); + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; } sub GenerateTitle($) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 66fcab7..567a489 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -94,8 +94,11 @@ sub GetTitle($) { my ($self) = @_; - return $self->GetParam("Key") ? $self->GetParam("Key") : - "Add " . $self->{Collection}->GetItemName(); + return $self->GetParam("Key") if ($self->GetParam("Key")); + + my $Title = $self->{Collection}->GetItemName(); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return "Add $Title"; } sub GenerateFormStart($)

1 0

Francois Gouget : testbot/web: The VMsList page deals with VMs so rename the $Item parameter.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: 5586caa061cf44ecb41d75a2446c783cbd10cede URL: https://source.winehq.org/git/tools.git/?a=commit;h=5586caa061cf44ecb41d75a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:04:23 2022 +0200 testbot/web: The VMsList page deals with VMs so rename the $Item parameter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/VMsList.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 283c542..0ed0b0d 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -54,16 +54,16 @@ sub SortKeys($$$) sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Item, $Action) = @_; + my ($self, $CollectionBlock, $VM, $Action) = @_; if ($Action eq "Delete") { - $Item->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + $VM->Role("deleted"); + (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; } - return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $VM, $Action); }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
114
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022