September 2019 - Wine-devel

[PATCH 1/3] scrobj: Use ReadValueChunk to read script body.
by Jacek Caban 26 Sep '19

26 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)

1 0

[PATCH] testbot/LibvirtTool: Create a reconfig job for new live Build/Wine VM snapshots.
by Francois Gouget 26 Sep '19

26 Sep '19

Only the live snapshots are kept up to date by the TestBot. So Wine will always be out of date in powered off snapshots making any live snapshot created from them unusable. The fix is to create a high priority reconfig job so they are brought up to date before being used for any other task. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 37f95e9f1..f6e2d4f60 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -562,6 +562,24 @@ sub Revert() { $DomainSnapshot .= "-live"; CreateSnapshot($Domain, $DomainSnapshot); + + if ($VM->Type eq "build" or $VM->Type eq "wine") + { + require WineTestBot::SpecialJobs; + $ErrMessage = WineTestBot::SpecialJobs::AddReconfigJob([$VM], $VM->Name, $VM->Type); + if (defined $ErrMessage) + { + Error("Could not create a job to update and rebuild Wine on the $VMKey VM: $ErrMessage\n"); + NotifyAdministrator("Could not create a job to update $VMKey", + "A live snapshot was created for $VMKey but no job could be\n". + "created to update and rebuild Wine on it:\n\n". + "$ErrMessage\n"); + } + else + { + Debug(Elapsed($Start), " Added a job to update and rebuild Wine on $VMKey\n"); + } + } } # Set up the VM locale -- 2.20.1

1 0

[PATCH] testbot/LibvirtTool: Set up new live snapshots with the latest TestAgentd.
by Francois Gouget 26 Sep '19

