wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Francois Gouget : winetest/dissect: Fix the XP, 2003 and Windows 10 platform detection.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: tools Branch: master Commit: ff48f4a56c8ba389ffe55fc5711d64d269d5e40b URL: http://source.winehq.org/git/tools.git/?a=commit;h=ff48f4a56c8ba389ffe55fc5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 29 14:31:54 2017 +0200 winetest/dissect: Fix the XP, 2003 and Windows 10 platform detection. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index f5e036b..141621e 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -224,14 +224,15 @@ my @idmatch = ( [ "nt3", 2, 3, 51, undef, 1 ], [ "2000", 2, 5, 0, undef, 1 ], [ "xp", 2, 5, 1, 1, 0 ], - [ "2003", 2, 5, 1, undef, 0 ], + [ "xp", 2, 5, 2, 1, 0 ], + [ "2003", 2, 5, 2, undef, 0 ], [ "vista", 2, 6, 0, 1, 0 ], [ "2008", 2, 6, 0, 3, 0 ], [ "win7", 2, 6, 1, 1, 0 ], [ "2008", 2, 6, 1, 3, 0 ], [ "win8", 2, 6, 2, undef, 0 ], [ "win8", 2, 6, 3, undef, 0 ], - [ "win10", 2, 10, 1, undef, 0 ], + [ "win10", 2, 10, 0, 1, 0 ], # [ "ce", 3, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, 1 ],

1 0

