February 2020 - Wine-Commits

Alexandre Julliard : unicode: Store variable-length sequences also for the main decomposition table.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: dba4bd756a2f1b4cc08d1b39b0cc04fe8aea3c7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba4bd756a2f1b4cc08d1b39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:10:53 2020 +0100 unicode: Store variable-length sequences also for the main decomposition table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 1589 +++++++++++++++++++++--------------------- libs/port/decompose.c | 1606 +++++++++++++++++++++---------------------- tools/make_unicode | 148 +--- 3 files changed, 1624 insertions(+), 1719 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dba4bd756a2f1b4cc08d…

1 0

Zebediah Figura : quartz/tests: Use BaseOutputPinImpl_AttemptConnection().
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: b9a5b7a3b7c4b7e0ac78b6c36a74cb1cd90a4bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a5b7a3b7c4b7e0ac78b6c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:49 2020 -0600 quartz/tests: Use BaseOutputPinImpl_AttemptConnection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 23 +++++------------------ dlls/quartz/tests/vmr7.c | 23 +++++------------------ dlls/quartz/tests/vmr9.c | 24 +++++------------------- 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f75cf2919a..4e26a18f83 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -522,31 +522,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 8a17bdcd19..bb793741e9 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -872,31 +872,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index ed3f7cd38b..a800aaeb70 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -876,32 +876,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - todo_wine_if (((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader.biBitCount == 24) - ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter)

1 0

Zebediah Figura : quartz/filesource: Accept any non-null subtype.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 76b6bcbf9857c63b5955f458c8a63ed314cfce8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b6bcbf9857c63b5955f458… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:51 2020 -0600 quartz/filesource: Accept any non-null subtype. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 3 ++- dlls/quartz/tests/filesource.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 2b7e9d58b1..4855f9834c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -591,7 +591,8 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY AsyncReader *filter = impl_from_strmbase_pin(iface); if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) - && IsEqualGUID(&mt->subtype, &filter->mt.subtype)) + && (!IsEqualGUID(&mt->subtype, &GUID_NULL) + || IsEqualGUID(&filter->mt.subtype, &GUID_NULL))) return S_OK; return S_FALSE; diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 16322902f5..6fe19bf2c9 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -389,7 +389,7 @@ static void test_file_source_filter(void) mt.formattype = FORMAT_VideoInfo; mt.subtype = MEDIASUBTYPE_RGB32; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Video; hr = IPin_QueryAccept(pin, &mt);

1 0

Francois Gouget : testbot/web: Remove an unneeded import in Sessions.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: tools Branch: master Commit: be98e7c49bd2ad3a98074317e0d05cba8c7e0b53 URL: https://source.winehq.org/git/tools.git/?a=commit;h=be98e7c49bd2ad3a9807431… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 15:52:19 2020 +0100 testbot/web: Remove an unneeded import in Sessions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 0afe6c9..4ca62ba 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -31,8 +31,6 @@ WineTestBot::CGI::Session - A web user's session use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use WineTestBot::Utils; - sub InitializeNew($$) { my ($self, $Collection) = @_;

1 0

Francois Gouget : testbot/web: Use a cryptographically secure random number generator.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: tools Branch: master Commit: 617f67bdeafa9e686c4378160ea912e8eaf2d00c URL: https://source.winehq.org/git/tools.git/?a=commit;h=617f67bdeafa9e686c43781… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 15:51:42 2020 +0100 testbot/web: Use a cryptographically secure random number generator. Session ids should really be hard to guess so a user cannot take over another's session. This also fixes a bug where the session id length could be less than 32 characters. Note: * This introduces a dependency on the Bytes::Random::Secure Perl module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 1 + testbot/lib/WineTestBot/CGI/Sessions.pm | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 456ffe6..4d430d9 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -6,6 +6,7 @@ Dependencies: - MySQL - Perl DBD and DBI::mysql modules - Sendmail and Procmail +- Bytes::Random::Secure (libbytes-random-secure-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 380d4b8..0afe6c9 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -56,7 +56,9 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotCollection); our @EXPORT = qw(CreateSessions DeleteSessions NewSession); +use Bytes::Random::Secure; use CGI::Cookie; + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Users; @@ -123,11 +125,7 @@ sub NewSession($$$) my $Id; while (defined($Existing)) { - $Id = ""; - foreach my $i (1..8) - { - $Id .= sprintf("%lx", int(rand(2 ** 16))); - } + $Id = Bytes::Random::Secure::random_bytes_hex(16); $Existing = $self->GetItem($Id); } $Session->Id($Id);

1 0

