September 2019 - Wine-Devel

[PATCH v2 5/6] kernel32/tests: Add tests for GetSystemPowerStatus
by Alex Henrie Sept. 25, 2019

Sept. 25, 2019

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Skip tests on Wine on Mac OS --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/power.c | 83 +++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 dlls/kernel32/tests/power.c diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e06141d9f6..e9516603ce 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -25,6 +25,7 @@ SOURCES = \ module.c \ path.c \ pipe.c \ + power.c \ process.c \ profile.c \ resource.c \ diff --git a/dlls/kernel32/tests/power.c b/dlls/kernel32/tests/power.c new file mode 100644 index 0000000000..af488849e2 --- /dev/null +++ b/dlls/kernel32/tests/power.c @@ -0,0 +1,83 @@ +/* + * Unit tests for power management functions + * + * Copyright (c) 2019 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" + +void test_GetSystemPowerStatus(void) +{ + SYSTEM_POWER_STATUS ps; + BOOL ret; + BYTE capacity_flags, expected_capacity_flags; + + if (0) /* crashes */ + GetSystemPowerStatus(NULL); + + memset(&ps, 0x23, sizeof(ps)); + ret = GetSystemPowerStatus(&ps); + ok(ret == TRUE, "expected TRUE\n"); + + if (ps.BatteryFlag == BATTERY_FLAG_UNKNOWN) + { + skip("GetSystemPowerStatus not implemented or not working\n"); + return; + } + else if (ps.BatteryFlag != BATTERY_FLAG_NO_BATTERY) + { + trace("battery detected\n"); + expected_capacity_flags = 0; + if (ps.BatteryLifePercent > 66) + expected_capacity_flags |= BATTERY_FLAG_HIGH; + if (ps.BatteryLifePercent < 33) + expected_capacity_flags |= BATTERY_FLAG_LOW; + if (ps.BatteryLifePercent < 5) + expected_capacity_flags |= BATTERY_FLAG_CRITICAL; + capacity_flags = (ps.BatteryFlag & ~BATTERY_FLAG_CHARGING); + ok(capacity_flags == expected_capacity_flags, + "expected %u%%-charged battery to have capacity flags 0x%02x, got 0x%02x\n", + ps.BatteryLifePercent, expected_capacity_flags, capacity_flags); + ok(ps.BatteryLifeTime <= ps.BatteryFullLifeTime, + "expected BatteryLifeTime %u to be less than or equal to BatteryFullLifeTime %u\n", + ps.BatteryLifeTime, ps.BatteryFullLifeTime); + if (ps.BatteryFlag & BATTERY_FLAG_CHARGING) + { + ok(ps.BatteryLifeTime == BATTERY_LIFE_UNKNOWN, + "expected BatteryLifeTime to be -1 when charging, got %u\n", ps.BatteryLifeTime); + ok(ps.BatteryFullLifeTime == BATTERY_LIFE_UNKNOWN, + "expected BatteryFullLifeTime to be -1 when charging, got %u\n", ps.BatteryFullLifeTime); + } + } + else + { + trace("no battery detected\n"); + ok(ps.ACLineStatus == AC_LINE_ONLINE, + "expected ACLineStatus to be 1, got %u\n", ps.ACLineStatus); + ok(ps.BatteryLifePercent == BATTERY_PERCENTAGE_UNKNOWN, + "expected BatteryLifePercent to be -1, got %u\n", ps.BatteryLifePercent); + ok(ps.BatteryLifeTime == BATTERY_LIFE_UNKNOWN, + "expected BatteryLifeTime to be -1, got %u\n", ps.BatteryLifeTime); + ok(ps.BatteryFullLifeTime == BATTERY_LIFE_UNKNOWN, + "expected BatteryFullLifeTime to be -1, got %u\n", ps.BatteryFullLifeTime); + } +} + +START_TEST(power) +{ + test_GetSystemPowerStatus(); +} -- 2.23.0

1 1

[PATCH] testbot: Add SpecialJobs to handle the reconfig / winetest jobs.
by Francois Gouget Sept. 25, 2019

Sept. 25, 2019

