October 2019 - Wine-devel - list.winehq.org

[PATCH] dpnet: Report no programs found in IDirectPlay8LobbyClient EnumLocalPrograms
by Alistair Leslie-Hughes 02 Oct '19

02 Oct '19

This allow dpnet examples from reporting an error. It's valid not to have any local dpnet programs running. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index e7024e1c01..4459373a14 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -483,7 +483,10 @@ static HRESULT WINAPI lobbyclient_EnumLocalPrograms(IDirectPlay8LobbyClient *ifa FIXME("(%p)->(%p %p %p %p 0x%08x)\n", This, guidapplication, enumdata, enumDataSize, items, flags); - return E_NOTIMPL; + if(enumDataSize) + *enumDataSize = 0; + + return S_OK; } static HRESULT WINAPI lobbyclient_ConnectApplication(IDirectPlay8LobbyClient *iface, DPL_CONNECT_INFO *connectioninfo, -- 2.23.0

1 0

[PATCH 1/2] testbot/LibvirtTool: Only create locale snapshots for Windows VMs.
by Francois Gouget 02 Oct '19

02 Oct '19

This is the only supported and needed case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f6e2d4f60..b2f54f2c8 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -495,7 +495,8 @@ sub Revert() my ($SetLocale, $CreateSnapshot); my $Domain = $VM->GetDomain(); - if (!$Domain->HasSnapshot($DomainSnapshot) and + if (($VM->Type eq "win32" or $VM->Type eq "win64") and + !$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//) { # Add some extra time to set up the VM locale and reboot it -- 2.20.1

1 1

[PATCH] testbot/web: Allow downloading the raw task reports and logs.
by Francois Gouget 02 Oct '19

02 Oct '19

This can make analysis easier or allow processing through scripts to derive statistics. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- In particular, while the full test suite reports are normally available through test.winehq.org, that's not the case when they time out. In such a case being able to download and grep through the report can be useful. testbot/web/GetTaskFile.pl | 79 ++++++++++++++++++++++++++++++++++++++ testbot/web/JobDetails.pl | 14 +++++-- 2 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 testbot/web/GetTaskFile.pl diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl new file mode 100644 index 000000000..83e723e47 --- /dev/null +++ b/testbot/web/GetTaskFile.pl @@ -0,0 +1,79 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Sends a Task's report or log file +# +# Copyright 2019 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 warnings; +use strict; + +use Apache2::Const -compile => qw(REDIRECT); +use CGI; +use Fcntl; # for O_READONLY +use WineTestBot::Config; + + +sub SendTaskFile($$$$$) +{ + my ($Request, $JobId, $StepNo, $TaskNo, $File) = @_; + + # Validate and untaint + return undef if ($JobId !~ m/^(\d+)$/); + $JobId = $1; + return undef if ($StepNo !~ m/^(\d+)$/); + $StepNo = $1; + return undef if ($TaskNo !~ m/^(\d+)$/); + $TaskNo = $1; + return undef if ($File !~ m/^(log|[a-zA-Z0-9_-]+\.report)$/); + $File = $1; + + my $FileName = "$DataDir/jobs/$JobId/$StepNo/$TaskNo/$File"; + if (sysopen(my $fh, $FileName, O_RDONLY)) + { + my ($FileSize, $MTime, $BlkSize) = (stat($fh))[7, 9, 11]; + + $Request->headers_out->add("Last-Modified", scalar(gmtime($MTime)) ." GMT"); + $Request->content_type("text/plain"); + $Request->headers_out->add("Content-length", $FileSize); + $Request->headers_out->add("Content-Disposition", + "attachment; filename='$File'"); + + $BlkSize ||= 16384; + print $_ while (sysread($fh, $_, $BlkSize)); + close($fh); + + return 1; + } + + return undef; +} + + +my $Request = shift; + +my $CGIObj = CGI->new($Request); +my $JobId = $CGIObj->param("Job") || ""; +my $StepNo = $CGIObj->param("Step") || ""; +my $TaskNo = $CGIObj->param("Task") || ""; +my $File = $CGIObj->param("File") || ""; + +if (!SendTaskFile($Request, $JobId, $StepNo, $TaskNo, $File)) +{ + $Request->headers_out->set("Location", "/"); + $Request->status(Apache2::Const::REDIRECT); +} + +exit; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d878805a..fc98e14b0 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -321,14 +321,22 @@ sub GetMoreInfoLink($$$$;$) return ($Action, $Url); } -sub GenerateMoreInfoLink($$$$;$) +sub GenerateMoreInfoLink($$$$;$$) { - my ($self, $LinkKey, $Label, $Set, $Value) = @_; + my ($self, $LinkKey, $Label, $Set, $Value, $StepTask) = @_; 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>"; + if (defined $Value) + { + $Url = "/GetTaskFile.pl?Job=". uri_escape($self->{JobId}) + ."&Step=". uri_escape($StepTask->StepNo) + ."&Task=". uri_escape($StepTask->TaskNo) + ."&File=". uri_escape($Value); + $Html = "<a href='$Url'>↓</a> $Html"; + } if ($Action eq "Hide") { $Html = "$Html"; @@ -442,7 +450,7 @@ EOF my $ReportCount; foreach my $LogName (@{$MoreInfo->{Logs}}) { - $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName, $StepTask); $ReportCount++ if ($LogName !~ /^old_/ and $LogName =~ /\.report$/); } print "</div>\n"; -- 2.20.1

1 0

[PATCH] testbot/LibvirtTool: Check the X session for Wine VMs after booting.
by Francois Gouget 02 Oct '19

02 Oct '19

We need to wait for the X session whenever a Wine VM is booted, even when not creating a snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 42 +++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index cc22435c5..d5901910c 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -420,6 +420,25 @@ sub SetupTestAgentd($$$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } + if ($Booting and $VM->Type eq "wine") + { + # Make sure the X session has had time to start + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + FatalError("Could not check for the X session on $VMKey\n") if (!$Pid); + + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the X session\n"); + } + FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + } + } + if ($ResetStartCount) { # If SetProperty() is not supported neither is --show-restarts. @@ -443,29 +462,6 @@ sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; - if ($VM->Type eq "wine") - { - # Make sure an X session has started before taking the snapshot - Debug(Elapsed($Start), " Waiting for the X session\n"); - LogMsg "Waiting for the $VMKey X session\n"; - my $TA = $VM->GetAgent(); - my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - if (!$Pid) - { - FatalError("Could not check for the X session on the $VMKey VM\n"); - } - if (!defined $TA->Wait($Pid, $SleepAfterBoot)) - { - my $ErrMessage = $TA->GetLastError(); - if ($ErrMessage =~ /timed out waiting for the child process/) - { - FatalError("Timed out waiting for the X session\n"); - } - FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); - } - $TA->Disconnect(); - } - if ($SleepAfterBoot != 0) { Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n"); -- 2.20.1

1 0

[PATCH 1/2] testbot/Submit: Allow submitting patches that touch zero or multiple test units.
by Francois Gouget 02 Oct '19

02 Oct '19

Patches submitted through the submit page no longer need to impact one and only one test unit. This means it's no longer necessary to split longer patches in order to test them. With the Wine VMs it also no longer makes sense to ban patches that don't touch the tests as one may need to make sure they compile and don't cause regressions in existing tests. However it is still necessary to specify command line arguments for the test executable which means picking a single test unit to run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 1 + testbot/bin/build/Build.pl | 6 + testbot/bin/build/WineTest.pl | 79 +++++++++---- testbot/lib/Build/Utils.pm | 43 +++++--- testbot/lib/WineTestBot/PatchUtils.pm | 1 + testbot/web/Submit.pl | 153 ++++++++++++++++++-------- 6 files changed, 199 insertions(+), 84 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index beb050276..ff5317c8b 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -484,6 +484,7 @@ if ($Step->Type eq "suite") elsif ($Step->FileType eq "patch") { $Script .= "--testpatch ". ShQuote($Task->Missions) ." patch.diff"; + $Script .= " ". $Task->CmdLineArg if (defined $Task->CmdLineArg); } else { diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index f23b733d6..4c342a5ac 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -87,6 +87,12 @@ sub BuildTestExecutables($$$) } InfoMsg "\nBuilding the $Build Wine test executable(s)\n"; + if (!@BuildDirs) + { + InfoMsg "Nothing to do\n"; + return 1; + } + my $CPUCount = GetCPUCount(); system("cd '$DataDir/wine-$Build' && set -x && ". "time make -j$CPUCount ". join(" ", sort @BuildDirs)); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 37c20d1b4..9948e0929 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -121,9 +121,7 @@ sub DailyWineTest($$$$) sub TestPatch($$) { - my ($Mission, $Impacts) = @_; - - return 1 if ($Mission->{test} eq "build"); + my ($Mission, $Impacts, $Args) = @_; my @TestList; if ($Mission->{test} eq "all" and @@ -180,6 +178,24 @@ sub TestPatch($$) return 1; } +sub GetExecutable($$$) +{ + my ($Mission, $Impacts, $Module) = @_; + + my $TestInfo = $Impacts->{Tests}->{$Module}; + my $TestExecutable = "$TestInfo->{ExeBase}.exe"; + my $Dst = "$DataDir/staging/$TestExecutable"; + unlink $Dst; + + my $WineDir = GetWineDir($Mission); + if (!symlink "$WineDir/$TestInfo->{Path}/$TestExecutable", $Dst) + { + LogMsg "Could not find $TestExecutable: $!\n"; + return undef; + } + return $TestExecutable; +} + sub TestExe($$$) { my ($Mission, $FileName, $Args) = @_; @@ -196,6 +212,21 @@ sub TestExe($$$) } } + my $TestDir = GetTestDir($Mission); + if ($TestDir eq ".") + { + $FileName = "$DataDir/staging/$FileName"; + } + else + { + unlink "$TestDir/$FileName"; + if (!symlink "$DataDir/staging/$FileName", "$TestDir/$FileName") + { + LogMsg "Could not create '$FileName' in the test directory: $!\n"; + return 0; + } + } + # Run the test executable RunWine($Mission, GetTestLauncher($Mission), "-t 120 ". ShArgv2Cmd($FileName, @$Args) @@ -210,7 +241,7 @@ sub TestExe($$$) # my $Action = ""; -my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); +my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $Module, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; @@ -248,17 +279,16 @@ while (@ARGV) elsif ($Action eq "winetest") { $BaseTag = $Arg; - # The remaining arguments are meant for WineTest - last; + last; # The remaining arguments are meant for WineTest } elsif (!defined $FileName) { if (IsValidFileName($Arg)) { - $FileName = "$DataDir/staging/$Arg"; - if (!-r $FileName) + $FileName = $Arg; + if (!-r "$DataDir/staging/$FileName") { - Error "'$Arg' is not readable\n"; + Error "'$FileName' is not readable\n"; $Usage = 2; } } @@ -266,14 +296,17 @@ while (@ARGV) { Error "the '$Arg' filename contains invalid characters\n"; $Usage = 2; - last; } if ($Action eq "testexe") { - # The remainder are the executable's arguments - last; + last; # The remainder are the executable's arguments } } + elsif ($Action eq "testpatch" and !defined $Module) + { + $Module = $Arg; + last; # The remainder are the executable's arguments + } else { Error "unexpected argument '$Arg'\n"; @@ -372,7 +405,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $Name0 [--help] --testexe MISSIONS EXE ARGS...\n"; - print "or $Name0 [--help] --testpatch MISSIONS PATCH\n"; + print "or $Name0 [--help] --testpatch MISSIONS PATCH [MODULE ARGS...]\n"; print "or $Name0 [--help] --winetest [--no-submit] MISSIONS BASETAG ARGS\n"; print "\n"; print "Tests the specified patch or runs WineTest in Wine.\n"; @@ -387,11 +420,10 @@ if (defined $Usage) print " - wow32: The 32 bit WoW Wine build.\n"; print " - wow64: The 64 bit WoW Wine build.\n"; print " EXE Is the staging file containing the executable to run.\n"; - print " ARGS Are the arguments for the test executable.\n"; print " PATCH Is the staging file containing the patch to test.\n"; print " BASETAG Is the tag for this WineTest run. Note that the build type is\n"; print " automatically added to this tag.\n"; - print " ARGS The WineTest arguments.\n"; + print " ARGS Arguments for the test.\n"; print " --help Shows this usage message.\n"; exit $Usage; } @@ -413,7 +445,7 @@ unlink map { GetMissionBaseName($_) .".report" } @{$TaskMissions->{Missions}}; my $Impacts; if ($Action eq "testpatch") { - $Impacts = ApplyPatch("wine", $FileName); + $Impacts = ApplyPatch("wine", "$DataDir/staging/$FileName"); exit(1) if (!$Impacts or !BuildWine($TaskMissions, "win32") or !BuildWine($TaskMissions, "wow64") or @@ -421,18 +453,25 @@ if ($Action eq "testpatch") } foreach my $Mission (@{$TaskMissions->{Missions}}) { + return 1 if ($Mission->{test} eq "build"); + if ($Action eq "testexe") { exit(1) if (!TestExe($Mission, $FileName, \@ARGV)); } - elsif ($Action eq "testpatch") - { - exit(1) if (!TestPatch($Mission, $Impacts)); - } elsif ($Action eq "winetest") { exit(1) if (!DailyWineTest($Mission, $OptNoSubmit, $BaseTag, \@ARGV)); } + elsif (@ARGV) + { + my $FileName = GetExecutable($Mission, $Impacts, $Module); + exit(1) if (!$FileName or !TestExe($Mission, $FileName, \@ARGV)); + } + else + { + exit(1) if (!TestPatch($Mission, $Impacts)); + } } LogMsg "ok\n"; diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 50146301a..15acf6783 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -30,7 +30,8 @@ our @EXPORT = qw(GetToolName InfoMsg LogMsg Error GitPull ApplyPatch GetCPUCount BuildNativeTestAgentd BuildWindowsTestAgentd GetTestLauncher BuildTestLauncher UpdateAddOns - SetupWineEnvironment RunWine CreateWinePrefix); + SetupWineEnvironment GetWineDir GetTestDir RunWine + CreateWinePrefix); use Digest::SHA; use File::Basename; @@ -397,29 +398,37 @@ sub SetupWineEnvironment($) return $BaseName; } +sub GetWineDir($) +{ + my ($Mission) = @_; + return "$DataDir/wine-$Mission->{Build}"; +} + +sub GetTestDir($) +{ + my ($Mission) = @_; + + my $DevDir = "$ENV{WINEPREFIX}/dosdevices"; + return "." if (!-d $DevDir); + + my $Dir = $Mission->{dir} || ""; + # We cannot put colons in missions so restore the drive letter + $Dir = "$DevDir/c:/$Dir" if ($Dir !~ s~^([a-z])/~$DevDir/$1:/~); + return -d $Dir ? $Dir : "$DevDir/c:"; +} + sub RunWine($$$) { my ($Mission, $Cmd, $CmdArgs) = @_; - my $WineDir = "$DataDir/wine-$Mission->{Build}"; - $Cmd = "$WineDir/$Cmd" if ($Cmd =~ /\.exe\.so$/); - - my $CurDir = "$ENV{WINEPREFIX}/dosdevices"; - if (!-d $CurDir) - { - $CurDir = "."; - } - else - { - my $Dir = $Mission->{dir} || ""; - # We cannot put colons in missions so restore the drive letter - $Dir = "$CurDir/c:/$Dir" if ($Dir !~ s~^([a-z])/~$CurDir/$1:/~); - $CurDir = -d $Dir ? $Dir : "$ENV{WINEPREFIX}/dosdevices/c:"; - } + my $TestDir = GetTestDir($Mission); + my $WineDir = GetWineDir($Mission); + $Cmd = "$WineDir/$Cmd" if ($Cmd =~ /\.exe\.so$/); my $Magic = `file '$Cmd'`; my $Wine = ($Magic =~ /ELF 64/ ? "$WineDir/wine64" : "$WineDir/wine"); - return system("set -x && cd '$CurDir' && ". + + return system("set -x && cd '$TestDir' && ". "time '$Wine' '$Cmd' $CmdArgs"); } diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 71be9cf00..3c2f67011 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -441,6 +441,7 @@ sub GetPatchImpacts($) next if (exists $TestInfo->{Files}->{"$Base.spec"}); # Don't try running a deleted test unit obviously next if ($TestInfo->{Files}->{$File} eq "rm"); + $TestInfo->{AllUnits}->{$Base} = 1; if ($TestInfo->{All} or $TestInfo->{Files}->{$File}) { diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index a51ace650..b67237528 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -32,6 +32,7 @@ use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename; use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Engine::Notify; @@ -174,16 +175,10 @@ sub _AnalyzePatch($) $self->{ErrMessage} = "'$self->{FileName}' is not a valid patch"; return undef; } - if ($self->{Impacts}->{TestUnitCount} == 0) + if ($self->{Impacts}->{ModuleUnitCount} == 0) { $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "The patch does not impact the tests"; - return undef; - } - if ($self->{Impacts}->{TestUnitCount} > 1) - { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "The patch contains changes to multiple tests"; + $self->{ErrMessage} = "The patch does not directly impact the Wine dlls and programs"; return undef; } return 1; @@ -271,6 +266,65 @@ sub _ValidateVMSelection($;$) return 1; } +sub _GetTestExecutables($) +{ + my ($self, $ResetInvalid) = @_; + + if (!$self->{TestExecutables}) + { + if ($self->{FileType} eq "patch") + { + foreach my $Module (sort keys %{$self->{Impacts}->{Tests}}) + { + my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; + next if (!%{$TestInfo->{Files}}); + $self->{TestExecutables}->{"$TestInfo->{ExeBase}.exe"} = $Module; + } + } + else + { + $self->{TestExecutables}->{$self->{FileName}} = 1; + } + } +} + +sub _ValidateTestExecutable($;$) +{ + my ($self, $ResetInvalid) = @_; + + $self->_GetTestExecutables(); + if ($ResetInvalid and (!defined $self->{TestExecutable} or + !$self->{TestExecutables}->{$self->{TestExecutable}})) + { + $self->{TestExecutable} = (sort keys %{$self->{TestExecutables}})[0]; + if (!defined $self->{CmdLineArg} and $self->{Impacts}) + { + my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; + my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; + $self->{CmdLineArg} = (sort keys %{$TestInfo->{PatchedUnits}})[0] || + (sort keys %{$TestInfo->{AllUnits}})[0]; + } + } + + if (!defined $self->{TestExecutable}) + { + $self->{ErrField} = "TestExecutable"; + $self->{ErrMessage} = "You must specify the test executable filename"; + return undef; + } + elsif (!$self->{TestExecutables}->{$self->{TestExecutable}} or + # Make sure the test executable filename is valid + # to defend against malicious patches. + !IsValidFileName($self->{TestExecutable})) + { + $self->{ErrField} = "TestExecutable"; + $self->{ErrMessage} = "Invalid test executable filename"; + return undef; + } + + return 1; +} + sub Validate($) { my ($self) = @_; @@ -318,14 +372,7 @@ sub Validate($) if ($self->{Page} >= 3) { - if (($self->{FileType} eq "patch" and - $self->{TestExecutable} !~ m/^[\w_.]+_test\.exe$/) or - !IsValidFileName($self->{TestExecutable})) - { - $self->{ErrField} = "TestExecutable"; - $self->{ErrMessage} = "Invalid test executable filename"; - return undef; - } + return undef if (!$self->_ValidateTestExecutable()); if ($self->{CmdLineArg} eq "" and !$self->{NoCmdLineArgWarn}) { @@ -493,6 +540,30 @@ sub GetHeaderText($) } return $HeaderText; } + elsif ($self->{Page} == 3 and $self->{Impacts}) + { + my @TestExecutables; + $self->_GetTestExecutables(); + foreach my $TestExecutable (sort keys %{$self->{TestExecutables}}) + { + my $Module = $self->{TestExecutables}->{$TestExecutable}; + my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; + my @TestUnits; + foreach my $TestUnit (sort keys %{$TestInfo->{AllUnits}}) + { + if ($TestInfo->{PatchedUnits}->{$TestUnit}) + { + push @TestUnits, "$TestUnit"; + } + elsif ($TestInfo->{All} or $TestInfo->{PatchedModule}) + { + push @TestUnits, $TestUnit; + } + } + push @TestExecutables, "$Module: ". join(" ", @TestUnits) if (@TestUnits); + } + return join(" \n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); + } return ""; } @@ -512,15 +583,18 @@ sub GetPropertyDescriptors($) } elsif ($self->{Page} == 3) { - $self->_GetFileType(); - my $IsPatch = ($self->{FileType} eq "patch"); - $self->{PropertyDescriptors} ||= [ - CreateBasicPropertyDescriptor("TestExecutable", "Test executable", !1, $IsPatch, "A", 50), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), - CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), - ]; + if (!$self->{PropertyDescriptors}) + { + $self->_GetTestExecutables(); + my @TestExecutables = sort keys %{$self->{TestExecutables}}; + $self->{PropertyDescriptors} = [ + CreateEnumPropertyDescriptor("TestExecutable", "Test executable", !1, 1, \@TestExecutables), + CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), + CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), + CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), + ]; + } } return $self->SUPER::GetPropertyDescriptors(); } @@ -601,7 +675,9 @@ sub GenerateFields($) # By default select the base VMs that are ready to run tasks if (!$self->{UserVMSelection} and !$VMRow->{Extra} and - $VMRow->{VM}->Status !~ /^(?:offline|maintenance)$/) + $VMRow->{VM}->Status !~ /^(?:offline|maintenance)$/ and + ($VMRow->{VM}->Type eq "wine" or !$self->{Impacts} or + $self->{Impacts}->{TestUnitCount})) { $VMRow->{Checked} = 1; } @@ -764,8 +840,6 @@ sub OnUnset($) unlink($StagingFilePath) if ($StagingFilePath); delete $self->{FileName}; } - delete $self->{TestExecutable}; - delete $self->{CmdLineArg}; return 1; } @@ -783,29 +857,13 @@ sub OnPage1Next($) $self->{FileName} = $self->GetParam("Upload"); return undef if (!$self->_ValidateFileName() or !$self->_Upload()); } - if (!$self->Validate() or !$self->_ValidateVMSelection("deselect")) + if (!$self->Validate() or !$self->_ValidateVMSelection("deselect") or + !$self->_ValidateTestExecutable("reset")) { return undef; } # Set defaults - if ((!defined $self->{TestExecutable} or !defined $self->{CmdLineArg}) and - $self->{Impacts}) - { - foreach my $TestInfo (values %{$self->{Impacts}->{Tests}}) - { - next if (!$TestInfo->{UnitCount}); - if (!defined $self->{TestExecutable}) - { - $self->{TestExecutable} = "$TestInfo->{ExeBase}.exe"; - } - if (!defined $self->{CmdLineArg}) - { - $self->{CmdLineArg} = (keys %{$TestInfo->{PatchedUnits}})[0]; - } - last; - } - } if (!defined $self->{Run64}) { # Whether we show it or not the default is true @@ -997,7 +1055,8 @@ sub _SubmitJob($$) $Task->VM($VM); $Task->Timeout($Timeout); $Task->Missions($MissionStatement); - $Task->CmdLineArg($self->{CmdLineArg}) if ($self->{FileType} ne "patch"); + my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; + $Task->CmdLineArg(($Module eq 1 ? "" : "$Module ") .$self->{CmdLineArg}); } # Now save it all (or whatever's left to save) -- 2.20.1

1 1

[PATCH] testbot/TestAgent: Fix typos in the usage message.
by Francois Gouget 02 Oct '19

02 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 84bbf7e0c..40f443e46 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -345,12 +345,12 @@ if (defined $Usage) print " as <localpath>.\n"; print " run Runs the specified <command> on the server.\n"; print " --run-no-wait Don't wait for the command.\n"; - print " --run-in <serverpath> Redirect the stdin or the command being run to the\n"; + print " --run-in <serverpath> Redirect the stdin of the command being run to the\n"; print " specified server file.\n"; - print " --run-out <serverpath> Redirect the stdout or the command being run to the\n"; + print " --run-out <serverpath> Redirect the stdout of the command being run to the\n"; print " specified server file.\n"; print " --run-dntrunc-out Do not truncate the file stdout is redirected to.\n"; - print " --run-err <serverpath> Redirect the stderr or the command being run to the\n"; + print " --run-err <serverpath> Redirect the stderr of the command being run to the\n"; print " specified server file.\n"; print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " wait Waits for the specified child process on the server.\n"; -- 2.20.1

1 0

[PATCH] testbot/web: Remove the execute permissions on Munin.pl.
by Francois Gouget 02 Oct '19

02 Oct '19

They are not needed for CGI scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Munin.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 testbot/web/Munin.pl diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl old mode 100755 new mode 100644 -- 2.20.1

1 0

[PATCH] dsound/tests: Add some GetStatus checks
by Alistair Leslie-Hughes 01 Oct '19

01 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/tests/dsound.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 41818deb17..d242bf6b24 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1063,7 +1063,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, DWORD expected) { HRESULT rc; - DWORD ret; + DWORD ret, status; rc=IDirectSoundBuffer_SetCurrentPosition(dsb,0); ok(rc==DS_OK, @@ -1076,13 +1076,22 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, if(rc!=DS_OK) return rc; + rc = IDirectSoundBuffer_GetStatus(dsb, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == DSBSTATUS_PLAYING,"got %08x\n", status); + rc=IDirectSoundBuffer_Stop(dsb); ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08x\n",rc); if(rc!=DS_OK) return rc; + rc = IDirectSoundBuffer_GetStatus(dsb, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == 0 /* Stopped */,"got %08x\n", status); + ret=WaitForMultipleObjects(count,event,FALSE,0); ok(ret==expected,"expected %d. got %d\n",expected,ret); + return rc; } @@ -1537,7 +1546,7 @@ static void test_notifications(LPGUID lpGuid) WAVEFORMATEX wfx; DSBPOSITIONNOTIFY notifies[2]; HANDLE handles[2]; - DWORD expect; + DWORD expect, status; int cycles; rc = pDirectSoundCreate(lpGuid, &dso, NULL); @@ -1607,12 +1616,20 @@ static void test_notifications(LPGUID lpGuid) ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, "Got unexpected notification order or timeout: %u\n", wait); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING),"got %08x\n", status); + expect = !expect; } rc = IDirectSoundBuffer_Stop(buf); ok(rc == DS_OK, "Stop: %08x\n", rc); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08x\n",rc); + ok(status == 0,"got %08x\n", status); + CloseHandle(notifies[0].hEventNotify); CloseHandle(notifies[1].hEventNotify); -- 2.17.1

2 1

[PATCH 1/6] quartz/tests: Add some tests for IPin::EndOfStream() on the video renderer.
by Zebediah Figura 01 Oct '19

01 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 139 ++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3919b419e14..112b4bd309d 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -991,6 +991,144 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *grap IMediaControl_Release(control); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc) +{ + unsigned int ret = FALSE; + LONG_PTR param1, param2; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, 50)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + Sleep(1000); + ret = check_ec_complete(eventsrc); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1097,6 +1235,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); test_sample_time(pin, input, graph); + test_eos(pin, input, graph); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.23.0

2 10

[PATCH 1/2] mf: Partially implement topology cloning.
by Nikolay Sivov 01 Oct '19

01 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 1 - dlls/mf/topology.c | 52 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4eba79e120..b221398a71 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1308,7 +1308,6 @@ todo_wine { ok(value == MF_TOPOLOGY_RESOLUTION_SUCCEEDED, "Unexpected value %#x.\n", value); } hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); -todo_wine ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology2, "Unexpected instance.\n"); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 926fd48747..dacb57d264 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -111,6 +111,8 @@ static struct topology_node *unsafe_impl_from_IMFTopologyNode(IMFTopologyNode *i return impl_from_IMFTopologyNode(iface); } +static struct topology *unsafe_impl_from_IMFTopology(IMFTopology *iface); + static struct topology_loader *impl_from_IMFTopoLoader(IMFTopoLoader *iface) { return CONTAINING_RECORD(iface, struct topology_loader, IMFTopoLoader_iface); @@ -574,14 +576,11 @@ static HRESULT topology_get_node_by_id(const struct topology *topology, TOPOID i return MF_E_NOT_FOUND; } -static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node_iface) +static HRESULT topology_add_node(struct topology *topology, IMFTopologyNode *node_iface) { - struct topology *topology = impl_from_IMFTopology(iface); struct topology_node *node = unsafe_impl_from_IMFTopologyNode(node_iface); struct topology_node *match; - TRACE("%p, %p.\n", iface, node_iface); - if (!node) return E_POINTER; @@ -603,6 +602,15 @@ static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node return S_OK; } +static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node) +{ + struct topology *topology = impl_from_IMFTopology(iface); + + TRACE("%p, %p.\n", iface, node); + + return topology_add_node(topology, node); +} + static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *node) { struct topology *topology = impl_from_IMFTopology(iface); @@ -672,11 +680,41 @@ static HRESULT WINAPI topology_Clear(IMFTopology *iface) return S_OK; } -static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src_topology) +static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src) { - FIXME("(%p)->(%p)\n", iface, src_topology); + struct topology *topology = impl_from_IMFTopology(iface); + struct topology *src_topology = unsafe_impl_from_IMFTopology(src); + IMFTopologyNode *node; + HRESULT hr; + size_t i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, src); + + topology_clear(topology); + + /* Clone nodes. */ + for (i = 0; i < src_topology->nodes.count; ++i) + { + if (FAILED(hr = MFCreateTopologyNode(src_topology->nodes.nodes[i]->node_type, &node))) + { + WARN("Failed to create a node, hr %#x.\n", hr); + break; + } + + if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(node, &src_topology->nodes.nodes[i]->IMFTopologyNode_iface))) + topology_add_node(topology, node); + + IMFTopologyNode_Release(node); + } + + FIXME("Clone node connections.\n"); + + /* Copy attributes and id. */ + hr = IMFTopology_CopyAllItems(src, (IMFAttributes *)&topology->IMFTopology_iface); + if (SUCCEEDED(hr)) + topology->id = src_topology->id; + + return S_OK; } static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **ret) -- 2.23.0

2 3