August 2018 - Wine-Devel - list.winehq.org

[PATCH] testbot/build: Rename the build directories to allow for more than one project.
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

The new naming scheme is 'project-build', thus avoiding name collisions in case we need build trees for other projects besides Wine. The build now matches the name of the corresponding test reports for Windows builds too; that is exe32 and exe64. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 26 +++++++++---------- testbot/bin/build/Reconfig.pl | 42 +++++++++++++++++++++---------- testbot/bin/build/WineReconfig.pl | 16 +++++++++--- testbot/bin/build/WineTest.pl | 2 +- testbot/lib/Build/Utils.pm | 6 ++--- 5 files changed, 58 insertions(+), 34 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7f94c8595..7a268db5c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -58,11 +58,11 @@ sub BuildNative() { InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-native' && set -x && ". + system("cd '$DataDir/wine-native' && set -x && ". "time make -j$CPUCount __tooldeps__"); if ($? != 0) { - LogMsg "Rebuild of native tools failed\n"; + LogMsg "The Wine native tools build failed\n"; return !1; } @@ -71,9 +71,9 @@ sub BuildNative() sub BuildTestExecutables($$$) { - my ($Targets, $Impacts, $Bits) = @_; + my ($Targets, $Impacts, $Build) = @_; - return 1 if (!$Targets->{"exe$Bits"}); + return 1 if (!$Targets->{$Build}); my (@BuildDirs, @TestExes); foreach my $TestInfo (values %{$Impacts->{Tests}}) @@ -81,26 +81,26 @@ sub BuildTestExecutables($$$) push @BuildDirs, $TestInfo->{Path}; my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; push @TestExes, $TestExe; - unlink("$DataDir/build-mingw$Bits/$TestExe"); # Ignore errors + unlink("$DataDir/wine-$Build/$TestExe"); # Ignore errors } - InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; + InfoMsg "\nBuilding the $Build Wine test executable(s)\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-mingw$Bits' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". "time make -j$CPUCount ". join(" ", sort @BuildDirs)); if ($? != 0) { - LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; + LogMsg "The $Build Wine crossbuild failed\n"; return !1; } my $Success = 1; foreach my $TestExe (@TestExes) { - if (!-f "$DataDir/build-mingw$Bits/$TestExe") + if (!-f "$DataDir/wine-$Build/$TestExe") { - LogMsg "Make didn't produce a $TestExe file\n"; - $Success = undef; + LogMsg "Make didn't produce the $Build $TestExe file\n"; + $Success = !1; } } @@ -223,8 +223,8 @@ my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or ($Impacts->{WineBuild} and !BuildNative()) or - !BuildTestExecutables($Targets, $Impacts, 32) or - !BuildTestExecutables($Targets, $Impacts, 64)) + !BuildTestExecutables($Targets, $Impacts, "exe32") or + !BuildTestExecutables($Targets, $Impacts, "exe64")) { exit(1); } diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 36748d66e..f2d63fa24 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -52,19 +52,27 @@ sub BuildNative($) { my ($NoRm) = @_; - mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = "build-native"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-native") + { + rename("$DataDir/$OldDir", "$DataDir/wine-native"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-native", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-native' && set -x && ". + system("cd '$DataDir/wine-native' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount __tooldeps__"); if ($? != 0) { - LogMsg "Build native failed\n"; + LogMsg "The Wine native tools build failed\n"; return !1; } @@ -73,22 +81,30 @@ sub BuildNative($) sub BuildCross($$$) { - my ($Targets, $NoRm, $Bits) = @_; + my ($Targets, $NoRm, $Build) = @_; - return 1 if (!$Targets->{"exe$Bits"}); - mkdir "$DataDir/build-mingw$Bits" if (!-d "$DataDir/build-mingw$Bits"); + return 1 if (!$Targets->{$Build}); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = $Build eq "exe32" ? "build-mingw32" : "build-mingw64"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") + { + rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-$Build", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # Rebuild from scratch to make sure cruft will not accumulate - InfoMsg "\nRebuilding the $Bits-bit test executables\n"; + InfoMsg "\nRebuilding the $Build Wine test executables\n"; my $CPUCount = GetCPUCount(); - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); - system("cd '$DataDir/build-mingw$Bits' && set -x && ". + my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); + system("cd '$DataDir/wine-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . - "time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && ". + "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount buildtests"); if ($? != 0) { - LogMsg "Build cross ($Bits bits) failed\n"; + LogMsg "The $Build Wine crossbuild failed\n"; return !1; } @@ -100,8 +116,8 @@ sub UpdateWineBuilds($$) my ($Targets, $NoRm) = @_; return BuildNative($NoRm) && - BuildCross($Targets, $NoRm, 32) && - BuildCross($Targets, $NoRm, 64); + BuildCross($Targets, $NoRm, "exe32") && + BuildCross($Targets, $NoRm, "exe64"); } diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index b30ddd190..2416eebfa 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -50,19 +50,27 @@ sub BuildWine($$$$) my ($Targets, $NoRm, $Build, $Extras) = @_; return 1 if (!$Targets->{$Build}); - mkdir "$DataDir/build-$Build" if (!-d "$DataDir/build-$Build"); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = "build-$Build"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") + { + rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-$Build", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not # accumulate InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-$Build' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". "time make -j$CPUCount"); if ($? != 0) { - LogMsg "The $Build build failed\n"; + LogMsg "The $Build Wine build failed\n"; return !1; } @@ -75,7 +83,7 @@ sub UpdateWineBuilds($$) return BuildWine($Targets, $NoRm, "win32", "") && BuildWine($Targets, $NoRm, "wow64", "--enable-win64") && - BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/build-wow64'"); + BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 9c264b485..9be73a42f 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -58,7 +58,7 @@ sub BuildWine($$) InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-$Build' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". "time make -j$CPUCount"); if ($? != 0) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 038c188f2..fd1b8467c 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -326,9 +326,9 @@ sub RunWine($$$) { my ($Build, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/build-$Build' && file $Cmd`; + my $Magic = `cd '$DataDir/wine-$Build' && file $Cmd`; my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/build-$Build' && set -x && ". + return system("cd '$DataDir/wine-$Build' && set -x && ". "time $Wine $Cmd $CmdArgs"); } @@ -354,7 +354,7 @@ sub CreateWinePrefix($$) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/build-$Build' && ./server/wineserver -w"); + system("cd '$DataDir/wine-$Build' && ./server/wineserver -w"); } return undef; -- 2.18.0

1 0

[PATCH] testbot: Improve the log naming scheme.
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

Tasks generate multiple types of logs and reports: * 32 bit and / or 64 bit test reports(in *.report). * A list of inconsistencies found in each test report (in err). * A build or task log (in log). * A list of task errors (in err). * When a TestBot error occurs and a task gets restarted, the old task logs are preserved in *.old files. So far a task would generate either a single .report file or the log file which is why the above scheme was sufficient. However this is bound to change and there are additional constraints to accommodate: * Running the tests on Wine will generate both a build log and a test report. * It may also be desirable to run both the 32 and 64 bit WoW Wine tests in a single task which would result in it having both a wow32.report and a wow64.report file in addition to the log one. * If a task has two test reports the corresponding inconsistencies must be easily identifiable and kept separate. This also means not mixing them with the generic task errors. * WineTest's reference logs are stored in 'vmname_*.log' files where the variable part is computed differently for the Windows and Wine reports. So this patch tweaks the log and report naming scheme to avoid mixing messages from different sources and to make it easier to match logs and error files: * For each log or report called 'xxx', any additional error message will go to 'xxx.err'. This means any inconsistencies found in 'wow32.report' will go to 'wow32.report.err' and will not be mixed with those of the 64 bit report. * Old versions of a log, report or error file called 'xxx' will be concatenated in 'old_xxx' (and the corresponding old errors would be in 'old_xxx.err'). * The reference version of a report, log or error file called 'xxx' will be stored in 'vmname_xxx'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 15 ++++++++ testbot/bin/Janitor.pl | 2 +- testbot/bin/WineRunBuild.pl | 4 +-- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 27 ++++++++------- testbot/bin/WineRunWineTest.pl | 32 ++++++++++------- testbot/bin/WineSendLog.pl | 22 ++++++------ testbot/lib/WineTestBot/LogUtils.pm | 54 ++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Tasks.pm | 16 +++++---- testbot/web/JobDetails.pl | 4 +-- testbot/web/Munin.pl | 2 +- 11 files changed, 127 insertions(+), 55 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 4478d479b..79b25fac0 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -51,6 +51,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; use WineTestBot::Jobs; use WineTestBot::Log; +use WineTestBot::LogUtils; # FIXME Temporary, for the log renaming use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::RecordGroups; @@ -102,6 +103,20 @@ sub Cleanup($;$$) { my ($Starting, $KillTasks, $KillVMs) = @_; + # FIXME Temporary: Rename the old logs so they follow the new naming scheme + # and can be identified by WineSendLog.pl and JobDetails.pl. + RenameReferenceLogs(); + foreach my $Job (@{CreateJobs()->GetItems()}) + { + foreach my $Step (@{$Job->Steps->GetItems()}) + { + foreach my $Task (@{$Step->Tasks->GetItems()}) + { + RenameTaskLogs($Task->GetDir()); + } + } + } + # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. my %RunningVMs; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 18bbc3dea..120845121 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -311,7 +311,7 @@ if (opendir(my $dh, "$DataDir/latest")) { next if ($Entry eq "." or $Entry eq ".."); - if ($Entry =~ /^(.*)_[a-z0-9]+\.(?:err|log)$/) + if ($Entry =~ /^(.*)_[a-z0-9]+\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are # retired or scheduled for deletion. diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b246164e5..cca96b92a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -183,14 +183,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/err")) + if (open(my $ErrFile, ">>", "$TaskDir/log.err")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'err' for writing: $!\n"; + Error "Unable to open 'log.err' for writing: $!\n"; } umask($OldUMask); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 3fec02b89..19f5ed467 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/err")) + if (open(my $ErrFile, ">>", "$TaskDir/log.err")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'err' for writing: $!\n"; + Error "Unable to open 'log.err' for writing: $!\n"; } umask($OldUMask); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index c602979b1..5ff3fc4a5 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -214,14 +214,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/err")) + if (open(my $ErrFile, ">>", "$TaskDir/log.err")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'err' for writing: $!\n"; + Error "Unable to open 'log.err' for writing: $!\n"; } umask($OldUMask); } @@ -296,15 +296,15 @@ sub WrapUpAndExit($;$$$) # Keep the old report if the new one is missing if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { - # Update the reference VM suite results for WineSendLog.pl - my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_", - $Step->FileType eq "exe64" ? "64" : "32"); - unlink("$LatestBaseName.log"); - link("$TaskDir/$RptFileName", "$LatestBaseName.log"); - unlink("$LatestBaseName.err"); - if (-f "$TaskDir/err" and !-z "$TaskDir/err") + # Update the VM's reference WineTest results for WineSendLog.pl + my $RefReport = "$DataDir/latest/". $Task->VM->Name ."_$RptFileName"; + unlink($RefReport); + link("$TaskDir/$RptFileName", $RefReport); + + unlink("$RefReport.err"); + if (-f "$TaskDir/$RptFileName.err" and !-z "$TaskDir/$RptFileName.err") { - link("$TaskDir/err", "$LatestBaseName.err"); + link("$TaskDir/$RptFileName.err", "$RefReport.err"); } } } @@ -541,9 +541,12 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { # $LogFailures can legitimately be undefined in case of a timeout $TaskFailures += $LogFailures || 0; - foreach my $Error (@$LogErrors) + if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) { - LogTaskError("$Error\n"); + # Save the extra errors detected by ParseWineTestReport() in + # $RptFileName.err (see WineRunWineTest.pl). + print $Log "$_\n" for (@$LogErrors); + close($Log); } } } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 2552a7c9d..0363a26b3 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -209,14 +209,14 @@ sub LogTaskError($) my ($ErrMessage) = @_; Debug("$Name0:error: ", $ErrMessage); - if (open(my $ErrFile, ">>", "$TaskDir/err")) + if (open(my $ErrFile, ">>", "$TaskDir/log.err")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'err' for writing: $!\n"; + Error "Unable to open 'log.err' for writing: $!\n"; } } @@ -295,15 +295,15 @@ sub WrapUpAndExit($;$$$) my $RptFileName = "$Build.report"; if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { - # Update the reference VM suite results for WineSendLog.pl - my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, - "_$Build"); - unlink("$LatestBaseName.log"); - link("$TaskDir/$RptFileName", "$LatestBaseName.log"); - unlink("$LatestBaseName.err"); - if (-f "$TaskDir/err" and !-z "$TaskDir/err") + # Update the VM's reference WineTest results for WineSendLog.pl + my $RefReport = "$DataDir/latest/". $Task->VM->Name ."_$RptFileName"; + unlink($RefReport); + link("$TaskDir/$RptFileName", $RefReport); + + unlink("$RefReport.err"); + if (-f "$TaskDir/$RptFileName.err" and !-z "$TaskDir/$RptFileName.err") { - link("$TaskDir/err", "$LatestBaseName.err"); + link("$TaskDir/$RptFileName.err", "$RefReport.err"); } } } @@ -560,9 +560,17 @@ if ($Step->Type ne "build") { # $LogFailures can legitimately be undefined in case of a timeout $TaskFailures += $LogFailures || 0; - foreach my $Error (@$LogErrors) + if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) { - LogTaskError("$Error\n"); + # Save the extra errors detected by ParseWineTestReport() in + # $RptFileName.err: + # - This keep the .report file clean. + # - Each .err file can be matched to its corresponding .report, even + # if there are multiple .report files in the directory. + # - The .err file can be moved to the latest directory next to the + # reference report. + print $Log "$_\n" for (@$LogErrors); + close($Log); } } } diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 368d830de..2127eadb7 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -327,7 +327,7 @@ EOF } close LOGFILE; - if (open ERRFILE, "<$TaskDir/err") + if (open ERRFILE, "<$TaskDir/log.err") { my $First = 1; while (defined($Line = <ERRFILE>)) @@ -365,7 +365,7 @@ EOF push @FailureKeys, $Key; } } - elsif (open ERRFILE, "<$TaskDir/err") + elsif (open ERRFILE, "<$TaskDir/log.err") { my $HasErrEntries = !1; my $Line; @@ -419,7 +419,7 @@ EOF close LOGFILE; } - if (open ERRFILE, "<$TaskDir/err") + if (open ERRFILE, "<$TaskDir/log.err") { my $Line; while (defined($Line = <ERRFILE>)) @@ -456,12 +456,12 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/err"); + my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/log.err"); if ($BotFailure) { # TestBot errors are not the developer's fault and prevent us from doing # any meaningful analysis. So skip. - Error "A TestBot error was found in $TaskDir/err\n"; + Error "A TestBot error was found in $TaskDir/log.err\n"; next; } @@ -470,9 +470,7 @@ EOF my $LogName = $LogFiles->[0] || "log"; if ($LogName =~ /\.report$/) { - $StepTask->FileName =~ m/^(.*)_test(64)?\.exe$/; - my ($BaseName, $Bits) = ($1, $2 || "32"); - my $LatestName = "$DataDir/latest/" . $StepTask->VM->Name . "_$Bits"; + my $LatestName = "$DataDir/latest/". $StepTask->VM->Name ."_$LogName"; my ($LatestBotFailure, $Dummy) = CheckErrLog("$LatestName.err"); if (! $LatestBotFailure) { @@ -481,13 +479,15 @@ EOF # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine # so any failure it reported is not caused by this patch. - $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/$LogName", + $StepTask->FileName =~ m/^(.*)_test/; + my $BaseName = $1; + $MessagesFromLog = CompareLogs($LatestName, "$TaskDir/$LogName", $BaseName, $StepTask->CmdLineArg); } } else { - Error "BotFailure found in ${LatestName}.err\n"; + Error "BotFailure found in $LatestName.err\n"; } } elsif (open(my $LogFile, "<", "$TaskDir/$LogName")) @@ -596,7 +596,7 @@ EOF close($logfile); } - if (open(my $errfile, "<", "$TaskDir/err")) + if (open(my $errfile, "<", "$TaskDir/log.err")) { my $Line; while (defined($Line = <$errfile>)) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e05afb605..6f7cef5e8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -29,6 +29,7 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogLineCategory GetReportLineCategory + RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); use File::Basename; @@ -485,6 +486,49 @@ sub GetReportLineCategory($) # Log querying and formatting # +sub RenameReferenceLogs() +{ + if (opendir(my $dh, "$DataDir/latest")) + { + # We will be renaming files so read the directory in one go + my @Entries = readdir($dh); + close($dh); + foreach my $Entry (@Entries) + { + if ($Entry =~ /^([a-z0-9._]+)$/) + { + my $NewName = $Entry = $1; + $NewName =~ s/\.log$/.report/; + $NewName =~ s/(_[a-z0-9]+)\.err$/$1.report.err/; + $NewName =~ s/_(32|64)\.report/_exe$1.report/; + if ($Entry ne $NewName and !-f "$DataDir/latest/$NewName") + { + rename "$DataDir/latest/$Entry", "$DataDir/latest/$NewName"; + } + } + } + } +} + +sub RenameTaskLogs($) +{ + my ($Dir) = @_; + + if (-f "$Dir/err" and !-f "$Dir/log.err") + { + rename "$Dir/err", "$Dir/log.err"; + } + + if (-f "$Dir/log.old" and !-f "$Dir/old_log") + { + rename "$Dir/log.old", "$Dir/old_log"; + } + if (-f "$Dir/err.old" and !-f "$Dir/old_log.err") + { + rename "$Dir/err.old", "$Dir/old_log.err"; + } +} + =pod =over 12 @@ -503,8 +547,8 @@ sub GetLogFileNames($;$) my @Candidates = ("exe32.report", "exe64.report", "win32.report", "wow32.report", "wow64.report", - "log", "err"); - push @Candidates, "log.old", "err.old" if ($IncludeOld); + "log", "log.err"); + push @Candidates, "old_log", "old_log.err" if ($IncludeOld); my @Logs; foreach my $FileName (@Candidates) @@ -521,9 +565,9 @@ my %_LogFileLabels = ( "wow32.report" => "32 bit WoW Wine report", "wow64.report" => "64 bit Wow Wine report", "log" => "task log", - "err" => "task errors", - "log.old" => "old logs", - "err.old" => "old task errors", + "log.err" => "task errors", + "old_log" => "old logs", + "old_log.err" => "old task errors", ); =pod diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 70b620544..084784a3b 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -117,13 +117,15 @@ sub _SetupTask($$) if (-d $Dir) { mkpath("$Dir.new", 0, 0775); - rename "$Dir/log.old", "$Dir.new/log.old" if (-f "$Dir/log.old"); - rename "$Dir/err.old", "$Dir.new/err.old" if (-f "$Dir/err.old"); - foreach my $Filename ("log", "err") + foreach my $Filename ("log", "log.err") { + if (-f "$Dir/old_$Filename") + { + rename "$Dir/old_$Filename", "$Dir.new/old_$Filename"; + } if (open(my $Src, "<", "$Dir/$Filename")) { - if (open(my $Dst, ">>", "$Dir.new/$Filename.old")) + if (open(my $Dst, ">>", "$Dir.new/old_$Filename")) { print $Dst "----- Run ", ($self->TestFailures || 0), " $Filename\n"; while (my $Line = <$Src>) @@ -142,7 +144,7 @@ sub _SetupTask($$) # Capture Perl errors in the task's generic error log my $TaskDir = $self->CreateDir(); - if (open(STDERR, ">>", "$TaskDir/err")) + if (open(STDERR, ">>", "$TaskDir/log.err")) { # Make sure stderr still flushes after each print my $tmp=select(STDERR); @@ -152,7 +154,7 @@ sub _SetupTask($$) else { require WineTestBot::Log; - WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/err': $!\n"); + WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/log.err': $!\n"); } } @@ -215,7 +217,7 @@ sub UpdateStatus($$) my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); - if (open TASKLOG, ">>$TaskDir/err") + if (open TASKLOG, ">>$TaskDir/log.err") { print TASKLOG "TestBot process got stuck or died unexpectedly\n"; close TASKLOG; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ee4e53930..e1fe20f18 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -393,7 +393,7 @@ sub GenerateBody($) print "</div>\n"; my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; - my $ErrName = $LogName eq "log.old" ? "err.old" : "err"; + my $ErrName = "$LogName.err"; my ($EmptyDiag, $LogFirst) = (undef, 1); if (open(my $LogFile, "<", "$TaskDir/$LogName")) @@ -472,7 +472,7 @@ sub GenerateBody($) if (!$LogFirst) { print "<div class='HrTitle'>". - ($ErrName eq "err" ? "Other errors" : "Old errors") . + ($ErrName =~ /^old_/ ? "Old errors" : "Extra errors") . "<div class='HrLine'></div></div>\n"; } print "<pre><code>"; diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index 840d912f1..35160a159 100755 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -441,7 +441,7 @@ sub GetOutput($) foreach my $VM (@SortedVMs) { next if ($VM->Type ne "win32" and $VM->Type ne "win64"); - my $Filename = "$DataDir/latest/". $VM->Name ."_$Bitness.log"; + my $Filename = "$DataDir/latest/". $VM->Name ."_exe$Bitness.report"; my $Size = -s $Filename; if (defined $Size) { -- 2.18.0

1 0

[PATCH] testbot/WineRunBuild: Check dependencies when grabbing test executables.
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

There is no need to try and grab test executables for steps that don't depend on this build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 32369b191..2c5fbfa29 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -342,7 +342,8 @@ if ($Step->FileType ne "patch") my (%Bitnesses, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { - if ($TestStep->FileType =~ /^exe([0-9]+)$/) + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe([0-9]+)$/) { $Bitnesses{$1} = 1; $TestExes{$TestStep->FileName} = 1; -- 2.18.0

1 0

[PATCH] testbot: Remove support for the old task status lines.
by Francois Gouget Aug. 23, 2018

Aug. 23, 2018

Note that there is no need to wait for all task logs to be in the new format because ParseTaskLog() is only called when a new task completes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2c5fbfa29..b246164e5 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -406,7 +406,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Build"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result 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 b45dba5c7..3fec02b89 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -388,7 +388,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Reconfig"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 216811116..2552a7c9d 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -499,7 +499,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Task"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d39c81b38..e05afb605 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -50,9 +50,9 @@ Returns ok if the task was successful and an error code otherwise. =back =cut -sub ParseTaskLog($$) +sub ParseTaskLog($) { - my ($FileName, $ResultPrefix) = @_; + my ($FileName) = @_; if (open(my $LogFile, "<", $FileName)) { @@ -60,16 +60,16 @@ sub ParseTaskLog($$) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^(?:$ResultPrefix|Task): ok$/) + if ($Line =~ /^Task: ok$/) { $Result ||= "ok"; } - elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/) + elsif ($Line =~ /^Task: Patch failed to apply$/) { $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^(?:$ResultPrefix|Task): /) + elsif ($Line =~ /^Task: /) { $Result = "failed"; } -- 2.18.0

1 0

[PATCH] odbccp32: Fake success from SQLWriteDSNToIni/W
by Alistair Leslie-Hughes Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index fa82ca9..a9b58fa 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1585,7 +1585,7 @@ BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) clear_errors(); FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) @@ -1593,7 +1593,7 @@ BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) clear_errors(); FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } BOOL WINAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName, -- 1.9.1