This allows creating these jobs without having to go through CheckForWinetestUpdate.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 284 ++++--------------------- testbot/lib/WineTestBot/SpecialJobs.pm | 276 ++++++++++++++++++++++++ 2 files changed, 323 insertions(+), 237 deletions(-) create mode 100644 testbot/lib/WineTestBot/SpecialJobs.pm diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c30da162a..3f697315b 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -51,12 +51,8 @@ use HTTP::Status; use WineTestBot::Config; use WineTestBot::Engine::Notify; -use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::Missions; -use WineTestBot::PatchUtils; -use WineTestBot::Users; -use WineTestBot::Utils; +use WineTestBot::SpecialJobs; use WineTestBot::VMs; @@ -168,267 +164,81 @@ sub UpdateWineTest($$) return (1, $LatestBaseName); } -sub AddJob($$$$) +sub DoReconfig($$) { - my ($VMKey, $BaseJob, $LatestBaseName, $Build) = @_; - - my $Remarks = defined $VMKey ? "$VMKey VM" : - $Build eq "exe64" ? "64 bit VMs" : - "$BaseJob VMs"; - $Remarks = "WineTest: $Remarks"; - Debug("Creating the '$Remarks' job\n"); - - my $VMs = CreateVMs(); - $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); - if ($Build eq "exe64") - { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]) if (!defined $VMKey); - } - elsif ($BaseJob eq "base") - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]) if (!defined $VMKey); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]) if (!defined $VMKey); - } - if ($VMs->GetItemsCount() == 0) - { - if (defined $VMKey) - { - Error "The $VMKey VM is not suitable for $Build WineTest jobs\n"; - return 0; - } - # There is nothing to do - Debug(" Found no VM\n"); - return 1; - } - - # First create a new job - my $Jobs = CreateJobs(); - my $NewJob = $Jobs->Add(); - $NewJob->User(GetBatchUser()); - $NewJob->Priority(($BaseJob eq "base" and $Build eq "exe32") ? 8 : 9); - $NewJob->Remarks($Remarks); - - # Add a task for each VM - my $Tasks; - foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) + my ($VMKey, $VMType) = @_; + Debug("Creating the $VMType reconfig job\n"); + my $VMs = GetReconfigVMs($VMKey, $VMType); + if (@$VMs) { - my $VM = $VMs->GetItem($VMKey); - my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); + my $ErrMessage = AddReconfigJob($VMs, $VMKey, $VMType); if (defined $ErrMessage) { - Debug("$VMKey has an invalid mission statement: $!\n"); - next; - } - - foreach my $TaskMissions (@$Missions) - { - next if (!$TaskMissions->{Builds}->{$Build}); - - if (!$Tasks) - { - # Add a step to the job - my $TestStep = $NewJob->Steps->Add(); - $TestStep->Type("suite"); - $TestStep->FileName($LatestBaseName); - $TestStep->FileType($Build); - $Tasks = $TestStep->Tasks; - } - - Debug(" $VMKey $Build\n"); - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($SuiteTimeout); - $Task->Missions($TaskMissions->{Statement}); + ErrorMessage("$ErrMessage\n"); + return 0; } } - - # Save it all - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined $ErrMessage) + elsif (defined $VMKey) { - LogMsg "Failed to save the $LatestBaseName job: $ErrMessage\n"; + Error("The $VMKey VM is not a $VMType VM\n"); return 0; } - - # Stage the test file so it can be picked up by the job - if (!link("$DataDir/latest/$LatestBaseName", - "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName")) - { - Error "Failed to stage $LatestBaseName: $!\n"; - return 0; - } - - # Switch Status to staging to indicate we are done setting up the job - $NewJob->Status("staging"); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined $ErrMessage) + else { - Error "Failed to save the $LatestBaseName job (staging): $ErrMessage\n"; - return 0; + Debug("Found no VM for the $VMType reconfig job\n"); } - return 1; } -sub AddWineTestJob($) +sub DoWindowsTest($$$$) { - my ($VMKey) = @_; - - my $Remarks = defined $VMKey ? "$VMKey VM" : "Wine VMs"; - $Remarks = "WineTest: $Remarks"; - Debug("Creating the '$Remarks' job\n"); - - my $VMs = CreateVMs(); - $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); - $VMs->AddFilter("Type", ["wine"]); - $VMs->FilterEnabledRole(); - if ($VMs->GetItemsCount() == 0) + my ($VMKey, $Build, $BaseJob, $LatestBaseName) = @_; + Debug("Creating the $BaseJob $Build Windows tests job\n"); + my $VMs = GetWindowsTestVMs($VMKey, $Build, $BaseJob); + if (@$VMs) { - if (defined $VMKey) - { - Error "The $VMKey VM is not a wine VM\n"; - return 0; - } - # There is nothing to do - Debug(" Found no VM\n"); - return 1; - } - - # First create a new job - my $Jobs = CreateJobs(); - my $NewJob = $Jobs->Add(); - $NewJob->User(GetBatchUser()); - $NewJob->Priority(7); - $NewJob->Remarks($Remarks); - my $Steps = $NewJob->Steps; - - # Add a step for each VM - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - # Move all the missions into separate tasks so we don't have one very - # long task hogging the VM forever. Note that this is also ok because - # the WineTest tasks don't have to recompile Wine. - my $MissionStatement = SplitMissionStatementTasks($VM->Missions); - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + my $ErrMessage = AddWindowsTestJob($VMs, $VMKey, $Build, $BaseJob, $LatestBaseName); if (defined $ErrMessage) { - Debug("$VMKey has an invalid mission statement: $!\n"); - next; - } - - my $Tasks; - foreach my $TaskMissions (@$Missions) - { - if (!$Tasks) - { - # Add a step to the job - my $TestStep = $Steps->Add(); - $TestStep->Type("suite"); - $TestStep->FileType("none"); - $Tasks = $TestStep->Tasks; - } - - Debug(" $VMKey $TaskMissions->{Statement}\n"); - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout(GetTestTimeout(undef, $TaskMissions)); - $Task->Missions($TaskMissions->{Statement}); + ErrorMessage("$ErrMessage\n"); + return 0; } } - - # Save it all - $NewJob->Status("staging"); - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined $ErrMessage) + elsif (defined $VMKey) { - Error "Failed to save the WineTest job: $ErrMessage\n"; + Error("The $VMKey VM is not suitable for $BaseJob $Build Windows tests jobs\n"); return 0; } - + else + { + Debug("Found no VM for the $BaseJob $Build Windows tests job\n"); + } return 1; } -sub AddReconfigJob($$) +sub DoWineTest($) { - my ($VMKey, $VMType) = @_; - - my $Remarks = defined $VMKey ? "$VMKey $VMType VM" : "$VMType VMs"; - $Remarks = "Update the $Remarks"; - Debug("Creating the '$Remarks' job\n"); - - my $VMs = CreateVMs(); - $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); - $VMs->AddFilter("Type", [$VMType]); - $VMs->FilterEnabledRole(); - if ($VMs->GetItemsCount() == 0) + my ($VMKey) = @_; + Debug("Creating the Wine tests job\n"); + my $VMs = GetWineTestVMs($VMKey); + if (@$VMs) { - if (defined $VMKey) - { - Error "The $VMKey VM is not a $VMType VM\n"; - return 0; - } - # There is nothing to do - Debug(" Found no VM\n"); - return 1; - } - - # First create a new job - my $Jobs = CreateJobs(); - my $NewJob = $Jobs->Add(); - $NewJob->User(GetBatchUser()); - $NewJob->Priority(3); - $NewJob->Remarks($Remarks); - - # Add a step to the job - my $Steps = $NewJob->Steps; - my $BuildStep = $Steps->Add(); - $BuildStep->Type("reconfig"); - $BuildStep->FileType("none"); - - # Add a task for each VM - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - Debug(" $VMKey $VMType reconfig\n"); - my $Task = $BuildStep->Tasks->Add(); - $Task->VM($VM); - - # Merge all the tasks into one so we only recreate the base snapshot once - my $MissionStatement = $VMType ne "wine" ? "exe32:exe64" : - MergeMissionStatementTasks($VM->Missions); - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + my $ErrMessage = AddWineTestJob($VMs, $VMKey); if (defined $ErrMessage) { - Debug("$VMKey has an invalid mission statement: $!\n"); - next; - } - if (@$Missions != 1) - { - Debug("Found no mission or too many task missions for $VMKey\n"); - next; + ErrorMessage("$ErrMessage\n"); + return 0; } - $Task->Timeout(GetBuildTimeout(undef, $Missions->[0])); - $Task->Missions($Missions->[0]->{Statement}); } - - # Save it all - $NewJob->Status("staging"); - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined $ErrMessage) + elsif (defined $VMKey) { - Error "Failed to save the Reconfig job: $ErrMessage\n"; + Error("The $VMKey VM is not suitable for Wine tests jobs\n"); return 0; } - + else + { + Debug("Found no VM for the Wine tests job\n"); + } return 1; } @@ -566,12 +376,12 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or # A new executable means there have been commits so update Wine. Create # 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($OptVMKey, "build")); - $Rc = 1 if ($OptTypes{base32} and !AddJob($OptVMKey, "base", $LatestBaseName, "exe32")); - $Rc = 1 if ($OptTypes{other32} and !AddJob($OptVMKey, "other", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{build} and !DoReconfig($OptVMKey, "build")); + $Rc = 1 if ($OptTypes{base32} and !DoWindowsTest($OptVMKey, "exe32", "base", $LatestBaseName)); + $Rc = 1 if ($OptTypes{other32} and !DoWindowsTest($OptVMKey, "exe32", "other", $LatestBaseName)); - $Rc = 1 if ($OptTypes{winebuild} and !AddReconfigJob($OptVMKey, "wine")); - $Rc = 1 if ($OptTypes{winetest} and !AddWineTestJob($OptVMKey)); + $Rc = 1 if ($OptTypes{winebuild} and !DoReconfig($OptVMKey, "wine")); + $Rc = 1 if ($OptTypes{winetest} and !DoWineTest($OptVMKey)); } } @@ -589,7 +399,7 @@ if ($OptTypes{all64}) } elsif ($Create == 1) { - $Rc = 1 if ($OptTypes{all64} and !AddJob($OptVMKey, "", $LatestBaseName, "exe64")); + $Rc = 1 if ($OptTypes{all64} and !DoWindowsTest($OptVMKey, "exe64", "", $LatestBaseName)); } } diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm new file mode 100644 index 000000000..b0cb1480d --- /dev/null +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -0,0 +1,276 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# +# Provides methods to create the jobs that update Wine or run the full +# WineTest suite. +# +# Copyright 2009 Ge van Geldorp +# Copyright 2018-2019 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package WineTestBot::SpecialJobs; + +=head1 NAME + +WineTestBot::SpecialJobs - Create the jobs that update Wine or run the full +WineTest suite. + +=cut + +use Exporter 'import'; +our @EXPORT = qw(GetReconfigVMs AddReconfigJob + GetWindowsTestVMs AddWindowsTestJob + GetWineTestVMs AddWineTestJob); + +use WineTestBot::Config; +use WineTestBot::Jobs; +use WineTestBot::Missions; +use WineTestBot::PatchUtils; # Get*Timeout() +use WineTestBot::Users; +use WineTestBot::VMs; + + +sub GetReconfigVMs($$) +{ + my ($VMKey, $VMType) = @_; + + my $VMs = CreateVMs(); + $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); + $VMs->AddFilter("Type", [$VMType]); + $VMs->FilterEnabledRole(); + + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; + return \@SortedVMs; +} + +sub AddReconfigJob($$$) +{ + my ($VMs, $VMKey, $VMType) = @_; + + # First create a new job + my $Jobs = CreateJobs(); + my $NewJob = $Jobs->Add(); + $NewJob->User(GetBatchUser()); + $NewJob->Priority(3); + my $Remarks = defined $VMKey ? "$VMKey $VMType VM" : "$VMType VMs"; + $NewJob->Remarks("Update the $Remarks"); + + # Add a step to the job + my $Steps = $NewJob->Steps; + my $BuildStep = $Steps->Add(); + $BuildStep->Type("reconfig"); + $BuildStep->FileType("none"); + + # Add a task for each VM + foreach my $VM (@$VMs) + { + my $Task = $BuildStep->Tasks->Add(); + $Task->VM($VM); + + # Merge all the tasks into one so we only recreate the base snapshot once + my $MissionStatement = $VM->Type ne "wine" ? "exe32:exe64" : + MergeMissionStatementTasks($VM->Missions); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + return "$VMKey has an invalid mission statement: $ErrMessage"; + } + if (@$Missions != 1) + { + return "Found no mission or too many task missions for $VMKey"; + } + $Task->Timeout(GetBuildTimeout(undef, $Missions->[0])); + $Task->Missions($Missions->[0]->{Statement}); + } + + # Save it all + $NewJob->Status("staging"); + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + return "Failed to save the '$Remarks' job: $ErrMessage"; + } + return undef; +} + +sub GetWindowsTestVMs($$$) +{ + my ($VMKey, $Build, $BaseJob) = @_; + + my $VMs = CreateVMs(); + $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); + if ($Build eq "exe64") + { + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]) if (!defined $VMKey); + } + elsif ($BaseJob eq "base") + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]) if (!defined $VMKey); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]) if (!defined $VMKey); + } + + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; + return \@SortedVMs; +} + +sub AddWindowsTestJob($$$$$) +{ + my ($VMs, $VMKey, $Build, $BaseJob, $LatestBaseName) = @_; + + # First create a new job + my $Jobs = CreateJobs(); + my $NewJob = $Jobs->Add(); + $NewJob->User(GetBatchUser()); + $NewJob->Priority(($BaseJob eq "base" and $Build eq "exe32") ? 8 : 9); + my $Remarks = defined $VMKey ? "$VMKey VM" : + $Build eq "exe64" ? "64 bit VMs" : + "$BaseJob VMs"; + $NewJob->Remarks("WineTest: $Remarks"); + + # Add a task for each VM + my $Tasks; + foreach my $VM (@$VMs) + { + my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); + if (defined $ErrMessage) + { + return "$VMKey has an invalid mission statement: $!"; + } + + foreach my $TaskMissions (@$Missions) + { + next if (!$TaskMissions->{Builds}->{$Build}); + + if (!$Tasks) + { + # Add a step to the job + my $TestStep = $NewJob->Steps->Add(); + $TestStep->Type("suite"); + $TestStep->FileName($LatestBaseName); + $TestStep->FileType($Build); + $Tasks = $TestStep->Tasks; + } + + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($SuiteTimeout); + $Task->Missions($TaskMissions->{Statement}); + } + } + + # Save it all + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + return "Failed to save the '$Remarks' job: $ErrMessage"; + } + + # Stage the test file so it can be picked up by the job + if (!link("$DataDir/latest/$LatestBaseName", + "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName")) + { + return "Failed to stage $LatestBaseName: $!"; + } + + # Switch Status to staging to indicate we are done setting up the job + $NewJob->Status("staging"); + ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + return "Failed to save the '$Remarks' job (staging): $ErrMessage"; + } + return undef; +} + +sub GetWineTestVMs($) +{ + my ($VMKey) = @_; + + my $VMs = CreateVMs(); + $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); + $VMs->AddFilter("Type", ["wine"]); + $VMs->FilterEnabledRole(); + + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; + return \@SortedVMs; +} + +sub AddWineTestJob($$) +{ + my ($VMs, $VMKey) = @_; + + # First create a new job + my $Jobs = CreateJobs(); + my $NewJob = $Jobs->Add(); + $NewJob->User(GetBatchUser()); + $NewJob->Priority(7); + my $Remarks = defined $VMKey ? "$VMKey VM" : "Wine VMs"; + $NewJob->Remarks("WineTest: $Remarks"); + + # Add a step for each VM + foreach my $VM (@$VMs) + { + # Move all the missions into separate tasks so we don't have one very + # long task hogging the VM forever. Note that this is also ok because + # the WineTest tasks don't have to recompile Wine. + my $MissionStatement = SplitMissionStatementTasks($VM->Missions); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + return "$VMKey has an invalid mission statement: $!"; + } + + my $Tasks; + foreach my $TaskMissions (@$Missions) + { + if (!$Tasks) + { + # Add a step to the job + my $TestStep = $NewJob->Steps->Add(); + $TestStep->Type("suite"); + $TestStep->FileType("none"); + $Tasks = $TestStep->Tasks; + } + + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout(GetTestTimeout(undef, $TaskMissions)); + $Task->Missions($TaskMissions->{Statement}); + } + } + + # Save it all + $NewJob->Status("staging"); + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + return "Failed to save the '$Remarks' job: $ErrMessage"; + } + + return undef; +} + +1; -- 2.20.1

1 0

[PATCH] testbot/web: Always check the https connection the same way.
by Francois Gouget Sept. 25, 2019

Sept. 25, 2019

The standard way the TestBot checks the https connection is with '$UseSSL && ! SecureConnection())' so use that form in CheckSecurePage() too. This actually simplifies it too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index d1442c1e5..c1a8c8cbf 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -73,12 +73,10 @@ sub CheckSecurePage($$) { my ($self, $Page) = @_; - if (! $UseSSL || SecureConnection()) + if ($UseSSL && ! SecureConnection()) { - return; + $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); } - - $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); } sub GenerateHttpHeaders($) -- 2.20.1