Francois Gouget : winetest/dissect: Make it possible to update the web pages.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: tools Branch: master Commit: 2a554666c4903e3060fba3d5df15a33a7b9987f9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a554666c4903e3060fba3d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 29 00:37:19 2017 +0200 winetest/dissect: Make it possible to update the web pages. This makes it possible to refresh the website after upgrading the script with a command such as: find data -name report -exec dissect --update {} \; winetest.cron Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 61 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 40b1462..f5e036b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -96,19 +96,22 @@ use File::Temp qw/tempdir/; use Errno qw/ENOTEMPTY/; -my ($report, $tmpdir, $tag); +my ($update, $tmpdir, $tag); -sub mydie(@) { - my $errdir = tempdir ("errXXXXX", DIR => $queuedir); - if (!rename $tmpdir, $errdir) { - print STDERR "$name0:error: unable to rename '$tmpdir' to '$errdir': $!\n"; - exit 3; - } +sub mydie(@) +{ my $label = $tag ? $tag : "<notag>"; - if (open ERR, ">$errdir/error") - { - print ERR "$label: ", @_; - close ERR; + if (!$update) { + my $errdir = tempdir ("errXXXXX", DIR => $queuedir); + if (!rename $tmpdir, $errdir) { + print STDERR "$name0:error: unable to rename '$tmpdir' to '$errdir': $!\n"; + exit 3; + } + if (open ERR, ">$errdir/error") + { + print ERR "$label: ", @_; + close ERR; + } } print STDERR "$name0:error:$label: ", @_; exit 1; @@ -124,8 +127,14 @@ sub create_box($$$) return $box; } -($report, undef) = glob "$queuedir/rep*/report"; -exit 2 unless defined $report; +my $report; +if (defined $ARGV[0] and $ARGV[0] eq "--update") { + $report = $ARGV[1]; + $update = 1; +} else { + ($report, undef) = glob "$queuedir/rep*/report"; +} +exit 2 unless (defined $report && -f $report); ($tmpdir = $report) =~ s|^(.+)/report$|$1|; @@ -472,20 +481,22 @@ for (my $i = 0; $i <= $#boxes; $i++) } my $builddir = "$datadir/$testbuild"; -foreach ($datadir, $builddir) { - if (!(-d $_ || mkdir $_)) { - print STDERR "$name0:error: unable to create the '$_' directory: $!\n"; - exit 3; +if (!$update) { + foreach my $dir ($datadir, $builddir) { + if (!-d $dir && !mkdir $dir) { + print STDERR "$name0:error: unable to create the '$dir' directory: $!\n"; + exit 3; + } } -} -my ($dir, $dirbase, $try); -$dir = $dirbase = "$builddir/${version}_$tag"; -$try = 0; -while (!rename $tmpdir, $dir) { - $!{ENOTEMPTY} or mydie "unable to rename '$tmpdir' to '$dir': $!\n"; - ++$try < $maxmult or mydie "more than $maxmult submissions for $dirbase\n"; - $dir = "${dirbase}_$try"; + my ($dir, $dirbase, $try); + $dir = $dirbase = "$builddir/${version}_$tag"; + $try = 0; + while (!rename $tmpdir, $dir) { + $!{ENOTEMPTY} or mydie "unable to rename '$tmpdir' to '$dir': $!\n"; + ++$try < $maxmult or mydie "more than $maxmult submissions for $dirbase\n"; + $dir = "${dirbase}_$try"; + } } if (!-e "$builddir/outdated") { if (!open SIGN, ">$builddir/outdated") {

1 0

Francois Gouget : winetest/dissect: Use more informative titles for the report pages.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: tools Branch: master Commit: e39a5e4dbf94c7bd37a2fde50c509050c4a75734 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e39a5e4dbf94c7bd37a2fde5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 29 00:39:23 2017 +0200 winetest/dissect: Use more informative titles for the report pages. So far opening multiple pages would result in a bunch of brower tabs all called 'Wine test run report', making it hard to keep track of which is which. Now they will have the short date, test unit if appropriate, and report tag. So no matter if you try to figure out when the output of a specific test changed, or want to compare the results of a given test on multiple machines, or simply work on a few tests at once, you'll know which tab contains the data you need. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 3082d9d..40b1462 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -60,10 +60,41 @@ my $minimum_report_version=4; my $summary_version=4; +$ENV{GIT_DIR} = $gitdir; + +sub get_build_info($) +{ + my ($build) = @_; + my ($date, $subject); + + my $commit = `git log --max-count=1 --pretty="format:%ct %s" "$build^0" 2>/dev/null` if ($build =~ /^[0-9a-f]{40}$/); + if ($commit && $commit =~ /^(\d+) (.*)$/) + { + ($date, $subject) = ($1, $2); + # Make sure the directory's mtime matches the commit time + utime $date, $date, "$datadir/$build"; + } + else + { + $date = (stat "$datadir/$build")[9]; + $subject = ""; + } + return ($date, $subject); +} + +use POSIX qw(locale_h strftime); +setlocale(LC_ALL, "C"); + +sub short_date($) +{ + my ($date) = @_; + return strftime("%b %d", gmtime($date)); +} + + use File::Temp qw/tempdir/; use Errno qw/ENOTEMPTY/; -$ENV{GIT_DIR} = $gitdir; my ($report, $tmpdir, $tag); @@ -119,6 +150,10 @@ $testbuild eq $commit or mydie "not an existing commit $testbuild\n"; my $shortbuild = substr($testbuild,0,12); my $archive = "winetest-$shortbuild.exe"; +my ($date, $_subject) = get_build_info($testbuild); +my $short_date = short_date($date); + + $_ = <IN>; if (/^Archive: /) { $_ = <IN>; } # ignore Archive header @@ -127,7 +162,7 @@ $tag = $1; $_ = <IN>; /^Build info:\r?$/ or mydie "no Build info header: $_"; -my $box = create_box( "version", "version", "Version information for $tag" ); +my $box = create_box( "version", "version", "$tag $short_date information" ); $box->{data} .= "<h2>Build version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; $box->{data} .= "<tr><td>Build</td><td><a title=\"$testbuild\" href=\"$gitweb/?a=shortlog;h=$testbuild\">$shortbuild</a></td></tr>\n"; @@ -397,7 +432,7 @@ for (my $i = 0; $i <= $#boxes; $i++) open REPORT, ">$tmpdir/report.html" or mydie "unable to open '$tmpdir/report.html' for writing: $!\n"; -print REPORT start_html( -title => "Wine test run report", -style => {src=>"/report.css"} ); +print REPORT start_html( -title => "$short_date $tag report", -style => {src=>"/report.css"} ); print REPORT "<div class=\"navbar\">"; print REPORT "<a href=\"report\">raw report</a> | <a href=\"..\">summary</a> | <a href=\"../..\">index</a>"; printf REPORT " | <a href=\"/builds/%s\">test binary</a>", escapeHTML($archive) if $archive; @@ -420,7 +455,7 @@ close REPORT or mydie "error writing to '$tmpdir/report.html': $!\n"; for (my $i = 0; $i <= $#boxes; $i++) { open FILE, ">$tmpdir/$boxes[$i]->{id}.html" or mydie "unable to open '$tmpdir/$boxes[$i]->{id}.html' for writing: $!\n"; - print FILE start_html( -title => "Wine test run report", -style => {src=>"/report.css"} ); + print FILE start_html( -title => "$short_date $boxes[$i]->{id} $tag", -style => {src=>"/report.css"} ); print FILE "<div class=\"navbar\">"; print FILE $boxes[$i]->{prev} ? "<a href=\"./$boxes[$i]->{prev}.html\">prev</a> | " : "prev | "; print FILE $boxes[$i]->{next} ? "<a href=\"./$boxes[$i]->{next}.html\">next</a> | " : "next | ";

1 0

Francois Gouget : winetest/gather: Move the build index legend to where it is printed.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: tools Branch: master Commit: 0dee7be42351ada7a70aceab834bbfbfe00d5099 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0dee7be42351ada7a70aceab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 29 00:37:36 2017 +0200 winetest/gather: Move the build index legend to where it is printed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/winetest/gather b/winetest/gather index 26bc612..7e26a43 100755 --- a/winetest/gather +++ b/winetest/gather @@ -455,16 +455,6 @@ my $header_footer=build_header_footer(\@groups); my $short_build = substr($build,0,12); my $short_date = short_date($date); -my $legend = -"<div class=\"legend\"> -<h3>Legend</h3> -<p class=\"legend\">All tests <span class=\"result pass\">pass</span> in all reports.</p> -<p class=\"legend\">Some tests <span class=\"result mixed\">fail</span> in some reports.</p> -<p class=\"legend\">Some tests <span class=\"result fail\">fail</span> in all reports.</p> -<p class=\"legend\">This <span class=\"result pass also-skip\">border</span> signals that some tests are skipped.</p> -<p class=\"legend\">This <span class=\"result mixed also-todo\">border</span> and this <span class=\"result todo\">background</span> signal that the implementation needs some work.</p> -</div>"; - sub min_to_max($) { my ($minmax)=@_; @@ -736,7 +726,14 @@ EOF </tbody> </table> </div> -$legend +<div class="legend"> +<h3>Legend</h3> +<p class="legend">All tests <span class="result pass">pass</span> in all reports.</p> +<p class="legend">Some tests <span class="result mixed">fail</span> in some reports.</p> +<p class="legend">Some tests <span class="result fail">fail</span> in all reports.</p> +<p class="legend">This <span class="result pass also-skip">border</span> signals that some tests are skipped.</p> +<p class="legend">This <span class="result mixed also-todo">border</span> and this <span class="result todo">background</span> signal that the implementation needs some work.</p> +</div> <div class="navbar"> To run the tests on your Windows machine, download the <a href="/builds/winetest-$short_build.exe">32-bit winetest</a>. If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-$short_build.exe">64-bit winetest</a>.

1 0

Francois Gouget : winetest/gather: Show the short date in the index titles and headers.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: tools Branch: master Commit: 24b1fef48314cc526b20f8f08ab077aa27b16800 URL: http://source.winehq.org/git/tools.git/?a=commit;h=24b1fef48314cc526b20f8f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 29 00:38:40 2017 +0200 winetest/gather: Show the short date in the index titles and headers. Since there is only one build per day, using the short date is just as unique while being more readable and shorter. It has the additional advantage of being ordered unlike the build id (*) which makes the browser tab names more meaningful. The build id is still shown in the page header in addition to the short date since there is more space there and it is used for linking to other pages. (*) 'Mar 15' is clearly older than 'Mar 17' whereas no such determination can be made from '6a05069a' and 'c3b108e5' alone. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/winetest/gather b/winetest/gather index a0cb9b7..26bc612 100755 --- a/winetest/gather +++ b/winetest/gather @@ -45,7 +45,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$datadir $gitweb/; +use vars qw/$datadir $gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -55,6 +55,38 @@ $name0 =~ s+^.*/++; my $summary_version=4; +$ENV{GIT_DIR} = $gitdir; + +sub get_build_info($) +{ + my ($build) = @_; + my ($date, $subject); + + my $commit = `git log --max-count=1 --pretty="format:%ct %s" "$build^0" 2>/dev/null` if ($build =~ /^[0-9a-f]{40}$/); + if ($commit && $commit =~ /^(\d+) (.*)$/) + { + ($date, $subject) = ($1, $2); + # Make sure the directory's mtime matches the commit time + utime $date, $date, "$datadir/$build"; + } + else + { + $date = (stat "$datadir/$build")[9]; + $subject = ""; + } + return ($date, $subject); +} + +use POSIX qw(locale_h strftime); +setlocale(LC_ALL, "C"); + +sub short_date($) +{ + my ($date) = @_; + return strftime("%b %d", gmtime($date)); +} + + # A test name is of the form 'dll:unit' where: # dll Is the dll being tested. # unit Is a unit test composed of multiple individual checks testing @@ -131,6 +163,7 @@ my ($outdated,undef) = glob "$datadir/*/outdated"; exit 2 unless defined $outdated; (my $build = $outdated) =~ s|^\Q$datadir\E/(.*)/outdated$|$1|; (my $release = $build) =~ s/^(\d+).*$/$1/; +my ($date, $_subject) = get_build_info($build); # Read in the data @@ -420,6 +453,7 @@ EOF my $header_footer=build_header_footer(\@groups); my $short_build = substr($build,0,12); +my $short_date = short_date($date); my $legend = "<div class=\"legend\"> @@ -616,14 +650,14 @@ sub output_table($) { $group_name = $group->{name}; $header_footer = build_header_footer($group->{reports}); - $title = "$group_name results for build $short_build"; + $title = "$short_date: $group_name results"; $filename = "index_$group_name.html"; } else { $group_name = "global"; $header_footer = build_header_footer(\@groups); - $title = "Summary for build $short_build"; + $title = "$short_date: Summary"; $filename = "index.html"; } @@ -657,7 +691,7 @@ EOF print OUT " | <a href=\"..\">index</a>\n"; print OUT "</div>\n"; print OUT "<div class=\"group\">\n"; - print OUT "<h1>$group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; + print OUT "<h1>$short_date: $group_name results for build <a href=\".\" title=\"$build\">$short_build</a></h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; } else @@ -668,7 +702,7 @@ EOF print OUT " | <a href=\"..\">index</a>"; print OUT "</div>\n"; print OUT "<div class=\"main\">\n"; - print OUT "<h1>Main summary for build $short_build</h1>\n"; + print OUT "<h1>$short_date: Summary for build $short_build</h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody>\n"; }

1 0

Francois Gouget : winetest/gather: Remove support for the 'winetest crash' case.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: tools Branch: master Commit: ac431db6c41326b865e51e20fe88ab9a9655573f URL: http://source.winehq.org/git/tools.git/?a=commit;h=ac431db6c41326b865e51e20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 29 00:36:28 2017 +0200 winetest/gather: Remove support for the 'winetest crash' case. dissect has no support for writing this type of status in the summary.txt files. Also if WineTest does crash one would likely have to manually submit the results (i.e. it's unlikely to happen). And most importantly a lot of test results would be missing which, based on the current policy, means the whole report is and should be rejected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/winetest/gather b/winetest/gather index cf4423a..a0cb9b7 100755 --- a/winetest/gather +++ b/winetest/gather @@ -79,8 +79,6 @@ my $summary_version=4; # dir The directory containing the report data (log files, etc). # group A reference to the group the report belongs to. # dllmissing A hash of the missing dlls for that system. -# winetestcrash The name of the last test that was run before winetest -# crashed. # filelimit The name of the last test that was run before the report file # size limit was reached. # <testname> Maps the test names to a structure containing the individual @@ -179,10 +177,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $alltests{$testname} = $source; if ($count eq "failed") { - if ($todos eq "crash") { - $report->{$testname} = { status => "winetest crash" }; - $report->{winetestcrash} = $testname; - } elsif ($todos eq "filelimit") { + if ($todos eq "filelimit") { $report->{$testname} = { status => "file limit" }; $report->{filelimit} = $testname; } else { @@ -265,7 +260,6 @@ foreach my $group (@groups) { foreach my $report (@{$group->{reports}}) { if (!exists $report->{$testname}) { my ($dll, $unit) = split(/:/, $testname); - my $crash = $report->{winetestcrash}; my $filelimit = $report->{filelimit}; if (exists $report->{dllmissing}->{$dll}) { # Mark this test as missing because of a missing dll @@ -273,9 +267,6 @@ foreach my $group (@groups) { count => [ 1, 1 ], skips => [ 1, 1 ] }; - } elsif (defined $crash && $testname gt $crash) { - # Mark this test as missing because of a winetest crash - $report->{$testname}->{status} = "winetest crash"; } elsif (defined $filelimit && $testname gt $filelimit) { # Mark this test as missing because of a partial report file $report->{$testname}->{status} = "filelimit"; @@ -490,7 +481,6 @@ sub get_result_title($$) return "No tests run as $dll is not present on this system"; } if ($result->{status} eq "skipped") { return "Test skipped by user request"; } - if ($result->{status} eq "winetest crash") { return "Test did not run as winetest crashed"; } if ($result->{status} eq "filelimit") { return "Test is missing because of a partial report file"; } if ($result->{status} eq "missing") { return "Test did not run for an unknown reason"; } if ($result->{status} eq "mixed") { return "Mixed results"; } @@ -544,10 +534,6 @@ sub singletest($$$) { { $msg = "n/a"; } - elsif ($status eq "winetest crash") - { - $msg = "winetest"; - } elsif ($status eq "filelimit") { $msg = "truncated";

1 0

Francois Gouget : testbot: Also report the 'succeeded inside todo block' lines.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: tools Branch: master Commit: 9ebc103b54f5719a3a0a11bde54fdb5e81dbf500 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9ebc103b54f5719a3a0a11bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 29 00:36:20 2017 +0200 testbot: Also report the 'succeeded inside todo block' lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/web/JobDetails.pl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 7357c06..dec73a6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -483,9 +483,9 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } ($CurrentDll, $CurrentUnit) = ($Dll, $Unit); } - elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test failed: / or + elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or ($CurrentUnit ne "" and - $Line =~ /($CurrentUnit)\.c:\d+: Test failed: /)) + $Line =~ /($CurrentUnit)\.c:\d+: Test (?:failed|succeeded inside todo block): /)) { my $Unit = $1; if ($Unit eq $CurrentUnit) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 1d47763..c5803ed 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -349,7 +349,8 @@ sub GenerateBody($) { $CurrentDll = $1; } - if ($FullLog || $Line =~ m/: Test failed: / || + if ($FullLog || + $Line =~ m/: Test (?:failed|succeeded inside todo block): / || $Line =~ m/Fatal: test '[^']+' does not exist/ || $Line =~ m/ done $258$/ || $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /)

1 0

Jacek Caban : xmllite: Don' t fail in readerinput_detectencoding if input buffer has 3 bytes.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 291ffdd7fff9a65d231c1ad76648bb6da6da26f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=291ffdd7fff9a65d231c1ad76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 28 17:27:17 2017 +0200 xmllite: Don't fail in readerinput_detectencoding if input buffer has 3 bytes. 3 bytes are enough for detection code and we already have tests for that, except they (accidentally, I assume) include null byte in the stream. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index de24537..e81f266 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -875,7 +875,7 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod { HRESULT hr = readerinput_growraw(readerinput); if (FAILED(hr)) return hr; - if (buffer->written <= 3) return MX_E_INPUTEND; + if (buffer->written < 3) return MX_E_INPUTEND; } ptrW = (WCHAR *)buffer->data; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c342303..40873a4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1447,7 +1447,6 @@ static void test_read_element(void) static const UINT depths[] = { 0, 1, 2, 2, 2, 3, 2, 1 }; IXmlReader *reader; XmlNodeType type; - IStream *stream; unsigned int i; UINT depth; HRESULT hr; @@ -1457,9 +1456,7 @@ static void test_read_element(void) while (test->xml) { - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1494,7 +1491,6 @@ static void test_read_element(void) ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); } - IStream_Release(stream); test++; }