Francois Gouget : testbot: Simplify and speed up GenerateRandomString().
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: tools Branch: master Commit: d14d2f504e8f0da4599ed388233734c10fbc4849 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d14d2f504e8f0da4599ed38… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 15:52:07 2020 +0100 testbot: Simplify and speed up GenerateRandomString(). Perl's rand() function can return random values greater than 2^16 nowadays. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index e8ba516..27b222f 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -201,8 +201,8 @@ sub GenerateRandomString($) my $RandomString = ""; while (length($RandomString) < $Len) { - my $Part = "0000" . sprintf("%lx", int(rand(2 ** 16))); - $RandomString .= substr($Part, -4); + $RandomString .= sprintf("%08x", int(rand(2 ** 32))); + } return substr($RandomString, 0, $Len);

1 0

Francois Gouget : testbot: Move reference logs to the task and prepare for having more than one.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: tools Branch: master Commit: a6a86fd439e014b0ab80713bfdb2532d0fe8587d URL: https://source.winehq.org/git/tools.git/?a=commit;h=a6a86fd439e014b0ab80713… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 03:50:07 2020 +0100 testbot: Move reference logs to the task and prepare for having more than one. The old reference report filename format was '<vmname>_<reportname>' which means there could only be one per report. Each job should only have one report of a given type per VM so add it to the reference filename. Also the use of an underscore as the separator made it hard to split the components apart as both <vmname> and <reportname> can contain underscores such as 'w1064v1809_fr' and 'win32_fr_FR.report'. Dashes are a better choice since they are not allowed in either the VM name or the report name. So the new refeence filename format is '<vmname>-job<jobid>-<reportname>'. Note: * After applying this patch run UpdateTaskLogs to move and rename the existing reference reports. * When downgrading to run code before this patch it's best to run UpdateTaskLogs --delete before downgrading and then UpdateTaskLogs after the downgrade. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 3 +- testbot/bin/UpdateTaskLogs | 113 ++++++++++++++++++++++++++++++---- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 5 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/JobDetails.pl | 4 +- 7 files changed, 110 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=a6a86fd439e014b0ab8…

1 0

Francois Gouget : testbot: Do cosmetic cleanups in the patch handling code.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: tools Branch: master Commit: 0ed47287f3f3d34f78a313363cd8851d87cd9591 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0ed47287f3f3d34f78a3133… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 03:22:19 2020 +0100 testbot: Do cosmetic cleanups in the patch handling code. Prefix unused variables with an underscore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 23 ++++++++--------------- testbot/lib/WineTestBot/PendingPatchSets.pm | 4 ++-- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index ca8d57f..46b17e5 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -212,7 +212,7 @@ sub Submit($$$) $BuildStep->DebugLevel(0); # Save the build step so the others can reference it. - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage)) { $self->Disposition("Failed to submit build step"); @@ -308,7 +308,7 @@ sub Submit($$$) } # Save it all - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { $self->Disposition("Failed to submit job"); @@ -325,7 +325,7 @@ sub Submit($$$) # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); $NewJob->Priority($Priority); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { $self->Disposition("Failed to submit job (staging)"); @@ -470,9 +470,7 @@ sub NewPatch($$$) if ($Subject =~ m/\d+\/\d+/) { $Patch->Disposition("Checking series"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { @@ -482,9 +480,7 @@ sub NewPatch($$$) else { $Patch->Disposition("Checking patch"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { @@ -505,14 +501,11 @@ sub NewPatch($$$) { $PatchBody->purge(); } - + if (! defined($ErrMessage)) { - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage if (defined $ErrMessage); } return undef; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 5be39e4..5339513 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -258,7 +258,7 @@ sub NewSubmission($$) $Part->Patch($Patch); - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); if (defined($ErrMessage)) { $Patch->Disposition("Error occurred during series processing"); @@ -280,7 +280,7 @@ sub NewSubmission($$) $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); if (!defined $ErrMessage) { - (my $ErrProperty, $ErrMessage) = $Part->Patch->Save(); + ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); } } else

1 0

