wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Francois Gouget : winetest: What dissect and gather support depends on their code. So it makes no sense to put $fileversion in a configuration file. Also modify dissect to distinguish the supported report version from the version of the produced summary file .
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: tools Branch: master Commit: 3ed1950a6b537f03f63cfeb91130b0f411acd49d URL: http://source.winehq.org/git/tools.git/?a=commit;h=3ed1950a6b537f03f63cfeb9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 19:58:15 2008 +0100 winetest: What dissect and gather support depends on their code. So it makes no sense to put $fileversion in a configuration file. Also modify dissect to distinguish the supported report version from the version of the produced summary file. --- winetest/dissect | 11 ++++++++--- winetest/gather | 7 +++++-- winetest/winetest.conf | 3 --- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 46b8970..b3e9a56 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -29,12 +29,17 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; -use vars qw/$builds $queuedir $datadir $maxmult $fileversion $maxfilesize/; +use vars qw/$builds $queuedir $datadir $maxmult $maxfilesize/; require "winetest.conf"; my $name0=$0; $name0 =~ s+^.*/++; +# We support reports version 4 and up +my $minimum_report_version=4; +# And we generate summary files version 4 +my $summary_version=4; + use File::Temp qw/tempdir/; use Errno qw/ENOTEMPTY/; @@ -65,8 +70,8 @@ my $filesize = -s "$report"; $_ = <IN>; /^Version (\d+)\r?$/ or mydie "no version header: $_"; -$1 eq $fileversion or mydie "illegal version: $1\n"; -print SUM "Version $fileversion\n"; +mydie "illegal version: $1\n" if ($1 lt $minimum_report_version); +print SUM "Version $summary_version\n"; $_ = <IN>; /^Tests from build ([-.0-9a-zA-Z]+)\r?$/ or mydie "no build header: $_"; diff --git a/winetest/gather b/winetest/gather index 8a5588f..a84e5be 100755 --- a/winetest/gather +++ b/winetest/gather @@ -27,12 +27,15 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; -use vars qw/$datadir $fileversion/; +use vars qw/$datadir/; require "winetest.conf"; my $name0=$0; $name0 =~ s+^.*/++; +# We support summary files version 4 and up +my $summary_version=4; + # Group result containers: # name Group name @@ -116,7 +119,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { print STDERR "$name0:error: unable to open '$file' for reading: $!\n"; next; } - if (($_ = <TEST>) ne "Version $fileversion\n") { + if (($_ = <TEST>) ne "Version $summary_version\n") { print STDERR "$name0:error: wrong header in '$file': $_"; close TEST; next; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index d7ffb69..a7ddf3f 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -9,9 +9,6 @@ $datadir = "$root/data"; # Maximum number of reports for one version and tag $maxmult = 10; -# File version number -$fileversion = 4; - # Maximum size of the report file # This should be in line with programs\winetest\send.c $maxfilesize = 1.5 * 1024 * 1024;

1 0

