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

Paul Vriens : kernel32/tests: Skip tests when codepage is not available.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: b2093dc86aeaeb0ee12649ced079e731a2787389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2093dc86aeaeb0ee12649ced… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 1 17:33:44 2008 +0200 kernel32/tests: Skip tests when codepage is not available. --- dlls/kernel32/tests/codepage.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 0c5d697..7ca4a6f 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -290,6 +290,26 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) ok(!strcmp(mbs, "??"), "mbs is %s\n", mbs); if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + /* Length-only tests */ + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); + ok(ret == 1, "ret is %d\n", ret); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); + ok(ret == 5, "ret is %d\n", ret); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + if (!IsValidCodePage(950)) + { + skip("Codepage 950 not available\n"); + return; + } + + /* Double-byte tests */ SetLastError(0xdeadbeef); ret = WideCharToMultiByte(950, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); ok(ret == 5, "ret is %d\n", ret); @@ -313,18 +333,6 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) /* Length-only tests */ SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); - ok(ret == 1, "ret is %d\n", ret); - if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); - ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); - ok(ret == 5, "ret is %d\n", ret); - if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); - ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); - - SetLastError(0xdeadbeef); ret = WideCharToMultiByte(950, 0, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar); ok(ret == 2, "ret is %d\n", ret); if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar);

1 0

