September 2008 - Wine-commits

Alexandre Julliard : winetest: Add a link to the latest winetest.exe.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: tools Branch: master Commit: bbc9f8f9d88f7ceaef3e401d27511ad65a3df170 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bbc9f8f9d88f7ceaef3e401d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 23:23:58 2008 +0200 winetest: Add a link to the latest winetest.exe. --- winetest/build-index | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 50d8b12..e282277 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -266,7 +266,15 @@ foreach my $build (@builds) if ($build->{subj}) { printf OUT "<a href=\"$gitweb?a=shortlog;h=%s\">%s</a>", $build->{name}, escapeHTML($build->{subj}); } print OUT "</td></tr>\n"; } -print OUT "</table>\n</body></html>\n"; + +print OUT <<"EOF"; +</table></div> +<div class="navbar"> +To run the tests on your Windows machine, download the <a href="http://www.astro.gla.ac.uk/users/paulm/WRT/CrossBuilt/winetest-latest.exe">latest winetest.exe</a> build. +</div> +</body></html> +EOF + close OUT; rename "data/index.html.new", "data/index.html" or unlink "data/index.html.new";

1 0

Alexandre Julliard : winetest: Build a totals file for each build, to allow showing the number of failures on the index page.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: tools Branch: master Commit: 3f9be135a7609648c0a365c9aeb4d0aed2201cd2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3f9be135a7609648c0a365c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 21:41:42 2008 +0200 winetest: Build a totals file for each build, to allow showing the number of failures on the index page. --- winetest/gather | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 9637763..9f5ff3f 100755 --- a/winetest/gather +++ b/winetest/gather @@ -377,7 +377,10 @@ EOF !$report->{errors} ? percent($report->{todos}, $unit_count) : (percent($report->{errors}, $unit_count) . "+" . percent($report->{todos}, $unit_count)); - $stats .= " <th class=\"$class\"><a title=\"$unit_count unit tests, $report->{errors} have errors, $report->{todos} have todos\">$count<br>$prcnt\%</a></th>\n"; + my $title = "$unit_count unit tests, $report->{errors} have errors"; + $title .= ", $report->{todos} have todos" if $report->{todos}; + + $stats .= " <th class=\"$class\"><a title=\"$title\">$count<br>$prcnt\%</a></th>\n"; } chop $title; chop $stats; @@ -493,7 +496,10 @@ sub get_result_title($$) my $mm_errors=min_to_max($result->{errors}); my $mm_todos=min_to_max($result->{todos}); my $mm_skips=min_to_max($result->{skips}); - return "$mm_count tests, $mm_errors errors, $mm_todos todos, $mm_skips skips"; + my $title = "$mm_count tests, $mm_errors errors"; + $title .= ", $mm_todos todos" if ($mm_todos); + $title .= ", $mm_skips skips" if ($mm_skips); + return $title; } if ($result->{status} eq "dll missing") { @@ -607,6 +613,34 @@ sub test_links($) " | <a href=\"../tests/$testname.html\" title=\"$testname results across all builds\">all builds</a></td>"; } +sub build_totals($) +{ + my ($reports)=@_; + + if (!open TOTAL, ">$datadir/$build/total.txt.new") + { + print STDERR "$name0:error: unable to open '$datadir/$build/total.txt.new' for writing: $!\n"; + return; + } + my $unit_count=scalar(keys %alltests); + foreach my $rep (@{$reports}) { + my $report=$rep; + my $report_count = 0; + if (exists $report->{reports}) { + $report_count = @{$report->{reports}}; + if ($report_count == 1) { + $report = $report->{reports}->[0]; + } + } elsif (exists $report->{name}) { + # Ignore groups with no reports + next; + } + printf TOTAL "%s %u %u %u %u\n", $report->{group}->{name}, $report_count, $unit_count, $report->{errors}, $report->{todos}; + } + close TOTAL; + rename "$datadir/$build/total.txt.new", "$datadir/$build/total.txt" or unlink "$datadir/$build/total.txt"; +} + # Create the Main Summary foreach my $testname (sort keys %alltests) { my $source = $alltests{$testname}; @@ -676,6 +710,8 @@ 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"; +build_totals(\@groups); + DONE: if (!unlink $outdated) { print STDERR "$name0:error: unable to unlink '$outdated': $!\n";

1 0

Alexandre Julliard : winetest: Show the number of failures per build/ version on the index page.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: tools Branch: master Commit: a459d639b139a0d36cefc389cec7d978337b9536 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a459d639b139a0d36cefc389… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 21:47:10 2008 +0200 winetest: Show the number of failures per build/version on the index page. Use the same formatting and colors as the other report pages. --- winetest/build-index | 70 +++++++++++++++++++++++++++++++------------------ winetest/index.css | 52 ------------------------------------- winetest/summary.css | 9 ++++++ 3 files changed, 53 insertions(+), 78 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index cf4f4fc..50d8b12 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -83,18 +83,18 @@ my %versions = (); foreach my $build (@builds) { my %build_ver = (); - if (opendir( DIR, "./data/$build->{name}" )) + if (open TOTAL, "./data/$build->{name}/total.txt" ) { - foreach my $run (readdir(DIR)) + while (<TOTAL>) { - next unless -d "./data/$build->{name}/$run"; - next unless $run =~ /^([0-9a-z]*)_.*/; - next unless defined $idmap{$1}; - my $ver = $idmap{$1}->{name}; - $versions{$ver}++; - $build_ver{$ver}++; + if (/^([A-Za-z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/) + { + my ($name, $runs, $tests, $errors, $todos) = ($1, $2, $3, $4, $5); + $versions{$name}++; + $build_ver{$name} = [ $runs, $tests, $errors, $todos ]; + } } - closedir(DIR); + close TOTAL; } $build->{versions} = \%build_ver; } @@ -205,46 +205,64 @@ print OUT <<"EOF"; <html> <head> <title>Wine test runs</title> - <link rel="stylesheet" href="/index.css" type="text/css"> + <link rel="stylesheet" href="/summary.css" type="text/css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> +<div class="main"> +<h2>Wine test runs</h2> EOF -print OUT "<table class=\"builds\"><tr><th class=\"build\">Build</th><th class=\"date\">Date</th>\n"; +print OUT "<table class=\"report\"><thead><tr><th class=\"test\">Build</th><th class=\"test\">Date</th>\n"; foreach my $ver (@groups) { next unless defined($versions{$ver->{name}}); - printf OUT "<th class=\"version\">%s</th>", $ver->{name}; + printf OUT "<th class=\"test\">%s</th>", $ver->{name}; } -print OUT "<th class=\"commit\">Head commit</th></tr>\n"; +print OUT "<th colspan=\"3\">Failures</th><th></th></tr></thead>\n"; -my $odd = 0; foreach my $build (@builds) { - printf OUT "<tr class=\"%s\">\n", $odd ? "dark" : "light"; - $odd = !$odd; - printf OUT " <td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); + 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]; + my ($total_runs, $total_tests, $total_errors, $total_todos); foreach my $ver (@groups) { next unless defined($versions{$ver->{name}}); - my $count = $build->{versions}->{$ver->{name}}; - if (!$count) - { - printf OUT "<td class=\"version\">.</td>"; - } - elsif ($count > 1) + my $counts = $build->{versions}->{$ver->{name}}; + if (!defined @{$counts}) { - printf OUT "<td class=\"version\"><a href=\"%s/#group_%s\">%u</a></td>", $build->{name}, $ver->{name}, $count; + printf OUT "<td class=\"note\"> </td>"; } else { - printf OUT "<td class=\"version\"><a href=\"%s\">%u</a></td>", $build->{name}, $count; + my ($runs, $tests, $errors, $todos) = @{$counts}; + my $href = $runs > 1 ? "$build->{name}/#group_$ver->{name}" : "$build->{name}"; + my $title = $runs > 1 ? "$runs test runs, " : ""; + $title .= "$tests unit tests, $errors have errors"; + $title .= ", $todos have todos" if ($todos); + my $class = $errors ? ($todos ? "fail also-todo" : "fail") : ($todos ? "todo" : "pass"); + printf OUT "<td class=\"result %s\"><a title=\"%s\" href=\"%s\">%u</a></td>", $class, $title, $href, $errors || $todos; + $total_runs++; + $total_tests += $tests; + $total_errors += $errors; + $total_todos += $todos; } } - print OUT "\n <td class=\"commit\">"; + if ($total_tests) + { + my $class = $total_errors ? "fail" : $total_todos ? "pass also-todo" : "pass"; + my $title = sprintf "%u test runs, %u total unit tests, %u have errors", $total_runs, $total_tests, $total_errors; + $title .= ", $total_todos have todos" if $total_todos; + printf OUT "\n <td> </td><td class=\"result %s\"><a title=\"%s\" href=\"%s\">%4.1f%%</a></td><td> </td>\n", + $class, $title, $build->{name}, $total_errors * 100 / $total_tests; + } + else + { + print OUT "\n <td> </td><td class=\"note\"> </td><td> </td>\n"; + } + print OUT " <td class=\"commitlink\">"; if ($build->{subj}) { printf OUT "<a href=\"$gitweb?a=shortlog;h=%s\">%s</a>", $build->{name}, escapeHTML($build->{subj}); } print OUT "</td></tr>\n"; } diff --git a/winetest/index.css b/winetest/index.css deleted file mode 100644 index 020193d..0000000 --- a/winetest/index.css +++ /dev/null @@ -1,52 +0,0 @@ -/* give a WineHQ-ish look to the test list */ - -body { - background-color: #E2E2E2; - color: #000000; - font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; - margin: 10px; - font-size: small; -} - -a { color: #A50D0D; text-decoration: none; } -a:visited { color: #FF0000; } -a:hover { color: #FF6666; text-decoration: underline; } -a:active { color: #FF0000; } -a.hidden { text-decoration: none; color: #000000; } - -table.builds { - margin-right: auto; - text-spacing: 0; - border-spacing: 0; - white-space: nowrap; -} - -table.builds th { - line-height: 0.9; - vertical-align: text-top; - border-width: thin; - background-color: #601919; - color: #ffffff; - padding: 5px; -} - -table.builds td { - padding: 1px 5px; -} - -tr.light { background-color: #ffffff; } -tr.dark { background-color: #fff8f8; } -tr.light:hover { background-color: #f8e8e8; } -tr.dark:hover { background-color: #f8e8e8; } - -td.build, td.date { - font-family: monospace; - font-size: medium; -} -td.version { - text-align: center; -} -.commit { - width: 100%; - text-align: left; -} diff --git a/winetest/summary.css b/winetest/summary.css index ae4b31f..1a0711e 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -146,6 +146,15 @@ table.report td.test { table.report td.links { font-size: x-small; } +table.report th.commitlink, td.commitlink { + text-align: left; +} +table.report td.build, td.date { + font-family: monospace; + font-size: medium; + padding-left: 5px; + padding-right: 5px; +} form td { text-align: left; }

1 0

Detlef Riekenberg : bugzilla: Fix Wine 1.01 buglist and update Wine 1. 0 to 1.2
by Jeremy Newman 16 Sep '08

16 Sep '08

Module: bugzilla Branch: master Commit: bf8f8c423d0ce73b5134ddaab60e1366e04c9064 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=bf8f8c423d0ce73b5134d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Sep 14 13:54:59 2008 +0200 bugzilla: Fix Wine 1.01 buglist and update Wine 1.0 to 1.2 Fix the output for the Wine 1.0.1 bugs The Main Page has still a query for: bugs to be fixed for Wine 1.0 -- By by ... Detlef >From a84868405532f4fd3d3eb0cf4d15422e6a0dec28 Mon Sep 17 00:00:00 2001 From: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun, 14 Sep 2008 13:51:13 +0200 Subject: [PATCH] bugzilla: Fix Wine 1.01 buglist and update Wine 1.0 to 1.2 --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 7682ff9..d74f9bc 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -32,7 +32,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.0.1&order=bugs.bug_severity" class="menuItem">Wine 1.0.1</a></span></td></tr> + <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?product=Wine&target_milestone=1.0.1&order=bugs.bug_severity" class="menuItem">Wine 1.0.1</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.2.0&order=bugs.bug_severity" class="menuItem">Wine 1.2</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&keywords_type=anywords" class="menuItem">Regressions</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklist&keywords_type=anywords" class="menuItem">Tasklist</a></span></td></tr> diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 9e13783..cce37cf 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -168,8 +168,12 @@ function addSidebar() { <p>The bugs we are currently working on are organized into Task lists.</p> <ol class="wine_index_list"> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Wine 1.0</a><br> - These bugs are scheduled to be fixed before Wine 1.0 is released. + <li><a href="http://bugs.winehq.org/buglist.cgi?product=Wine&target_milestone=1.0.1&…">Wine 1.0.1</a><br> + These bugs are scheduled to be backported to the stable Wine 1.0 Tree, before Wine 1.0.1 is released. + </li> + + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Wine 1.2</a><br> + These bugs are scheduled to be fixed before Wine 1.2 is released. </li> <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Regressions</a><br>

1 0

Alexandre Julliard : winetest: Reject truncated reports instead of displaying a gazillion failures.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: tools Branch: master Commit: 79d23d319829f5d5c73079a54dac624eca80a927 URL: http://source.winehq.org/git/tools.git/?a=commit;h=79d23d319829f5d5c73079a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 12:43:46 2008 +0200 winetest: Reject truncated reports instead of displaying a gazillion failures. --- winetest/dissect | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 17a5c4b..4d137c1 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -289,8 +289,7 @@ if (defined $dll) { $result = "failed filelimit - -"; $box->{data} .= "<div class=\"test end\">test failed: file limit exceeded</div>\n"; } else { - $result = "failed crash - -"; - $box->{data} .= "<div class=\"test end\">test failed: winetest crash</div>\n"; + mydie "report truncated (winetest crash?)\n"; } goto FINISH; }

1 0

Hans Leidekker : winhttp: Fix logic inversion bug in setting disable flags.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: d943ffa6f798f106bc7e4b398bab9622f97a85b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d943ffa6f798f106bc7e4b398… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 16 12:32:11 2008 +0200 winhttp: Fix logic inversion bug in setting disable flags. Spotted by Jeremy White. --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 04b9b47..4967aff 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -400,7 +400,7 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe } TRACE("0x%x\n", disable); - hdr->disable_flags &= disable; + hdr->disable_flags |= disable; return TRUE; } case WINHTTP_OPTION_AUTOLOGON_POLICY:

1 0

Hans Leidekker : winhttp: Manage a session global cookie cache.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 4a706aae706a1636555e5528b0ad91936fc3e69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a706aae706a1636555e5528b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 16 12:31:35 2008 +0200 winhttp: Manage a session global cookie cache. --- dlls/winhttp/Makefile.in | 1 + dlls/winhttp/cookie.c | 281 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/request.c | 20 ++- dlls/winhttp/session.c | 8 + dlls/winhttp/winhttp_private.h | 21 +++ 5 files changed, 324 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a706aae706a1636555e5…

1 0

Hans Leidekker : winhttp: Move handling of default request parameters back to WinHttpOpenRequest.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 4ae5741c4e8a9ec7568a9e46da65ea1a44e1d643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae5741c4e8a9ec7568a9e46d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 16 12:31:16 2008 +0200 winhttp: Move handling of default request parameters back to WinHttpOpenRequest. Avoids special casing all over the place. --- dlls/winhttp/request.c | 20 ++++++-------------- dlls/winhttp/session.c | 10 +++++++--- dlls/winhttp/winhttp_private.h | 5 +++++ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b62a0e3..485ec73 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -480,28 +480,20 @@ static WCHAR *build_request_string( request_t *request ) static const WCHAR crlf[] = {'\r','\n',0}; static const WCHAR colon[] = {':',' ',0}; static const WCHAR twocrlf[] = {'\r','\n','\r','\n',0}; - static const WCHAR get[] = {'G','E','T',0}; - static const WCHAR slash[] = {'/',0}; - static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; WCHAR *ret; const WCHAR **headers, **p; - const WCHAR *verb = get, *path = slash, *version = http1_1; unsigned int len, i = 0, j; - if (request->verb && request->verb[0]) verb = request->verb; - if (request->path && request->path[0]) path = request->path; - if (request->version && request->version[0]) version = request->version; - /* allocate space for an array of all the string pointers to be added */ len = request->num_headers * 4 + 7; if (!(headers = heap_alloc( len * sizeof(LPCWSTR) ))) return NULL; - headers[i++] = verb; + headers[i++] = request->verb; headers[i++] = space; - headers[i++] = path; + headers[i++] = request->path; headers[i++] = space; - headers[i++] = version; + headers[i++] = request->version; for (j = 0; j < request->num_headers; j++) { @@ -797,7 +789,6 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len static const WCHAR keep_alive[] = {'K','e','e','p','-','A','l','i','v','e',0}; static const WCHAR no_cache[] = {'n','o','-','c','a','c','h','e',0}; static const WCHAR length_fmt[] = {'%','l','d',0}; - static const WCHAR post[] = {'P','O','S','T',0}; BOOL ret = FALSE; connect_t *connect = request->connect; @@ -813,7 +804,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len if (connect->hostname) add_host_header( request, connect->hostname, connect->hostport, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); - if (total_len || (request->verb && !strcmpW( request->verb, post ))) + if (total_len || (request->verb && !strcmpW( request->verb, postW ))) { WCHAR length[21]; /* decimal long int + null */ sprintfW( length, length_fmt, total_len ); @@ -1114,6 +1105,7 @@ static BOOL handle_redirect( request_t *request ) if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; strcpyW( request->path, uc.lpszUrlPath ); } + else request->path = strdupW( slashW ); } /* remove content-type/length headers */ @@ -1122,7 +1114,7 @@ static BOOL handle_redirect( request_t *request ) /* redirects are always GET requests */ heap_free( request->verb ); - request->verb = NULL; + request->verb = strdupW( getW ); ret = TRUE; end: diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 4bf9d43..35cac0c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -480,9 +480,13 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; - if (verb && !(request->verb = strdupW( verb ))) goto end; - if (object && !(request->path = strdupW( object ))) goto end; - if (version && !(request->version = strdupW( version ))) goto end; + if (!verb || !verb[0]) verb = getW; + if (!object || !object[0]) object = slashW; + if (!version || !version[0]) version = http1_1; + + if (!(request->verb = strdupW( verb ))) goto end; + if (!(request->path = strdupW( object ))) goto end; + if (!(request->version = strdupW( version ))) goto end; if (!(hrequest = alloc_handle( &request->hdr ))) goto end; request->hdr.handle = hrequest; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 6508b38..ee01f4d 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -36,6 +36,11 @@ # include <ws2tcpip.h> #endif +static const WCHAR getW[] = {'G','E','T',0}; +static const WCHAR postW[] = {'P','O','S','T',0}; +static const WCHAR slashW[] = {'/',0}; +static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; + typedef struct _object_header_t object_header_t; typedef struct

1 0

Hans Leidekker : winhttp: Reset content length when all data has been read.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 8df906f28e9f1bd53bc105f5b4a0d06adaca2ac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df906f28e9f1bd53bc105f5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 16 12:30:51 2008 +0200 winhttp: Reset content length when all data has been read. --- dlls/winhttp/request.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c149aca..b62a0e3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1226,6 +1226,13 @@ static BOOL receive_data_chunked( request_t *request, void *buffer, DWORD size, return TRUE; } +static void finished_reading( request_t *request ) +{ + /* FIXME: close connection here if necessary */ + request->content_length = ~0UL; + request->content_read = 0; +} + static BOOL read_data( request_t *request, void *buffer, DWORD to_read, DWORD *read, BOOL async ) { static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; @@ -1253,7 +1260,11 @@ static BOOL read_data( request_t *request, void *buffer, DWORD to_read, DWORD *r send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } - if (ret && read) *read = num_bytes; + if (ret) + { + if (read) *read = num_bytes; + if (!num_bytes) finished_reading( request ); + } return ret; } @@ -1263,6 +1274,7 @@ static void drain_content( request_t *request ) DWORD bytes_read; char buffer[2048]; + if (!request->content_length) return; for (;;) { if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return; @@ -1523,7 +1535,7 @@ static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDW if (async) { - if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE, &num_bytes, sizeof(DWORD) ); + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, &num_bytes, sizeof(DWORD) ); else { WINHTTP_ASYNC_RESULT result;

1 0

Dmitry Timoshkov : winhttp: Add some tests for set/query option, make them pass under Wine.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 11da0ac8a79b0a189f1ef3e58cdbb72b4b41d1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11da0ac8a79b0a189f1ef3e58… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 16 18:51:58 2008 +0900 winhttp: Add some tests for set/query option, make them pass under Wine. --- dlls/winhttp/session.c | 132 ++++++++++++++++++++++++++++++++++--- dlls/winhttp/tests/winhttp.c | 150 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 271 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11da0ac8a79b0a189f1ef…

1 0