1 0

[PATCH] testbot/web: Use GetTaskURL() to link to the task pages.
by Francois Gouget Sept. 25, 2019

Sept. 25, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 4 ++-- testbot/web/Stats.pl | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index bf7d6b9be..fe056aa48 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -231,9 +231,9 @@ EOF $Label .= "/64" if ($Bitness); } } - my $Key = $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No); + my $URL = GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No); my $Title = $self->escapeHTML($VMStatus->{job}->Remarks); - $Label = "<a href='/JobDetails.pl?Key=$Key' title='$Title'>$Label</a>"; + $Label = "<a href='$URL' title='$Title'>$Label</a>"; } elsif ($VMStatus->{status} eq "dirty") { diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 70e812dbe..91106bbc8 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -131,8 +131,7 @@ sub _GetStatHtml($$;$$) my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); if (defined $TaskNo) { - my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); - return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + return "<a href='". GetTaskURL($JobId, $StepNo, $TaskNo) ."'>$Value</a>"; } return "<a href='/index.pl#job$JobId'>$Value</a>"; } -- 2.20.1

1 0

[PATCH] testbot/Engine: Redirect stderr so Perl errors are logged.
by Francois Gouget Sept. 25, 2019

Sept. 25, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 81d3afc6b..aed0e51d3 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -742,6 +742,7 @@ sub main() } $SIG{CHLD} = \&REAPER; + WineTestBot::Log::SetupRedirects(); $WineTestBot::Engine::Notify::RunningInEngine = 1; LogMsg "Starting the WineTestBot Engine\n"; -- 2.20.1