Francois Gouget : testbot: Separate the per-task task and testbot logs.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: tools Branch: master Commit: c6ea1c622ac67d66f1c157b3aec8f7320036c242 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6ea1c622ac67d66f1c157b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 03:50:16 2020 +0100 testbot: Separate the per-task task and testbot logs. Each task has pairs of xxx.report and xxx.report.err files where the .err file contains extra errors detected while parsing xxx.report and can thus be rebuilt from the report files. They also have log and log.err files but log.err is completely independent from the log file: * log contains the traces printed by the script running on the VM, typically the build log or batch file commands. * log.err contains errors that occurred on the TestBot-server side, such as perl errors in the WineRun* scripts, or messages when the TestBot had to kill a stuck task. So rename log to task.log and log.err to testbot.log. This way their purpose is clearer and log.err does not run the risk of being confused with the other .err files. Note: * After applying this patch run UpdateTaskLogs to move and rename the existing reference reports. * It is not necessary to run UpdateTaskLogs when downgrading to run code just before this patch. However one can use the following commands to rename the task and testbot logs: find jobs -name task.log | while read f;do echo mv "$f" `dirname "$f"`/log;done find jobs -name testbot.log | while read f;do mv "$f" `dirname "$f"`/log.err;done Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 20 ++++++++++++++++++++ testbot/bin/WineRunBuild.pl | 8 ++++---- testbot/bin/WineRunReconfig.pl | 8 ++++---- testbot/bin/WineRunTask.pl | 6 +++--- testbot/bin/WineRunWineTest.pl | 8 ++++---- testbot/lib/WineTestBot/LogUtils.pm | 22 ++++++++++++---------- testbot/lib/WineTestBot/Tasks.pm | 10 +++++----- 7 files changed, 52 insertions(+), 30 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 11dd6d3..4ba383f 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -342,6 +342,26 @@ sub ProcessTaskLogs($$$) } $Rc += Delete($StepReportPath, "unneeded"); } + + my %LogMap = ( + "log" => "task.log", + "log.err" => "testbot.log", + "old_log" => "old_task.log", + "old_log.err" => "old_testbot.log"); + while (my ($OldName, $NewName) = each %LogMap) + { + if (-f "$TaskDir/$OldName" and !-f "$TaskDir/$NewName" and + !rename("$TaskDir/$OldName", "$TaskDir/$NewName")) + { + Error TaskKeyStr($Task) .": Could not rename $OldName because $NewName already exists\n"; + $Rc = 1; + } + } + + # testbot.log is the only log which we expect to be empty. + # There is not much point keeping it if that's the case. + my $TestBotLog = "$TaskDir/testbot.log"; + $Rc += Delete($TestBotLog) if (-z $TestBotLog); } if (($OptDelete or $OptRebuild) and !$CollectOnly) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 6b68c0d..45288af 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -181,14 +181,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/log.err")) + if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'log.err' for writing: $!\n"; + Error "Unable to open 'testbot.log' for writing: $!\n"; } umask($OldUMask); } @@ -417,9 +417,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); -if ($TA->GetFile("Build.log", "$TaskDir/log")) +if ($TA->GetFile("Build.log", "$TaskDir/task.log")) { - my $LogInfo = ParseTaskLog("$TaskDir/log"); + my $LogInfo = ParseTaskLog("$TaskDir/task.log"); if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 04c0e26..3005ba7 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -182,14 +182,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/log.err")) + if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'log.err' for writing: $!\n"; + Error "Unable to open 'testbot.log' for writing: $!\n"; } umask($OldUMask); } @@ -418,9 +418,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) my $LogInfo; Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); -if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) +if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) { - $LogInfo = ParseTaskLog("$TaskDir/log"); + $LogInfo = ParseTaskLog("$TaskDir/task.log"); if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 2b54048..59975c3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -210,14 +210,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/log.err")) + if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'log.err' for writing: $!\n"; + Error "Unable to open 'testbot.log' for writing: $!\n"; } umask($OldUMask); } @@ -534,7 +534,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); -if (!$TA->GetFile("Task.log", "$TaskDir/log") and !defined $TAError) +if (!$TA->GetFile("Task.log", "$TaskDir/task.log") and !defined $TAError) { $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 9a0a4eb..9d54745 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -206,14 +206,14 @@ sub LogTaskError($) my ($ErrMessage) = @_; Debug("$Name0:error: ", $ErrMessage); - if (open(my $ErrFile, ">>", "$TaskDir/log.err")) + if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'log.err' for writing: $!\n"; + Error "Unable to open 'testbot.log' for writing: $!\n"; } } @@ -506,9 +506,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); -if ($TA->GetFile("Task.log", "$TaskDir/log")) +if ($TA->GetFile("Task.log", "$TaskDir/task.log")) { - my $LogInfo = ParseTaskLog("$TaskDir/log"); + my $LogInfo = ParseTaskLog("$TaskDir/task.log"); if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the task completed successfully diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 36f3674..0a98a5a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -622,8 +622,8 @@ sub GetLogFileNames($;$) win32.report win32_*.report wow32.report wow32_*.report wow64.report wow64_*.report - log); - push @Globs, "old_log" if ($IncludeOld); + task.log testbot.log); + push @Globs, ("old_task.log", "old_testbot.log") if ($IncludeOld); my (@Logs, %Seen); foreach my $Glob (@Globs) @@ -637,7 +637,7 @@ sub GetLogFileNames($;$) { $LogName = $1; # untaint } - elsif ($LogName eq $Glob) # log and old_log cases + elsif ($LogName eq $Glob) # (old_) task.log and testbot.log cases { $LogName = $Glob; # untaint } @@ -659,13 +659,15 @@ sub GetLogFileNames($;$) } my %_LogFileLabels = ( - "exe32.report" => '32 bit%s report', - "exe64.report" => '64 bit%s report', - "win32.report" => '32 bit%s report', - "wow32.report" => '32 bit%s WoW report', - "wow64.report" => '64 bit%s WoW report', - "log" => 'task%s log', - "old_log" => 'old%s logs', + "exe32.report" => '32 bit%s report', + "exe64.report" => '64 bit%s report', + "win32.report" => '32 bit%s report', + "wow32.report" => '32 bit%s WoW report', + "wow64.report" => '64 bit%s WoW report', + "task.log" => 'task%s log', + "testbot.log" => 'testbot%s log', + "old_task.log" => 'old%s task logs', + "old_testbot.log" => 'old%s testbot logs', ); =pod diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 7b9ac9b..541b555 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -153,7 +153,7 @@ sub _SetupTask($$) if (-d $Dir) { mkpath("$Dir.new", 0, 0775); - foreach my $Filename ("log", "log.err") + foreach my $Filename ("task.log", "testbot.log") { if (-f "$Dir/old_$Filename") { @@ -178,9 +178,9 @@ sub _SetupTask($$) rename("$Dir.new", $Dir); } - # Capture Perl errors in the task's generic error log + # Capture Perl errors in the per-task TestBot log my $TaskDir = $self->CreateDir(); - if (open(STDERR, ">>", "$TaskDir/log.err")) + if (open(STDERR, ">>", "$TaskDir/testbot.log")) { # Make sure stderr still flushes after each print my $tmp=select(STDERR); @@ -190,7 +190,7 @@ sub _SetupTask($$) else { require WineTestBot::Log; - WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/log.err': $!\n"); + WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/testbot.log': $!\n"); } } @@ -253,7 +253,7 @@ sub UpdateStatus($$) my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); - if (open TASKLOG, ">>$TaskDir/log.err") + if (open TASKLOG, ">>$TaskDir/testbot.log") { print TASKLOG "TestBot process got stuck or died unexpectedly\n"; close TASKLOG;

