- Wine-Devel - list.winehq.org

[PATCH 06/11] winex11: Use pthread for synchronization in vulkan.c.
by Jacek Caban April 18, 2022

April 18, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-)

2 1

[PATCH 05/11] winex11: Use pthread for settings locking.
by Jacek Caban April 18, 2022

April 18, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)

2 1

[PATCH 04/11] winex11: Use pthread for palette locking.
by Jacek Caban April 18, 2022

April 18, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/palette.c | 43 ++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 25 deletions(-)

2 1

[PATCH 03/11] winex11: Use pthread for synchronization in opengl.c.
by Jacek Caban April 18, 2022

April 18, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 90 ++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 49 deletions(-)

2 1

[PATCH 02/11] winex11: Use pthread for keyboard lock.
by Jacek Caban April 18, 2022

April 18, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/keyboard.c | 47 ++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 27 deletions(-)

2 1

[PATCH 01/11] winex11: Use pthread for surface locking.
by Jacek Caban April 18, 2022

April 18, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/bitblt.c | 11 ++++------- dlls/winex11.drv/init.c | 12 ++++++++++++ dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 18 insertions(+), 7 deletions(-)

2 1

[tools] testbot/web: Simplify linking patches to the job details pages.
by Francois Gouget April 18, 2022

April 18, 2022