1 0

[PATCH] testbot/LibvirtTool: Create the locale snapshots as needed.
by Francois Gouget Sept. 25, 2019

Sept. 25, 2019

A VM may have a lot of locale live snapshots. This removes the need for manually creating them (or recreating them after restoring the VM from backup or after a QEmu upgrade). Sadly the locales must still be manually installed beforehand. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 73 +++++++++++++++++++++--- testbot/{scripts => bin}/SetWinLocale | 0 testbot/bin/WineRunReconfig.pl | 2 +- testbot/lib/WineTestBot/LibvirtDomain.pm | 5 +- 4 files changed, 67 insertions(+), 13 deletions(-) rename testbot/{scripts => bin}/SetWinLocale (100%) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index d1402bc49..936c38608 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -365,9 +365,9 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } -sub SetupTestAgentd($$) +sub SetupTestAgentd($$$) { - my ($VM, $Booting) = @_; + my ($VM, $Booting, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -379,6 +379,23 @@ sub SetupTestAgentd($$) my $ErrMessage = $TA->GetLastError(); FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } + + if ($ResetStartCount) + { + # If SetProperty() is not supported neither is --show-restarts. + # So it all works out. + $TA->SetProperty("start.count", 0); + } + else + { + # Check that TestAgentd is not displaying the "Has Windows rebooted?" + # warning. + my $Count = $TA->GetProperties("start.count"); + if (defined $Count and $Count > 1) + { + FatalError("Cannot take a live snapshot because start.count=$Count > 1"); + } + } $TA->Disconnect(); } @@ -435,9 +452,17 @@ sub Revert() $CurrentStatus = "reverting"; my $DomainSnapshot = $VM->IdleSnapshot; my $ExtraTimeout = 0; - my $CreateSnapshot; + my ($SetLocale, $CreateSnapshot); my $Domain = $VM->GetDomain(); + if (!$Domain->HasSnapshot($DomainSnapshot) and + $DomainSnapshot =~ s/-([a-z]{2})[_-]([A-Z]{2})$//) + { + # Add some extra time to set up the VM locale and reboot it + $ExtraTimeout += $VMToolTimeout; + $SetLocale = "$1-$2"; + Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-$SetLocale snapshot\n"); + } if (!$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-live$//) { # Add some extra time to boot the VM and create the live snapshot @@ -484,19 +509,49 @@ sub Revert() # Mark the VM as sleeping which allows the scheduler to abort the revert in # favor of higher priority tasks. But don't allow interruptions in the # middle of snapshot creation! - if (!$CreateSnapshot) + if (!$CreateSnapshot and !$SetLocale) { return 1 if (ChangeStatus("reverting", "sleeping")); } - # Set up the TestAgent server - SetupTestAgentd($VM, $Booting); + # Set up the TestAgent server. Note that setting the locale will require a + # reboot so reset start.count in that case. + SetupTestAgentd($VM, $Booting, $SetLocale); if ($CreateSnapshot) { - CreateSnapshot($Domain, $VM->IdleSnapshot); + $DomainSnapshot .= "-live"; + CreateSnapshot($Domain, $DomainSnapshot); } - else + + # Set up the VM locale + if ($SetLocale) + { + Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); + if (system("$BinDir/SetWinLocale", "--vm", $VMKey, "--default", $SetLocale)) + { + FatalError("Could not set the $VMKey locale to $SetLocale\n"); + } + + Debug(Elapsed($Start), " Wait for the $VMKey locale-setting reboot to complete\n"); + LogMsg "Wait for the $VMKey locale-setting reboot to complete\n"; + while (1) + { + my $TA = $VM->GetAgent(); + my $Count = $TA->GetProperties("start.count"); + $TA->Disconnect(); + + # SetupTestAgentd() has reset start.count to zero. + # It will only change after the reboot. + last if (defined $Count and $Count != 0); + + sleep(1); + } + + $DomainSnapshot .= "-$SetLocale"; + CreateSnapshot($Domain, $DomainSnapshot); + } + elsif (!$CreateSnapshot) { my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? $SleepAfterBoot : $SleepAfterRevert; @@ -505,7 +560,7 @@ sub Revert() sleep($Sleep); } - if ($CreateSnapshot) + if ($CreateSnapshot or $SetLocale) { # The activity monitor does not like it when VMs skip the sleeping step return 1 if (ChangeStatus("reverting", "sleeping")); diff --git a/testbot/scripts/SetWinLocale b/testbot/bin/SetWinLocale similarity index 100% rename from testbot/scripts/SetWinLocale rename to testbot/bin/SetWinLocale diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index d558654ef..1e0e15371 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -512,7 +512,7 @@ if ($NewStatus eq 'completed') } Debug(Elapsed($Start), " Recreating the $IdleSnapshot snapshot\n"); - $ErrMessage = $Domain->CreateSnapshot(); + $ErrMessage = $Domain->CreateSnapshot($IdleSnapshot); if (defined $ErrMessage) { # Without the snapshot the VM is not usable anymore but FatalError() will diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 207dc6d45..68004a551 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -330,14 +330,13 @@ sub RevertToSnapshot($$) return (undef, $Reason != Sys::Virt::Domain::STATE_RUNNING_FROM_SNAPSHOT); } -sub CreateSnapshot($) +sub CreateSnapshot($$) { - my ($self) = @_; + my ($self, $SnapshotName) = @_; my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); - my $SnapshotName = $self->{VM}->IdleSnapshot; # FIXME: XML escaping my $Xml = "<domainsnapshot><name>$SnapshotName</name></domainsnapshot>"; eval { $Domain->create_snapshot($Xml, 0) }; -- 2.20.1

1 0

[PATCH] testbot/WineRunReconfig: Tweak formatting of a notification email.
by Francois Gouget Sept. 25, 2019

Sept. 25, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 05de10b46..d558654ef 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -299,8 +299,8 @@ sub FatalTAError($$) # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "A TestAgent operation to the ". $VM->Name ." VM failed:\n". - "\n$ErrMessage\n". + "A TestAgent operation to the ". $VM->Name ." VM failed:\n\n". + "$ErrMessage\n\n". "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } -- 2.20.1

1 0

[PATCH 1/5] strmbase: Rename pfnCheckMediaType() to pin_query_accept().
by Zebediah Figura Sept. 25, 2019

Sept. 25, 2019

And remove the unnecessary calling convention. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avico.c | 13 +++++------ dlls/qcap/avimux.c | 26 +++++++++------------ dlls/qcap/smartteefilter.c | 40 ++++++++++++++------------------- dlls/qcap/vfwcapture.c | 14 +++++------- dlls/quartz/filesource.c | 14 +++++------- dlls/strmbase/pin.c | 6 ++--- dlls/strmbase/renderer.c | 13 +++++------ dlls/strmbase/transform.c | 27 ++++++++++------------ dlls/winegstreamer/gstdemux.c | 30 ++++++++++++------------- dlls/wineqtdecoder/qtsplitter.c | 18 +++++++-------- include/wine/strmbase.h | 9 ++++---- 11 files changed, 93 insertions(+), 117 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index ca904a96326..0371cd74c17 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -379,7 +379,7 @@ static const IPinVtbl AVICompressorInputPinVtbl = { BaseInputPinImpl_NewSegment }; -static HRESULT WINAPI AVICompressorIn_CheckMediaType(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) +static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) { AVICompressor *This = impl_from_strmbase_pin(base); VIDEOINFOHEADER *videoinfo; @@ -499,12 +499,11 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample * return hres; } -static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = { - { - AVICompressorIn_CheckMediaType, - AVICompressorIn_GetMediaType - }, - AVICompressorIn_Receive +static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = +{ + .base.pin_query_accept = sink_query_accept, + .base.pfnGetMediaType = AVICompressorIn_GetMediaType, + .pfnReceive = AVICompressorIn_Receive, }; static HRESULT WINAPI AVICompressorOut_QueryInterface(IPin *iface, REFIID riid, void **ppv) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 7e33e4abe6f..a61ae5600e9 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1152,7 +1152,7 @@ static const ISpecifyPropertyPagesVtbl SpecifyPropertyPagesVtbl = { SpecifyPropertyPages_GetPages }; -static HRESULT WINAPI AviMuxOut_CheckMediaType(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) +static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); return S_OK; @@ -1223,13 +1223,10 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, static const struct strmbase_source_ops source_ops = { - { - AviMuxOut_CheckMediaType, - AviMuxOut_GetMediaType - }, - AviMuxOut_AttemptConnection, - NULL, - AviMuxOut_DecideAllocator, + .base.pin_query_accept = source_query_accept, + .base.pfnGetMediaType = AviMuxOut_GetMediaType, + .pfnAttemptConnection = AviMuxOut_AttemptConnection, + .pfnDecideAllocator = AviMuxOut_DecideAllocator, }; static inline AviMux *impl_from_out_IPin(IPin *iface) @@ -1372,7 +1369,7 @@ static const IQualityControlVtbl AviMuxOut_QualityControlVtbl = { AviMuxOut_QualityControl_SetSink }; -static HRESULT WINAPI AviMuxIn_CheckMediaType(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) +static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) { if(IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio) && IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx)) @@ -1495,12 +1492,11 @@ static HRESULT WINAPI AviMuxIn_Receive(BaseInputPin *base, IMediaSample *pSample return hr; } -static const BaseInputPinFuncTable AviMuxIn_BaseInputFuncTable = { - { - AviMuxIn_CheckMediaType, - AviMuxIn_GetMediaType - }, - AviMuxIn_Receive +static const BaseInputPinFuncTable AviMuxIn_BaseInputFuncTable = +{ + .base.pin_query_accept = sink_query_accept, + .base.pfnGetMediaType = AviMuxIn_GetMediaType, + .pfnReceive = AviMuxIn_Receive, }; static inline AviMux* impl_from_in_IPin(IPin *iface) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index bbf27a16b2b..98293fb4d8e 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -167,7 +167,7 @@ static const IPinVtbl SmartTeeFilterInputVtbl = { BaseInputPinImpl_NewSegment }; -static HRESULT WINAPI SmartTeeFilterInput_CheckMediaType(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) +static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) { SmartTeeFilter *This = impl_from_strmbase_pin(base); TRACE("(%p, AM_MEDIA_TYPE(%p))\n", This, pmt); @@ -319,12 +319,11 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSamp return hrPreview; } -static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = { - { - SmartTeeFilterInput_CheckMediaType, - SmartTeeFilterInput_GetMediaType - }, - SmartTeeFilterInput_Receive +static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = +{ + .base.pin_query_accept = sink_query_accept, + .base.pfnGetMediaType = SmartTeeFilterInput_GetMediaType, + .pfnReceive = SmartTeeFilterInput_Receive, }; static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) @@ -362,7 +361,7 @@ static const IPinVtbl SmartTeeFilterCaptureVtbl = { BasePinImpl_NewSegment }; -static HRESULT WINAPI SmartTeeFilterCapture_CheckMediaType(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) +static HRESULT capture_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); return S_OK; @@ -391,13 +390,10 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(struct strmbase_sour static const struct strmbase_source_ops capture_ops = { - { - SmartTeeFilterCapture_CheckMediaType, - SmartTeeFilterCapture_GetMediaType - }, - BaseOutputPinImpl_AttemptConnection, - NULL, - SmartTeeFilterCapture_DecideAllocator, + .base.pin_query_accept = capture_query_accept, + .base.pfnGetMediaType = SmartTeeFilterCapture_GetMediaType, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = SmartTeeFilterCapture_DecideAllocator, }; static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) @@ -435,7 +431,7 @@ static const IPinVtbl SmartTeeFilterPreviewVtbl = { BasePinImpl_NewSegment }; -static HRESULT WINAPI SmartTeeFilterPreview_CheckMediaType(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) +static HRESULT preview_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); return S_OK; @@ -464,14 +460,12 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_sour static const struct strmbase_source_ops preview_ops = { - { - SmartTeeFilterPreview_CheckMediaType, - SmartTeeFilterPreview_GetMediaType - }, - BaseOutputPinImpl_AttemptConnection, - NULL, - SmartTeeFilterPreview_DecideAllocator, + .base.pin_query_accept = preview_query_accept, + .base.pfnGetMediaType = SmartTeeFilterPreview_GetMediaType, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = SmartTeeFilterPreview_DecideAllocator, }; + IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) { static const WCHAR captureW[] = {'C','a','p','t','u','r','e',0}; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 60ea7d5623b..c84baa7abc6 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -512,7 +512,7 @@ static inline VfwCapture *impl_from_strmbase_pin(struct strmbase_pin *pin) return CONTAINING_RECORD(pin, VfwCapture, source.pin); } -static HRESULT WINAPI VfwPin_CheckMediaType(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) +static HRESULT source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) { VfwCapture *filter = impl_from_strmbase_pin(pin); return qcap_driver_check_format(filter->driver_info, mt); @@ -556,13 +556,11 @@ static HRESULT WINAPI VfwPin_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops source_ops = { - { - VfwPin_CheckMediaType, - VfwPin_GetMediaType - }, - BaseOutputPinImpl_AttemptConnection, - VfwPin_DecideBufferSize, - BaseOutputPinImpl_DecideAllocator, + .base.pin_query_accept = source_query_accept, + .base.pfnGetMediaType = VfwPin_GetMediaType, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideBufferSize = VfwPin_DecideBufferSize, + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index b69cfeb411b..ac210824f07 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -580,7 +580,7 @@ static inline AsyncReader *impl_from_IAsyncReader(IAsyncReader *iface) return CONTAINING_RECORD(iface, AsyncReader, IAsyncReader_iface); } -static HRESULT WINAPI FileAsyncReaderPin_CheckMediaType(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) { AsyncReader *filter = impl_from_strmbase_pin(iface); @@ -703,13 +703,11 @@ static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(struct strmbase_source static const struct strmbase_source_ops source_ops = { - { - FileAsyncReaderPin_CheckMediaType, - FileAsyncReaderPin_GetMediaType - }, - FileAsyncReaderPin_AttemptConnection, - FileAsyncReaderPin_DecideBufferSize, - BaseOutputPinImpl_DecideAllocator, + .base.pin_query_accept = source_query_accept, + .base.pfnGetMediaType = FileAsyncReaderPin_GetMediaType, + .pfnAttemptConnection = FileAsyncReaderPin_AttemptConnection, + .pfnDecideBufferSize = FileAsyncReaderPin_DecideBufferSize, + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; static HRESULT WINAPI FileAsyncReader_QueryInterface(IAsyncReader *iface, REFIID iid, void **out) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 6fe08e60b1d..3b05e5c62a1 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -292,7 +292,7 @@ HRESULT WINAPI BasePinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) TRACE("(%p)->(%p)\n", iface, pmt); - return (This->pFuncsTable->pfnCheckMediaType(This, pmt) == S_OK ? S_OK : S_FALSE); + return (This->pFuncsTable->pin_query_accept(This, pmt) == S_OK ? S_OK : S_FALSE); } HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) @@ -654,7 +654,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This, TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); - if ((hr = This->pFuncsTable->base.pfnCheckMediaType(&This->pin, pmt)) != S_OK) + if ((hr = This->pFuncsTable->base.pin_query_accept(&This->pin, pmt)) != S_OK) return hr; This->pin.pConnectedTo = pReceivePin; @@ -780,7 +780,7 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP if (This->pin.pConnectedTo) hr = VFW_E_ALREADY_CONNECTED; - if (SUCCEEDED(hr) && This->pin.pFuncsTable->pfnCheckMediaType(&This->pin, pmt) != S_OK) + if (SUCCEEDED(hr) && This->pin.pFuncsTable->pin_query_accept(&This->pin, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */ diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 00c14eee283..6df54146568 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -211,7 +211,7 @@ static const struct strmbase_filter_ops filter_ops = .filter_query_interface = renderer_query_interface, }; -static HRESULT WINAPI BaseRenderer_Input_CheckMediaType(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) +static HRESULT sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) { BaseRenderer *filter = impl_from_IPin(&pin->IPin_iface); return filter->pFuncsTable->pfnCheckMediaType(filter, mt); @@ -223,12 +223,11 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample *samp return BaseRendererImpl_Receive(filter, sample); } -static const BaseInputPinFuncTable input_BaseInputFuncTable = { - { - BaseRenderer_Input_CheckMediaType, - BasePinImpl_GetMediaType - }, - BaseRenderer_Receive +static const BaseInputPinFuncTable input_BaseInputFuncTable = +{ + .base.pin_query_accept = sink_query_accept, + .base.pfnGetMediaType = BasePinImpl_GetMediaType, + .pfnReceive = BaseRenderer_Receive, }; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 698a77de053..4bb9e7fa005 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -45,7 +45,7 @@ static inline TransformFilter *impl_from_sink_IPin(IPin *iface) return CONTAINING_RECORD(iface, TransformFilter, sink.pin.IPin_iface); } -static HRESULT WINAPI TransformFilter_Input_CheckMediaType(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) { TransformFilter *pTransform = impl_from_sink_IPin(&iface->IPin_iface); @@ -92,7 +92,7 @@ static inline TransformFilter *impl_from_source_IPin(IPin *iface) return CONTAINING_RECORD(iface, TransformFilter, source.pin.IPin_iface); } -static HRESULT WINAPI TransformFilter_Output_CheckMediaType(struct strmbase_pin *This, const AM_MEDIA_TYPE *pmt) +static HRESULT source_query_accept(struct strmbase_pin *This, const AM_MEDIA_TYPE *pmt) { TransformFilter *pTransformFilter = impl_from_source_IPin(&This->IPin_iface); AM_MEDIA_TYPE* outpmt = &pTransformFilter->pmt; @@ -163,23 +163,20 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = transform_destroy, }; -static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { - { - TransformFilter_Input_CheckMediaType, - BasePinImpl_GetMediaType - }, - TransformFilter_Input_Receive +static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = +{ + .base.pin_query_accept = sink_query_accept, + .base.pfnGetMediaType = BasePinImpl_GetMediaType, + .pfnReceive = TransformFilter_Input_Receive, }; static const struct strmbase_source_ops source_ops = { - { - TransformFilter_Output_CheckMediaType, - TransformFilter_Output_GetMediaType - }, - BaseOutputPinImpl_AttemptConnection, - TransformFilter_Output_DecideBufferSize, - BaseOutputPinImpl_DecideAllocator, + .base.pin_query_accept = source_query_accept, + .base.pfnGetMediaType = TransformFilter_Output_GetMediaType, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideBufferSize = TransformFilter_Output_DecideBufferSize, + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; static HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter *iface) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a47b108e49e..7b1080207ee 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1240,7 +1240,7 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = gstdemux_destroy, }; -static HRESULT WINAPI sink_CheckMediaType(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) return S_OK; @@ -1249,7 +1249,7 @@ static HRESULT WINAPI sink_CheckMediaType(struct strmbase_pin *iface, const AM_M static const BasePinFuncTable sink_ops = { - .pfnCheckMediaType = sink_CheckMediaType, + .pin_query_accept = sink_query_accept, .pfnGetMediaType = BasePinImpl_GetMediaType, }; @@ -1793,7 +1793,7 @@ static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void ** return E_NOINTERFACE; } -static HRESULT WINAPI GSTOutPin_CheckMediaType(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) +static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); return S_OK; @@ -1906,13 +1906,11 @@ static const IPinVtbl GST_OutputPin_Vtbl = { static const struct strmbase_source_ops source_ops = { - { - GSTOutPin_CheckMediaType, - GSTOutPin_GetMediaType - }, - BaseOutputPinImpl_AttemptConnection, - GSTOutPin_DecideBufferSize, - GSTOutPin_DecideAllocator, + .base.pin_query_accept = source_query_accept, + .base.pfnGetMediaType = GSTOutPin_GetMediaType, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideBufferSize = GSTOutPin_DecideBufferSize, + .pfnDecideAllocator = GSTOutPin_DecideAllocator, }; static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *name) @@ -2304,7 +2302,7 @@ void start_dispatch_thread(void) CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL)); } -static HRESULT WINAPI wave_parser_sink_CheckMediaType(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +static HRESULT wave_parser_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) return S_FALSE; @@ -2317,7 +2315,7 @@ static HRESULT WINAPI wave_parser_sink_CheckMediaType(struct strmbase_pin *iface static const BasePinFuncTable wave_parser_sink_ops = { - .pfnCheckMediaType = wave_parser_sink_CheckMediaType, + .pin_query_accept = wave_parser_sink_query_accept, .pfnGetMediaType = BasePinImpl_GetMediaType, }; @@ -2413,7 +2411,7 @@ IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) return &object->filter.IUnknown_inner; } -static HRESULT WINAPI avi_splitter_sink_CheckMediaType(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +static HRESULT avi_splitter_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream) && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_Avi)) @@ -2423,7 +2421,7 @@ static HRESULT WINAPI avi_splitter_sink_CheckMediaType(struct strmbase_pin *ifac static const BasePinFuncTable avi_splitter_sink_ops = { - .pfnCheckMediaType = avi_splitter_sink_CheckMediaType, + .pin_query_accept = avi_splitter_sink_query_accept, .pfnGetMediaType = BasePinImpl_GetMediaType, }; @@ -2520,7 +2518,7 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) return &object->filter.IUnknown_inner; } -static HRESULT WINAPI mpeg_splitter_sink_CheckMediaType(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) return S_FALSE; @@ -2535,7 +2533,7 @@ static HRESULT WINAPI mpeg_splitter_sink_CheckMediaType(struct strmbase_pin *ifa static const BasePinFuncTable mpeg_splitter_sink_ops = { - .pfnCheckMediaType = mpeg_splitter_sink_CheckMediaType, + .pin_query_accept = mpeg_splitter_sink_query_accept, .pfnGetMediaType = BasePinImpl_GetMediaType, }; diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 5e034a511bf..371c0f1ddaf 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -290,7 +290,7 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = qt_splitter_destroy, }; -static HRESULT WINAPI sink_CheckMediaType(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { QTInPin *pin = impl_from_IPin(&iface->IPin_iface); @@ -304,7 +304,7 @@ static HRESULT WINAPI sink_CheckMediaType(struct strmbase_pin *iface, const AM_M static const BasePinFuncTable sink_ops = { - .pfnCheckMediaType = sink_CheckMediaType, + .pin_query_accept = sink_query_accept, .pfnGetMediaType = BasePinImpl_GetMediaType, }; @@ -1289,7 +1289,7 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p return E_NOINTERFACE; } -static HRESULT WINAPI QTOutPin_CheckMediaType(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) +static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); return S_OK; @@ -1406,13 +1406,11 @@ static const IQualityControlVtbl QTOutPin_QualityControl_Vtbl = { static const struct strmbase_source_ops source_ops = { - { - QTOutPin_CheckMediaType, - QTOutPin_GetMediaType - }, - BaseOutputPinImpl_AttemptConnection, - QTOutPin_DecideBufferSize, - QTOutPin_DecideAllocator, + .base.pin_query_accept = source_query_accept, + .base.pfnGetMediaType = QTOutPin_GetMediaType, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideBufferSize = QTOutPin_DecideBufferSize, + .pfnDecideAllocator = QTOutPin_DecideAllocator, }; static const OutputQueueFuncTable output_OutputQueueFuncTable = { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f4654b964fc..cd9448775e6 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -42,15 +42,14 @@ struct strmbase_pin const struct BasePinFuncTable* pFuncsTable; }; -typedef HRESULT (WINAPI *BasePin_CheckMediaType)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); typedef LONG (WINAPI *BasePin_GetMediaTypeVersion)(struct strmbase_pin *pin); typedef HRESULT (WINAPI *BasePin_GetMediaType)(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt); typedef struct BasePinFuncTable { - /* Required for QueryAccept(), Connect(), ReceiveConnection(). */ - BasePin_CheckMediaType pfnCheckMediaType; - /* Required for BasePinImpl_EnumMediaTypes */ - BasePin_GetMediaType pfnGetMediaType; + /* Required for QueryAccept(), Connect(), ReceiveConnection(). */ + HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); + /* Required for EnumMediaTypes(). */ + BasePin_GetMediaType pfnGetMediaType; } BasePinFuncTable; struct strmbase_source -- 2.23.0

