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

Alexandre Julliard : kernelbase: Reimplement updating the locale values in the registry on locale change.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 5014a44e3ca71dbcc312316a2e7baf0602eba41f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5014a44e3ca71dbcc312316a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:12:15 2022 +0200 kernelbase: Reimplement updating the locale values in the registry on locale change. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 94 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 30 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8b1d3b51afc..24ccc8abdfa 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1654,6 +1654,68 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ } +/* update a registry value based on the current user locale info */ +static void update_registry_value( UINT type, const WCHAR *value ) +{ + WCHAR buffer[80]; + UINT len = get_locale_info( user_locale, user_lcid, type, buffer, ARRAY_SIZE(buffer) ); + if (len) RegSetValueExW( intl_key, value, 0, REG_SZ, (BYTE *)buffer, len * sizeof(WCHAR) ); +} + + +/* update all registry values upon user locale change */ +static void update_locale_registry(void) +{ + WCHAR buffer[80]; + UINT len; + + len = swprintf( buffer, ARRAY_SIZE(buffer), L"%08x", GetUserDefaultLCID() ); + RegSetValueExW( intl_key, L"Locale", 0, REG_SZ, (BYTE *)buffer, (len + 1) * sizeof(WCHAR) ); + + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_ICALENDARTYPE, entry_icalendartype.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_ICOUNTRY, entry_icountry.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_ICURRDIGITS, entry_icurrdigits.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_ICURRENCY, entry_icurrency.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_IDIGITS, entry_idigits.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_IDIGITSUBSTITUTION, entry_idigitsubstitution.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_IFIRSTDAYOFWEEK, entry_ifirstdayofweek.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_IFIRSTWEEKOFYEAR, entry_ifirstweekofyear.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_ILZERO, entry_ilzero.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_IMEASURE, entry_imeasure.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_INEGCURR, entry_inegcurr.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_INEGNUMBER, entry_inegnumber.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_IPAPERSIZE, entry_ipapersize.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_S1159, entry_s1159.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_S2359, entry_s2359.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SCURRENCY, entry_scurrency.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SDECIMAL, entry_sdecimal.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SGROUPING, entry_sgrouping.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SLIST, entry_slist.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SLONGDATE, entry_slongdate.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SMONDECIMALSEP, entry_smondecimalsep.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SMONGROUPING, entry_smongrouping.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SMONTHOUSANDSEP, entry_smonthousandsep.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SNATIVEDIGITS, entry_snativedigits.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SNEGATIVESIGN, entry_snegativesign.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SPOSITIVESIGN, entry_spositivesign.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SSHORTDATE, entry_sshortdate.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SSHORTTIME, entry_sshorttime.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_STHOUSAND, entry_sthousand.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_STIMEFORMAT, entry_stimeformat.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SYEARMONTH, entry_syearmonth.value ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_IDATE, L"iDate" ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_ITIME, L"iTime" ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_ITIMEMARKPOSN, L"iTimePrefix" ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_ITLZERO, L"iTLZero" ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SDATE, L"sDate" ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_STIME, L"sTime" ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SABBREVLANGNAME, L"sLanguage" ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SCOUNTRY, L"sCountry" ); + update_registry_value( LOCALE_NOUSEROVERRIDE | LOCALE_SNAME, L"LocaleName" ); + SetUserGeoID( user_locale->igeoid ); +} + + /*********************************************************************** * init_locale */ @@ -1664,8 +1726,7 @@ void init_locale(void) void *sort_ptr; WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; DYNAMIC_TIME_ZONE_INFORMATION timezone; - GEOID geoid = GEOID_NOT_AVAILABLE; - DWORD count, dispos, i; + DWORD count; SIZE_T size; HKEY hkey; @@ -1721,17 +1782,6 @@ void init_locale(void) RegCloseKey( hkey ); } - if (!RegCreateKeyExW( intl_key, L"Geo", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, &dispos )) - { - if (dispos == REG_CREATED_NEW_KEY) - { - GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IGEOID | LOCALE_RETURN_NUMBER, - (WCHAR *)&geoid, sizeof(geoid) / sizeof(WCHAR) ); - SetUserGeoID( geoid ); - } - RegCloseKey( hkey ); - } - /* Update registry contents if the user locale has changed. * This simulates the action of the Windows control panel. */ @@ -1742,24 +1792,8 @@ void init_locale(void) TRACE( "updating registry, locale changed %s -> %08lx\n", debugstr_w(bufferW), user_lcid ); } else TRACE( "updating registry, locale changed none -> %08lx\n", user_lcid ); - swprintf( bufferW, ARRAY_SIZE(bufferW), L"%08x", user_lcid ); - RegSetValueExW( intl_key, L"Locale", 0, REG_SZ, - (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); - for (i = 0; i < ARRAY_SIZE(registry_values); i++) - { - GetLocaleInfoW( LOCALE_USER_DEFAULT, registry_values[i].lctype | LOCALE_NOUSEROVERRIDE, - bufferW, ARRAY_SIZE( bufferW )); - RegSetValueExW( intl_key, registry_values[i].name, 0, REG_SZ, - (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); - } - - if (geoid == GEOID_NOT_AVAILABLE) - { - GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IGEOID | LOCALE_RETURN_NUMBER, - (WCHAR *)&geoid, sizeof(geoid) / sizeof(WCHAR) ); - SetUserGeoID( geoid ); - } + update_locale_registry(); if (!RegCreateKeyExW( nls_key, L"Codepage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ))

1 0

Alexandre Julliard : kernelbase: Reimplement currency formatting values in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 30, 2022

March 30, 2022

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 March 30, 2022

March 30, 2022

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 March 30, 2022

March 30, 2022

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 March 30, 2022

March 30, 2022

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: The VMsList page deals with VMs so rename the $Item parameter.
by Alexandre Julliard March 30, 2022

March 30, 2022

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

Francois Gouget : testbot/web: Add an Apache module import for the Munin redirects.
by Alexandre Julliard March 30, 2022

March 30, 2022

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/web: The main page deals with jobs so rename the $Item parameter.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: tools Branch: master Commit: a24c76ae9e17f3679ad49cdd0c327c658653fbbf URL: https://source.winehq.org/git/tools.git/?a=commit;h=a24c76ae9e17f3679ad49cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:04:13 2022 +0200 testbot/web: The main page deals with jobs 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/index.pl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 1f362fc..9442153 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -91,27 +91,27 @@ sub GenerateHeaderCell($$$) sub GetDisplayValue($$$) { - my ($self, $Item, $PropertyDescriptor) = @_; + my ($self, $Job, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetName() eq "User" && - defined($Item->Patch) && - $Item->User->GetKey() eq GetBatchUser()->GetKey() && - defined($Item->Patch->FromName)) + defined($Job->Patch) && + $Job->User->GetKey() eq GetBatchUser()->GetKey() && + defined($Job->Patch->FromName)) { - return $Item->Patch->FromName; + return $Job->Patch->FromName; } - return $self->SUPER::GetDisplayValue($Item, $PropertyDescriptor); + return $self->SUPER::GetDisplayValue($Job, $PropertyDescriptor); } sub GenerateDataCell($$$$) { - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Job, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - my $EscapedKey = uri_escape($Item->GetKey()); + my $EscapedKey = uri_escape($Job->GetKey()); print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", @@ -122,11 +122,11 @@ sub GenerateDataCell($$$$) "boterror" => "<span class='boterror'>TestBot error</span>", "canceled" => "<span class='canceled'>canceled</span>", ); - my $Status = $Item->Status; + my $Status = $Job->Status; my $HTMLStatus = $HTMLChunks{$Status} || $Status; if ($Status eq "completed" || $Status eq "running" || $Status eq "boterror" || $Status eq "canceled") { - my $JobInfo = $self->{JobsInfo}->{$Item->Id}; + my $JobInfo = $self->{JobsInfo}->{$Job->Id}; my $FailuresPrefix; if ($Status eq "completed") @@ -170,15 +170,15 @@ sub GenerateDataCell($$$$) } elsif ($PropertyName eq "Ended") { - if (defined $Item->Ended) + if (defined $Job->Ended) { - my $Duration = $Item->Ended - $Item->Submitted; - my $TagId = "E". $Item->Id; + my $Duration = $Job->Ended - $Job->Submitted; + my $TagId = "E". $Job->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($Item->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($Job->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'></script>\n"; print "</td>\n"; } @@ -189,7 +189,7 @@ sub GenerateDataCell($$$$) } else { - $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($Job, $PropertyDescriptor, $DetailsPage); } }

1 0

Francois Gouget : testbot/web: Document why ErrField is not set when failing to delete an item.
by Alexandre Julliard March 30, 2022

March 30, 2022

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: The UsersList page deals with users so rename the $Item parameter.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: tools Branch: master Commit: 1976e3811184c2d17a80d8bbfc36fb3a63cadb10 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1976e3811184c2d17a80d8b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:04:18 2022 +0200 testbot/web: The UsersList page deals with users 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/UsersList.pl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 3621702..019bc63 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -58,12 +58,12 @@ sub DisplayProperty($$$) sub GenerateDataCell($$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $CollectionBlock, $User, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - my $Status = $Item->Status; + my $Status = $User->Status; my ($Class, $Label); if ($Status eq "disabled") { @@ -73,19 +73,19 @@ sub GenerateDataCell($$$$$) { ($Class, $Label) = ('userdeleted', 'deleted'); } - elsif ($Item->WaitingForApproval()) + elsif ($User->WaitingForApproval()) { ($Class, $Label) = ('userrequest', 'request'); } - elsif (!$Item->Activated()) + elsif (!$User->Activated()) { ($Class, $Label) = ('userapproved', 'approved'); } - elsif ($Item->HasRole("admin")) + elsif ($User->HasRole("admin")) { ($Class, $Label) = ('useradmin', 'admin'); } - elsif ($Item->HasRole("wine-devel")) + elsif ($User->HasRole("wine-devel")) { ($Class, $Label) = ('userdevel', 'wine-devel'); } @@ -93,12 +93,12 @@ sub GenerateDataCell($$$$$) { ($Class, $Label) = ('usernone', 'none'); } - print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($Item->GetKey()), + print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($User->GetKey()), "'><span class='$Class'>$Label</span></a></td>"; } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($CollectionBlock, $User, $PropertyDescriptor, $DetailsPage); } } @@ -112,20 +112,20 @@ sub GetItemActions($$) sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Item, $Action) = @_; + my ($self, $CollectionBlock, $User, $Action) = @_; if ($Action eq "Delete") { - $Item->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + $User->Status('deleted'); + (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions - DeleteSessions($Item); + DeleteSessions($User); return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $User, $Action); }

1 0