There is no need to call uri_escape() on integers. Also the URL is simple (no ampersand) and does not need to go through escapeHTML(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/PatchesList.pl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 943b9c5bb..48c8382e7 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -25,7 +25,6 @@ package PatchesBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use URI::Escape; use WineTestBot::Patches; @@ -54,9 +53,7 @@ sub GenerateDataView($$$) $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; - my $URI = "/JobDetails.pl?Key=" . uri_escape($JobId); - print "<a href='" . $self->escapeHTML($URI) . "'>" . - "Job " . $self->escapeHTML($JobId) . "</a>"; + print "<a href='/JobDetails.pl?Key=$JobId'>Job $JobId</a>"; } else { -- 2.30.2

1 0

[tools] testbot: Add User::AddRole().
by Francois Gouget April 18, 2022

April 18, 2022

This simplifies adding a role to a user, particularly with regards to making sure the user's Roles collection is up to date. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Users.pm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index bd9cf358b..f2f2a199d 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -106,22 +106,25 @@ sub GenerateResetCode($) } } +sub AddRole($$) +{ + my ($self, $Role) = @_; + + my $UserRole = $self->Roles->Add(); + my $OldKey = $UserRole->GetKey(); + $UserRole->Role($Role); + $self->Roles->KeyChanged($OldKey, $Role->GetKey()); +} + sub AddDefaultRoles($) { my ($self) = @_; - my $UserRoles = $self->Roles; my $DefaultRoles = CreateRoles(); $DefaultRoles->AddFilter("IsDefaultRole", [1]); - foreach my $RoleKey (@{$DefaultRoles->GetKeys()}) + foreach my $Role (@{$DefaultRoles->GetItems()}) { - if (! defined($UserRoles->GetItem($RoleKey))) - { - my $NewRole = $UserRoles->Add(); - my $OldKey = $NewRole->GetKey(); - $NewRole->Role($DefaultRoles->GetItem($RoleKey)); - $UserRoles->KeyChanged($OldKey, $RoleKey); - } + $self->AddRole($Role) if (!$self->Roles->GetItem($Role->Name)); } } -- 2.30.2

1 0

[tools] testbot/cgi: Introduce ValueFormatter to handle value formatting.
by Francois Gouget April 18, 2022

April 18, 2022

This allows sharing code between CollectionBlock and FormPage. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 38 +++------- testbot/lib/ObjectModel/CGI/FormPage.pm | 11 +-- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 69 +++++++++++++++++++ 3 files changed, 82 insertions(+), 36 deletions(-) create mode 100644 testbot/lib/ObjectModel/CGI/ValueFormatter.pm diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 435c44e7f..36f1b0188 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -47,6 +47,8 @@ our @EXPORT = qw(new); use POSIX qw(strftime); use URI::Escape; +use ObjectModel::CGI::ValueFormatter; + =pod =over 12 @@ -280,35 +282,15 @@ sub GenerateDataView($$$) my $PropertyName = $PropertyDescriptor->GetName(); my $Value = $Row->{Item}->$PropertyName; - if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) + if ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "DT" and defined $Value) { - # Note: This only supports single-key Itemrefs - foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) - { - if ($ValuePD->GetIsKey()) - { - $PropertyName = $ValuePD->GetName(); - print $self->escapeHTML($Value->$PropertyName); - return; - } - } - } - elsif ($PropertyDescriptor->GetClass() eq "Basic") - { - if ($PropertyDescriptor->GetType() eq "B") - { - print $Value ? "Yes" : "No"; - return; - } - if ($PropertyDescriptor->GetType() eq "DT" and defined $Value) - { - print "<script type='text/javascript'></script><noscript><div>", - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), - "</div></noscript>\n"; - return; - } + print "<script type='text/javascript'></script><noscript><div>", + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), + "</div></noscript>\n"; + return; } print defined $Value ? $self->escapeHTML($Value) : " "; } diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 4f29efec7..7fd2f561e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -57,6 +57,8 @@ $MyFormPage->GeneratePage(); use ObjectModel::CGI::Page; our @ISA = qw(ObjectModel::CGI::Page); +use ObjectModel::CGI::ValueFormatter; + =pod =over 12 @@ -280,14 +282,7 @@ sub GenerateValueView($$$) { my ($self, $PropertyDescriptor, $Value) = @_; - if ($PropertyDescriptor->GetClass() eq "Basic") - { - if ($PropertyDescriptor->GetType() eq "B") - { - print $Value ? "Yes" : "No"; - } - } - print defined $Value ? $self->escapeHTML($Value) : " "; + GenerateValueHTML($self, $PropertyDescriptor, $Value); } sub GetInputType($$) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm new file mode 100644 index 000000000..cad6eee1b --- /dev/null +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -0,0 +1,69 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Generates HTML providing a user-readable representation of a given value +# +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package ObjectModel::CGI::ValueFormatter; + +use Exporter 'import'; +our @EXPORT = qw(GenerateValueHTML); + + +=pod +=over 12 + +=item C<GenerateValueHTML()> + +Generates an HTML snippet representing the value in a user-readable form. + +The Parent parameter must point to a class that implements the escapeHTML() +method. + +=back +=cut + +sub GenerateValueHTML($$$); + +sub GenerateValueHTML($$$) +{ + my ($Parent, $PropertyDescriptor, $Value) = @_; + + if ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + return; + } + if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) + { + # Note: This only supports single-key Itemrefs + foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) + { + if ($ValuePD->GetIsKey()) + { + my $PropertyName = $ValuePD->GetName(); + GenerateValueHTML($Parent, $ValuePD, $Value->$PropertyName); + return; + } + } + } + print defined $Value ? $Parent->escapeHTML($Value) : " "; +} + +1; -- 2.30.2

1 0

[PATCH v2] cmd/tests: Add tests for the magic environment variables.
by Francois Gouget April 18, 2022

April 18, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Chop off the AM/PM time /t suffix. I'll resend the rest of the series once the base tests have proven they work for a while. --- programs/cmd/tests/test_builtins.cmd | 41 +++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 15 ++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..d4f4306391a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -585,7 +585,6 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir -echo CD value %CD% echo %% echo P% echo %P @@ -1789,6 +1788,46 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +if defined cd (echo Has %%cd%%) else (echo Not defined) +echo CD value %CD% + +rem Some locales include the day-of-week either before or after the +rem day-month-year part. This makes it impossible to check the content of %date% +if defined date (echo Has %%date%%) else (echo Not defined) +set WINE_foo=%date:~9,1% +if defined WINE_foo (echo Good %%date%%) else (echo Too short) + +set WINE_before=%date% +for /f "usebackq tokens=*" %%i in (`date /t`) do set WINE_foo=%%i +set WINE_after=%date% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before% " (if not "%WINE_foo%"=="%WINE_after% " (echo date /t != %%date%%) else (echo Match)) else (echo Match) + +if defined errorlevel (echo Has %%errorlevel%%) else (echo Not defined) + +if defined time (echo Has %%time%%) else (echo Not defined) +set WINE_foo=%time:~7,1% +if defined WINE_foo (echo %%time%% has seconds) else (echo Too short) +set WINE_foo=%time:~10,1% +if defined WINE_foo (echo %%time%% has 1/100s) else (echo Too short) +set WINE_foo=%time:~11,1% +if not defined WINE_foo (echo End of %%time%%) else (echo Too long) + +rem %time% has a leading space instead of a zero so ignore the first character. +rem It is also in 24h mode while time /t may be in am/pm mode so ignore the +rem second character too. +set WINE_before=%time:~2,3% +for /f "usebackq tokens=*" %%i in (`time /t`) do set WINE_foo=%%i +set WINE_after=%time:~2,3% +set WINE_foo=%WINE_foo:~2,3% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before%" (if not "%WINE_foo%"=="%WINE_after%" (echo time /t != %%time:~2,3%%) else (echo Match)) else (echo Match) + +if defined random (echo Has %%random%%) else (echo Not defined) +set WINE_foo=%random% +if %WINE_foo% neq %random% (echo %%random%% looks random) else (echo Constant?) + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..15fda131a5c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -500,7 +500,6 @@ I'm here!@space@ ~dp0 should be directory containing batch file @drive@@path@ @drive@@path@ -CD value @pwd@@or_broken(a)CD value(a)space@ % P P @@ -1216,6 +1215,20 @@ WINE_foo correctly 7 WINE_foo correctly 8(a)or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6(a)or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6(a)or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +(a)todo_wine@Has %cd% +CD value @pwd@@or_broken(a)CD value(a)space@ +(a)todo_wine@Has %date% +(a)todo_wine@Good %date% +(a)todo_wine@Match +(a)todo_wine@Has %errorlevel% +(a)todo_wine@Has %time% +(a)todo_wine@%time% has seconds +(a)todo_wine@%time% has 1/100s +End of %time% +(a)todo_wine@Match +(a)todo_wine@Has %random% +%random% looks random --- for /F ------ string argument a -- 2.30.2

2 1