April 2021 - Wine-commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 22a7059f985387d44502de828e52f8f8f0e835d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22a7059f985387d44502de82… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 28 11:59:49 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index a85dbe0e19d..828aaff52fa 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-21 09:19+0300\n" +"PO-Revision-Date: 2021-04-28 11:59+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3974,10 +3974,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Negalima modifikuoti nerašomos savybės „|“" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "„[objektas]“ nėra datos objektas" +msgstr "„Šis“ nėra atvaizdžio objektas" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value"

1 0

Hugh McMaster : reg: Consistently use 'hkey' for HKEY variables.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: c809f9462455ffb0e03a9ae4057f0cd47c85ee5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c809f9462455ffb0e03a9ae4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:28 2021 +1000 reg: Consistently use 'hkey' for HKEY variables. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 18 +++++++++--------- programs/reg/delete.c | 16 ++++++++-------- programs/reg/export.c | 8 ++++---- programs/reg/query.c | 26 +++++++++++++------------- 4 files changed, 34 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c809f9462455ffb0e03a…

1 0

Hugh McMaster : reg: Do not print a line break after querying a registry key.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: f32816268ed5715c5bce20daf9bb20aa194a7127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f32816268ed5715c5bce20da… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:29 2021 +1000 reg: Do not print a line break after querying a registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 4 ---- programs/reg/tests/query.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 6485d36db6f..efcd16f8ad5 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -287,10 +287,6 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) } free(subkey_name); - - if (i && !recurse) - output_string(newlineW); - return 0; } diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 34196c77aa4..a8720da8da1 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -225,7 +225,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test3, FALSE, TODO_REG_COMPARE); + compare_query(buf, test3, FALSE, 0); add_value(subkey, "Test3", REG_SZ, "Some string data", 16); dword = 0xabc;

1 0