1 0

Jacek Caban : vbscript: Add SetScriptState(SCRIPTSTATE_CLOSED) implementation.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 1c6649d443f73cc44167f0dd71ac88dddff752ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c6649d443f73cc44167f0dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 19:57:11 2020 +0100 vbscript: Add SetScriptState(SCRIPTSTATE_CLOSED) implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 71 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 5 ++- 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index f0b75ad2f3..10af993ba5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1520,10 +1520,81 @@ static void test_vbscript_uninitializing(void) hres = IActiveScriptParse_InitNew(parse); ok(hres == E_UNEXPECTED, "InitNew failed: %08x\n", hres); + /* initialize again and use SetScriptState(SCRIPTSTATE_CLOSED) to uninitialize it */ + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CLOSED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CLOSED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + test_state(script, SCRIPTSTATE_CLOSED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CLOSED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CLOSED) failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_INITIALIZED) failed: %08x\n", hres); + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + test_state(script, SCRIPTSTATE_CLOSED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CLOSED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CLOSED) failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_INITIALIZED) failed: %08x\n", hres); + IActiveScriptParse_Release(parse); ref = IActiveScript_Release(script); ok(!ref, "ref = %d\n", ref); + + script = create_vbscript(); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CLOSED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CLOSED) failed: %08x\n", hres); + + ref = IActiveScript_Release(script); + ok(!ref, "ref = %d\n", ref); } static void test_vbscript_release(void) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b597389a9a..4f00128217 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -559,7 +559,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE return S_OK; } - if(!This->is_initialized || !This->ctx->site) + if(!This->is_initialized || (!This->ctx->site && ss != SCRIPTSTATE_CLOSED)) return E_UNEXPECTED; switch(ss) { @@ -573,6 +573,9 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE case SCRIPTSTATE_INITIALIZED: decrease_state(This, SCRIPTSTATE_INITIALIZED); return S_OK; + case SCRIPTSTATE_CLOSED: + decrease_state(This, SCRIPTSTATE_CLOSED); + return S_OK; case SCRIPTSTATE_DISCONNECTED: FIXME("unimplemented SCRIPTSTATE_DISCONNECTED\n"); return S_OK;

1 0