March 2008 - Wine-Commits - list.winehq.org

Eric Pouech : riched20: Start handling OLE objects inside richedit.
by EmpKey Administrator March 14, 2008

March 14, 2008

Hi, I am using CRichEditView class in MFC library to display RTF. The problem is that ole objects are not displayed in-line with their surround texts. Could you please let me know how to solve the problem? Thanks in advances emp

1 0

Francois Gouget : winetest: We have one test executable per dll, and each contains multiple unit tests. Align the variable names accordingly.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: 27cbeb672b21ea9694aa4d28442b6c00ec046896 URL: http://source.winehq.org/git/tools.git/?a=commit;h=27cbeb672b21ea9694aa4d28… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:31:24 2008 +0100 winetest: We have one test executable per dll, and each contains multiple unit tests. Align the variable names accordingly. --- winetest/dissect | 20 ++++++++++---------- winetest/gather | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 0d017fc..f3a0f13 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -151,27 +151,27 @@ if (/^Dll info:\r?$/) { } /Test output:\r?/ or mydie "no test header: $_"; -my ($unit, $test, $source, $rev, $result); +my ($dll, $unit, $source, $rev, $result); my ($lines,$total, $todo, $failed, $skipped); -$unit = undef; # state machine starts +$dll = undef; # state machine starts $total = $todo = $failed = $skipped = 0; $lines = 0; while (<IN>) { - if (!defined $unit) { # new test + if (!defined $dll) { # new test next if /^\s*$/; m[([_.a-z0-9]+):([_a-z0-9]+) start ([/_.a-z0-9]+) (-|[.0-9]+)\r?$] or mydie "no start line:$.: $_"; - ($unit,$test,$source,$rev) = ($1,$2,$3,$4); + ($dll,$unit,$source,$rev) = ($1,$2,$3,$4); open OUT, ">:raw", $tmpfile or mydie "can't open $tmpfile: $!\n"; print OUT; - } elsif (/^(.*$test.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { + } elsif (/^(.*$unit.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; $total += $2; $todo += $3; $failed += $4; $skipped += $5; print OUT; - } elsif (/$unit:$test done $(-?\d+)$\r?$/) { + } elsif (/$dll:$unit done $(-?\d+)$\r?$/) { chomp; # current test ended if ($lines==0) { $result = "failed $1 - -"; @@ -179,22 +179,22 @@ while (<IN>) { $result = "$total $todo $failed $skipped"; } FINISH: - print SUM "- $unit $test $result $source $rev\n"; + print SUM "- $dll $unit $result $source $rev\n"; print OUT; close OUT or mydie "error writing $tmpfile: $!\n"; if (-s $tmpfile) { - my $testfile = "$tmpdir/${unit}:${test}.txt"; + my $testfile = "$tmpdir/$dll:$unit.txt"; rename $tmpfile, $testfile or mydie "can't rename $tmpfile to $testfile: $!\n"; } - $unit = undef; + $dll = undef; $total = $todo = $failed = $skipped = 0; $lines = 0; } else { # current test output print OUT; } } -if (defined $unit) { +if (defined $dll) { # Either winetest crashed or the report file was cut off $_=""; if ($filesize == $maxfilesize) { diff --git a/winetest/gather b/winetest/gather index bf84b24..9f46589 100755 --- a/winetest/gather +++ b/winetest/gather @@ -102,13 +102,13 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { next; } while (<TEST>) { - my ($digest, $unit, $test, $count, $todo, $error, $skipped, + my ($digest, $dll, $unit, $count, $todo, $error, $skipped, $source, $rev) = split; - my $testname = "$unit:$test"; + my $testname = "$dll:$unit"; # Leave this in for older type reports - if ($test =~ /_dll_missing/) { + if ($unit =~ /_dll_missing/) { # Mark the dll as missing on this system - $testref->{dllmissing}->{$unit} = 1; + $testref->{dllmissing}->{$dll} = 1; next; } $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; @@ -159,7 +159,7 @@ foreach my $group (@groups) { if (!exists $test->{results}->{$testname}) { # Make sure missing tests are shown in the group results $group->{digests}->{$testname} = "differ"; - my ($dll, $subtest) = split(/:/, $testname); + my ($dll, $unit) = split(/:/, $testname); my $crash = $test->{crash}; my $filelimit = $test->{filelimit}; if (exists $test->{dllmissing}->{$dll}) { @@ -253,13 +253,13 @@ print OUT <<"EOF"; <table class="report"> <thead> <tr> - <th class="test">unit:test</th> + <th class="test">dll:unit_test</th> $header </tr> </thead> <tfoot> <tr> - <th class="test">unit:test</th> + <th class="test">dll:unit_test</th> $header </tr> </tfoot> @@ -392,13 +392,13 @@ EOF <table class="report"> <thead> <tr> - <th class="test">unit:test</th> + <th class="test">dll:unit_test</th> $header </tr> </thead> <tfoot> <tr> - <th class="test">unit:test</th> + <th class="test">dll:unit_test</th> $header </tr> </tfoot>