Francois Gouget : winetest: Tweak / standardize the error messages and print them to stderr rather than stdout .
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: tools Branch: master Commit: 08119d06e94c1b44b082ba2f1efd0fa15895826a URL: http://source.winehq.org/git/tools.git/?a=commit;h=08119d06e94c1b44b082ba2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 19:57:50 2008 +0100 winetest: Tweak / standardize the error messages and print them to stderr rather than stdout. --- winetest/dissect | 42 +++++++++++++++++++++++------------------- winetest/gather | 16 ++++++++++------ 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index f3a0f13..46b8970 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -32,18 +32,22 @@ use strict; use vars qw/$builds $queuedir $datadir $maxmult $fileversion $maxfilesize/; require "winetest.conf"; +my $name0=$0; +$name0 =~ s+^.*/++; + + use File::Temp qw/tempdir/; use Errno qw/ENOTEMPTY/; my ($report, $tmpdir); -sub mydie($) { +sub mydie(@) { my $errdir = tempdir ("errXXXXX", DIR => $queuedir); if (!rename $tmpdir, $errdir) { - print "can't rename $tmpdir to $errdir: $!\n"; + print STDERR "$name0:error: unable to rename '$tmpdir' to '$errdir': $!\n"; exit 3; } - print "$errdir: ", @_; + print STDERR "$name0:error:$errdir: ", @_; exit 1; } @@ -53,8 +57,8 @@ exit 2 unless defined $report; ($tmpdir = $report) =~ s|^(.+)/report$|$1|; my $tmpfile = "$tmpdir/dissect.tmp"; -open IN, "<:raw", $report or mydie "can't read $report: $!"; -open SUM, ">$tmpdir/summary.txt" or mydie "can't write $tmpdir/summary.txt: $!"; +open IN, "<:raw", $report or mydie "unable to open '$report' for reading: $!\n"; +open SUM, ">$tmpdir/summary.txt" or mydie "unable to open '$tmpdir/summary.txt' for writing: $!\n"; # Get the size of the report file my $filesize = -s "$report"; @@ -68,7 +72,7 @@ $_ = <IN>; /^Tests from build ([-.0-9a-zA-Z]+)\r?$/ or mydie "no build header: $_"; my $testbuild = $1; if (!open BUILDS, "<$builds") { - print "can't open $builds: $!\n"; + print STDERR "$name0:error: unable to open '$builds' for reading: $!\n"; exit 3; } while (<BUILDS>) { @@ -89,13 +93,13 @@ my $tag = $1 eq ""?"":"_$1"; $_ = <IN>; /^Build info:\r?$/ or mydie "no Build info header: $_"; -open BINFO, ">$tmpdir/build.txt" or mydie "can't write $tmpdir/build.txt: $!"; +open BINFO, ">$tmpdir/build.txt" or mydie "unable to open '$tmpdir/build.txt' for writing: $!\n"; while (($_ = <IN>) =~ s/^ //) { print BINFO; } -close BINFO or mydie "error writing $tmpdir/build.txt: $!"; +close BINFO or mydie "error writing to '$tmpdir/build.txt': $!\n"; my ($wine, $version, $major, $minor, $plid); /^Operating system version:\r?$/ or mydie "no OS header: $_"; -open OSVER, ">$tmpdir/version.txt" or mydie "can't write $tmpdir/version.txt: $!"; +open OSVER, ">$tmpdir/version.txt" or mydie "unable to open '$tmpdir/version.txt' for writing: $!\n"; while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { print OSVER "$1=$2\n"; if ($1 eq "bRunningUnderWine") { @@ -108,7 +112,7 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { $plid = $2; } } -close OSVER or mydie "error writing $tmpdir/version.txt: $!"; +close OSVER or mydie "error writing to '$tmpdir/version.txt': $!\n"; $version = "unknown"; if ($plid==1 && $major==4) { @@ -145,9 +149,9 @@ if ($wine) { # Dll information is only available in new type reports if (/^Dll info:\r?$/) { - open DLLINFO, ">$tmpdir/dllinfo.txt" or mydie "can't write $tmpdir/dllinfo.txt: $!"; + open DLLINFO, ">$tmpdir/dllinfo.txt" or mydie "unable to open '$tmpdir/dllinfo.txt' for writing: $!\n"; while (($_ = <IN>) =~ s/^ //) { print DLLINFO; } - close DLLINFO or mydie "error writing $tmpdir/dllinfo.txt: $!"; + close DLLINFO or mydie "error writing to '$tmpdir/dllinfo.txt': $!\n"; } /Test output:\r?/ or mydie "no test header: $_"; @@ -162,7 +166,7 @@ while (<IN>) { m[([_.a-z0-9]+):([_a-z0-9]+) start ([/_.a-z0-9]+) (-|[.0-9]+)\r?$] or mydie "no start line:$.: $_"; ($dll,$unit,$source,$rev) = ($1,$2,$3,$4); - open OUT, ">:raw", $tmpfile or mydie "can't open $tmpfile: $!\n"; + open OUT, ">:raw", $tmpfile or mydie "unable to open '$tmpfile' for writing: $!\n"; print OUT; } elsif (/^(.*$unit.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; @@ -181,11 +185,11 @@ while (<IN>) { FINISH: print SUM "- $dll $unit $result $source $rev\n"; print OUT; - close OUT or mydie "error writing $tmpfile: $!\n"; + close OUT or mydie "error writing ot '$tmpfile': $!\n"; if (-s $tmpfile) { my $testfile = "$tmpdir/$dll:$unit.txt"; rename $tmpfile, $testfile or - mydie "can't rename $tmpfile to $testfile: $!\n"; + mydie "unable to rename '$tmpfile' to '$testfile': $!\n"; } $dll = undef; $total = $todo = $failed = $skipped = 0; @@ -204,13 +208,13 @@ if (defined $dll) { } goto FINISH; } -close SUM or mydie "error writing $tmpdir/summary.txt: $!"; +close SUM or mydie "error writing to '$tmpdir/summary.txt': $!\n"; close IN; my $builddir = "$datadir/$testbuild"; foreach ($datadir, $builddir) { if (!(-d $_ || mkdir $_)) { - print "can't create $_: $!\n"; + print STDERR "$name0:error: unable to create the '$_' directory: $!\n"; exit 3; } } @@ -219,13 +223,13 @@ my ($dir, $dirbase, $try); $dir = $dirbase = "$builddir/$version$tag"; $try = 0; while (!rename $tmpdir, $dir) { - $!{ENOTEMPTY} or mydie "can't rename $tmpdir to $dir: $!\n"; + $!{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") { - print "can't outdate $builddir: $!\n"; + print STDERR "$name0:error: unable to open '$builddir/outdated' for writing: $!\n"; exit 1; } close SIGN; diff --git a/winetest/gather b/winetest/gather index c37e4c1..8a5588f 100755 --- a/winetest/gather +++ b/winetest/gather @@ -30,6 +30,10 @@ use strict; use vars qw/$datadir $fileversion/; require "winetest.conf"; +my $name0=$0; +$name0 =~ s+^.*/++; + + # Group result containers: # name Group name # extrema Hashes test names to an array containing the minimum and maximum @@ -91,7 +95,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $group = undef unless defined $tag[0]; # make the check below fail } if (!defined $group) { - print "Unknown architecture: $id in file $file\n"; + print STDERR "$name0:error: unknown architecture '$id' in '$file'\n"; next; } @@ -109,16 +113,16 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $report->{tag} = @tag?"@tag":""; $report->{dir} = $dir; if (!open TEST, "<$file") { - print "can't open $file: $!\n"; + print STDERR "$name0:error: unable to open '$file' for reading: $!\n"; next; } if (($_ = <TEST>) ne "Version $fileversion\n") { - print "$file: wrong header: $_"; + print STDERR "$name0:error: wrong header in '$file': $_"; close TEST; next; } if (($url = <TEST>) !~ s/^Archive: (.*)\n$/$1/) { - print "$file: wrong archive url: $_"; + print STDERR "$name0:error: wrong archive url in '$file': $url"; close TEST; next; } @@ -232,7 +236,7 @@ EOF chop $header; if (!open OUT, ">$datadir/$build/index.html") { - print "can't open $datadir/$build/index.html for writing: $!\n"; + print STDERR "$name0:error: unable to open '$datadir/$build/index.html' for writing: $!\n"; goto DONE; } print OUT <<"EOF"; @@ -452,6 +456,6 @@ close OUT; DONE: if (!unlink $outdated) { - print "can't unlink $outdated: $!\n"; + print STDERR "$name0:error: unable to unlink '$outdated': $!\n"; exit 3; }

