March 2021 - Wine-devel - list.winehq.org

[tools] testbot/TestWTBS: Tweak the message for failed TestUnits module matches.
by Francois Gouget 01 Mar '21

01 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 04487c4bc..e3b0a3ce6 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1217,7 +1217,7 @@ sub CheckJobTree($;$) $TestUnits->{$MissionType}->{$TestUnit} = 0; $Matched = 1; } - ok($Matched, "Check that $MissionType VMs ran $TestGrep for job $JobId") + ok($Matched, "Check that $MissionType VMs ran $TestGrep tests for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); } my @ExtraUnits = grep { $TestUnits->{$MissionType}->{$_} } keys %{$TestUnits->{$MissionType}}; -- 2.20.1

1 0

[tools] testbot/TestWTBS: Don't report failed test unit matches twice.
by Francois Gouget 01 Mar '21

01 Mar '21

If a module:unit entry did not match, it's certainly not going to match as a module name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This issue was found thanks to the testwtbsuite test suite. --- testbot/tests/TestWTBS | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e3b0a3ce6..2a6b66e6d 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1209,6 +1209,7 @@ sub CheckJobTree($;$) } fail("Check that $MissionType VMs ran $TestGrep for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); + next; } my $Matched; foreach my $TestUnit (keys %{$TestUnits->{$MissionType}}) -- 2.20.1

1 0

[tools] testbot/TestWTBS: Improve the error checking documentation.
by Francois Gouget 01 Mar '21

01 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 2a6b66e6d..6a19f138b 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -654,14 +654,23 @@ n 0 comm.c:2210: Test failed: WTBS Simulate an unreported test failure g 0 tests.report.Report validation errors n 0 kernel32:comm has unaccounted for failure messages -This checks that the 'comm.c' failure appears in the 'kernel32' group -of the reports of all test tasks; that the TestBot issues a report consistency -failure as well; and that no other new error is present. If no preexisting -errors are expected, that is if test unit produces no failure when run outside -the test suite, then one could also issue the following check: +This checks that the 'comm.c' failure appears in the 'kernel32' group of the +reports of all test tasks; that the TestBot issues a report consistency +failure as well; that no other new error is present in either group; and that +there are no other error groups. + +If no preexisting errors are expected, that is if the test unit produces no +failure when run outside the test suite, then one could also issue the +following check: p tests.TestFailures 2 +Note that if there is no group directive this test is skipped. So to check that +there is no error one would declare an empty group such as below, though a +'TestFailures 0' check seems like a clearer and better approach. + +g 0 tests.report.kernel32 + Finally, note that while the error directives are inherited by subcategories, they are not merged. So if if both win and win32 have error-matching directives, win32 will not inherit anything from the win category. -- 2.20.1

1 0

[tools] testbot/TestWTBS: Fix matching regexps in patches.
by Francois Gouget 01 Mar '21

01 Mar '21

That step was getting skipped for patches submitted through the mailing list, i.e. whenever CheckJobTree() was first called from CheckPatch() (which checks the patches/* files) rather than straight from CheckJobs(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sending the 100+ wtbsuite test cases is normally done through WinePatches*Submit.pl, that is as if coming from the mailing list, resulting in that check being skipped. Found thanks to the testwtbsuite test suite. --- testbot/tests/TestWTBS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 6a19f138b..daeb36eaa 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1126,10 +1126,6 @@ sub CheckJobTree($;$) $TestInfo = LoadTestInfo($Step->GetFullFileName()); return if (!$TestInfo); - if ($TestInfo->{patch}) - { - GrepFile($Job->Id, $Job->GetDir(), "patch.diff", $TestInfo->{patch}); - } } my $TaskType = $Step->Type eq "build" ? "build" : @@ -1164,6 +1160,10 @@ sub CheckJobTree($;$) } } } + if ($TestInfo->{patch}) + { + GrepFile($Job->Id, $Job->GetDir(), "patch.diff", $TestInfo->{patch}); + } if ($Email->{HasFailedEmail}) { foreach my $VMName (sort keys %FailedVMs) -- 2.20.1

1 0

[tools] testbot/TestWTBS: wine:build should inherit from build.
by Francois Gouget 01 Mar '21

01 Mar '21

wine:build tasks are very similar to regular build tasks so it makes sense to have them inherit from them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index daeb36eaa..7a5f29f3d 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -370,7 +370,8 @@ sub LoadTestInfo($) foreach my $Pair (["tasks", ["build", "tests"]], ["tests", ["win", "wine"]], ["win", ["win32", "win64"]], - ["wine", ["wine:test", "wine:module"]]) + ["wine", ["wine:test", "wine:module"]], + ["build", ["wine:build"]]) { my ($Src, $TaskTypes) = @$Pair; foreach my $Field (keys %{$TestInfo->{$Src}}) -- 2.20.1

1 0

[tools] testbot/TestWTBS: The build tasks should not have test units.
by Francois Gouget 01 Mar '21

01 Mar '21

First check that TestUnits was not accidentally set for build and wine:build tasks, and then set it to an empty string (which is not possible from via regular directives) which means any test unit will show up as an error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 7a5f29f3d..e9fa98edc 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -361,9 +361,10 @@ sub LoadTestInfo($) SetDefault($TestInfo, "tasks", "Status", "completed"); SetDefault($TestInfo, "tasks", "HasTask", 1); } - if (defined $TestInfo->{"wine:build"}->{TestUnits}) + foreach my $BuildType ("build", "wine:build") { - fail("wine:build.TestUnits should not be set"); + next if (!defined $TestInfo->{$BuildType}->{TestUnits}); + fail("$BuildType.TestUnits should not be set"); } # Then propagate the defaults @@ -397,8 +398,9 @@ sub LoadTestInfo($) } } } - # Reset the inherited wine:build.TestUnits since it makes no sense - delete $TestInfo->{"wine:build"}->{TestUnits}; + # build and wine:build tasks should not be running tests + $TestInfo->{"build"}->{TestUnits} = ""; + $TestInfo->{"wine:build"}->{TestUnits} = ""; # Automatically check the Task: lines in simple cases foreach my $Build ("build", "wine:build") -- 2.20.1

1 0

[tools] testbot/web: Limit the number of days shown on the index page.
by Francois Gouget 01 Mar '21

01 Mar '21

By default only show jobs from the last 4 days to speed up generating and loading the page. The limit can of course be changed through the page to access older jobs. One can also get their own default by adding '?Days=N' at the end of the bookmarked TestBot URL. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The 4 day default is arbitrary and could be adjusted. Setting it too short would frequently force reloading the page with a longer period which would be annoying. Setting it too long would unnecessarily increase the load on the web server and slow page load. Four days seems like a good compromise because it is the shortest time that allows sending a patch on a friday morning, going offline for the week-end, and checking the results on monday afternoon without hitting the limit. One could also pick 1 week as the default but I'm not sure it would bring much benefit. Here this typically reduces the page generation time to about 0.3 s (from 2.4 s). Obviously how much benefit one gets depends on how many jobs were submitted each day (in my case ~3x the normal volume on wtbsuite days so it's quite variable). --- testbot/lib/WineTestBot/Config.pm | 5 ++-- testbot/web/index.pl | 45 +++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index a4aba2c55..fe4a27cd6 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -38,7 +38,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $PrettyHostNames $JobPurgeDays + $TunnelDefaults $PrettyHostNames $DefaultIndexDays $JobPurgeDays $WebHostName $RegistrationQ $RegistrationARE $MuninAPIKey); require Exporter; @@ -55,7 +55,7 @@ require Exporter; $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $PrettyHostNames $JobPurgeDays + $TunnelDefaults $PrettyHostNames $DefaultIndexDays $JobPurgeDays $WebHostName $RegistrationQ $RegistrationARE $MuninAPIKey); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); @@ -152,6 +152,7 @@ $LDAPSearchFilter = undef; $LDAPRealNameAttribute = undef; $LDAPEMailAttribute = undef; +$DefaultIndexDays = 4; $JobPurgeDays = 30; if (!$::BuildEnv) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index cc32bdbeb..603f295d5 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -236,8 +236,8 @@ sub GetDetailsPage($) package StatusPage; -use ObjectModel::CGI::Page; -our @ISA = qw(ObjectModel::CGI::Page); +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); use WineTestBot::Config; use WineTestBot::Engine::Notify; @@ -251,10 +251,31 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{Days} = $self->GetParam("Days"); + $self->Validate(); + $self->{start} = Time(); $self->SUPER::_initialize($Request, $RequiredRole); } +sub Validate($) +{ + my ($self) = @_; + + if (!defined $self->{Days} or !$self->{Days}) + { + $self->{Days} = $DefaultIndexDays; + } + elsif ($self->{Days} !~ /^[0-9]{1,2}$/) + { + $self->{ErrField} = "Days"; + $self->{ErrMessage} = "The number of days must be between 1 and 99"; + $self->{Days} = $DefaultIndexDays; + return undef; + } + return $self->SUPER::Validate(); +} + sub OutputDot($$) { my ($self, $DotColor) = @_; @@ -328,12 +349,15 @@ sub GenerateBody($) print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs(); + my $CutOff = time() - $self->{Days} * 24 * 60 * 60; + $Jobs->AddFilter("Submitted", [$CutOff], ">="); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); # We need to collect information about the tasks of all jobs except the # pretty rare queued jobs. But doing so one job at a time is inefficient so # do it all at once now and store the results in ...->{JobsInfo}. my $Tasks = CreateTasks(); + $Tasks->AddFilter("Started", [$CutOff], ">="); foreach my $Task (@{$Tasks->GetItems()}) { my $JobInfo = ($JobsCollectionBlock->{JobsInfo}->{$Task->JobId} ||= {}); @@ -353,6 +377,18 @@ sub GenerateBody($) $JobsCollectionBlock->GenerateList(); + print <<EOF; +<p></p> +<form id="Days" action='/' method='get'> + <div class='ItemProperty'><label>Show jobs for the past</label> + <div class='ItemValue'> + <input type='text' name='Days' maxlength='2' size='2' value='$self->{Days}' /> days + <input type='submit' value='Update'/> + </div> + </div> +</form> +EOF + print "<h2><a name='vms'></a>VMs</h2>\n"; my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); $VMsCollectionBlock->GenerateList(); @@ -361,6 +397,11 @@ sub GenerateBody($) print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } +sub OnAction($$) +{ + my ($self, $Action) = @_; + return $self->Validate() ? 1 : undef; +} package main; -- 2.20.1

1 0

[tools] testbot/LogUtils: Let ParseWineTestReport() do the error detection.
by Francois Gouget 01 Mar '21

01 Mar '21

This reduces duplication and lets ParseWineTestReport()'s more sophisticated analysis have the last word on which report lines contain errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is needed to allow proper handling of IgnoreExceptions lines. testbot/lib/WineTestBot/LogUtils.pm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 267dcd9ec..4d2619ccc 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -328,14 +328,6 @@ sub GetReportLineCategory($) { return "skip"; } - if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or - $Line =~ /Fatal: test .* does not exist/ or - $Line =~ / done $258$/ or - $Line =~ /: unhandled exception [0-9a-fA-F]{8} (?:at|in) / or - $Line =~ /^Unhandled exception: /) - { - return "error"; - } if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or $Line =~ /: this is the last test seen before the exception/) { @@ -736,14 +728,6 @@ sub ParseWineTestReport($$$) } $Cur->{Rc} = $Rc; } - elsif (GetReportLineCategory($Line) eq "error") - { - # This should only happen on very garbled lines, or if there is an - # inconsistency between GetReportLineCategory() and - # ParseWineTestReport(). - _AddReportError($LogInfo, $Cur, $LineNo, $Line); - } - } $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); _CloseTestUnit($LogInfo, $Cur, 1); -- 2.20.1

1 0

[PATCH 1/9] reg/tests: Split 'delete' tests from reg.c
by Hugh McMaster 01 Mar '21

01 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/Makefile.in | 3 +- programs/reg/tests/delete.c | 123 ++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 125 +++------------------------------ programs/reg/tests/reg_test.h | 56 +++++++++++++++ 4 files changed, 191 insertions(+), 116 deletions(-) create mode 100644 programs/reg/tests/delete.c create mode 100644 programs/reg/tests/reg_test.h diff --git a/programs/reg/tests/Makefile.in b/programs/reg/tests/Makefile.in index c5ce9f3a06b..791a8cfc4e3 100644 --- a/programs/reg/tests/Makefile.in +++ b/programs/reg/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = reg.exe IMPORTS = advapi32 C_SRCS = \ - reg.c + reg.c \ + delete.c diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c new file mode 100644 index 00000000000..fff3c5348b8 --- /dev/null +++ b/programs/reg/tests/delete.c @@ -0,0 +1,123 @@ +/* + * Copyright 2014 Akihiro Sagawa + * Copyright 2016-2018, 2021 Hugh McMaster + * + * 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 "reg_test.h" + +static void test_delete(void) +{ + HKEY hkey, hsubkey; + DWORD r; + const DWORD deadbeef = 0xdeadbeef; + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg delete", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg delete /h", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg delete -H", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + /* Multiple /v* switches */ + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* No /v argument */ + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Create a test key */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); + add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); + add_value(hkey, NULL, REG_DWORD, &deadbeef, sizeof(deadbeef)); + + add_key(hkey, "subkey", &hsubkey); + close_key(hsubkey); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "bar"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "foo"); + verify_key(hkey, "subkey"); + + /* Test forward and back slashes */ + add_key(hkey, "https://winehq.org", &hsubkey); + close_key(hsubkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + + run_reg_exe("reg delete HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "https://winehq.org"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v count/up /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "count/up"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "\\foo\\bar"); + + close_key(hkey); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + +START_TEST(delete) +{ + DWORD r; + + if (!run_reg_exe("reg.exe /?", &r)) { + win_skip("reg.exe not available, skipping 'delete' tests\n"); + return; + } + + test_delete(); +} diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 538a274d54f..97766e191fa 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -16,22 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <windows.h> -#include "wine/test.h" +#include "reg_test.h" #define lok ok_(__FILE__,line) -#define KEY_WINE "Software\\Wine" -#define KEY_BASE KEY_WINE "\\reg_test" -#define REG_EXIT_SUCCESS 0 -#define REG_EXIT_FAILURE 1 #define TODO_REG_TYPE (0x0001u) #define TODO_REG_SIZE (0x0002u) #define TODO_REG_DATA (0x0004u) #define TODO_REG_COMPARE (0x0008u) -#define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) -static BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) +BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) { STARTUPINFOA si = {sizeof(STARTUPINFOA)}; PROCESS_INFORMATION pi; @@ -86,8 +79,7 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, } } -#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) -static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) +void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) { LONG err; @@ -105,8 +97,7 @@ static void open_key_(unsigned line, const HKEY base, const char *path, const DW lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", err); } -#define close_key(k) close_key_(__LINE__,k) -static void close_key_(unsigned line, HKEY hkey) +void close_key_(unsigned line, HKEY hkey) { LONG err; @@ -114,8 +105,7 @@ static void close_key_(unsigned line, HKEY hkey) lok(err == ERROR_SUCCESS, "RegCloseKey failed: %d\n", err); } -#define verify_key(k,s) verify_key_(__LINE__,k,s) -static void verify_key_(unsigned line, HKEY key_base, const char *subkey) +void verify_key_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -127,8 +117,7 @@ static void verify_key_(unsigned line, HKEY key_base, const char *subkey) RegCloseKey(hkey); } -#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) -static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) +void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -141,8 +130,7 @@ static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subke RegCloseKey(hkey); } -#define add_key(k,p,s) add_key_(__LINE__,k,p,s) -static void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) +void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) { LONG err; @@ -163,7 +151,7 @@ static void delete_key_(unsigned line, const HKEY hkey, const char *path) } } -static LONG delete_tree(const HKEY key, const char *subkey) +LONG delete_tree(const HKEY key, const char *subkey) { HKEY hkey; LONG ret; @@ -205,9 +193,7 @@ cleanup: return ret; } -#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) -static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, - const void *data, size_t size) +void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size) { LONG err; @@ -631,97 +617,6 @@ static void test_add(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE); } -static void test_delete(void) -{ - HKEY hkey, hsubkey; - DWORD r; - const DWORD deadbeef = 0xdeadbeef; - - delete_tree(HKEY_CURRENT_USER, KEY_BASE); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - - run_reg_exe("reg delete", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete /?", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg delete /h", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg delete -H", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - /* Multiple /v* switches */ - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - /* No /v argument */ - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - /* Create a test key */ - add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); - add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); - add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); - add_value(hkey, NULL, REG_DWORD, &deadbeef, sizeof(deadbeef)); - - add_key(hkey, "subkey", &hsubkey); - close_key(hsubkey); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "bar"); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, ""); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "foo"); - verify_key(hkey, "subkey"); - - /* Test forward and back slashes */ - add_key(hkey, "https://winehq.org", &hsubkey); - close_key(hsubkey); - add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); - add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); - - run_reg_exe("reg delete HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_key_nonexist(hkey, "https://winehq.org"); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v count/up /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "count/up"); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg_nonexist(hkey, "\\foo\\bar"); - - close_key(hkey); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); -} - static void test_query(void) { DWORD r; @@ -4851,13 +4746,13 @@ static void test_copy(void) START_TEST(reg) { DWORD r; + if (!run_reg_exe("reg.exe /?", &r)) { win_skip("reg.exe not available, skipping reg.exe tests\n"); return; } test_add(); - test_delete(); test_query(); test_import(); test_unicode_import(); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h new file mode 100644 index 00000000000..78d1098499a --- /dev/null +++ b/programs/reg/tests/reg_test.h @@ -0,0 +1,56 @@ +/* + * Copyright 2021 Hugh McMaster + * + * 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 + */ + +#ifndef __REG_TEST_H__ +#define __REG_TEST_H__ + +#include <stdio.h> +#include <windows.h> +#include "wine/test.h" + +/* Common #defines */ +#define KEY_WINE "Software\\Wine" +#define KEY_BASE KEY_WINE "\\reg_test" +#define REG_EXIT_SUCCESS 0 +#define REG_EXIT_FAILURE 1 + +/* Helper functions */ +#define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) +BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc); + +#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) +void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value); + +#define close_key(k) close_key_(__LINE__,k) +void close_key_(unsigned line, HKEY hkey); + +#define verify_key(k,s) verify_key_(__LINE__,k,s) +void verify_key_(unsigned line, HKEY key_base, const char *subkey); + +#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) +void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey); + +#define add_key(k,p,s) add_key_(__LINE__,k,p,s) +void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey); + +LONG delete_tree(const HKEY key, const char *subkey); + +#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) +void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size); + +#endif /* __REG_TEST_H__ */ -- 2.30.1

3 16

[PATCH] dwrite/layout: Implement axis values property for the format object.
by Nikolay Sivov 01 Mar '21

01 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 79 +++++++++++++++++++++++++++++++------- dlls/dwrite/tests/layout.c | 38 ++++++++++++++++-- include/dwrite_3.idl | 2 +- 3 files changed, 100 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 38be4eeb2da..99048b97a3c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -62,6 +62,9 @@ struct dwrite_textformat_data IDWriteFontCollection *collection; IDWriteFontFallback *fallback; + + DWRITE_FONT_AXIS_VALUE *axis_values; + unsigned int axis_values_count; }; enum layout_range_attr_kind { @@ -328,6 +331,7 @@ static void release_format_data(struct dwrite_textformat_data *data) if (data->trimmingsign) IDWriteInlineObject_Release(data->trimmingsign); heap_free(data->family_name); heap_free(data->locale); + heap_free(data->axis_values); } static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout4(IDWriteTextLayout4 *iface) @@ -465,6 +469,41 @@ static inline HRESULT format_set_linespacing(struct dwrite_textformat_data *form return S_OK; } +static HRESULT format_set_font_axisvalues(struct dwrite_textformat_data *format, + DWRITE_FONT_AXIS_VALUE const *axis_values, unsigned int num_values) +{ + heap_free(format->axis_values); + format->axis_values = NULL; + format->axis_values_count = 0; + + if (num_values) + { + if (!(format->axis_values = heap_calloc(num_values, sizeof(*axis_values)))) + return E_OUTOFMEMORY; + memcpy(format->axis_values, axis_values, num_values * sizeof(*axis_values)); + format->axis_values_count = num_values; + } + + return S_OK; +} + +static HRESULT format_get_font_axisvalues(struct dwrite_textformat_data *format, + DWRITE_FONT_AXIS_VALUE *axis_values, unsigned int num_values) +{ + if (!format->axis_values_count) + { + if (num_values) memset(axis_values, 0, num_values * sizeof(*axis_values)); + return S_OK; + } + + if (num_values < format->axis_values_count) + return E_NOT_SUFFICIENT_BUFFER; + + memcpy(axis_values, format->axis_values, min(num_values, format->axis_values_count) * sizeof(*axis_values)); + + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -4922,24 +4961,30 @@ static HRESULT WINAPI dwritetextformat2_layout_GetLineSpacing(IDWriteTextFormat3 static HRESULT WINAPI dwritetextformat3_layout_SetFontAxisValues(IDWriteTextFormat3 *iface, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_set_font_axisvalues(&layout->format, axis_values, num_values); } static UINT32 WINAPI dwritetextformat3_layout_GetFontAxisValueCount(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return 0; + TRACE("%p.\n", iface); + + return layout->format.axis_values_count; } static HRESULT WINAPI dwritetextformat3_layout_GetFontAxisValues(IDWriteTextFormat3 *iface, - DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_get_font_axisvalues(&layout->format, axis_values, num_values); } static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_layout_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) @@ -6042,24 +6087,30 @@ static HRESULT WINAPI dwritetextformat2_GetLineSpacing(IDWriteTextFormat3 *iface static HRESULT WINAPI dwritetextformat3_SetFontAxisValues(IDWriteTextFormat3 *iface, DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_set_font_axisvalues(&format->format, axis_values, num_values); } static UINT32 WINAPI dwritetextformat3_GetFontAxisValueCount(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return 0; + TRACE("%p.\n", iface); + + return format->format.axis_values_count; } static HRESULT WINAPI dwritetextformat3_GetFontAxisValues(IDWriteTextFormat3 *iface, - DWRITE_FONT_AXIS_VALUE const *axis_values, UINT32 num_values) + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values) { - FIXME("%p, %p, %u.\n", iface, axis_values, num_values); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, num_values); + + return format_get_font_axisvalues(&format->format, axis_values, num_values); } static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43e62a39956..cc4079faa14 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5894,7 +5894,7 @@ static void test_text_format_axes(void) { IDWriteFontCollection *collection; IDWriteFontCollection2 *collection2; - DWRITE_FONT_AXIS_VALUE axis; + DWRITE_FONT_AXIS_VALUE axes[2]; IDWriteTextFormat3 *format3; DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; @@ -5944,9 +5944,9 @@ if (SUCCEEDED(hr)) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "Unexpected font weight %d.\n", weight); /* Regular properties are not set from axis values. */ - axis.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; - axis.value = 200.0f; - hr = IDWriteTextFormat3_SetFontAxisValues(format3, &axis, 1); + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axes[0].value = 200.0f; + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 1); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); weight = IDWriteTextFormat3_GetFontWeight(format3); @@ -5965,6 +5965,36 @@ if (SUCCEEDED(hr)) count = IDWriteTextFormat3_GetFontAxisValueCount(format3); ok(!count, "Unexpected axis count %u.\n", count); + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(axes[0].axisTag == 0 && axes[0].value == 0.0f, "Unexpected value.\n"); + + axes[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axes[0].value = 200.0f; + axes[1].axisTag = DWRITE_FONT_AXIS_TAG_WIDTH; + axes[1].value = 2.0f; + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(count == 2, "Unexpected axis count %u.\n", count); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 1); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_GetFontAxisValues(format3, axes, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_SetFontAxisValues(format3, axes, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteTextFormat3_GetFontAxisValueCount(format3); + ok(!count, "Unexpected axis count %u.\n", count); + IDWriteTextFormat3_Release(format3); IDWriteTextFormat_Release(format); diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 1b10454ec60..0db2de71cf1 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -562,7 +562,7 @@ interface IDWriteTextFormat3 : IDWriteTextFormat2 UINT32 num_values); UINT32 GetFontAxisValueCount(); HRESULT GetFontAxisValues( - DWRITE_FONT_AXIS_VALUE const *axis_values, + DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 num_values); DWRITE_AUTOMATIC_FONT_AXES GetAutomaticFontAxes(); HRESULT SetAutomaticFontAxes(DWRITE_AUTOMATIC_FONT_AXES axes); -- 2.30.1

1 0