Hugh McMaster : reg: Only print the name of the registry key if it contains values or we are recursing.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: ec0a799ea8884479d7b56b81fb9fdd106f1a751b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0a799ea8884479d7b56b81… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:30 2021 +1000 reg: Only print the name of the registry key if it contains values or we are recursing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 14 ++++++++++---- programs/reg/tests/query.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index efcd16f8ad5..4af6c7f5449 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -210,9 +210,10 @@ static int query_value(HKEY hkey, WCHAR *value_name, WCHAR *path, BOOL recurse) return 0; } -static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) +static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) { LONG rc; + DWORD num_values; DWORD max_value_len = 256, value_len; DWORD max_data_bytes = 2048, data_size; DWORD subkey_len; @@ -221,7 +222,12 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) BYTE *data; HKEY subkey; - output_string(L"%1\n", path); + rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, + &num_values, NULL, NULL, NULL, NULL); + if (rc) return 1; + + if (num_values || recursing) + output_string(L"%1\n", path); value_name = malloc(max_value_len * sizeof(WCHAR)); data = malloc(max_data_bytes); @@ -275,7 +281,7 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ, &subkey)) { - query_all(subkey, subkey_path, recurse); + query_all(subkey, subkey_path, recurse, TRUE); RegCloseKey(subkey); } free(subkey_path); @@ -311,7 +317,7 @@ static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, output_message(STRING_MATCHES_FOUND, num_values_found); } else - ret = query_all(hkey, key_name, recurse); + ret = query_all(hkey, key_name, recurse, FALSE); RegCloseKey(hkey); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index a8720da8da1..4ccbab58cb8 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -282,7 +282,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test8a, FALSE, TODO_REG_COMPARE); + compare_query(buf, test8a, FALSE, 0); read_reg_output("reg query HKCU\\" KEY_BASE " /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg: Print a new line when recursing and the current key has no registry values.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 35ccb87a767394ea3054c8890ad7b245e431290d URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ccb87a767394ea3054c889… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:31 2021 +1000 reg: Print a new line when recursing and the current key has no registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 2 +- programs/reg/tests/query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 4af6c7f5449..66e54548688 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -262,7 +262,7 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) free(data); free(value_name); - if (i || recurse) + if (i || recursing) output_string(newlineW); subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 4ccbab58cb8..76186794f5e 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -286,7 +286,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE " /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test8b, FALSE, TODO_REG_COMPARE); + compare_query(buf, test8b, FALSE, 0); delete_tree(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Alexandre Julliard : packaging: Add Ubuntu 21.04.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: tools Branch: master Commit: 4b729b58c9913c568cd0900b4fc9d41d3cf97644 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4b729b58c9913c568cd0900… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 22:14:36 2021 +0200 packaging: Add Ubuntu 21.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 3 ++- packaging/obs/rsync-filter | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 299a524..4f8757b 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,4 +34,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index d7405f1..4ab9f4b 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="32 33 buster bullseye bionic focal groovy" +distros="32 33 buster bullseye bionic focal groovy hirsute" dry_run= while [ $# -ge 1 ] @@ -221,6 +221,7 @@ do bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; focal) add_deb ubuntu focal xUbuntu_20.04 ;; groovy) add_deb ubuntu groovy xUbuntu_20.10 ;; + hirsute) add_deb ubuntu hirsute xUbuntu_21.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index b9eec32..823558e 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -17,6 +17,7 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/groovy ++ /ubuntu/dists/hirsute - /ubuntu/dists/* - /ubuntu/*

1 0

Francois Gouget : winetest/build-index: Link the test unit pages to the failure patterns.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: tools Branch: master Commit: 940756efbf128034638e41e4b14e1842ab0c6012 URL: https://source.winehq.org/git/tools.git/?a=commit;h=940756efbf128034638e41e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:20:45 2021 +0200 winetest/build-index: Link the test unit pages to the failure patterns. Only for the test units that have failures in any of the buids / platforms since there is no pattern in case of success. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index 7eacb87..6a3356a 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -259,6 +259,7 @@ foreach my $build (@too_old) # my %alltests = (); +my %haspattern = (); foreach my $build (@builds) { @@ -268,6 +269,10 @@ foreach my $build (@builds) chomp; my ($test, $group, $cell) = split / +/, $_, 3; $alltests{$test}->{$build->{name}}->{$group} = $cell; + if (!$haspattern{$test} and $cell =~ /result (?:fail|mixed)/) + { + $haspattern{$test} = 1; + } } close SUM; } @@ -294,6 +299,8 @@ foreach my $test (keys %alltests) { my $filename = "data/tests/$test.html"; open OUT, ">", "$filename.new" or die "could not open '$filename.new' for writing: $!"; + + my $title_link = $haspattern{$test} ? " | <a href=\"/data/patterns.html#$test\">failure patterns</a>" : ""; print OUT <<EOF; <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> @@ -312,7 +319,7 @@ EOF | <a href="..">index</a> </div> <div class="main"> -<h2>$test test runs</h2> +<h2>$test test runs$title_link</h2> <table class="report"> <thead> <tr><th class="test">Build</th><th class="test">Date</th>

1 0

Francois Gouget : winetest/build-patterns: Use color gradients for the failures.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: tools Branch: master Commit: fb6a47743a4fed412f88318b7a1e24d7d9e11944 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb6a47743a4fed412f88318… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:25:30 2021 +0200 winetest/build-patterns: Use color gradients for the failures. This makes it possible to identify when the failure count changes, such as when a patch adds two new failures to a test that already had five, or when the failure count depending on the test configuration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 116 ++++++++++++++++++++++++++++++++++++++---------- winetest/report.css | 4 +- 2 files changed, 93 insertions(+), 27 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index f470c26..9dc2581 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -247,6 +247,9 @@ my %reports; # - name # The uniquely identifying test name in the form 'module:unit'. # +# - colors +# A hashtable of colors indexed by failure count. +# # - testreports # A hashtable mapping report directory names to objects storing the results # for that test and report combination. Each testreport object has the @@ -421,44 +424,101 @@ foreach my $testname (keys %tests) } +# +# Compute color gradients +# + +sub color2html($) +{ + my ($c) = @_; + return sprintf "#%02x%02x%02x", $c->[0], $c->[1], $c->[2]; +} + +sub blend($$$) +{ + my ($p, $start, $end) = @_; + my $r = [int($start->[0] * (1 - $p) + $end->[0] * $p + 0.5), + int($start->[1] * (1 - $p) + $end->[1] * $p + 0.5), + int($start->[2] * (1 - $p) + $end->[2] * $p + 0.5)]; + return $r; +} + +my @keycolors = ([0, 255, 255], # cyan + [0, 255, 0], # green + [255, 255, 0], # yellow + [255, 0, 0], # red +); + +# Use colors to differentiate the set values. Each unique value is assigned +# a color (in HTML format) picked along a series of gradients passing by the +# colors defined in @keycolors. +sub compute_set_colors($) +{ + my ($set) = @_; + my @values = sort { $a <=> $b } keys %$set; + my $count = @values; + if ($count == 1) + { + $set->{$values[0]} = color2html($keycolors[0]); + } + else + { + my $k = 0; + my ($start, $end) = (-1, 0); + for (0..$count-1) + { + while (!$end or $_ > $end) + { + $k++; + $start = $end; + $end = ($count-1) * $k / (@keycolors-1); + } + $set->{$values[$_]} = color2html(blend(($_-$start)/($end-$start), + $keycolors[$k-1], + $keycolors[$k])); + } + } +} + + # # Write the failure patterns page for the given set of reports # my %status2html = ( # Dll information status values - # <status> => [ <symbol>, <class-char>, <title>, <link> ] - "missing" => ["n", "n", "not run for an unknown reason", "report"], - "missingdll" => ["m", "m", "missing dll", "version"], - "missingentrypoint" => ["e", "e", "missing entry point", "version"], - "missingordinal" => ["o", "o", "missing ordinal", "version"], - "missingsxs" => ["v", "v", "missing side-by-side dll version", "version"], - "stub" => ["u", "u", "stub Windows dll", "version"], - "native" => ["N", "N", "native Windows dll", "version"], - "loaderror258" => ["I", "I", "timed out while getting the test list", "version"], + # <status> => [ <symbol>, <class-char>, <title>, <link>, <attrs> ] + "missing" => ["n", "n", "not run for an unknown reason", "report", ""], + "missingdll" => ["m", "m", "missing dll", "version", ""], + "missingentrypoint" => ["e", "e", "missing entry point", "version", ""], + "missingordinal" => ["o", "o", "missing ordinal", "version", ""], + "missingsxs" => ["v", "v", "missing side-by-side dll version", "version", ""], + "stub" => ["u", "u", "stub Windows dll", "version", ""], + "native" => ["N", "N", "native Windows dll", "version", ""], + "loaderror258" => ["I", "I", "timed out while getting the test list", "version", ""], # Other status values - "skipped" => ["-", "s", "skipped by user request", ""], - "crash" => ["C", "C", "crash", "t"], - "258" => ["T", "T", "timeout", "t"], + "skipped" => ["-", "s", "skipped by user request", "", ""], + "crash" => ["C", "C", "crash", "t", ""], + "258" => ["T", "T", "timeout", "t", ""], ); -# Returns a tuple containing the symbol, CSS class, title and link type -# for the specified status. -sub get_status_html($) +# Returns a tuple containing the symbol, CSS class, title, link type and +# HTML attributes for the specified status. +sub get_status_html($$) { - my ($status) = @_; + my ($status, $failcolors) = @_; return @{$status2html{$status}} if ($status2html{$status}); if ($status =~ /^[0-9]+$/) { - return ("F", "F", "$status failures", "t"); + return ("F", "F", "$status failures", "t", " style='background-color: $failcolors->{$status}'"); } if ($status =~ /^loaderror(.*)$/) { - return ("L", "L", "got error $1 while getting the test list", "version"); + return ("L", "L", "got error $1 while getting the test list", "version", ""); } - return ("?", "", "unknown status $status", "report"); + return ("?", "", "unknown status $status", "report", ""); } sub write_patterns_list($$) @@ -481,6 +541,8 @@ sub write_patterns_list($$) print $html "</div></div>\n"; + compute_set_colors($test->{colors}); + print $html "<div class='test'>\n"; foreach my $reportdir (@sortedreports) { @@ -519,7 +581,7 @@ sub write_patterns_list($$) } else { - ($symbol, $class, $title, my $link) = get_status_html($status); + ($symbol, $class, $title, my $link, $attrs) = get_status_html($status, $test->{colors}); if ($link eq "t") { $tag = "a"; @@ -606,17 +668,23 @@ EOF # Build a list of test units that will appear on this page so we can # link them to each other. my $testnames = []; - unit: foreach my $testname (sort keys %tests) + foreach my $testname (sort keys %tests) { my $test = $tests{$testname}; + my $addtest; foreach my $testreport (values %{$test->{testreports}}) { - if ($testreport->{failed}) + next if (!$testreport->{failed}); + $addtest = 1; + + foreach my $status (values %{$testreport->{status}}) { - push @$testnames, $testname; - next unit; + next if ($status !~ /^[0-9]+$/); + next if ($status eq "258"); # timeouts have their own color + $test->{colors}->{$status} = undef; } } + push @$testnames, $testname if ($addtest); } print $html "<h2>$title</h2>\n"; diff --git a/winetest/report.css b/winetest/report.css index cca1ba9..2cc4663 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -89,9 +89,7 @@ div.pattern :hover { color: black; text-decoration: underline; } .patC { /* crash */ background-color: #ff5555; } -.patF { /* failure(s) */ - background-color: #ff0000; -} +/* .patF failure(s) */ /* .patn not run for an unknown reason */ /* .patm missing dll */ .pate { /* missing entrypoint */

1 0

Francois Gouget : winetest/build-patterns: Add TestBot-specific failure pattern pages.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: tools Branch: master Commit: d895deb83cefc8da6d17f7971eb7051f70de0c7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d895deb83cefc8da6d17f79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 28 11:26:18 2021 +0200 winetest/build-patterns: Add TestBot-specific failure pattern pages. One page only shows the failure patterns of the Windows TestBot machines, and another just the Wine TestBot machines. This also cleanly separates the Windows and Wine failure modes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 4 ++-- winetest/build-patterns | 48 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 6a3356a..e69ea1f 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -220,7 +220,7 @@ foreach my $build (readdir(DIR)) { if ($build !~ /^[0-9a-f]{40}$/) { - if ($build !~ /^(?:\.\.?|(?:errors|index|patterns)\.html|tests)$/) + if ($build !~ /^(?:\.\.?|(?:errors|index|patterns.*)\.html|tests)$/) { error("'data/$build' is not a valid build directory\n"); } @@ -430,7 +430,7 @@ print OUT <<"EOF"; <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> -<div class="navbar"><a href="patterns.html">failure patterns</a></div> +<div class="navbar">Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> <div class="main"> <h2>Wine test runs</h2> EOF diff --git a/winetest/build-patterns b/winetest/build-patterns index 9dc2581..e87fabc 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -168,6 +168,8 @@ Actions: Generated files: \$workdir/data/patterns.html + \$workdir/data/patterns-tb-win.html + \$workdir/data/patterns-tb-wine.html Exit: 0 - success @@ -206,7 +208,7 @@ foreach my $build (readdir(DIR)) { if ($build !~ /^[0-9a-f]{40}$/) { - if ($build !~ /^(?:\.\.?|(?:errors|index|patterns)\.html|tests)$/) + if ($build !~ /^(?:\.\.?|(?:errors|index|patterns.*)\.html|tests)$/) { error("'data/$build' is not a valid build directory\n"); } @@ -521,9 +523,9 @@ sub get_status_html($$) return ("?", "", "unknown status $status", "report", ""); } -sub write_patterns_list($$) +sub write_patterns_list($$$$) { - my ($html, $testnames) = @_; + my ($html, $pagereports, $mainpage, $testnames) = @_; for my $i (0..@$testnames-1) { @@ -532,6 +534,7 @@ sub write_patterns_list($$) print $html "<div class='testfile' id='$testname'>\n"; print $html "<div class='updownbar'><a href='tests/$testname.html'>$testname</a>"; + print $html " <small>(<a href='$mainpage#$testname'>see all results</a></small>)" if ($mainpage); print $html "<div class='ralign'>"; my $href = $i ? $testnames->[$i-1] : ""; @@ -546,6 +549,7 @@ sub write_patterns_list($$) print $html "<div class='test'>\n"; foreach my $reportdir (@sortedreports) { + next if (!$pagereports->{$reportdir}); my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); print $html "<div class='pattern'>"; @@ -644,11 +648,11 @@ sub write_patterns_list($$) } } -sub write_patterns_page($) +sub write_patterns_page($$$) { - my ($title) = (@_); + my ($pagereports, $subpage, $title) = (@_); - my $filename = "data/patterns.html"; + my $filename = "data/patterns$subpage.html"; open(my $html, ">", "$filename.new") or die "could not open '$filename.new' for writing: $!"; print $html <<"EOF"; @@ -661,7 +665,7 @@ sub write_patterns_page($) <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> -<div class="navbar"><a href="..">index</a></div> +<div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> <div class="main"> EOF @@ -672,8 +676,9 @@ EOF { my $test = $tests{$testname}; my $addtest; - foreach my $testreport (values %{$test->{testreports}}) + foreach my $reportdir (keys %$pagereports) { + my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); $addtest = 1; @@ -687,8 +692,9 @@ EOF push @$testnames, $testname if ($addtest); } + my $mainpage = $subpage ? "patterns.html" : ""; print $html "<h2>$title</h2>\n"; - write_patterns_list($html, $testnames); + write_patterns_list($html, $pagereports, $mainpage, $testnames); print $html "</div></body></html>\n"; close($html); @@ -699,6 +705,28 @@ EOF } } -write_patterns_page("Test failure patterns"); +write_patterns_page(\%reports, "", "All test patterns"); + +my %tbreports; +foreach my $report (values %reports) +{ + next if ($report->{tag} !~ /^newtb-/); # ignore non-TestBot reports + if ($report->{is_rerun}) + { + # Skip reruns because they are infrequent and thus usually do not + # meaningfully contribute to the patterns. + # They can still be checked on the 'all reports' page. + next; + } + # Windows and Wine have different failure modes so put them on separate + # pages. + my $page = ($report->{platform} =~ /^(?:linux|mac|bsd|solaris|wine)$/) ? "wine" : "win"; + $tbreports{$page}->{$report->{dir}} = 1; +} + +write_patterns_page($tbreports{win}, "-tb-win", + "Windows test patterns (TestBot only)"); +write_patterns_page($tbreports{wine}, "-tb-wine", + "Wine test patterns (TestBot only)"); exit 0;

1 0

Anton Baskanov : quartz/dsoundrender: Don't let writepos advance past playpos.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 9b30d0928285e7fd5620a0104a82233990d2bb9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b30d0928285e7fd5620a010… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 26 09:51:23 2021 +0700 quartz/dsoundrender: Don't let writepos advance past playpos. Fixes audio stuttering during video playback in multiple games (e.g. Commandos 2, Alien Nations, Dino Crisis Demo). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 5 +---- dlls/quartz/tests/dsoundrender.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 6c6732e468a..f7f0255d4ab 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -149,7 +149,6 @@ static void DSoundRender_UpdatePositions(struct dsound_render *This, DWORD *seqw static HRESULT DSoundRender_GetWritePos(struct dsound_render *This, DWORD *ret_writepos, REFERENCE_TIME write_at, DWORD *pfree, DWORD *skip) { - WAVEFORMATEX *wfx = (WAVEFORMATEX *)This->sink.pin.mt.pbFormat; DWORD writepos, min_writepos, playpos; REFERENCE_TIME max_lag = 50 * 10000; REFERENCE_TIME cur, writepos_t, delta_t; @@ -212,10 +211,8 @@ static HRESULT DSoundRender_GetWritePos(struct dsound_render *This, *ret_writepos = (min_writepos + aheadbytes) % This->buf_size; } end: - if (playpos > *ret_writepos) + if (playpos >= *ret_writepos) *pfree = playpos - *ret_writepos; - else if (playpos == *ret_writepos) - *pfree = This->buf_size - wfx->nBlockAlign; else *pfree = This->buf_size + playpos - *ret_writepos; if (time_from_pos(This, This->buf_size - *pfree) >= DSoundRenderer_Max_Fill) { diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index c33c074d93d..e591e1832d5 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -737,7 +737,7 @@ static HRESULT send_frame(IMemInputPin *sink) params->sink = sink; params->sample = sample; thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); - ret = WaitForSingleObject(thread, 500); + ret = WaitForSingleObject(thread, 2000); todo_wine_if (ret) ok(!ret, "Wait failed.\n"); GetExitCodeThread(thread, &ret); CloseHandle(thread);

1 0