1 0

Francois Gouget : winetest: Rename a $_ variable to $group for clarity.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: tools Branch: master Commit: cb36c591545f2927e60090a30621177eb7564c00 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cb36c591545f2927e60090a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 19:56:31 2008 +0100 winetest: Rename a $_ variable to $group for clarity. --- winetest/gather | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/winetest/gather b/winetest/gather index 301485f..c37e4c1 100755 --- a/winetest/gather +++ b/winetest/gather @@ -203,24 +203,24 @@ foreach my $group (@groups) { # Write out the tables my ($header); # same in thead and tfoot -foreach (@groups) { - if (exists $_->{reports}) { - my $report_count = @{$_->{reports}}; +foreach my $group (@groups) { + if (exists $group->{reports}) { + my $report_count = @{$group->{reports}}; if ($report_count > 1) { - $header .= " <th><a href=\"#$_->{name}\">$_->{name} $report_count reports</a></th>\n"; + $header .= " <th><a href=\"#$group->{name}\">$group->{name} $report_count reports</a></th>\n"; } else { - my $report = $_->{reports}->[0]; + my $report = $group->{reports}->[0]; # If dllinfo.txt exist we use a different layout (new style report) if (-r "$datadir/$build/$report->{dir}/dllinfo.txt") { $header .= <<"EOF"; - <th>$_->{name} + <th>$group->{name} <a href=\"$report->{dir}/version.txt\">$report->{tag}</a> <a href=\"$report->{dir}/dllinfo.txt\">[info]</a> <a href=\"$report->{dir}/report\">[file]</a></th> EOF } else { $header .= <<"EOF"; - <th>$_->{name} + <th>$group->{name} <a href=\"$report->{dir}/build.txt\">$report->{tag}</a> <a href=\"$report->{dir}/version.txt\">[info]</a> <a href=\"$report->{dir}/report\">[file]</a></th>

1 0

Francois Gouget : winetest: Groups contain multiple reports all corresponding to the same platform. So fix the variable names accordingly. Improve the documentation of the group and report structures.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: tools Branch: master Commit: b0920a9875831836e7cfd39f0763c2d796a40f58 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b0920a9875831836e7cfd39f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 19:55:58 2008 +0100 winetest: Groups contain multiple reports all corresponding to the same platform. So fix the variable names accordingly. Improve the documentation of the group and report structures. --- winetest/gather | 136 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 79 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=b0920a9875831836e7cf…

1 0

Francois Gouget : winetest: s/$subtest/$unit/ for consistency.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: tools Branch: master Commit: 072d86af829edacaa9a14c7c399a260d597dfeca URL: http://source.winehq.org/git/tools.git/?a=commit;h=072d86af829edacaa9a14c7c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 19:55:31 2008 +0100 winetest: s/$subtest/$unit/ for consistency. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index 9f46589..6c006f9 100755 --- a/winetest/gather +++ b/winetest/gather @@ -280,7 +280,7 @@ sub singletest($$$) { 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") { - my ($dll, $subtest) = split(/:/, $testname); + my ($dll, $unit) = split(/:/, $testname); $dll.=".dll" if ($dll !~ /\./); print OUT <<"EOF"; <td class="skip_pass"><a

1 0

Alexandre Julliard : shell32/tests: Remove spurious linefeeds in error messages.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: fad0f48350fe80dfc95691691766f98f25b998fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad0f48350fe80dfc95691691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 15 11:45:43 2008 +0100 shell32/tests: Remove spurious linefeeds in error messages. --- dlls/shell32/tests/shellpath.c | 50 +++++++++++++-------------------------- 1 files changed, 17 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ff041c8..985d36d 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -296,24 +296,21 @@ static void testSHGetFolderLocationInvalidArgs(void) pidl = NULL; hr = pSHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); ok(hr == E_INVALIDARG, - "SHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl)\n" - "returned 0x%08x, expected E_INVALIDARG\n", hr); + "SHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl) returned 0x%08x, expected E_INVALIDARG\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* check a bogus user token: */ pidl = NULL; hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); ok(hr == E_FAIL, - "SHGetFolderLocation(NULL, CSIDL_FAVORITES, 2, 0, &pidl)\n" - "returned 0x%08x, expected E_FAIL\n", hr); + "SHGetFolderLocation(NULL, CSIDL_FAVORITES, 2, 0, &pidl) returned 0x%08x, expected E_FAIL\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* check reserved is not zero: */ pidl = NULL; hr = pSHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 1, &pidl); ok(hr == E_INVALIDARG, - "SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 1, &pidl)\n" - "returned 0x%08x, expected E_INVALIDARG\n", hr); + "SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 1, &pidl) returned 0x%08x, expected E_INVALIDARG\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* a NULL pidl pointer crashes, so don't test it */ @@ -344,12 +341,10 @@ static void testSHGetFolderPathInvalidArgs(void) hr = pSHGetFolderPathA(NULL, CSIDL_DESKTOP, (HANDLE)2, SHGFP_TYPE_DEFAULT, path); ok(hr == E_FAIL, - "SHGetFolderPathA(NULL, CSIDL_DESKTOP, 2, SHGFP_TYPE_DEFAULT, path)\n" - "returned 0x%08x, expected E_FAIL\n", hr); + "SHGetFolderPathA(NULL, CSIDL_DESKTOP, 2, SHGFP_TYPE_DEFAULT, path) returned 0x%08x, expected E_FAIL\n", hr); hr = pSHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path); ok(hr == E_INVALIDARG, - "SHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path)\n" - "returned 0x%08x, expected E_INVALIDARG\n", hr); + "SHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path) returned 0x%08x, expected E_INVALIDARG\n", hr); } static void testSHGetSpecialFolderPathInvalidArgs(void) @@ -362,20 +357,17 @@ static void testSHGetSpecialFolderPathInvalidArgs(void) #if 0 ret = pSHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE); ok(!ret, - "SHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE)\n" - "returned TRUE, expected FALSE\n"); + "SHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE) returned TRUE, expected FALSE\n"); #endif /* odd but true: calling with a NULL path still succeeds if it's a real * dir (on some windows platform). on winME it generates exception. */ ret = pSHGetSpecialFolderPathA(NULL, path, CSIDL_PROGRAMS, FALSE); ok(ret, - "SHGetSpecialFolderPathA(NULL, path, CSIDL_PROGRAMS, FALSE)\n" - "returned FALSE, expected TRUE\n"); + "SHGetSpecialFolderPathA(NULL, path, CSIDL_PROGRAMS, FALSE) returned FALSE, expected TRUE\n"); ret = pSHGetSpecialFolderPathA(NULL, path, 0xeeee, FALSE); ok(!ret, - "SHGetSpecialFolderPathA(NULL, path, 0xeeee, FALSE)\n" - "returned TRUE, expected FALSE\n"); + "SHGetSpecialFolderPathA(NULL, path, 0xeeee, FALSE) returned TRUE, expected FALSE\n"); } static void testApiParameters(void) @@ -399,13 +391,11 @@ static BYTE testSHGetFolderLocation(BOOL optional, int folder) pidl = NULL; hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); ok(SUCCEEDED(hr) || optional, - "SHGetFolderLocation(NULL, %s, NULL, 0, &pidl)\n" - "failed: 0x%08x\n", getFolderName(folder), hr); + "SHGetFolderLocation(NULL, %s, NULL, 0, &pidl) failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) { ok(pidl != NULL, - "SHGetFolderLocation(NULL, %s, NULL, 0, &pidl)\n" - "succeeded, but returned pidl is NULL\n", getFolderName(folder)); + "SHGetFolderLocation(NULL, %s, NULL, 0, &pidl) succeeded, but returned pidl is NULL\n", getFolderName(folder)); if (pidl) { LPITEMIDLIST pidlLast = pILFindLastID(pidl); @@ -433,13 +423,11 @@ static BYTE testSHGetSpecialFolderLocation(BOOL optional, int folder) pidl = NULL; hr = pSHGetSpecialFolderLocation(NULL, folder, &pidl); ok(SUCCEEDED(hr) || optional, - "SHGetSpecialFolderLocation(NULL, %s, &pidl)\n" - "failed: 0x%08x\n", getFolderName(folder), hr); + "SHGetSpecialFolderLocation(NULL, %s, &pidl) failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) { ok(pidl != NULL, - "SHGetSpecialFolderLocation(NULL, %s, &pidl)\n" - "succeeded, but returned pidl is NULL\n", getFolderName(folder)); + "SHGetSpecialFolderLocation(NULL, %s, &pidl) succeeded, but returned pidl is NULL\n", getFolderName(folder)); if (pidl) { LPITEMIDLIST pidlLast = pILFindLastID(pidl); @@ -463,8 +451,7 @@ static void testSHGetFolderPath(BOOL optional, int folder) hr = pSHGetFolderPathA(NULL, folder, NULL, SHGFP_TYPE_CURRENT, path); ok(SUCCEEDED(hr) || optional, - "SHGetFolderPathA(NULL, %s, NULL, SHGFP_TYPE_CURRENT, path)\n" - "failed: 0x%08x\n", getFolderName(folder), hr); + "SHGetFolderPathA(NULL, %s, NULL, SHGFP_TYPE_CURRENT, path) failed: 0x%08x\n", getFolderName(folder), hr); } static void testSHGetSpecialFolderPath(BOOL optional, int folder) @@ -679,8 +666,7 @@ static void testWinDir(void) GetWindowsDirectoryA(windowsDir, sizeof(windowsDir)); myPathRemoveBackslashA(windowsDir); ok(!lstrcmpiA(windowsDir, windowsShellPath), - "GetWindowsDirectory does not match SHGetSpecialFolderPath:\n" - "GetWindowsDirectory returns %s\nSHGetSpecialFolderPath returns %s\n", + "GetWindowsDirectory returns %s SHGetSpecialFolderPath returns %s\n", windowsDir, windowsShellPath); } } @@ -701,8 +687,7 @@ static void testSystemDir(void) { myPathRemoveBackslashA(systemShellPath); ok(!lstrcmpiA(systemDir, systemShellPath), - "GetSystemDirectory does not match SHGetSpecialFolderPath:\n" - "GetSystemDirectory returns %s\nSHGetSpecialFolderPath returns %s\n", + "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", systemDir, systemShellPath); } /* check CSIDL_SYSTEMX86; note that this isn't always present, so don't @@ -712,8 +697,7 @@ static void testSystemDir(void) { myPathRemoveBackslashA(systemShellPath); ok(!lstrcmpiA(systemDir, systemShellPath), - "GetSystemDirectory does not match SHGetSpecialFolderPath:\n" - "GetSystemDirectory returns %s\nSHGetSpecialFolderPath returns %s\n", + "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", systemDir, systemShellPath); } } @@ -782,7 +766,7 @@ static void testNonExistentPath1(void) } ok(SUCCEEDED(hr), "SHGetFolderPath(NULL, CSIDL_FAVORITES | CSIDL_FLAG_CREATE, " - "NULL, SHGFP_TYPE_CURRENT, path)\nfailed: 0x%08x\n", hr); + "NULL, SHGFP_TYPE_CURRENT, path) failed: 0x%08x\n", hr); } /* Subprocess helper 2: make sure SHGetFolderPath still succeeds when the