26 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 46 +++++++++++++++++++++++++++++++--- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/lib/Build/Utils.pm | 7 ++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 936c38608..37f95e9f1 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -365,9 +365,9 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } -sub SetupTestAgentd($$$) +sub SetupTestAgentd($$$$) { - my ($VM, $Booting, $ResetStartCount) = @_; + my ($VM, $Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -380,6 +380,46 @@ sub SetupTestAgentd($$$) FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } + # Upgrade TestAgentd + if ($UpgradeTestAgentd and ($VM->Type eq "win32" or $VM->Type eq "win64")) + { + Debug(Elapsed($Start), " Upgrading the $VMKey TestAgent server from $Version\n"); + LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; + if ($Version !~ / ([0-9]+)\.([0-9]+)$/) + { + FatalError("Unsupported TestAgent server version: $Version\n"); + } + # We want 'TestAgentd --detach --show-restarts' on Windows but this was + # not supported before this version and changing how the server is started + # is too complex. + $Version = sprintf("%02d.%02d", $1, $2); + if ($Version lt "01.07") + { + FatalError("The TestAgent server is too old to be upgraded: $Version\n"); + } + + if (!$TA->Upgrade("$DataDir/latest/TestAgentd.exe")) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not upgrade the $VMKey TestAgent: $ErrMessage\n"); + } + # Give the server enough time to restart, thus (maybe) avoiding a timeout + # on the first (re)connection attempt. + sleep(1); + $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the new $VMKey TestAgent: $ErrMessage\n"); + } + LogMsg "Upgraded the $VMKey TestAgent server to $Version\n"; + + # Note that the privileged TestAgent server (if any) is usually run with + # --set-time-only which means it cannot be upgraded since the restart RPC + # is blacklisted. But that also means it's unlikely to need upgrading. + # A side effect is that it will force TestAgentd.exe.old to stay around. + } + if ($ResetStartCount) { # If SetProperty() is not supported neither is --show-restarts. @@ -516,7 +556,7 @@ sub Revert() # Set up the TestAgent server. Note that setting the locale will require a # reboot so reset start.count in that case. - SetupTestAgentd($VM, $Booting, $SetLocale); + SetupTestAgentd($VM, $Booting, ($CreateSnapshot or $SetLocale), $SetLocale); if ($CreateSnapshot) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index f4238873e..ddb2208e2 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -464,7 +464,8 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - foreach my $FileName ("../src/TestLauncher/TestLauncher32.exe", + foreach my $FileName ("../src/testagentd/TestAgentd.exe", + "../src/TestLauncher/TestLauncher32.exe", "../src/TestLauncher/TestLauncher64.exe", "latest/winefiles.txt", "latest/wine-parentsrc.txt") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 50d573523..9a4590677 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -215,6 +215,9 @@ sub BuildNativeTestAgentd() sub BuildWindowsTestAgentd() { + my $WindowsTestAgentd = "$::RootDir/src/testagentd/TestAgentd.exe"; + my $Before = GetMTime($WindowsTestAgentd); + InfoMsg "\nRebuilding the Windows TestAgentd\n"; my $CPUCount = GetCPUCount(); system("cd '$::RootDir/src/testagentd' && set -x && ". @@ -225,6 +228,10 @@ sub BuildWindowsTestAgentd() return !1; } + if ($Before != GetMTime($WindowsTestAgentd)) + { + LogMsg "Updated TestAgentd.exe\n"; + } return 1; } -- 2.20.1

1 0

[PATCH] testbot/Engine: Increase VM::errors when a process dies and put it offline.
by Francois Gouget 26 Sep '19

26 Sep '19

A process dying is most likely to be a TestBot bug. But increase the VM's error count regardless and eventually put it offline. This will have two benefits: * If the crash is specific to that VM it will let other VMs runs. * It will notify the administrator that the VM was put offline and that something is wrong. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 530a2ee1e..b6a89984c 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -360,7 +360,18 @@ sub _CheckAndClassifyVMs() $FoundVMErrors = 1; $VM->ChildDeadline(undef); $VM->ChildPid(undef); - $VM->Status("dirty"); + my $Errors = ($VM->Errors || 0) + 1; + $VM->Errors($Errors); + if ($Errors >= $MaxVMErrors) + { + $VM->Status("offline"); + NotifyAdministrator("The TestBot and/or the ". $VM->Name ." VM needs fixing", + "The ". $VM->Name ." VM got $Errors consecutive errors, the last of which is a child process crash which indicates a TestBot bug. But something may also be wrong with the VM for it to have triggered the crash so it has been put offline.\n"); + } + else + { + $VM->Status("dirty"); + } $VM->Save(); $VM->RecordResult($Sched->{records}, "boterror process died"); $Sched->{lambvms}->{$VMKey} = 1; -- 2.20.1

1 0

[PATCH] testbot/web: Document and slightly optimize PageBase::Redirect().
by Francois Gouget 26 Sep '19

26 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index c1a8c8cbf..e3d2e04d5 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -395,18 +395,18 @@ sub Redirect($$$) $self->SetCookies(); if (substr($Location, 0, 4) ne "http") { - my $Protocol = "http"; - if (SecureConnection()) - { - $Protocol .= "s"; - } + # Use the same protocol as for the current page. To force switching to + # https the caller should use MakeSecureURL(). + my $Protocol = SecureConnection() ? "https://" : "http://"; if (substr($Location, 0, 1) ne "/") { + # Despite its name, Request->uri only contains the path portion of the + # URI, excluding the protocol, hostname and parameters! my $URI = $self->{Request}->uri; - $URI =~ s=^(.*)/[^/]*$=$1/=; - $Location = $URI . $Location; + $URI =~ s=^(.*)/[^/]*$=$1/$Location=; + $Location = $URI; } - $Location = $Protocol . "://" . $ENV{"HTTP_HOST"} . $Location; + $Location = $Protocol . $ENV{"HTTP_HOST"} . $Location; } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT); -- 2.20.1

1 0

[PATCH] testbot/WineRunReconfig: Use SpecialJobs to create the WineTest job.
by Francois Gouget 26 Sep '19

26 Sep '19

Also notify the administrator if that job creation fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 1e0e15371..f4238873e 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -526,10 +526,24 @@ if ($NewStatus eq 'completed') FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } - if ($VM->Type eq "wine" and - system("$BinDir/CheckForWinetestUpdate.pl", "--vm", $VM->Name, "--create", "winetest")) + if ($VM->Type eq "wine") { - Error("Could not create a job to run WineTest on the ". $VM->Name ." VM\n"); + require WineTestBot::SpecialJobs; + $ErrMessage = WineTestBot::SpecialJobs::AddWineTestJob([$VM], $VM->Name); + if (defined $ErrMessage) + { + Error("Could not create a WineTest job for ". $VM->Name .": $ErrMessage\n"); + NotifyAdministrator("Could not create a WineTest job for ". $VM->Name, + "Could not create a job to run WineTest on ". $VM->Name + ." after its update:\n\n". + "$ErrMessage\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); + } + else + { + Debug(Elapsed($Start), " Added a WineTest job for ". $VM->Name ."\n"); + } } } -- 2.20.1

1 0

[PATCH] testbot/SpecialJobs: Tweak GetWindowsTestVMs() to work the same for 32 and 64 bit.
by Francois Gouget 26 Sep '19

26 Sep '19

Also make it possible to retrieve all the enabled VMs, regardless of their role like is possible with the other GetXxxVMs() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/SpecialJobs.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index b0cb1480d..d709e48f7 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -113,21 +113,21 @@ sub GetWindowsTestVMs($$$) my ($VMKey, $Build, $BaseJob) = @_; my $VMs = CreateVMs(); - $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); - if ($Build eq "exe64") + $VMs->AddFilter("Type", $Build eq "exe32" ? ["win32", "win64"] : ["win64"]); + if (defined $VMKey) { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]) if (!defined $VMKey); + $VMs->AddFilter("Name", [$VMKey]); + $VMs->FilterEnabledRole(); } - elsif ($BaseJob eq "base") + elsif ($BaseJob) { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]) if (!defined $VMKey); + $VMs->AddFilter("Role", $BaseJob eq "base" ? ["base"] : + $BaseJob eq "other" ? ["winetest"] : + ["base", "winetest"]); } else { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]) if (!defined $VMKey); + $VMs->FilterEnabledRole(); } my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); -- 2.20.1