1 0

[PATCH] shell32: Add start menu icon
by Alex Henrie Aug. 23, 2018

Aug. 23, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/menu.ico | Bin 0 -> 4696 bytes dlls/shell32/resources/menu.svg | 214 ++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 1 + 4 files changed, 216 insertions(+) create mode 100644 dlls/shell32/resources/menu.ico create mode 100644 dlls/shell32/resources/menu.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index bef3f6304a..886301542d 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -74,6 +74,7 @@ SVG_SRCS = \ resources/folder_open.svg \ resources/help.svg \ resources/internet.svg \ + resources/menu.svg \ resources/mycomputer.svg \ resources/mydocs.svg \ resources/netdrive.svg \ diff --git a/dlls/shell32/resources/menu.ico b/dlls/shell32/resources/menu.ico new file mode 100644 index 0000000000000000000000000000000000000000..516fb3a9fe0b25920321fd679a58aea0cc8396a3 GIT binary patch literal 4696 zcmeHKOK4M35Iy<We45aw1r=9s;isGEZ39|@&?F=@K(a)+qD>`D{UC@%a|Voen!gn;cT zf(r%fwzv|z5mEd^iz~&I3q`S{n^LS+gj!;0oZEPtJW<}Ib&*8|CNt;W^JXS<@4$P2 z0d{aPKt;|7jFZopk+1>G1ay$r<Ng*c9<c$c`kQY69yqjk#;L_y+W<wW^6ycukfOzl zf8aYCfzd<JUZ;H<FVq<h1^RfkT&-p(a)3zy?_WXvah5g#y7XkAKdAgm(a)seG%Z&P9U2H z%CwZ70WL6LHV$}h0$a|FJv_XhHjKv)^afD5T6p!8kR=_C1T7`&=1nF`W}@_#mXu^7 zIz+q-Wu^LH<+`V3JVy9TIN*zA-p_q3+9sI;#l`a1cSrK7{qsS?bN|mD--)V`V;5hx ze_5~(zGz*(|LM(c!=z1(V$e9!?j1wPtnA8muVG1(p$;4!63NP)+t;6l*H;%^<7RK% z{+56A*#BWZcf~Qfu79)I22BD2Q`5`Sis?zu^%UJo>_`Xu(*ucg%9A{wB7-j0+3jN8 zt}b_sF%NTl*ghBA>tSs6^{`v>!0EFCr%nw2`+-~6iUpoL9E=9;`s29{^6BOvPRb{P zOSWoOd>WjlG*AaBD+0*cC0=_EAZumg>hWar37%d&*?kdD*2=~eyym<#&@f1pBF;_L z%HA8nlZ~s#6Y*rNUOd(a)-*?fX08&~j}^CEFc8;By#P1cHgA!}vh>hWar37%d&*?kdD z*2=~eJU%Zfsh4#1eT;k|jrKlPt-JO+546>5ZAa_XbGWbFtsy;LvtPAdaj)60YCrV) vAiAc<<M&G;RY}D>ddU~^zvr=1;qUgqGx`qXDzNNYvtDsBf48EaYwhnZVuEqx literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/menu.svg b/dlls/shell32/resources/menu.svg new file mode 100644 index 0000000000..408803b4bb --- /dev/null +++ b/dlls/shell32/resources/menu.svg @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + id="svg8" + version="1.1" + viewBox="0 0 632 272" + height="272" + width="632"> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <rect + y="200" + x="40" + height="32" + width="192" + id="rect815" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="120" + x="40" + height="32" + width="192" + id="rect815-3" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="40" + x="40" + height="32" + width="192" + id="rect815-3-6" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <rect + y="256" + x="278" + height="6" + width="36" + id="rect815-7" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0stroke-opacity:1" /> + <rect + y="241" + x="278" + height="6" + width="36" + id="rect815-3-5" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="226" + x="278" + height="6" + width="36" + id="rect815-3-6-3" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAcIAAAHCAAXfPIkwAAAAHdElNRQfiCBYRBApLB7b2AAAANklEQVRYw+3UMQ4AIAgAMfT/f8bZ +WUVN2o2FCwsRsKpNU+7f2k9fIHA/ABTwrgWAL3jXAvCCAcmqAyIux0X6AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEwLTA2OjAw89BlqAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yMlQyMzowNDoxMC0wNjowMIKN3RQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAcIAAAHCAAXfPIkwAAAAHdElNRQfiCBYRBApLB7b2AAAANklEQVRYw+3UMQ4AIAgAMfT/f8bZ +WUVN2o2FCwsRsKpNU+7f2k9fIHA/ABTwrgWAL3jXAvCCAcmqAyIux0X6AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEwLTA2OjAw89BlqAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yMlQyMzowNDoxMC0wNjowMIKN3RQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:48-4" + x="384" + y="220" /> + <rect + y="260" + x="444" + height="4" + width="24" + id="rect815-7-5" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="250" + x="444" + height="4" + width="24" + id="rect815-3-5-6" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + y="240" + x="444" + height="4" + width="24" + id="rect815-3-6-3-2" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-opacity:1" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAASwAAAEsAAdCmVQYAAAAHdElNRQfiCBYRBApLB7b2AAAAK0lEQVRIx2NgGAWMcNZ/8nQyUeqC +gTdgFAwGMJoSR8HgAKMpcRQwMDAwAAD3KQMWtPUZjwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0w +OC0yMlQyMzowNDoxMC0wNjowMPPQZagAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDgtMjJUMjM6 +MDQ6MTAtMDY6MDCCjd0UAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJ +RU5ErkJggg== +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAASwAAAEsAAdCmVQYAAAAHdElNRQfiCBYRBApLB7b2AAAAK0lEQVRIx2NgGAWMcNZ/8nQyUeqC +gTdgFAwGMJoSR8HgAKMpcRQwMDAwAAD3KQMWtPUZjwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0w +OC0yMlQyMzowNDoxMC0wNjowMPPQZagAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTgtMDgtMjJUMjM6 +MDQ6MTAtMDY6MDCCjd0UAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJ +RU5ErkJggg== +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRChrIM4scAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjEwOjI2 +LTA2OjAw1uooywAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzoxMDoyNi0wNjowMKe3 +kHcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRBAs8AIZgAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEx +LTA2OjAwVaduHAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzowNDoxMS0wNjowMCT6 +1qAAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBYRBAs8AIZgAAAAHklEQVQoz2NgoBQwMjAwMDD8xy3L +RLEVlINRRxIJAHSgAwpvTcLEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTIyVDIzOjA0OjEx +LTA2OjAwVaduHAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yMlQyMzowNDoxMS0wNjowMCT6 +1qAAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 178fa789ae..5a637e95ba 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -208,6 +208,7 @@ #define IDI_SHELL_APP_FOLDER 37 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 +#define IDI_SHELL_START_MENU 40 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 -- 2.18.0

1 0

[PATCH v2] quartz: Return correct error in IBasicAudio put_Volume
by Alistair Leslie-Hughes Aug. 23, 2018

Aug. 23, 2018

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45366 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/quartz/filtergraph.c | 2 ++ dlls/quartz/tests/filtergraph.c | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0113674..210eb3e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -3140,6 +3140,8 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume) if (hr == S_OK) hr = IBasicAudio_put_Volume(pBasicAudio, lVolume); + else + hr = E_NOTIMPL; LeaveCriticalSection(&This->cs); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 85079d9..d73cde7 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -67,6 +67,20 @@ static WCHAR *load_resource(const WCHAR *name) return pathW; } +static void test_basic_audio(IFilterGraph2 *graph, HRESULT expected) +{ + IBasicAudio* basic; + HRESULT hr; + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&basic); + ok(hr==S_OK, "Cannot get IBasicAudio interface returned: %x\n", hr); + + hr = IBasicAudio_put_Volume(basic, 0); + ok(hr==expected, "expected %x got %x\n", expected, hr); + + IBasicAudio_Release(basic); +} + static IFilterGraph2 *create_graph(void) { IFilterGraph2 *ret; @@ -540,7 +554,7 @@ static HRESULT test_graph_builder_connect(WCHAR *filename) return hr; } -static void test_render_run(const WCHAR *file) +static void test_render_run(const WCHAR *file, HRESULT expected ) { IFilterGraph2 *graph; HANDLE h; @@ -576,6 +590,7 @@ todo_wine { ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); rungraph(graph); + test_basic_audio(graph, expected); refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); @@ -620,6 +635,7 @@ static void test_render_with_multithread(void) thread = CreateThread(NULL, 0, call_RenderFile_multithread, graph, 0, NULL); ok(WaitForSingleObject(thread, 1000) == WAIT_OBJECT_0, "wait failed\n"); + IFilterGraph2_Release(graph); CloseHandle(thread); CoUninitialize(); @@ -2291,8 +2307,8 @@ START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); - test_render_run(avifile); - test_render_run(mpegfile); + test_render_run(avifile, E_NOTIMPL); + test_render_run(mpegfile, S_OK); test_graph_builder(); test_render_filter_priority(); test_aggregate_filter_graph(); -- 1.9.1