Reece Dunn : crypt32: Removed the failing base64 test in Vista.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 786a2bd54293f03210ee21999cff11301bc87d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786a2bd54293f03210ee21999… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Thu Jul 31 09:13:53 2008 +0100 crypt32: Removed the failing base64 test in Vista. --- dlls/crypt32/tests/base64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 965b3f8..15f41c8 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -67,7 +67,7 @@ static const BYTE toEncode4[] = struct BinTests tests[] = { { toEncode1, sizeof(toEncode1), "AA==\r\n", }, { toEncode2, sizeof(toEncode2), "AQI=\r\n", }, - { toEncode3, sizeof(toEncode3), "AQID\r\n", }, + /* { toEncode3, sizeof(toEncode3), "AQID\r\n", }, This test fails on Vista. */ { toEncode4, sizeof(toEncode4), "YWJjZGVmZ2hpamxrbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5MEFCQ0RFRkdISUpL\r\n" "TE1OT1BRUlNUVVZXWFlaMDEyMzQ1Njc4OTBhYmNkZWZnaGlqbGttbm9wcXJzdHV2\r\n" @@ -79,7 +79,7 @@ struct BinTests tests[] = { struct BinTests testsNoCR[] = { { toEncode1, sizeof(toEncode1), "AA==\n", }, { toEncode2, sizeof(toEncode2), "AQI=\n", }, - { toEncode3, sizeof(toEncode3), "AQID\n", }, + /* { toEncode3, sizeof(toEncode3), "AQID\n", }, This test fails on Vista. */ { toEncode4, sizeof(toEncode4), "YWJjZGVmZ2hpamxrbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5MEFCQ0RFRkdISUpL\n" "TE1OT1BRUlNUVVZXWFlaMDEyMzQ1Njc4OTBhYmNkZWZnaGlqbGttbm9wcXJzdHV2\n"

1 0

Alexandre Julliard : winetest: Build per-test global summaries over all available builds.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: tools Branch: master Commit: b3aab8612d1acb367dc05b78036baf90a115e0c2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b3aab8612d1acb367dc05b78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 1 15:35:20 2008 +0200 winetest: Build per-test global summaries over all available builds. --- winetest/build-index | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++ winetest/summary.css | 4 +- 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 77fb157..cf4f4fc 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -99,6 +99,104 @@ foreach my $build (@builds) $build->{versions} = \%build_ver; } +# load summary files + +my %alltests = (); + +foreach my $build (@builds) +{ + open SUM, "./data/$build->{name}/summary.txt" or next; + while (<SUM>) + { + chomp; + my ($test, $group, $cell) = split / +/, $_, 3; + $alltests{$test}->{$build->{name}}->{$group} = $cell; + } + close SUM; +} + +# build the tests linked list + +my $prev; +foreach my $test (sort keys %alltests) +{ + $alltests{$test}->{prev} = "$prev.html" if $prev; + $alltests{$prev}->{next} = "$test.html" if $prev; + $prev = $test; +} + +# output the html files for individual test runs + +foreach my $test (keys %alltests) +{ + open OUT, ">data/tests/$test.html.new" or die "cannot create data/tests/$test.html.new"; + print OUT <<EOF; +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>$test test runs</title> + <link rel="stylesheet" href="/summary.css" type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> +<body> +<div class="navbar"> +EOF + print OUT defined($alltests{$test}->{prev}) ? "<a href=\"./$alltests{$test}->{prev}\">prev</a>" : "prev"; + print OUT defined($alltests{$test}->{next}) ? " | <a href=\"./$alltests{$test}->{next}\">next</a>" : " | next"; + print OUT <<EOF; + | <a href="..">index</a> +<script type="text/javascript" src="/summary.js"></script> +</div> +<div class="main"> +<h2>$test test runs</h2> +<table class="report"> +<thead> + <tr><th class="test">Build</th><th class="test">Date</th> +EOF + + # check which group names are actually used by that test + my %used_group; + foreach my $build (@builds) + { + next unless defined $alltests{$test}->{$build->{name}}; + foreach my $group (keys %{$alltests{$test}->{$build->{name}}}) { $used_group{$group} = 1; } + } + + foreach my $group (@groups) + { + next unless defined $used_group{$group->{name}}; + printf OUT " <th class=\"test\">$group->{name}</th>\n"; + } + print OUT " <th class=\"test\"></th></tr>\n"; + foreach my $build (@builds) + { + next unless defined $alltests{$test}->{$build->{name}}; + printf OUT " <tr><td class=\"build\"><a href=\"../%s\" title=\"%s\">%s</a></td>\n", + $build->{name}, $build->{name}, substr($build->{name},0,12); + my @date = gmtime($build->{date}); + printf OUT " <td class=\"date\">%02d-%s-%04d %02d:%02d</td>", + $date[3], $months[$date[4]], $date[5] + 1900, $date[2], $date[1], $date[0]; + foreach my $group (@groups) + { + next unless defined $used_group{$group->{name}}; + if (defined $alltests{$test}->{$build->{name}}->{$group->{name}}) + { + printf OUT " %s\n", $alltests{$test}->{$build->{name}}->{$group->{name}}; + } + else + { + print OUT " <td class=\"note\"></td>\n"; + } + } + print OUT " <td class=\"links\"><a href=\"$gitweb?a=shortlog;h=$build->{name}\">shortlog</a>"; + print OUT " | <a href=\"../$build->{name}\">all tests</a></td></tr>\n"; + } + print OUT "</table></body></html>\n"; + close OUT; + rename "data/tests/$test.html.new", "data/tests/$test.html" or unlink "data/tests/$test.html.new"; +} + open OUT, ">data/index.html.new" or die "cannot create data/index.html.new"; print OUT <<"EOF"; diff --git a/winetest/summary.css b/winetest/summary.css index 9ce7f77..ae4b31f 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -143,8 +143,8 @@ table.report td.vis_note :link, table.report td.vis_note :visited { table.report td.test { text-align: left; } -table.report td a { - display: block; +table.report td.links { + font-size: x-small; } form td { text-align: left;

1 0

Alexandre Julliard : winetest: Ignore all files that aren' t in sha1 format in the main directory.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: tools Branch: master Commit: 93583dedc08d7c7bcf0d8cab906295309333984a URL: http://source.winehq.org/git/tools.git/?a=commit;h=93583dedc08d7c7bcf0d8cab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 1 15:47:45 2008 +0200 winetest: Ignore all files that aren't in sha1 format in the main directory. --- winetest/site | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/winetest/site b/winetest/site index 68fe51f..d27d794 100755 --- a/winetest/site +++ b/winetest/site @@ -17,8 +17,7 @@ if ($q->param('testing')) { opendir(DIR, "./data/"); foreach my $build (readdir(DIR)) { - next if $build =~ /^\./; - next unless $build =~ /^[-.0-9a-zA-Z]+$/; + next unless $build =~ /^[0-9a-f]{40}$/; next unless -f "./data/$build/index.html"; push @builds, { name => $build, date => (stat "./data/$build")[9] }; }

1 0

Alexandre Julliard : winetest: Add links to the per-test summaries in the build page.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: tools Branch: master Commit: 81136e728d1ea5c00e7bcc283778f8d85922a8b1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=81136e728d1ea5c00e7bcc28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 1 15:45:59 2008 +0200 winetest: Add links to the per-test summaries in the build page. --- winetest/gather | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index 497f0bb..f36b145 100755 --- a/winetest/gather +++ b/winetest/gather @@ -378,12 +378,14 @@ $title <tr> <th class="test">errors</th> $stats + <th class="test"></th> </tr> </thead> <tfoot> <tr> <th class="test">errors</th> $stats + <th class="test"></th> </tr> <tr> <th class="test">platforms</th> @@ -552,6 +554,15 @@ sub singletest($$$) { } } +sub test_links($) +{ + my ($testname) = @_; + my $source = $alltests{$testname}; + return "<td class=\"links\"><a href=\"$gitweb/?a=history;f=$source;hb=$build\">history</a>" . + " | <a href=\"$gitweb/?a=blob;f=$source;hb=$build\">source</a>" . + " | <a href=\"../tests/$testname.html\">all builds</a></td>"; +} + # Create the Main Summary foreach my $testname (sort keys %alltests) { my $source = $alltests{$testname}; @@ -568,7 +579,7 @@ EOF singletest($group, $testname, $group->{name}); } } - print OUT " </tr>\n"; + printf OUT " %s\n </tr>\n", test_links($testname); } print OUT <<"EOF"; </tbody> @@ -602,9 +613,7 @@ EOF foreach my $report (@{$group->{reports}}) { singletest($report, $testname, $group->{name}); } - print OUT <<"EOF"; - </tr> -EOF + printf OUT " %s\n </tr>\n", test_links($testname); } print OUT <<"EOF"; </tbody>

1 0

Alexandre Julliard : winetest: Store the individual test result cells in a summary.txt file.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: tools Branch: master Commit: 2982843bb613a786fc2fdc4b1fc20fb9c1f37cc6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2982843bb613a786fc2fdc4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 1 15:18:55 2008 +0200 winetest: Store the individual test result cells in a summary.txt file. --- winetest/gather | 107 +++++++++++++++++++++++++++++------------------------- 1 files changed, 57 insertions(+), 50 deletions(-) diff --git a/winetest/gather b/winetest/gather index 295fe9f..497f0bb 100755 --- a/winetest/gather +++ b/winetest/gather @@ -396,8 +396,13 @@ EOF my $header_footer=build_header_footer(\@groups); my $short_build = substr($build,0,12); -if (!open OUT, ">$datadir/$build/index.html") { - print STDERR "$name0:error: unable to open '$datadir/$build/index.html' for writing: $!\n"; +if (!open OUT, ">$datadir/$build/index.html.new") { + print STDERR "$name0:error: unable to open '$datadir/$build/index.html.new' for writing: $!\n"; + goto DONE; +} +if (!open SUMMARY, ">$datadir/$build/summary.txt.new") +{ + print STDERR "$name0:error: unable to open '$datadir/$build/summary.txt.new' for writing: $!\n"; goto DONE; } print OUT <<"EOF"; @@ -448,10 +453,10 @@ sub singletest($$$) { my ($group, $testname, $groupname) = @_; my $result = $group->{$testname}; - my ($href, $label); + my ($class, $msg, $title, $mouseover, $href, $label); if ($group->{reports} and @{$group->{reports}} > 1) { - $href = $result->{omit} ? "" : "href=\"#group_$groupname:$testname\""; + $href = $result->{omit} ? "" : "#group_$groupname:$testname"; $label = $groupname; } else @@ -460,11 +465,11 @@ sub singletest($$$) { $label = "$groupname $report->{tag}"; if (-r "$datadir/$build/$report->{dir}/$testname.html") { - $href = "href=\"$report->{dir}/$testname.html\""; + $href = "$report->{dir}/$testname.html"; } elsif (-r "$datadir/$build/$report->{dir}/$testname.txt") { - $href = "href=\"$report->{dir}/$testname.txt\""; + $href = "$report->{dir}/$testname.txt"; } else { @@ -475,76 +480,75 @@ sub singletest($$$) { my $status = $result->{status}; if ($status eq "run") { - my $class = $result->{errors}->[0] ? "fail" : - $result->{errors}->[1] ? "mixed" : - $result->{todos}->[1] ? "todo" : - "pass"; + $class = $result->{errors}->[0] ? "fail" : + $result->{errors}->[1] ? "mixed" : + $result->{todos}->[1] ? "todo" : + "pass"; $class .= " also-todo" if ($result->{todos}->[1]); $class .= " also-skip" if ($result->{skips}->[1]); + $class = "result $class"; my $mm_count=min_to_max($result->{count}); my $mm_errors=min_to_max($result->{errors}); my $mm_todos=min_to_max($result->{todos}); my $mm_skips=min_to_max($result->{skips}); - my $title="$mm_count tests, $mm_errors errors, $mm_todos todos, $mm_skips skips"; - my $msg=!$result->{todos}->[1] ? $result->{errors}->[1] : - !$result->{errors}->[1] ? $result->{todos}->[1] : - "$result->{errors}->[1]+$result->{todos}->[1]"; - print OUT <<"EOF"; - <td class="result $class"><a $href title="$title" - onMouseOver="refresh('$testname', '$label', '$mm_count', '$mm_todos', '$mm_errors', '$mm_skips');" - >$msg</a></td> -EOF + $title="$mm_count tests, $mm_errors errors, $mm_todos todos, $mm_skips skips"; + if ($group->{reports} and @{$group->{reports}} > 1) + { + $title = sprintf "%u test runs, %s", $#{$group->{reports}} + 1, $title; + } + $msg=!$result->{todos}->[1] ? $result->{errors}->[1] : + !$result->{errors}->[1] ? $result->{todos}->[1] : + "$result->{errors}->[1]+$result->{todos}->[1]"; + $mouseover = "onMouseOver=\"refresh('$testname', '$label', '$mm_count', '$mm_todos', '$mm_errors', '$mm_skips');\""; } elsif ($status eq "dll missing") { my ($dll, $unit) = split(/:/, $testname); $dll.=".dll" if ($dll !~ /\./); - print OUT <<"EOF"; - <td class="result pass also-skip"><a $href - title="No tests run as $dll is not present on this system" - >n/a</a></td> -EOF + $class = "result pass also-skip"; + $title = "No tests run as $dll is not present on this system"; + $msg = "n/a"; } elsif ($status eq "winetest crash") { - print OUT <<"EOF"; - <td class="note"><a $href - title="Test did not run as winetest crashed" - >winetest</a></td> -EOF + $class = "note"; + $title = "Test did not run as winetest crashed"; + $msg = "winetest"; } elsif ($status eq "filelimit") { - print OUT <<"EOF"; - <td class="note"><a $href - title="Test is missing because of a partial report file" - >truncated</a></td> -EOF + $class = "note"; + $title = "Test is missing because of a partial report file"; + $msg = "truncated"; } elsif ($status eq "missing") { - print OUT <<"EOF"; - <td class="note"><a $href - title="Test did not run for an unknown reason" - >not run</a></td> -EOF + $class = "note"; + $title = "Test did not run for an unknown reason"; + $msg = "not run"; } elsif ($status eq "mixed") { - print OUT <<"EOF"; - <td class="note"><a $href - title="Mixed results" - >mixed</a></td> -EOF + $class = "note"; + $title = "Mixed results"; + $msg = "mixed"; } else { - my $msg = $status eq "crash" ? "crashed" : - $status eq "-2" ? "failed" : - $status =~ /^-/ ? "crashed" : - $status eq "258" ? "timeout": "failed"; - $msg = "<a $href>$msg</a>" if ($href ne ""); - print OUT " <td class=\"note\">$msg</td>\n"; + $class = "note"; + $msg = $status eq "crash" ? "crashed" : + $status eq "-2" ? "failed" : + $status =~ /^-/ ? "crashed" : + $status eq "258" ? "timeout": "failed"; + } + printf OUT " <td class=\"%s\"><a %s %s %s>%s</a></td>\n", + $class, $href ? "href=\"$href\"" : "", + $title ? "title=\"$title\"" : "", $mouseover || "", $msg; + if ($group->{reports}) + { + printf SUMMARY "%s %s <td class=\"%s\"><a %s %s %s>%s</a></td>\n", + $testname, $groupname, $class, $href ? "href=\"../$build/$href\"" : "", + $title ? "title=\"$title\"" : "", $mouseover || "", $msg; } } @@ -613,6 +617,9 @@ print OUT <<"EOF"; </html> EOF close OUT; +close SUMMARY; +rename "$datadir/$build/index.html.new", "$datadir/$build/index.html" or unlink "$datadir/$build/index.html.new"; +rename "$datadir/$build/summary.txt.new", "$datadir/$build/summary.txt" or unlink "$datadir/$build/summary.txt"; DONE: if (!unlink $outdated) {

1 0

Reece Dunn : secur32: Fix the schannel tests crashing on Vista.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 922414b60a46012a31fee64d7e4e12be35d66992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922414b60a46012a31fee64d7… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Wed Jul 30 21:50:46 2008 +0100 secur32: Fix the schannel tests crashing on Vista. --- dlls/secur32/tests/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b4eaf12..904b6fd 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -245,7 +245,7 @@ static void testAcquireSecurityContext(void) pFreeCredentialsHandle(&cred); /* but fails for inbound. */ st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, - NULL, &schanCred, NULL, NULL, NULL, NULL); + NULL, &schanCred, NULL, NULL, &cred, NULL); ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", st);

1 0

Reece Dunn : shell32: Fix shlexec crashing on Vista.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 428fd07e73c08e01f463982fab0d4b4267695b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=428fd07e73c08e01f463982fa… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Wed Jul 30 22:22:27 2008 +0100 shell32: Fix shlexec crashing on Vista. --- dlls/shell32/tests/shlexec.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 644d611..5eed12b 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -847,9 +847,12 @@ static void test_find_executable(void) /* Don't test FindExecutable(..., NULL), it always crashes */ strcpy(command, "your word"); + if (0) /* Can crash on Vista! */ + { rc=(int)FindExecutableA(NULL, NULL, command); ok(rc == SE_ERR_FNF || rc > 32 /* nt4 */, "FindExecutable(NULL) returned %d\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); + } strcpy(command, "your word"); rc=(int)FindExecutableA(tmpdir, NULL, command);

1 0

Reece Dunn : secur32: Fix the ntlm tests crashing on Vista.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: e413bbeea2664bdc15c1055aa8d42c4caeaa6ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e413bbeea2664bdc15c1055aa… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Wed Jul 30 21:36:25 2008 +0100 secur32: Fix the ntlm tests crashing on Vista. --- dlls/secur32/tests/ntlm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index b1f6c3f..4667ef0 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -927,6 +927,8 @@ static void testSignSeal(void) workgroup[] = "WORKGROUP", test_pass[] = "testpass"; + complex_data[1].pvBuffer = complex_data[3].pvBuffer = NULL; + /**************************************************************** * This is basically the same as in testAuth with a fake server, * as we need a valid, authenticated context.

1 0

Zac Brown : winhttp/tests: Add test for sending request.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 8ead5566485aa3b4fcbad9ea16facce31b73ccdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ead5566485aa3b4fcbad9ea1… Author: Zac Brown <zac(a)zacbrown.org> Date: Wed Jul 30 13:20:40 2008 -0700 winhttp/tests: Add test for sending request. --- dlls/winhttp/tests/winhttp.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d417a56..3b43550 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -74,7 +74,80 @@ static void test_OpenRequest (void) } +static void test_SendRequest (void) +{ + HINTERNET session, request, connection; + DWORD header_len, optional_len, total_len; + DWORD bytes_rw; + BOOL ret; + CHAR buffer[256]; + int i; + + static const WCHAR test_site[] = {'c','r','o','s','s','o','v','e','r','.', + 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; + static const WCHAR content_type[] = + {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ','a','p','p','l','i','c','a','t','i','o','n', + '/','x','-','w','w','w','-','f','o','r','m','-','u','r','l','e','n','c','o','d','e','d',0}; + static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; + static const WCHAR test_verb[] = {'P','O','S','T',0}; + static CHAR post_data[] = "mode=Test"; + static CHAR test_post[] = "mode => Test\\0\n"; + + header_len = -1L; + total_len = optional_len = sizeof(post_data); + memset(buffer, 0xff, sizeof(buffer)); + + session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); + todo_wine ok(session != NULL, "WinHttpOpen failed to open session.\n"); + + connection = WinHttpConnect (session, test_site, INTERNET_DEFAULT_HTTP_PORT, 0); + todo_wine ok(connection != NULL, + "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + + request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, + WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); + if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) + { + skip("Network unreachable, skipping.\n"); + goto done; + } + todo_wine ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); + + ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, 0); + todo_wine ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); + + for (i = 3; post_data[i]; i++) + { + bytes_rw = -1; + ret = WinHttpWriteData(request, &post_data[i], 1, &bytes_rw); + todo_wine ok(ret == TRUE, "WinHttpWriteData failed: %u.\n", GetLastError()); + todo_wine ok(bytes_rw == 1, "WinHttpWriteData failed, wrote %u bytes instead of 1 byte.\n", bytes_rw); + } + + ret = WinHttpReceiveResponse(request, NULL); + todo_wine ok(ret == TRUE, "WinHttpReceiveResponse failed: %u.\n", GetLastError()); + + bytes_rw = -1; + ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); + todo_wine ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); + + todo_wine ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", + bytes_rw, strlen(test_post)); + todo_wine ok(strncmp(buffer, test_post, bytes_rw) == 0, + "Data read did not match, got '%s'.\n", buffer); + + ret = WinHttpCloseHandle(request); + todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); + done: + ret = WinHttpCloseHandle(connection); + todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); + ret = WinHttpCloseHandle(session); + todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); +} + START_TEST (winhttp) { test_OpenRequest(); + test_SendRequest(); }

1 0