1 0

Francois Gouget : A couple of spelling and wording tweaks.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: 2293fa753876b9cb54442c84040b4dc2ebbae3bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=2293fa753876b9cb54442c84… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:26:19 2008 +0100 A couple of spelling and wording tweaks. --- download.inc.php | 2 +- winetest/README | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/download.inc.php b/download.inc.php index d0a8ef4..727a685 100644 --- a/download.inc.php +++ b/download.inc.php @@ -45,7 +45,7 @@ function is_downloadable($sUrl) fputs($fp, $get); while(!feof($fp)) { - // get ONLY header informations + // get ONLY header information $header .= fgets($fp, 128); } fclose($fp); diff --git a/winetest/README b/winetest/README index c5b39d8..2a0215d 100644 --- a/winetest/README +++ b/winetest/README @@ -13,7 +13,7 @@ the destination for that and presents the results in an ordered form. Configuration file, sets the following variables: $queuedir - queue incoming submissions here -$datadir - processed data get served from here +$datadir - processed data is served from here $builds - list of allowed build tags * winetest.cgi @@ -41,7 +41,7 @@ head of the file. * gather This program is intended to run as a second stage. See the sample -crontab file, races and concurrency problems must be dealed with on +crontab file. Races and concurrency problems must be dealt with on that higher level. The program looks for a file matching $datadir/*/outdated, creates index.html in the same directory and removes the outdated file. See also the head of the file.

1 0

Francois Gouget : winetest: Only append '.dll' if there is not already another extension.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: e77c1a3bf96ccbd6eb4b793393660ce54d6709c9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e77c1a3bf96ccbd6eb4b7933… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:26:28 2008 +0100 winetest: Only append '.dll' if there is not already another extension. --- winetest/gather | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index f4098ea..bf84b24 100755 --- a/winetest/gather +++ b/winetest/gather @@ -281,9 +281,10 @@ sub singletest($$$) { print OUT " <td class=\"note\">$fail</td>\n"; } elsif ($count eq "dll missing") { my ($dll, $subtest) = split(/:/, $testname); + $dll.=".dll" if ($dll !~ /\./); print OUT <<"EOF"; <td class="skip_pass"><a - title="No tests run as $dll.dll is not present on this system" + title="No tests run as $dll is not present on this system" >n/a</a></td> EOF } elsif ($count eq "winetest crash") {

1 0

Francois Gouget : winetest: Make the Version field a bit wider so it can accomodate long tags.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: 0d37e62de8d58a0763d1b27518d2a0d66d251f73 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0d37e62de8d58a0763d1b275… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:24:27 2008 +0100 winetest: Make the Version field a bit wider so it can accomodate long tags. --- winetest/resultform.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/resultform.html b/winetest/resultform.html index 967930d..547c5bb 100644 --- a/winetest/resultform.html +++ b/winetest/resultform.html @@ -20,7 +20,7 @@ </tr> <tr> <td>Version:</td> - <td><input type="text" name="version" size="10" readonly></td> + <td><input type="text" name="version" size="18" readonly></td> </tr> <tr> <td>Tests:</td>

1 0

Francois Gouget : winetest: If the test exit code is negative, then it is most likely an exception code, which means the test crashed. Don't assume the 'todo' field is numeric.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: 9d09f0dfcd711b02e8e664546292a1dc474c1a70 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9d09f0dfcd711b02e8e66454… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:26:07 2008 +0100 winetest: If the test exit code is negative, then it is most likely an exception code, which means the test crashed. Don't assume the 'todo' field is numeric. --- winetest/gather | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 415b619..f4098ea 100755 --- a/winetest/gather +++ b/winetest/gather @@ -272,9 +272,11 @@ sub singletest($$$) { my $file = "$test->{dir}/$testname.txt"; my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; if ($count eq "failed") { - my $msg = $todo eq "crash"?"crash": + my $msg = $todo eq "crash"?"crashed": + $todo eq "-2"?"failed": + $todo =~ /^-/?"crashed": $todo eq "filelimit"?"file limit": - $todo == 258?"timeout":"failed"; + $todo eq "258"?"timeout":"failed"; my $fail = -r "$datadir/$build/$file"?"<a href=\"$file\">$msg</a>":$msg; print OUT " <td class=\"note\">$fail</td>\n"; } elsif ($count eq "dll missing") {

1 0

Francois Gouget : winetest: Remove an obsolete comment about visible desktops. There' s no corresponding code anymore.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: cde29ddee6af0bb85b7f41912b50598ae3a8f7b8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cde29ddee6af0bb85b7f4191… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:25:34 2008 +0100 winetest: Remove an obsolete comment about visible desktops. There's no corresponding code anymore. --- winetest/gather | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index c9e490a..415b619 100755 --- a/winetest/gather +++ b/winetest/gather @@ -34,7 +34,6 @@ require "winetest.conf"; # name: group name # extrema: hashes min and max error numbers to test names # digests: hashes report digests or "differ" to test names -# visible: whether winetest ran on a visible desktop # tests: array of test hashes (name, tag, dir, results hash). my %w95 = (name => "Win95"); my %w98 = (name => "Win98");

1 0

Francois Gouget : winetest: Copy the winetest start, result summary and done lines to the per-test logs.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: f7fc108fa5af7f89263395fe1015e1dffa14a739 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f7fc108fa5af7f89263395fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:24:41 2008 +0100 winetest: Copy the winetest start, result summary and done lines to the per-test logs. --- winetest/dissect | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index b5ea968..0d017fc 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -163,14 +163,15 @@ while (<IN>) { or mydie "no start line:$.: $_"; ($unit,$test,$source,$rev) = ($1,$2,$3,$4); open OUT, ">:raw", $tmpfile or mydie "can't open $tmpfile: $!\n"; - } elsif (s/^(.*$test.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/$1/) { + print OUT; + } elsif (/^(.*$test.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; $total += $2; $todo += $3; $failed += $4; $skipped += $5; print OUT; - } elsif (s/$unit:$test done $(-?\d+)$\r?$//) { + } elsif (/$unit:$test done $(-?\d+)$\r?$/) { chomp; # current test ended if ($lines==0) { $result = "failed $1 - -";

1 0

Francois Gouget : winetest: Fix the computation of the cell tooltips to not add spurious double-quotes . This fixes a bunch of HTML errors.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: caacf70a8659d909f46fdc113863d86c92c99bd6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=caacf70a8659d909f46fdc11… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:23:36 2008 +0100 winetest: Fix the computation of the cell tooltips to not add spurious double-quotes. This fixes a bunch of HTML errors. --- winetest/gather | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index 80aec78..a40c2f6 100755 --- a/winetest/gather +++ b/winetest/gather @@ -333,12 +333,17 @@ EOF my $href = "href=\"#$group->{name}\""; if (exists $group->{extrema}->{$testname}) { my ($min,$max) = @{$group->{extrema}->{$testname}}; - my $class = $min==0?($max==0?"pass":"mixed"):"fail"; - my $title = $min==0?"":" title=\"Best: $min"; - my $errors = $min==$max?$min:"$min to $max"; my $todos = (exists $group->{todo}->{$testname})?"todo_":""; - $title = (exists $group->{todo}->{$testname})?"$title, Todo: $group->{todo}->{$testname}\"":"$title\""; my $skip = (exists $group->{skipped}->{$testname})?"skip_":""; + my $class = $min==0?($max==0?"pass":"mixed"):"fail"; + my $title = ""; + if ($min) + { + $title = " title=\"Best: $min"; + $title.= ", Todo: $group->{todo}->{$testname}" if (exists $group->{todo}->{$testname}); + $title.="\""; + } + my $errors = $min==$max?$min:"$min to $max"; print OUT <<"EOF"; <td class="$todos$skip$class"><a $href$title onMouseOver="refresh('$testname','$group->{name}','-','-','$errors');"

1 0

Francois Gouget : winetest: Add a missing </tr> tag.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: tools Branch: master Commit: c282a32676d030be2a1fd265ef3849534cd81c73 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c282a32676d030be2a1fd265… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 17:23:51 2008 +0100 winetest: Add a missing </tr> tag. --- winetest/gather | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/winetest/gather b/winetest/gather index a40c2f6..bda1f95 100755 --- a/winetest/gather +++ b/winetest/gather @@ -411,6 +411,9 @@ EOF <a href="$alltests{$testname}">$testname</a></td> EOF singletest ($_, $testname, $group->{name}) foreach (@{$group->{tests}}); + print OUT <<"EOF"; + </tr> +EOF } print OUT <<"EOF"; </tbody>

1 0