September 2018 - Wine-Devel

Re: [PATCH vkd3d 3/8] vkd3d-shader: Translate continue instructions.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 24, 2018

Re: [PATCH vkd3d 2/8] vkd3d-shader: Translate ineg instructions.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 24, 2018

Re: [PATCH vkd3d 1/8] vkd3d-shader: Promote immediate scalar constants to vectors.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 24, 2018

Re: [PATCH v3 5/5] shell32/tests: Test hijacking the edit control's procedure after AutoComplete

by Gabriel Ivăncescu

On Mon, Sep 24, 2018 at 3:02 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Why do you need all these Sleeps and dispatch calls? As far as I can > see, everything you are testing should be synchronous. > > -- > Alexandre Julliard > julliard(a)winehq.org Well, at first I also wanted to remove them (they were there before, but only one test existed). It looks like they are actually needed on Windows, though, otherwise the tests fail. I think Windows uses a separate thread to do the autocomplete and some other weird stuff like that. It's not the SendMessage that's the problem, but I think the edit control doesn't receive the autocompleted stuff immediately on Windows.

Sept. 24, 2018

Re: [PATCH] riched20: Avoid using GCC's typeof extension

by Alex Henrie

On Mon, Sep 24, 2018 at 1:58 AM Huw Davies <huw(a)codeweavers.com> wrote: > > On Thu, Sep 20, 2018 at 09:34:07PM -0600, Alex Henrie wrote: > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > > --- > > dlls/riched20/txthost.c | 86 ++++++++++++++++++++--------------------- > > dlls/riched20/txtsrv.c | 4 +- > > 2 files changed, 45 insertions(+), 45 deletions(-) > > > > diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c > > index b479bde81b..d929a1a0a3 100644 > > --- a/dlls/riched20/txthost.c > > +++ b/dlls/riched20/txthost.c > > @@ -501,9 +501,9 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i > > > > #ifdef __i386__ /* thiscall functions are i386-specific */ > > > > -#define THISCALL(func) __thiscall_ ## func > > +#define THISCALL(func) (void *) __thiscall_ ## func > > #define DEFINE_THISCALL_WRAPPER(func,args) \ > > - extern typeof(func) THISCALL(func); \ > > + extern void * __thiscall_ ## func(void); \ > > __ASM_STDCALL_FUNC(__thiscall_ ## func, args, \ > > "popl %eax\n\t" \ > > "pushl %ecx\n\t" \ > > We lose type-checking when assigning function ptrs to vtbl entries, which is > unfortunate. I think we'll be OK because there's still type-checking when compiling 64-bit Wine. -Alex

Sept. 24, 2018

Re: [PATCH v3 5/5] shell32/tests: Test hijacking the edit control's procedure after AutoComplete

by Alexandre Julliard

Gabriel Ivăncescu <gabrielopcode(a)gmail.com> writes: > Windows' AutoComplete seems to bypass hijacking in some cases. However, > WM_GETTEXT seems to be able to get hijacked. > > Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> > --- > > This still works now with Wine, so I think it's nice to add these tests > just in case for the future. > > Also reduced the Sleep amount to 1/3 of its original, which will be especially > useful in future tests (to be added) to prevent them from taking way too long. Why do you need all these Sleeps and dispatch calls? As far as I can see, everything you are testing should be synchronous. -- Alexandre Julliard julliard(a)winehq.org

Sept. 24, 2018

[PATCH] testbot: Fix the detection and reporting of timed out Wine tests.

by Francois Gouget