1 0

[PATCH 1/5] strmbase: Introduce BasePinImpl_QueryInterface().
by Zebediah Figura 26 Sep '19

26 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 25 +++++++++++++++++++++++++ include/wine/strmbase.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2cc6ef5259d..d85d767bf52 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -157,6 +157,31 @@ HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int ind return VFW_S_NO_MORE_ITEMS; } +HRESULT WINAPI BasePinImpl_QueryInterface(IPin *iface) +{ + struct strmbase_pin *pin = impl_from_IPin(iface); + HRESULT hr; + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + *out = NULL; + + if (pin->pFuncsTable->pin_query_interface + && SUCCEEDED(hr = pin->pFuncsTable->pin_query_interface(filter, iid, out))) + return hr; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPin)) + *out = iface; + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + ULONG WINAPI BasePinImpl_AddRef(IPin *iface) { struct strmbase_pin *pin = impl_from_IPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 65ba180caa7..5ee13c8892e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -47,6 +47,7 @@ typedef struct BasePinFuncTable { HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); /* Required for EnumMediaTypes(). */ HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); + HRESULT (*pin_query_interface)(struct strmbase_pin *pin, REFIID iid, void **out); } BasePinFuncTable; struct strmbase_source @@ -97,6 +98,7 @@ typedef struct BaseInputPinFuncTable { /* Base Pin */ HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); LONG WINAPI BasePinImpl_GetMediaTypeVersion(struct strmbase_pin *pin); +HRESULT WINAPI BasePinImpl_QueryInterface(IPin *iface, REFIID iid, void **out); ULONG WINAPI BasePinImpl_AddRef(IPin *iface); ULONG WINAPI BasePinImpl_Release(IPin *iface); HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface); -- 2.23.0

2 9

[PATCH] testbot/CheckForWinetestUpdate: Use WineTestBot::Utils so we get GetMTime().
by Francois Gouget 26 Sep '19

26 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will fix this error: Undefined subroutine &main::GetMTime called at /home/testbot/bin/CheckForWinetestUpdate.pl line 118, <DATA> line 755. The relevant jobs should get created at most one hour later. Otherwise running CheckForWinetestUpdate.pl with no parameter will take care of it immediately. testbot/bin/CheckForWinetestUpdate.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 3f697315b..c3ec3a4d2 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -53,6 +53,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Log; use WineTestBot::SpecialJobs; +use WineTestBot::Utils; use WineTestBot::VMs; -- 2.20.1

1 0

[PATCH 5/7] scrobj: Lookup object members implementations in scripts when createating scriptlet instance.
by Jacek Caban 25 Sep '19

25 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 92 ++++++++++++++++++++++++++++++++++++++ dlls/scrobj/tests/scrobj.c | 9 ---- 2 files changed, 92 insertions(+), 9 deletions(-)

2 2