1 0

Jared Lapsley : shdocvw: WebBrowser_get_Busy implementation.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: 473010268df893322c0252bef1629213310df1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=473010268df893322c0252bef… Author: Jared Lapsley <jared151(a)gmail.com> Date: Thu Mar 13 08:16:41 2008 -0400 shdocvw: WebBrowser_get_Busy implementation. --- dlls/shdocvw/dochost.c | 1 + dlls/shdocvw/navigate.c | 2 ++ dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 7 +++++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index c3a22f4..908503c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -78,6 +78,7 @@ static void navigate_complete(DocHost *This) SysFreeString(V_BSTR(&url)); if(disp) IDispatch_Release(disp); + This->busy = VARIANT_FALSE; } void object_available(DocHost *This) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 7e8606f..7ca0b0f 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -427,6 +427,8 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_dat dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = params; + This->busy = VARIANT_TRUE; + V_VT(params) = VT_BOOL|VT_BYREF; V_BOOLREF(params) = cancel; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index af647a1..1257b76 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -99,6 +99,7 @@ struct DocHost { VARIANT_BOOL silent; VARIANT_BOOL offline; + VARIANT_BOOL busy; ConnectionPointContainer cps; }; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 1262c3c..db6bea6 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -462,8 +462,11 @@ static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *Loca static HRESULT WINAPI WebBrowser_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pBool); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pBool); + + *pBool = This->doc_host.busy; + return S_OK; } static HRESULT WINAPI WebBrowser_Quit(IWebBrowser2 *iface)

