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

Francois Gouget : testbot/CheckForWineTestUpdate: Switch to the build semantics.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: f7cb67ea490c312b58e7041a926250bbf066bc90 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f7cb67ea490c312b58e7041… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:04 2018 +0200 testbot/CheckForWineTestUpdate: Switch to the build semantics. This matches the other scripts and simplifies the code in a couple of places. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index df5a326..21d2e15 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -59,8 +59,8 @@ use WineTestBot::Engine::Notify; my %WineTestUrls = ( - 32 => "http://test.winehq.org/builds/winetest-latest.exe", - 64 => "http://test.winehq.org/builds/winetest64-latest.exe" + "exe32" => "http://test.winehq.org/builds/winetest-latest.exe", + "exe64" => "http://test.winehq.org/builds/winetest64-latest.exe" ); my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1, @@ -96,9 +96,9 @@ error occurred. sub UpdateWineTest($$) { - my ($OptCreate, $Bits) = @_; + my ($OptCreate, $Build) = @_; - my $BitsSuffix = ($Bits == 64 ? "64" : ""); + my $BitsSuffix = ($Build eq "exe64" ? "64" : ""); my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; my $LatestFileName = "$DataDir/latest/$LatestBaseName"; if ($OptCreate) @@ -110,13 +110,13 @@ sub UpdateWineTest($$) # See if the online WineTest executable is newer my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); - my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); + my $Request = HTTP::Request->new(GET => $WineTestUrls{$Build}); if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); $Request->header("If-Modified-Since" => "$Since GMT"); } - Debug("Checking $WineTestUrls{$Bits}\n"); + Debug("Checking $WineTestUrls{$Build}\n"); my $Response = $UA->request($Request); if ($Response->code == RC_NOT_MODIFIED) { @@ -164,14 +164,14 @@ sub UpdateWineTest($$) sub AddJob($$$) { - my ($BaseJob, $LatestBaseName, $Bits) = @_; + my ($BaseJob, $LatestBaseName, $Build) = @_; - my $Remarks = ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other"); + my $Remarks = ($Build eq "exe64" ? "64-bit" : $BaseJob ? "base" : "other"); $Remarks = "WineTest: $Remarks VMs"; Debug("Creating the '$Remarks' job\n"); my $VMs = CreateVMs(); - if ($Bits == 64) + if ($Build eq "exe64") { $VMs->AddFilter("Type", ["win64"]); $VMs->AddFilter("Role", ["base", "winetest"]); @@ -197,22 +197,21 @@ sub AddJob($$$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); - $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); + $NewJob->Priority($BaseJob && $Build eq "exe32" ? 8 : 9); $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); - my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); $NewStep->FileName($LatestBaseName); - $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); + $NewStep->FileType($Build); # Add a task for each VM my $Tasks = $NewStep->Tasks; foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { - Debug(" $VMKey exe$Bits\n"); + Debug(" $VMKey $Build\n"); my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); @@ -406,7 +405,7 @@ my $Rc = 0; if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or $OptTypes{wine}) { - my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 32); + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe32"); if ($Create < 0) { $Rc = 1; @@ -417,8 +416,8 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or # this job first purely to make the WineTestBot job queue look nice, and # arbitrarily do it only for 32-bit executables to avoid redundant updates. $Rc = 1 if ($OptTypes{build} and !AddReconfigJob("build")); - $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, 32)); - $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, 32)); + $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, "exe32")); $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob("wine")); } @@ -431,14 +430,14 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or if ($OptTypes{all64}) { - my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 64); + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe64"); if ($Create < 0) { $Rc = 1; } elsif ($Create == 1) { - $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, 64)); + $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, "exe64")); } }

1 0

Francois Gouget : testbot/Reconfig: Clean up the command line options.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: 4a3dade90d16546467b7fb006035e366e7ab192b URL: https://source.winehq.org/git/tools.git/?a=commit;h=4a3dade90d16546467b7fb0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:13 2018 +0200 testbot/Reconfig: Clean up the command line options. This separates the actions (updating or building) from the targets they apply to (the exe32 and exe64 builds). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 69 +++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 450de0e..4aada32 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -125,11 +125,8 @@ sub BuildTestLauncher() return 1; } -sub GitPull($) +sub GitPull() { - my ($Targets) = @_; - return 1 if (!$Targets->{update}); - InfoMsg "\nUpdating the Wine source\n"; system("cd '$DataDir/wine' && git pull"); if ($? != 0) @@ -148,11 +145,10 @@ sub GitPull($) return 1; } -sub BuildNative($$) +sub BuildNative($) { - my ($Targets, $NoRm) = @_; + my ($NoRm) = @_; - return 1 if (!$Targets->{native}); mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); # Rebuild from scratch to make sure cruft will not accumulate @@ -194,6 +190,15 @@ sub BuildCross($$$) return 1; } +sub UpdateWineBuilds($$) +{ + my ($Targets, $NoRm) = @_; + + return BuildNative($NoRm) && + BuildCross($Targets, $NoRm, 32) && + BuildCross($Targets, $NoRm, 64); +} + # # Setup and command line processing @@ -203,15 +208,23 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; my %AllTargets; -map { $AllTargets{$_} = 1 } qw(update native exe32 exe64); +map { $AllTargets{$_} = 1 } qw(exe32 exe64); -my ($Usage, $TargetList, $NoRm); +my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $TargetList); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--no-rm") + if ($Arg eq "--update") { - $NoRm = 1; + $OptUpdate = 1; + } + elsif ($Arg eq "--build") + { + $OptBuild = 1; + } + elsif ($Arg eq "--no-rm") + { + $OptNoRm = 1; } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { @@ -240,6 +253,10 @@ while (@ARGV) my $Targets; if (!defined $Usage) { + if (!$OptUpdate and !$OptBuild) + { + $OptUpdate = $OptBuild = 1; + } $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); foreach my $Target (split /,/, $TargetList) { @@ -259,19 +276,19 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--no-rm] [--help] [TARGETS]\n"; + print "Usage: $Name0 [--update] [--build [--no-rm]] [--help] [TARGETS]\n"; print "\n"; print "Updates Wine to the latest version and recompiles it so the host is ready to build executables for the Windows tests.\n"; print "\n"; print "Where:\n"; - print " TARGETS Is a comma-separated list of reconfiguration targets. By default\n"; - print " every target is run.\n"; - print " - update: Update Wine's source code.\n"; - print " - native: Rebuild the native Wine tools.\n"; - print " - exe32: Rebuild the 32 bit Windows test executables.\n"; - print " - exe64: Rebuild the 64 bit Windows test executables.\n"; - print " --no-rm Don't rebuild from scratch.\n"; - print " --help Shows this usage message.\n"; + print " --update Update Wine's source code.\n"; + print " --build Update the Wine builds.\n"; + print " TARGETS Is a comma-separated list of reconfiguration targets. By default\n"; + print " every target is run.\n"; + print " - exe32: Rebuild the 32 bit Windows test executables.\n"; + print " - exe64: Rebuild the 64 bit Windows test executables.\n"; + print " --no-rm Don't rebuild from scratch.\n"; + print " --help Shows this usage message.\n"; exit 0; } @@ -293,15 +310,9 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") CountCPUs(); -if (!BuildTestAgentd() or - !BuildTestLauncher() or - !GitPull($Targets) or - !BuildNative($Targets, $NoRm) or - !BuildCross($Targets, $NoRm, 32) or - !BuildCross($Targets, $NoRm, 64)) -{ - exit(1); -} +exit(1) if (!BuildTestAgentd() or !BuildTestLauncher()); +exit(1) if ($OptUpdate and !GitPull()); +exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); LogMsg "ok\n"; exit;

1 0

Francois Gouget : testbot/WineTest: Clean up the command line options.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: ada7d8a85c8012e7c6e78549ec018985e8cf9b2f URL: https://source.winehq.org/git/tools.git/?a=commit;h=ada7d8a85c8012e7c6e7854… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:37 2018 +0200 testbot/WineTest: Clean up the command line options. This separates the actions (building or running WineTest) from the targets they apply to (the win32, wow32 and wow64 builds). This also renames the build action to --testpatch so it can later be seamlessly extended to perform a more thorough patch validation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 80 +++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1fa59c2..1010619 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -170,9 +170,9 @@ sub RunWine($$$) "time $Wine $Cmd $CmdArgs"); } -sub DailyWineTest($$$$) +sub DailyWineTest($$$$$) { - my ($Targets, $Build, $BaseTag, $Args) = @_; + my ($Targets, $Build, $NoSubmit, $BaseTag, $Args) = @_; return 1 if (!$Targets->{$Build}); @@ -190,7 +190,7 @@ sub DailyWineTest($$$$) } # Send the report to the website - if ($Targets->{submit} and + if (!$NoSubmit and RunWine($Build, "./programs/winetest/winetest.exe.so", "-c -s '../$Build.report'")) { @@ -210,13 +210,26 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; my %AllTargets; -map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64 submit); +map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64); -my ($Usage, $TargetList, $Action, $FileName, $BaseTag); +my $Action = ""; +my ($Usage, $OptNoSubmit, $TargetList, $FileName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg =~ /^(?:-\?|-h|--help)$/) + if ($Arg eq "--testpatch" or $Arg eq "build") + { + $Action = "testpatch"; + } + elsif ($Arg eq "--winetest" or $Arg eq "winetest") + { + $Action = "winetest"; + } + elsif ($Arg eq "--no-submit") + { + $OptNoSubmit = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; last; @@ -231,11 +244,7 @@ while (@ARGV) { $TargetList = $Arg; } - elsif (!defined $Action) - { - $Action = $Arg; - } - elsif (($Action || "") eq "winetest") + elsif ($Action eq "winetest") { $BaseTag = $Arg; # The remaining arguments are meant for WineTest @@ -289,7 +298,7 @@ if (!defined $Usage) $Usage = 2; } - if (!defined $Action) + if (!$Action) { Error "you must specify the action to perform\n"; $Usage = 2; @@ -311,13 +320,8 @@ if (!defined $Usage) $Usage = 2; } } - elsif ($Action ne "build") - { - Error "invalid '$Action' action\n"; - $Usage = 2; - } - if (!defined $FileName and ($Action || "") eq "build") + if (!defined $FileName and $Action eq "testpatch") { Error "you must provide a patch to test\n"; $Usage = 2; @@ -325,25 +329,24 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--help] TARGETS build PATCH\n"; - print "or $Name0 [--help] TARGETS winetest BASETAG ARGS\n"; + print "Usage: $Name0 [--help] --testpatch TARGETS PATCH\n"; + print "or $Name0 [--help] --winetest [--no-submit] TARGETS BASETAG ARGS\n"; print "\n"; print "Tests the specified patch or runs WineTest in Wine.\n"; print "\n"; print "Where:\n"; - print " TARGETS Is a comma-separated list of targets for the specified action.\n"; - print " - win32: The regular 32 bit Wine build.\n"; - print " - wow32: The 32 bit WoW Wine build.\n"; - print " - wow64: The 64 bit WoW Wine build.\n"; - print " - submit: Send the WineTest result to the website.\n"; - print " build Verify that the patch compiles.\n"; - print " PATCH Is the staging file containing the patch to test.\n"; - print " winetest Run WineTest and submit the result to the website if the submit\n"; - print " task was specified.\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 " --help Shows this usage message.\n"; + print " --testpatch Verify that the patch compiles.\n"; + print " --winetest Run WineTest and submit the result to the website.\n"; + print " --no-submit Do not submit the WineTest results to the website.\n"; + print " TARGETS Is a comma-separated list of targets for the specified action.\n"; + print " - win32: The regular 32 bit Wine build.\n"; + print " - wow32: The 32 bit WoW Wine build.\n"; + print " - wow64: The 64 bit WoW Wine build.\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 " --help Shows this usage message.\n"; exit $Usage; } @@ -363,7 +366,7 @@ map { unlink("$_.report") } keys %AllTargets; CountCPUs(); -if ($Action eq "build") +if ($Action eq "testpatch") { my $Impacts = ApplyPatch($FileName); exit(1) if (!$Impacts or @@ -373,9 +376,12 @@ if ($Action eq "build") } elsif ($Action eq "winetest") { - exit(1) if (!DailyWineTest($Targets, "win32", $BaseTag, \@ARGV) or - !DailyWineTest($Targets, "wow64", $BaseTag, \@ARGV) or - !DailyWineTest($Targets, "wow32", $BaseTag, \@ARGV)); + if (!DailyWineTest($Targets, "win32", $OptNoSubmit, $BaseTag, \@ARGV) or + !DailyWineTest($Targets, "wow64", $OptNoSubmit, $BaseTag, \@ARGV) or + !DailyWineTest($Targets, "wow32", $OptNoSubmit, $BaseTag, \@ARGV)) + { + exit(1); + } } LogMsg "ok\n";

1 0

Francois Gouget : testbot/WineReconfig: Clean up the command line options.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: 97e626961cd55937d4c79485eb8b0305b3442df4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=97e626961cd55937d4c7948… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:48 2018 +0200 testbot/WineReconfig: Clean up the command line options. This separates the actions (updating, building, etc.) from the targets they apply to (the win32, wow32 and wow64 builds). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineReconfig.pl | 113 +++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 43 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index e3f14e2..7772273 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -102,11 +102,8 @@ sub BuildTestAgentd() return 1; } -sub GitPull($) +sub GitPull() { - my ($Targets) = @_; - return 1 if (!$Targets->{update}); - InfoMsg "\nUpdating the Wine source\n"; system("cd '$DataDir/wine' && git pull"); if ($? != 0) @@ -129,7 +126,7 @@ sub BuildWine($$$$) { my ($Targets, $NoRm, $Build, $Extras) = @_; - return 1 if (!$Targets->{build} or !$Targets->{$Build}); + return 1 if (!$Targets->{$Build}); mkdir "$DataDir/build-$Build" if (!-d "$DataDir/build-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not @@ -148,6 +145,15 @@ sub BuildWine($$$$) return 1; } +sub UpdateWineBuilds($$) +{ + my ($Targets, $NoRm) = @_; + + return BuildWine($Targets, $NoRm, "win32", "") && + BuildWine($Targets, $NoRm, "wow64", "--enable-win64") && + BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/build-wow64'"); +} + # # WinePrefix helpers @@ -207,11 +213,8 @@ sub UpdateAddOn($$$) return 0; } -sub UpdateAddOns($) +sub UpdateAddOns() { - my ($Targets) = @_; - return 1 if (!$Targets->{addons}); - my %AddOns; if (open(my $fh, "<", "$DataDir/wine/dlls/appwiz.cpl/addons.c")) { @@ -277,7 +280,7 @@ sub NewWinePrefix($$) { my ($Targets, $Build) = @_; - return 1 if (!$Targets->{wineprefix} or !$Targets->{$Build}); + return 1 if (!$Targets->{$Build}); InfoMsg "\nRecreating the $Build wineprefix\n"; SetupWineEnvironment($Build); @@ -296,6 +299,20 @@ sub NewWinePrefix($$) return 1; } +sub UpdateWinePrefixes($) +{ + my ($Targets) = @_; + + return NewWinePrefix($Targets, "win32") && + # The wow32 and wow64 wineprefixes: + # - Are essentially identical. + # - Must be created after both WoW builds have been updated. + # - Make it possible to run the wow32 and wow64 tests in separate + # prefixes, thus ensuring they don't interfere with each other. + NewWinePrefix($Targets, "wow64") && + NewWinePrefix($Targets, "wow32"); +} + # # Setup and command line processing @@ -305,15 +322,31 @@ $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; my %AllTargets; -map { $AllTargets{$_} = 1 } qw(update addons build wineprefix win32 wow32 wow64); +map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64); -my ($Usage, $TargetList, $NoRm); +my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $TargetList); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--no-rm") + if ($Arg eq "--update") { - $NoRm = 1; + $OptUpdate = 1; + } + elsif ($Arg eq "--build") + { + $OptBuild = 1; + } + elsif ($Arg eq "--no-rm") + { + $OptNoRm = 1; + } + elsif ($Arg eq "--addons") + { + $OptAddOns = 1; + } + elsif ($Arg eq "--wineprefix") + { + $OptWinePrefix = 1; } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { @@ -342,6 +375,10 @@ while (@ARGV) my $Targets; if (!defined $Usage) { + if (!$OptUpdate and !$OptBuild and !$OptAddOns and !$OptWinePrefix) + { + $OptUpdate = $OptBuild = $OptAddOns = $OptWinePrefix = 1; + } $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); foreach my $Target (split /,/, $TargetList) { @@ -361,22 +398,24 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--no-rm] [--help] [TARGETS]\n"; + print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--wineprefix]\n"; + print " [--help] [TARGETS]\n"; print "\n"; print "Performs all the tasks needed for the host to be ready to test new patches: update the Wine source and addons, and rebuild the Wine binaries.\n"; print "\n"; print "Where:\n"; - print " TARGETS Is a comma-separated list of targets to process. By default all\n"; - print " targets are processed.\n"; - print " - update: Update Wine's source code.\n"; - print " - build: Update the Wine builds.\n"; - print " - addons: Update the Gecko and Mono Wine addons.\n"; - print " - wineprefix: Update the wineprefixes.\n"; - print " - win32: Apply the above to the regular 32 bit Wine.\n"; - print " - wow32: Apply the above to the 32 bit WoW Wine.\n"; - print " - wow64: Apply the above to the 64 bit WoW Wine.\n"; - print " --no-rm Don't rebuild from scratch.\n"; - print " --help Shows this usage message.\n"; + print " --update Update Wine's source code.\n"; + print " --build Update the Wine builds.\n"; + print " --addons Update the Gecko and Mono Wine addons.\n"; + print " --wineprefix Update the wineprefixes.\n"; + print "If none of the above actions is specified they are all performed.\n"; + print " TARGETS Is a comma-separated list of targets to process. By default all\n"; + print " targets are processed.\n"; + print " - win32: Apply the above to the regular 32 bit Wine.\n"; + print " - wow32: Apply the above to the 32 bit WoW Wine.\n"; + print " - wow64: Apply the above to the 64 bit WoW Wine.\n"; + print " --no-rm Don't rebuild from scratch.\n"; + print " --help Shows this usage message.\n"; exit 0; } @@ -399,23 +438,11 @@ if ($DataDir =~ /'/) CountCPUs(); -if (!BuildTestAgentd() or - !GitPull($Targets) or - !UpdateAddOns($Targets) or - !BuildWine($Targets, $NoRm, "win32", "") or - !BuildWine($Targets, $NoRm, "wow64", "--enable-win64") or - !BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/build-wow64'") or - !NewWinePrefix($Targets, "win32") or - # The wow32 and wow64 wineprefixes: - # - Are essentially identical. - # - Must be created after both WoW builds have been updated. - # - Make it possible to run the wow32 and wow64 tests in separate prefixes, - # thus ensuring they don't interfere with each other. - !NewWinePrefix($Targets, "wow64") or - !NewWinePrefix($Targets, "wow32")) -{ - exit(1); -} +exit(1) if (!BuildTestAgentd()); +exit(1) if ($OptUpdate and !GitPull()); +exit(1) if ($OptAddOns and !UpdateAddOns()); +exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); +exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($Targets)); LogMsg "ok\n"; exit;

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Simplify a hashtable copy.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: 3b435a98a044b78f452c78b6d3ece53c1baf6df7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3b435a98a044b78f452c78b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:07:56 2018 +0200 testbot/CheckForWinetestUpdate: Simplify a hashtable copy. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 21d2e15..a7d77f0 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -386,7 +386,7 @@ while (@ARGV) # Check parameters if (!defined $Usage) { - map { $OptTypes{$_} = 1 } keys %TaskTypes if (!%OptTypes); + %OptTypes = %TaskTypes if (!%OptTypes); } if (defined $Usage) {

1 0

Francois Gouget : testbot/build: Allow both commas and colons in the target lists.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: tools Branch: master Commit: d3d012ea7be2743c5073a0c3d5e8fa562c32ebda URL: https://source.winehq.org/git/tools.git/?a=commit;h=d3d012ea7be2743c5073a0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 20 09:08:10 2018 +0200 testbot/build: Allow both commas and colons in the target lists. This paves the way to a future switch to colons. It is only needed for Build.pl and WineTest.pl since the TestBot does not pass a target list to the Reconfig scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 +- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 920fc82..b729d95 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -250,7 +250,7 @@ if (!defined $Usage) } $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); - foreach my $Target (split /,/, $TargetList) + foreach my $Target (split /[,:]/, $TargetList) { $Target = "exe$1" if ($Target =~ /^(32|64)$/); if (!$AllTargets{$Target}) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1010619..3310b4c 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -282,7 +282,7 @@ if (!defined $Usage) { if (defined $TargetList) { - foreach my $Target (split /,/, $TargetList) + foreach my $Target (split /[,:]/, $TargetList) { if (!$AllTargets{$Target}) {

1 0

Alexandre Julliard : Wine release 3.14
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: website Branch: master Commit: 62bb5eee888e8af6b8f61567b75b028a12e8151e URL: https://source.winehq.org/git/website.git/?a=commit;h=62bb5eee888e8af6b8f61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 17 19:33:27 2018 +0200 Wine release 3.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018081701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018081701.xml b/news/en/2018081701.xml new file mode 100644 index 0000000..c3d3fb5 --- /dev/null +++ b/news/en/2018081701.xml @@ -0,0 +1,17 @@ +<news> +<date>August 17, 2018</date> +<title>Wine 3.14 Released</title> +<body> + The Wine development release 3.14 is now available. + <a href="{$root}/announce/3.14">What's new</a> in this release: +<ul> + <li>Support for DXTn texture decompression.</li> + <li>Deferral support for MSI install actions.</li> + <li>Support for Japanese keyboard in DirectInput.</li> + <li>More improvements in the standard Task Dialog.</li> + <li>A few more icons in Shell32.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.14.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : server: Use pipe_end state in find_available_server.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: 05319312783a3495c64898dd0e1c801420482b00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05319312783a3495c64898dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:41:08 2018 +0200 server: Use pipe_end state in find_available_server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index c17889b..c2c80b1 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1128,14 +1128,14 @@ static struct pipe_server *find_available_server( struct named_pipe *pipe ) /* look for pipe servers that are listening */ LIST_FOR_EACH_ENTRY( server, &pipe->servers, struct pipe_server, entry ) { - if (server->state == ps_wait_open) + if (server->pipe_end.state == FILE_PIPE_LISTENING_STATE && async_queued( &server->listen_q )) return (struct pipe_server *)grab_object( server ); } /* fall back to pipe servers that are idle */ LIST_FOR_EACH_ENTRY( server, &pipe->servers, struct pipe_server, entry ) { - if (server->state == ps_idle_server) + if (server->pipe_end.state == FILE_PIPE_LISTENING_STATE ) return (struct pipe_server *)grab_object( server ); }

1 0

Jacek Caban : server: Remove no longer needed pipe_state enum.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: ce5def4b58fb747bb3183220cb13c0e486048419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5def4b58fb747bb3183220… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:41:17 2018 +0200 server: Remove no longer needed pipe_state enum. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index c2c80b1..70134fb 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -42,15 +42,6 @@ #include "security.h" #include "process.h" -enum pipe_state -{ - ps_idle_server, - ps_wait_open, - ps_connected_server, - ps_wait_disconnect, - ps_wait_connect -}; - struct named_pipe; struct pipe_message @@ -81,7 +72,6 @@ struct pipe_server { struct pipe_end pipe_end; /* common header for pipe_client and pipe_server */ struct list entry; /* entry in named pipe servers list */ - enum pipe_state state; /* server state */ unsigned int options; /* pipe options */ struct async_queue listen_q; /* listen queue */ }; @@ -305,7 +295,8 @@ static void pipe_server_dump( struct object *obj, int verbose ) { struct pipe_server *server = (struct pipe_server *) obj; assert( obj->ops == &pipe_server_ops ); - fprintf( stderr, "Named pipe server pipe=%p state=%d\n", server->pipe_end.pipe, server->state ); + fprintf( stderr, "Named pipe server pipe=%p state=%d\n", server->pipe_end.pipe, + server->pipe_end.state ); } static void pipe_client_dump( struct object *obj, int verbose ) @@ -330,12 +321,6 @@ static struct fd *pipe_end_get_fd( struct object *obj ) return (struct fd *) grab_object( pipe_end->fd ); } -static void set_server_state( struct pipe_server *server, enum pipe_state state ) -{ - server->state = state; -} - - static struct pipe_message *queue_message( struct pipe_end *pipe_end, struct iosb *iosb ) { struct pipe_message *message; @@ -434,29 +419,10 @@ static void pipe_server_destroy( struct object *obj) static void pipe_client_destroy( struct object *obj) { struct pipe_client *client = (struct pipe_client *)obj; - struct pipe_server *server = (struct pipe_server *)client->pipe_end.connection; assert( obj->ops == &pipe_client_ops ); pipe_end_disconnect( &client->pipe_end, STATUS_PIPE_BROKEN ); - - if (server) - { - switch(server->state) - { - case ps_connected_server: - /* Don't destroy the server's fd here as we can't - do a successful flush without it. */ - set_server_state( server, ps_wait_disconnect ); - break; - case ps_idle_server: - case ps_wait_open: - case ps_wait_disconnect: - case ps_wait_connect: - assert( 0 ); - } - } - pipe_end_destroy( &client->pipe_end ); } @@ -1007,7 +973,6 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as server->pipe_end.state = FILE_PIPE_LISTENING_STATE; queue_async( &server->listen_q, async ); - set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); return 1; @@ -1032,7 +997,6 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as } pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - set_server_state( server, ps_wait_connect ); return 1; default: @@ -1091,7 +1055,6 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned allow_fd_caching( server->pipe_end.fd ); set_fd_signaled( server->pipe_end.fd, 1 ); init_async_queue( &server->listen_q ); - set_server_state( server, ps_idle_server ); return server; } @@ -1183,7 +1146,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc { async_wake_up( &server->listen_q, STATUS_SUCCESS ); server->pipe_end.state = FILE_PIPE_CONNECTED_STATE; - set_server_state( server, ps_connected_server ); server->pipe_end.connection = &client->pipe_end; client->pipe_end.connection = &server->pipe_end; server->pipe_end.client_pid = client->pipe_end.client_pid;

1 0

Jacek Caban : server: Share more code between pipe client and server destructors.
by Alexandre Julliard 17 Aug '18

17 Aug '18

Module: wine Branch: master Commit: 95296651b57dee423a567896cffa8424f2f5a8e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95296651b57dee423a567896… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:41:30 2018 +0200 server: Share more code between pipe client and server destructors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 70134fb..ba6f507 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -133,6 +133,7 @@ static const struct object_ops named_pipe_ops = }; /* common server and client pipe end functions */ +static void pipe_end_destroy( struct object *obj ); static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static struct fd *pipe_end_get_fd( struct object *obj ); static struct security_descriptor *pipe_end_get_sd( struct object *obj ); @@ -189,7 +190,6 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); -static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_client_ops = @@ -211,7 +211,7 @@ static const struct object_ops pipe_client_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ fd_close_handle, /* close_handle */ - pipe_client_destroy /* destroy */ + pipe_end_destroy /* destroy */ }; static const struct fd_ops pipe_client_fd_ops = @@ -382,10 +382,13 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status } } -static void pipe_end_destroy( struct pipe_end *pipe_end ) +static void pipe_end_destroy( struct object *obj ) { + struct pipe_end *pipe_end = (struct pipe_end *)obj; struct pipe_message *message; + pipe_end_disconnect( pipe_end, STATUS_PIPE_BROKEN ); + while (!list_empty( &pipe_end->message_queue )) { message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); @@ -399,7 +402,7 @@ static void pipe_end_destroy( struct pipe_end *pipe_end ) if (pipe_end->pipe) release_object( pipe_end->pipe ); } -static void pipe_server_destroy( struct object *obj) +static void pipe_server_destroy( struct object *obj ) { struct pipe_server *server = (struct pipe_server *)obj; struct named_pipe *pipe = server->pipe_end.pipe; @@ -411,19 +414,7 @@ static void pipe_server_destroy( struct object *obj) list_remove( &server->entry ); free_async_queue( &server->listen_q ); - pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); - - pipe_end_destroy( &server->pipe_end ); -} - -static void pipe_client_destroy( struct object *obj) -{ - struct pipe_client *client = (struct pipe_client *)obj; - - assert( obj->ops == &pipe_client_ops ); - - pipe_end_disconnect( &client->pipe_end, STATUS_PIPE_BROKEN ); - pipe_end_destroy( &client->pipe_end ); + pipe_end_destroy( obj ); } static void named_pipe_device_dump( struct object *obj, int verbose )

1 0