2 1

[PATCH] shell32: Use Public instead of AllUsersProfile in the registry. (v2)
by Dmitry Timoshkov Aug. 22, 2018

Aug. 22, 2018

This matches what recent Windows versions set in the process environment. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shellpath.c | 13 +++++++------ dlls/userenv/userenv_main.c | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index de4bf7d566..4b92e82065 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -951,13 +951,12 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0}; static const WCHAR Windows_Sidebar_GadgetsW[] = {'W','i','n','d','o','w','s',' ','S','i','d','e','b','a','r','\\','G','a','d','g','e','t','s',0}; static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +static const WCHAR AllUsersProfileW[] = {'%','P','U','B','L','I','C','%',0}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a','t','a','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; @@ -3806,11 +3805,13 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) { if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW))) { - WCHAR szAllUsers[MAX_PATH]; + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; - strcpyW(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); + GetSystemDirectoryW(def_val, MAX_PATH); + if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); + else FIXME("non-drive system paths unsupported\n"); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 538b912b20..06c7653836 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR AllUsersProfileW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e',0}; + static const WCHAR AllUsersProfileW[] = {'P','u','b','l','i','c',0}; static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; -- 2.17.1

1 0

[PATCH] comctl32: Correct spelling for ComboBox window class
by Fabian Maurer Aug. 22, 2018