1 0

Maarten Lankhorst : user32: Fix enumeration for EnumWindowStations and EnumDesktops.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: fd69ababec3b26e76837ed0d3cd82509c619a38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd69ababec3b26e76837ed0d3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 5 13:41:41 2008 -0800 user32: Fix enumeration for EnumWindowStations and EnumDesktops. --- dlls/user32/tests/winstation.c | 102 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/winstation.c | 36 ++++++++++++-- 2 files changed, 132 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 16a1c93..d69faa4 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #define DESKTOP_ALL_ACCESS 0x01ff @@ -248,6 +249,105 @@ static void test_handles(void) CloseHandle( hthread ); } +/* Enumeration tests */ + +static BOOL CALLBACK window_station_callbackA(LPSTR winsta, LPARAM lp) +{ + trace("window_station_callbackA called with argument %s\n", winsta); + return lp; +} + +static BOOL CALLBACK open_window_station_callbackA(LPSTR winsta, LPARAM lp) +{ + HWINSTA hwinsta; + + trace("open_window_station_callbackA called with argument %s\n", winsta); + hwinsta = OpenWindowStationA(winsta, FALSE, WINSTA_ENUMERATE); + ok(hwinsta != NULL, "Could not open desktop %s!\n", winsta); + if (hwinsta) + CloseWindowStation(hwinsta); + return lp; +} + +static void test_enumstations(void) +{ + BOOL ret; + + if (0) /* Crashes instead */ + { + SetLastError(0xbabefeed); + ret = EnumWindowStationsA(NULL, 0); + ok(!ret, "EnumWindowStationsA returned succesfully!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = EnumWindowStationsA(open_window_station_callbackA, 0x12345); + ok(ret == 0x12345, "EnumWindowStationsA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EnumWindowStationsA(window_station_callbackA, 0); + ok(!ret, "EnumWindowStationsA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); +} + +static BOOL CALLBACK desktop_callbackA(LPSTR desktop, LPARAM lp) +{ + trace("desktop_callbackA called with argument %s\n", desktop); + return lp; +} + +static BOOL CALLBACK open_desktop_callbackA(LPSTR desktop, LPARAM lp) +{ + HDESK hdesk; + static int once; + + trace("open_desktop_callbackA called with argument %s\n", desktop); + /* Only try to open one desktop */ + if (once++) + return lp; + + hdesk = OpenDesktopA(desktop, 0, FALSE, DESKTOP_ENUMERATE); + ok(hdesk != NULL, "Could not open desktop %s!\n", desktop); + if (hdesk) + CloseDesktop(hdesk); + return lp; +} + +static void test_enumdesktops(void) +{ + BOOL ret; + + if (0) /* Crashes instead */ + { + SetLastError(0xbabefeed); + ret = EnumDesktopsA(GetProcessWindowStation(), NULL, 0); + ok(!ret, "EnumDesktopsA returned succesfully!\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = EnumDesktopsA(NULL, desktop_callbackA, 0x12345); + ok(ret == 0x12345, "EnumDesktopsA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EnumDesktopsA(GetProcessWindowStation(), open_desktop_callbackA, 0x12345); + ok(ret == 0x12345, "EnumDesktopsA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EnumDesktopsA(INVALID_HANDLE_VALUE, desktop_callbackA, 0x12345); + ok(!ret, "EnumDesktopsA returned %x\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "LastError is set to %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + ok(!ret, "EnumDesktopsA returned %x\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -260,5 +360,7 @@ START_TEST(winstation) return; } + test_enumstations(); + test_enumdesktops(); test_handles(); } diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 75cb286..906f2ba 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -211,18 +214,27 @@ BOOL WINAPI EnumWindowStationsW( WINSTAENUMPROCW func, LPARAM lparam ) unsigned int index = 0; WCHAR name[MAX_PATH]; BOOL ret = TRUE; + NTSTATUS status; while (ret) { SERVER_START_REQ( enum_winstation ) { req->index = index; - wine_server_set_reply( req, name, sizeof(name) ); - ret = !wine_server_call( req ); + wine_server_set_reply( req, name, sizeof(name) - sizeof(WCHAR) ); + status = wine_server_call( req ); + name[wine_server_reply_size(reply)/sizeof(WCHAR)] = 0; index = reply->next; } SERVER_END_REQ; - if (ret) ret = func( name, lparam ); + if (status == STATUS_NO_MORE_ENTRIES) + break; + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + ret = func( name, lparam ); } return ret; } @@ -401,6 +413,10 @@ BOOL WINAPI EnumDesktopsW( HWINSTA winsta, DESKTOPENUMPROCW func, LPARAM lparam unsigned int index = 0; WCHAR name[MAX_PATH]; BOOL ret = TRUE; + NTSTATUS status; + + if (!winsta) + winsta = GetProcessWindowStation(); while (ret) { @@ -408,12 +424,20 @@ BOOL WINAPI EnumDesktopsW( HWINSTA winsta, DESKTOPENUMPROCW func, LPARAM lparam { req->winstation = winsta; req->index = index; - wine_server_set_reply( req, name, sizeof(name) ); - ret = !wine_server_call( req ); + wine_server_set_reply( req, name, sizeof(name) - sizeof(WCHAR) ); + status = wine_server_call( req ); + name[wine_server_reply_size(reply)/sizeof(WCHAR)] = 0; index = reply->next; } SERVER_END_REQ; - if (ret) ret = func( name, lparam ); + if (status == STATUS_NO_MORE_ENTRIES) + break; + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + ret = func(name, lparam); } return ret; }