Modify ParseWineTestReport() to report the number of test units and timeouts found in the report and remove the IsSuite parameter. This allows the caller to check whether the report has the expected number of test units, and to better decide whether the test as a whole timed out. The policy is to now only consider it to have timed out if all the test units timed out, which would typically only happen when running a single test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 6 +++--- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/lib/WineTestBot/LogUtils.pm | 16 +++++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 5ff3fc4a5..077426b23 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -523,13 +523,13 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } } -my $TimedOut; Debug(Elapsed($Start), " Retrieving the report file to '$RptFileName'\n"); if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { chmod 0664, "$TaskDir/$RptFileName"; - (my $LogFailures, my $LogErrors, $TimedOut) = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $Step->Type eq "suite", $TaskTimedOut); + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $TaskTimedOut); + $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); if (!defined $LogFailures and @$LogErrors == 1) { # Could not open the file @@ -563,4 +563,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); # Wrap up # -WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut || $TimedOut); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index e3b8b17ed..90e3403f7 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -534,7 +534,6 @@ elsif (!defined $TAError) # Grab the test logs if any # -my $TimedOut; if ($Step->Type ne "build") { my $BuildList = $Task->CmdLineArg; @@ -547,7 +546,8 @@ if ($Step->Type ne "build") { chmod 0664, "$TaskDir/$RptFileName"; - (my $LogFailures, my $LogErrors, $TimedOut) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $Step->Type eq "suite", $TaskTimedOut); + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); + $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); if (!defined $LogFailures and @$LogErrors == 1) { # Could not open the file @@ -595,4 +595,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); # Wrap up # -WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut || $TimedOut); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index b0b804046..17d44a44c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -277,23 +277,23 @@ a list of extra errors, and whether the test timed out. =back =cut -sub ParseWineTestReport($$$$) +sub ParseWineTestReport($$$) { - my ($FileName, $IsWineTest, $IsSuite, $TaskTimedOut) = @_; + my ($FileName, $IsWineTest, $TaskTimedOut) = @_; my $LogFile; if (!open($LogFile, "<", $FileName)) { my $BaseName = basename($FileName); - return (undef, ["Unable to open '$BaseName' for reading: $!"], undef); + return (undef, undef, undef, ["Unable to open '$BaseName' for reading: $!"]); } my $Parser = { IsWineTest => $IsWineTest, - IsSuite => $IsSuite, TaskTimedOut => $TaskTimedOut, - TimedOut => undef, + TestUnitCount => 0, + TimeoutCount => 0, Failures => undef, Errors => [], }; @@ -309,6 +309,7 @@ sub ParseWineTestReport($$$$) # Close the previous test unit _CloseTestUnit($Parser, $Cur, 0) if ($Cur->{Dll} ne ""); $Cur = _NewCurrentUnit($Dll, $Unit); + $Parser->{TestUnitCount}++; # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); @@ -414,7 +415,7 @@ sub ParseWineTestReport($$$$) # so record the failure but don't add an error message. $Parser->{Failures}++; $Cur->{IsBroken} = 1; - $Parser->{TimedOut} = $Parser->{IsSuite}; + $Parser->{TimeoutCount}++; } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -445,7 +446,8 @@ sub ParseWineTestReport($$$$) _CloseTestUnit($Parser, $Cur, 1); close($LogFile); - return ($Parser->{Failures}, $Parser->{Errors}, $Parser->{TimedOut}); + return ($Parser->{TestUnitCount}, $Parser->{TimeoutCount}, + $Parser->{Failures}, $Parser->{Errors}); } -- 2.18.0

Sept. 24, 2018

[PATCH] testbot: Fix patchset handling in GetPatchImpacts().

by Francois Gouget

Only the last part must be taken into account to determine if a rebuild or testing is needed. But they are needed, the previous parts must be taken into account for the rebuild, including the Autoconf and MakeMakefile fields. This also means the scope of the rebuild may be different from that of the tests (we may need a full rebuild to run a single test). So introduce RebuildRoot and RebuildModules which are similar to PatchedRoot and PatchedModules but also take into account patches from previous parts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 44 +++++++++++++++------------ 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 2bac7be46..b7307e527 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -283,24 +283,12 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{PatchedRoot} or $PastImpacts->{PatchedModules} or - $PastImpacts->{PatchedTests}) - { - # Update the list of Wine files so we correctly recognize patchset parts - # that modify new Wine files. - my $WineFiles = $PastImpacts->{WineFiles} || $_WineFiles; - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$WineFiles}; - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$PastImpacts->{NewFiles}}; - map { delete $Impacts->{WineFiles}->{$_} } keys %{$PastImpacts->{DeletedFiles}}; - # Modules impacted by previous parts of a patchset still need to be - # rebuilt. - $Impacts->{BuildModules} = { %{$PastImpacts->{BuildModules}} }; - } - else - { - $Impacts->{NewFiles} = $PastImpacts->{NewFiles}; - $Impacts->{DeletedFiles} = $PastImpacts->{DeletedFiles}; - } + # Update the list of Wine files so we correctly recognize patchset parts + # that modify new Wine files. + my $WineFiles = $PastImpacts->{WineFiles} || $_WineFiles; + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$WineFiles}; + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$PastImpacts->{NewFiles}}; + map { delete $Impacts->{WineFiles}->{$_} } keys %{$PastImpacts->{DeletedFiles}}; foreach my $PastInfo (values %{$PastImpacts->{Tests}}) { @@ -403,6 +391,24 @@ sub GetPatchImpacts($;$) $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; } + if ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules} or + $Impacts->{PatchedTests}) + { + # Any patched area will need to be rebuilt... + $Impacts->{RebuildRoot} = $Impacts->{PatchedRoot}; + $Impacts->{RebuildModules} = $Impacts->{PatchedModules}; + + # ... even if the patch was in previous parts + if ($PastImpacts) + { + $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; + $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; + $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; + $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; + map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; + } + } + return $Impacts; } @@ -419,7 +425,7 @@ sub GetBuildTimeout($$) map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %$Builds; # Set $ModuleCount to 0 if a full rebuild is needed - my $ModuleCount = (!$Impacts or $Impacts->{PatchedRoot}) ? 0 : + my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); my ($ExeTimeout, $WineTimeout) = (0, 0); -- 2.18.0

Sept. 24, 2018

[PATCH] testbot: Increase the full rebuild timeouts.

by Francois Gouget

The increased timeouts can be needed if the computer is otherwise busy (which should not be happening on the official TestBot unless the administrator is doing some maintenance on the side). The new timeouts should provide at least a 50% margin, thus also leaving some room for Wine to grow. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- There was a timeout on the TestBot once during a Wine update. The same day I also got a timeout on my box (but that's less surprising since it may have been busy with other things at the time). Hopefully the timeout increases will prevent a reoccurrence. testbot/lib/WineTestBot/Config.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index a83085d44..157617780 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -95,13 +95,13 @@ $MaxTaskTries = 3; # Exe build timeouts (in seconds) # - For a full build $ExeBuildNativeTimeout = 60; -$ExeBuildTestTimeout = 2 * 60; +$ExeBuildTestTimeout = 4 * 60; # - For a single module $ExeModuleTimeout = 30; # Wine build timeouts (in seconds) # - For a full build -$WineBuildTimeout = 20 * 60; +$WineBuildTimeout = 25 * 60; # - For a single module $WineModuleTimeout = 60; -- 2.18.0

Sept. 24, 2018

[PATCH] testbot: Improve error checking when combining patchset parts.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 23 ++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 4ef7a663a..3ac8c5350 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -106,20 +106,33 @@ sub SubmitSubset($$$) my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patch"); return "Could not create a combined patch file: $!" if (!$CombinedFile); - my $Parts = $self->Parts; + my $ErrMessage; for (my $PartNo = 1; $PartNo <= $MaxPart; $PartNo++) { - my $Part = $Parts->GetItem($PartNo); - if (defined $Part and - open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) + my $Part = $self->Parts->GetItem($PartNo); + if (!defined $Part) + { + $ErrMessage = "Could not find part $PartNo / $MaxPart"; + last; + } + + if (open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) { print $CombinedFile $_ for (<$PartFile>); close($PartFile); } + else + { + $ErrMessage = "Could not open part $PartNo for reading: $!"; + last; + } } close($CombinedFile); - my $ErrMessage = $FinalPatch->Submit($CombinedFileName, 1); + if (!defined $ErrMessage) + { + $ErrMessage = $FinalPatch->Submit($CombinedFileName, 1); + } unlink($CombinedFileName); return $ErrMessage; -- 2.18.0

Sept. 24, 2018