1 4

[PATCH 1/5] d3dx9: Simplify unsupported format check.
by Matteo Bruni Sept. 24, 2019

Sept. 24, 2019

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- This is only relevant for the direct copy code path (where source and destination formats match), the other path has another, more thorough, check already. The patch from Paul prompted me to recover and clean up a bunch of patches that have been stuck in my queue for years. So thank you Paul I guess :D dlls/d3dx9_36/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 8e9b834d882..00a7694ab0b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1890,9 +1890,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, srcformatdesc = get_format_info(src_format); destformatdesc = get_format_info(surfdesc.Format); - if (srcformatdesc->type == FORMAT_UNKNOWN || destformatdesc->type == FORMAT_UNKNOWN) + if (srcformatdesc->type == FORMAT_UNKNOWN) { - FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_format, surfdesc.Format); + FIXME("Unsupported format %#x.\n", src_format); return E_NOTIMPL; } -- 2.21.0

1 4

[PATCH v4] user32: Send a WM_ACTIVATE message after restoring a minimized window.
by Zhiyi Zhang Sept. 24, 2019

Sept. 24, 2019

The WmShowRestoreMinimizedOverlappedSeq message sequence in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() calls after restoring a minimized window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 169418. Add more tests to show that WM_ACTIVATE is not from SetFocus. v3: Supersede 170219. Fix some tests that occasionally fail on TestBots. v4: Supersede 170290. Fix some more tests. Those optional messages just appear right after I submitted the patch and I ran it multiple times before. I ran it even more times and this time there should be no more failures because of optional messages. dlls/user32/tests/msg.c | 238 +++++++++++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 9 +- 2 files changed, 245 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2766e7f5fb..4bf5c696ac 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -892,6 +892,138 @@ static const struct message WmShowVisMaxPopupSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* ShowWindow(hwnd, SW_RESTORE) to a minimized window */ +static const struct message WmShowRestoreMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, WA_ACTIVE }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and focused */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to a minimized window */ +static const struct message WmShowNoActivateMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + /* Following optional messages are on XP/2003 */ + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + { HCBT_ACTIVATE, hook|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam|optional, WA_ACTIVE }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { WM_KILLFOCUS, sent|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message on XP even if the window is already active and focused */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_RESTORE) to an active minimized window */ +static const struct message WmShowRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE message even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { WM_GETMINMAXINFO, sent|optional }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to an active minimized window */ +static const struct message WmShowNoActivateActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Following optional messages are present on XP */ + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and with flag SW_SHOWNOACTIVATE */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; /* CreateWindow (for a child popup window, not initially visible) */ static const struct message WmCreateChildPopupSeq[] = { { HCBT_CREATEWND, hook }, @@ -4636,7 +4768,7 @@ static void test_scroll_messages(HWND hwnd) static void test_showwindow(void) { - HWND hwnd, hchild; + HWND hwnd, hwnd2, hchild; RECT rc; hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, @@ -4773,6 +4905,68 @@ static void test_showwindow(void) ok_sequence(WmShowVisMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE); DestroyWindow(hwnd); flush_sequence(); + + /* Test 5: + * 1. Restoring a minimized window. + */ + hwnd = CreateWindowA("TestWindowClass", "window1", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + hwnd2 = CreateWindowA("static", "window2", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd2 != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd2); + ok(GetActiveWindow() == hwnd2, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE): minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd2); + ok(GetActiveWindow() == hwnd2, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE): minimized overlapped", TRUE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + flush_sequence(); + + /* Test 6: + * 1. Restoring a minimized but active window. + */ + hwnd = CreateWindowA("TestWindowClass", "parent", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE): active minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE): active minimized overlapped", TRUE); + + DestroyWindow(hwnd); + flush_sequence(); } static void test_sys_menu(void) @@ -15415,6 +15609,40 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to an active minimized window */ +static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE messages even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15476,7 +15704,15 @@ static void test_defwinproc(void) DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); flush_events(); ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); flush_sequence(); + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreActiveMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):active minimized overlapped", TRUE); GetCursorPos(&pos); GetWindowRect(hwnd, &rect); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bbbab60fbe..ebfdf9b6f0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1182,7 +1182,14 @@ static BOOL show_window( HWND hwnd, INT cmd ) else WIN_ReleasePtr( wndPtr ); /* if previous state was minimized Windows sets focus to the window */ - if (style & WS_MINIMIZE) SetFocus( hwnd ); + if (style & WS_MINIMIZE) + { + SetFocus( hwnd ); + /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */ + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & WS_CHILD) && !(swp & SWP_NOACTIVATE)) + SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 ); + } done: SetThreadDpiAwarenessContext( context ); -- 2.23.0

2 1