Aug. 22, 2018

Some programs try to get the class name, so this needs to have correct casing. Note: For some reason, you will need a proper clean to see the changes, just rebuilding is *not* enough. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/comctl32.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/comctl32.manifest b/dlls/comctl32/comctl32.manifest index 4c86137667..fa5df29634 100644 --- a/dlls/comctl32/comctl32.manifest +++ b/dlls/comctl32/comctl32.manifest @@ -6,7 +6,7 @@ <windowClass>ButtonListBox</windowClass> <windowClass>ComboBoxEx32</windowClass> <windowClass>ComboLBox</windowClass> - <windowClass>Combobox</windowClass> + <windowClass>ComboBox</windowClass> <windowClass>Edit</windowClass> <windowClass>Listbox</windowClass> <windowClass>NativeFontCtl</windowClass> -- 2.18.0

2 2

[PATCH v2 1/4] comctl32/edit: Get rid of useless float cast
by Gabriel Ivăncescu Aug. 22, 2018

Aug. 22, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Use a signed variable to get rid of some casts. dlls/comctl32/edit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..4e47647 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4911,9 +4911,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_MOUSEWHEEL: { - int wheelDelta; - UINT pulScrollLines = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + INT wheelDelta, pulScrollLines; + UINT tmp = 3; + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; if (wParam & (MK_SHIFT | MK_CONTROL)) { @@ -4931,10 +4932,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (es->wheelDeltaRemainder && pulScrollLines) { - int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + pulScrollLines = min((UINT)es->line_count, pulScrollLines); + cLineScroll = (pulScrollLines * es->wheelDeltaRemainder) / WHEEL_DELTA; + es->wheelDeltaRemainder -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } break; -- 1.9.1

1 3