1 0

Marcus Meissner : wininet: Split out NULL ptr and function ptr check.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: ed966469a4d2ae1c7d5ddad1b9d74e8d4d0783b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed966469a4d2ae1c7d5ddad1b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 14 22:34:54 2008 +0100 wininet: Split out NULL ptr and function ptr check. --- dlls/wininet/internet.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d5fbbc1..be1ee16 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1704,11 +1704,16 @@ BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer, TRACE("(%p %p %d %p)\n", hFile, lpBuffer, dwNumOfBytesToWrite, lpdwNumOfBytesWritten); lpwh = WININET_GetObject( hFile ); + if (!lpwh) { + WARN("Invalid handle\n"); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } - if(lpwh && lpwh->vtbl->WriteFile) { + if(lpwh->vtbl->WriteFile) { retval = lpwh->vtbl->WriteFile(lpwh, lpBuffer, dwNumOfBytesToWrite, lpdwNumOfBytesWritten); }else { - WARN("Invalid handle\n"); + WARN("No Writefile method.\n"); SetLastError(ERROR_INVALID_HANDLE); retval = FALSE; } @@ -1848,7 +1853,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d TRACE("(%p, 0x%08x, %p, %p)\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); - lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet ); + lpwhh = WININET_GetObject( hInternet ); switch (dwOption) {

1 0

Clinton Stimpson : user32: Test processing of expose events.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: wine Branch: master Commit: 05a8974e95ea221079fd43620dc231e55f28571f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a8974e95ea221079fd43620… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Fri Mar 14 23:59:54 2008 -0600 user32: Test processing of expose events. --- dlls/user32/tests/win.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 661a7e8..2c4d113 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4563,6 +4563,61 @@ static void test_GetUpdateRect(void) DestroyWindow(hgrandparent); } + +static LRESULT CALLBACK TestExposedRegion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if(msg == WM_PAINT) + { + PAINTSTRUCT ps; + RECT updateRect; + DWORD waitResult; + HWND win; + const int waitTime = 2000; + + BeginPaint(hwnd, &ps); + + /* create and destroy window to create an exposed region on this window */ + win = CreateWindowA("static", "win", WS_VISIBLE, + 10,10,50,50, NULL, NULL, 0, NULL); + DestroyWindow(win); + + waitResult = MsgWaitForMultipleObjectsEx( 0, NULL, waitTime, QS_PAINT, 0 ); + + ValidateRect(hwnd, NULL); + EndPaint(hwnd, &ps); + + if(waitResult != WAIT_TIMEOUT) + { + GetUpdateRect(hwnd, &updateRect, FALSE); +todo_wine +{ + ok(!IsRectEmpty(&updateRect), "Exposed rect should not be empty\n"); +} + } + + return 1; + } + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +static void test_Expose(void) +{ + ATOM atom; + WNDCLASSA cls; + HWND mw; + memset(&cls, 0, sizeof(WNDCLASSA)); + cls.lpfnWndProc = TestExposedRegion_WndProc; + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "TestExposeClass"; + atom = RegisterClassA(&cls); + + mw = CreateWindowA("TestExposeClass", "MainWindow", WS_VISIBLE|WS_OVERLAPPEDWINDOW, + 0, 0, 200, 100, NULL, NULL, 0, NULL); + + UpdateWindow(mw); + DestroyWindow(mw); +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); @@ -4645,6 +4700,7 @@ START_TEST(win) test_ShowWindow(); test_gettext(); test_GetUpdateRect(); + test_Expose(); /* add the tests above this line */ UnhookWindowsHookEx(hhook);

1 0

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 2008