1 0

Jacek Caban : xmllite/tests: Added set_input_string helper.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: bbd0ee4391d128a16210621616a2d7ccf5d8bb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd0ee4391d128a1621062161… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 28 17:27:10 2017 +0200 xmllite/tests: Added set_input_string helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 107 ++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbd0ee4391d128a162106…

1 0

Huw Davies : user32: Add an items rect to the header and use it to fix scrolling down.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: bdcaae4b7817cb0c96451cb6d77173e94c34a84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcaae4b7817cb0c96451cb6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 28 12:52:21 2017 +0100 user32: Add an items rect to the header and use it to fix scrolling down. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 52 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3c1bb3e..dafa996 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -97,6 +97,7 @@ typedef struct { BOOL bScrolling; /* Scroll arrows are active */ UINT nScrollPos; /* Current scroll position */ UINT nTotalHeight; /* Total height of menu items inside menu */ + RECT items_rect; /* Rectangle within which the items lie. Excludes margins and scroll arrows */ /* ------------ MENUINFO members ------ */ DWORD dwStyle; /* Extended menu style */ UINT cyMax; /* max height of the whole menu, 0 is screen height */ @@ -1170,26 +1171,27 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) HDC hdc; UINT start, i; BOOL textandbmp = FALSE; - int orgX, orgY, maxX, maxTab, maxTabWidth, maxHeight; + int orgX, orgY, maxTab, maxTabWidth, maxHeight; lppop->Width = lppop->Height = 0; + SetRect(&lppop->items_rect, MENU_MARGIN, MENU_MARGIN, MENU_MARGIN, MENU_MARGIN); + if (lppop->nItems == 0) return; hdc = GetDC( 0 ); SelectObject( hdc, get_menu_font(FALSE)); start = 0; - maxX = MENU_MARGIN; lppop->textOffset = 0; while (start < lppop->nItems) { lpitem = &lppop->items[start]; - orgX = maxX; + orgX = lppop->items_rect.right; if( lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK)) orgX += MENU_COL_SPACE; - orgY = MENU_MARGIN; + orgY = lppop->items_rect.top; maxTab = maxTabWidth = 0; /* Parse items until column break or end of menu */ @@ -1199,7 +1201,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break; MENU_CalcItemSize( hdc, lpitem, lppop->hwndOwner, orgX, orgY, FALSE, lppop ); - maxX = max( maxX, lpitem->rect.right ); + lppop->items_rect.right = max( lppop->items_rect.right, lpitem->rect.right ); orgY = lpitem->rect.bottom; if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab) { @@ -1210,18 +1212,17 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) } /* Finish the column (set all items to the largest width found) */ - maxX = max( maxX, maxTab + maxTabWidth ); + lppop->items_rect.right = max( lppop->items_rect.right, maxTab + maxTabWidth ); for (lpitem = &lppop->items[start]; start < i; start++, lpitem++) { - lpitem->rect.right = maxX; + lpitem->rect.right = lppop->items_rect.right; if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab) lpitem->xTab = maxTab; } - lppop->Height = max( lppop->Height, orgY ); + lppop->items_rect.bottom = max( lppop->items_rect.bottom, orgY ); } - lppop->Width = maxX; /* if none of the items have both text and bitmap then * the text and bitmaps are all aligned on the left. If there is at * least one item with both text and bitmap then bitmaps are @@ -1230,8 +1231,8 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) if( !textandbmp) lppop->textOffset = 0; /* space for 3d border */ - lppop->Height += MENU_MARGIN; - lppop->Width += MENU_MARGIN; + lppop->Height = lppop->items_rect.bottom + MENU_MARGIN; + lppop->Width = lppop->items_rect.right + MENU_MARGIN; /* Adjust popup height if it exceeds maximum */ maxHeight = MENU_GetMaxPopupHeight(lppop); @@ -1239,6 +1240,8 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) if (lppop->Height >= maxHeight) { lppop->Height = maxHeight; + lppop->items_rect.top += get_scroll_arrow_height(lppop); + lppop->items_rect.bottom = lppop->Height - MENU_MARGIN - get_scroll_arrow_height(lppop); lppop->bScrolling = TRUE; } else @@ -1307,6 +1310,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, lprect->bottom = maxY; lppop->Height = lprect->bottom - lprect->top; + lppop->items_rect = *lprect; /* Flush right all items between the MF_RIGHTJUSTIFY and */ /* the last item (if several lines, only move the last line) */ @@ -1937,32 +1941,22 @@ MENU_EnsureMenuItemVisible(LPPOPUPMENU lppop, UINT wIndex, HDC hdc) if (lppop->bScrolling) { MENUITEM *item = &lppop->items[wIndex]; - UINT nMaxHeight = MENU_GetMaxPopupHeight(lppop); UINT nOldPos = lppop->nScrollPos; - RECT rc; - UINT arrow_bitmap_height; - BITMAP bmp; - - GetClientRect(lppop->hWnd, &rc); - - GetObjectW(get_down_arrow_bitmap(), sizeof(bmp), &bmp); - arrow_bitmap_height = bmp.bmHeight; + const RECT *rc = &lppop->items_rect; + UINT scroll_height = rc->bottom - rc->top; - rc.top += arrow_bitmap_height; - rc.bottom -= arrow_bitmap_height + MENU_MARGIN; - - nMaxHeight -= GetSystemMetrics(SM_CYBORDER) + 2 * arrow_bitmap_height; - if (item->rect.bottom > lppop->nScrollPos + nMaxHeight) + /* NB the item rects include the MENU_MARGIN offset (so the first rect has + top == MENU_TOP_MARGIN) */ + if (item->rect.bottom - MENU_MARGIN > lppop->nScrollPos + scroll_height) { - - lppop->nScrollPos = item->rect.bottom - nMaxHeight; - ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, &rc, &rc); + lppop->nScrollPos = item->rect.bottom - MENU_MARGIN - scroll_height; + ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, rc, rc); MENU_DrawScrollArrows(lppop, hdc); } else if (item->rect.top - MENU_MARGIN < lppop->nScrollPos) { lppop->nScrollPos = item->rect.top - MENU_MARGIN; - ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, &rc, &rc); + ScrollWindow(lppop->hWnd, 0, nOldPos - lppop->nScrollPos, rc, rc); MENU_DrawScrollArrows(lppop, hdc); } }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017