March 2009 - Wine-commits - list.winehq.org

Christoph Korn : German template sync
by Jeremy Newman 18 Mar '09

18 Mar '09

Module: website Branch: master Commit: 56503a47a8c6bb9cc8dce3925e1cb677878168be URL: http://source.winehq.org/git/website.git/?a=commit;h=56503a47a8c6bb9cc8dce3… Author: Christoph Korn <c_korn(a)gmx.de> Date: Thu Mar 12 15:40:33 2009 +0100 German template sync >From 0978e9aeae67831dc3dac0cbafc3dc68c90154cd Mon Sep 17 00:00:00 2001 From: Christoph Korn <c_korn(a)gmx.de> Date: Thu, 12 Mar 2009 15:23:02 +0100 Subject: German template sync of commit 291c0647a26fb28316823b0edda4572ad92ca6fe --- templates/de/download.template | 4 ++-- templates/de/download/deblenny.template | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 67beeca..8051b9e 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -80,8 +80,8 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/download/deblenny">Debian</a></b> - binär .debs für Debian Lenny (5.0)</td> - <td><a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a></td> + binär .debs für Debian Etch, Lenny and Sid</td> + <td><a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a><br><a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/de/download/deblenny.template b/templates/de/download/deblenny.template index 3355b42..a4938aa 100644 --- a/templates/de/download/deblenny.template +++ b/templates/de/download/deblenny.template @@ -2,7 +2,7 @@  <h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> -Wine für Debian Lenny +Wine für Debian Etch, Lenny und Sid <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> <p>Ubuntu und andere Debian-basierte Distributionen nutzen ein spezielles Tool, bekannt @@ -32,8 +32,9 @@ wahrscheinlich nicht benutzen.</i></p> <div style="position:relative;left:20px">Öffne ein Terminal</div> <div style="position:relative;left:20px"><i>su</i> <font color="gray">#als root einloggen</font></div> <div style="position:relative;left:20px"><i>gedit /etc/apt/sources.list</i> <font color="gray">#um die Repositorydatei mit einem Texteditor zu öffnen (Du kannst gedit benutzen oder einen anderen)</font></div> -<div style="position:relative;left:20px">Füge diese Zeile hinzu: <i>deb http://www.lamaresh.net/apt lenny main</i></div> -<div style="position:relative;left:20px">Füge diese Zeile hinzu, wenn du auch das Sourcesrepository willst: <i>deb-src http://www.lamaresh.net/apt lenny main</i></div> +<div style="position:relative;left:20px">Füge diese Zeile für Etch hinzu: <i>deb http://www.lamaresh.net/apt etch main</i></div> +<div style="position:relative;left:20px">Füge diese Zeile für Lenny hinzu: <i>deb http://www.lamaresh.net/apt lenny main</i></div> +<div style="position:relative;left:20px">Füge diese Zeile für Sid hinzu: <i>deb http://www.lamaresh.net/apt sid main</i></div> <div style="position:relative;left:20px">Speichere und schließe sources.list</div> <div style="position:relative;left:20px"><i>apt-get update</i> <font color="gray">#um die Paketliste zu aktualisieren</font></div> <div style="position:relative;left:20px"><i>apt-get install wine</i> <font color="gray">#um die aktuelle Wineversion zu installieren</font></div><p></p> @@ -44,6 +45,10 @@ wahrscheinlich nicht benutzen.</i></p> <div style="position:relative;left:20px"><i>su</i> <font color="gray">#als root einloggen</font></div> <div style="position:relative;left:20px"><i>dpkg -i wine_1.1.xxx.deb</i> <font color="gray">#Ändere xxx zu deinem gewählten Paket, dadurch wird Wine installiert</font></div> -<br><br><p style="font-size:12px;text-align:left;font-style: italic;">Betreuer: <a href="http://www.lamaresh.net" target="_blank">Homepage</a>, <a href="mailto:repository(a)lamaresh.net">eMail</a></p> +<br><br><p style="font-size:12px;text-align:left;font-style: italic;"> +Homepage: <a href="http://www.lamaresh.net" target="_blank">http://www.lamaresh.net/</a><br> +Paketquellenbetreuer: <a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a><br> +Paketbauer: <a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a> +</p>

1 0

Alexandre Julliard : Wine release 1.1.17
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: website Branch: master Commit: 23b919b73de3ea51d9a1cff2109db15638136496 URL: http://source.winehq.org/git/website.git/?a=commit;h=23b919b73de3ea51d9a1cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 17:14:44 2009 +0100 Wine release 1.1.17 --- news/en/2009031301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009031301.xml b/news/en/2009031301.xml new file mode 100644 index 0000000..3e05c45 --- /dev/null +++ b/news/en/2009031301.xml @@ -0,0 +1,17 @@ +<news> +<date>March 13, 2009</date> +<title>Wine 1.1.17 Released</title> +<body> +<p> The Wine development release 1.1.17 is now available.</p> +<p> <a href="{$root}/announce/1.1.17">What's new</a> in this release: +<ul> + <li>Joystick support on Mac OS X.</li> + <li>Implementation of iphlpapi on Solaris. </li> + <li>A number of 64-bit improvements.</li> + <li>Obsolete LinuxThreads support has been removed.</li> + <li>Many fixes to the regression tests on Windows.</li> + <li>Various bug fixes.</li> +</ul></p> +<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.17.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : Release 1.1.17.
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: wine Branch: master Commit: 3d35a630c4ae65fb4ab3aaf408a09051d5067b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d35a630c4ae65fb4ab3aaf40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 17:07:55 2009 +0100 Release 1.1.17. --- ANNOUNCE | 1195 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 587 insertions(+), 628 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d35a630c4ae65fb4ab3a…

1 0

Tag wine-1.1.17 : Alexandre Julliard : Release 1.1.17
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: wine Branch: refs/tags/wine-1.1.17 Tag: 664d9cb71c96644e44e8231072f28546f24bdd76 URL: http://source.winehq.org/git/wine.git/?a=tag;h=664d9cb71c96644e44e8231072f2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 17:07:56 2009 +0100 Release 1.1.17

1 0

Alexandre Julliard : winetest: Remove some old format compatibility code.
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: tools Branch: master Commit: 67132b692e6bfa0e7aae484307482da540986f54 URL: http://source.winehq.org/git/tools.git/?a=commit;h=67132b692e6bfa0e7aae4843… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 16:20:40 2009 +0100 winetest: Remove some old format compatibility code. --- winetest/gather | 25 +------------------------ 1 files changed, 1 insertions(+), 24 deletions(-) diff --git a/winetest/gather b/winetest/gather index eda9203..a596a78 100755 --- a/winetest/gather +++ b/winetest/gather @@ -122,16 +122,6 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { } my $report = { group => $group}; - # Read the dll information if present - my $dllinfo = "$datadir/$build/$dir/dllinfo.txt"; - if (open DLLINFO, "<$dllinfo") { - while ($_ = <DLLINFO>) { - if (/^\s*([0-9a-zA-Z_.]+)=(dll is missing)\r?$/) { - $report->{dllmissing}->{$1} = 1; - } - } - close DLLINFO; - } $report->{tag} = @tag?"@tag":""; $report->{dir} = $dir; if (!open TEST, "<$file") { @@ -335,7 +325,6 @@ sub build_header_footer($) my $group = $report->{group}; if (!defined $msg) { - # If dllinfo.html exists we have html files if (-r "$datadir/$build/$report->{dir}/dllinfo.html") { $msg = <<"EOF"; $group->{name}<br><small> @@ -343,18 +332,10 @@ sub build_header_footer($) <a href=\"$report->{dir}/dllinfo.html\">[info]</a> <a href=\"$report->{dir}/report.html\">[file]</a></small> EOF - } - elsif (-r "$datadir/$build/$report->{dir}/version.html") { - $msg = <<"EOF"; - $group->{name}<br><small> - <a href=\"$report->{dir}/version.html\">$report->{tag}</a></small> -EOF } else { $msg = <<"EOF"; $group->{name}<br><small> - <a href=\"$report->{dir}/version.txt\">$report->{tag}</a><br> - <a href=\"$report->{dir}/dllinfo.txt\">[info]</a> - <a href=\"$report->{dir}/report\">[file]</a></small> + <a href=\"$report->{dir}/version.html\">$report->{tag}</a></small> EOF } chop $msg; @@ -537,10 +518,6 @@ sub singletest($$$) { { $href = "$report->{dir}/$testname.html"; } - elsif (-r "$datadir/$build/$report->{dir}/$testname.txt") - { - $href = "$report->{dir}/$testname.txt"; - } else { $href="";

1 0

Alexandre Julliard : winetest: Put all version information into a single file.
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: tools Branch: master Commit: f01df60e4e35723307e88f3fbc8773e6561e9293 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f01df60e4e35723307e88f3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 16:02:33 2009 +0100 winetest: Put all version information into a single file. --- winetest/dissect | 47 ++++++++++++++++++++++++----------------------- winetest/gather | 6 ++++++ 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 657ef9b..7416434 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -111,9 +111,11 @@ my $tag = $1 eq ""?"":"_$1"; $_ = <IN>; /^Build info:\r?$/ or mydie "no Build info header: $_"; -my $box = create_box( "build", "build", "Build info" ); -$box->{data} .= sprintf "<div class=\"output\">Build: <a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></div>\n", $testbuild, $testbuild, $shortbuild; -$box->{data} .= sprintf "<div class=\"output\">Tag: %s</div>\n", substr($tag,1); +my $box = create_box( "version", "version", sprintf "Version information for %s", substr($tag,1) ); +$box->{data} .= "<h2>Build version</h2>\n"; +$box->{data} .= "<table class=\"output\">\n"; +$box->{data} .= sprintf "<tr><td>Build</td><td><a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></td></tr>\n", $testbuild, $testbuild, $shortbuild; +$box->{data} .= sprintf "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">%s</a></td></tr></table>\n", substr($tag,1); $box->{data} .= sprintf "<div class=\"output\"> </div>\n"; while (($_ = <IN>) =~ s/^ //) { @@ -121,11 +123,10 @@ while (($_ = <IN>) =~ s/^ //) s/\r+$//; $box->{data} .= "<div class=\"output\">" . escapeHTML($_) . "</div>\n"; } -$box->{data} .= "</div>"; my ($wine, $wine_build, $version, $major, $minor, $plid, $product); /^Operating system version:\r?$/ or mydie "no OS header: $_"; -$box = create_box( "version", "version", "Operating system version" ); +$box->{data} .= "<h2>Operating system version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { $box->{data} .= sprintf "<tr><td>$1</td><td>%s</td></tr>\n", escapeHTML($2); @@ -145,7 +146,7 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { $archive = "winetest64-$shortbuild.exe" if ($2 eq "x86_64"); } } -$box->{data} .= "</table>"; +$box->{data} .= "</table>\n"; $version = "unknown"; if ($plid==1 && $major==4) { @@ -205,7 +206,7 @@ if ($wine_build) { my %dllinfo; /^Dll info:\r?$/ or mydie "no Dll info header: $_"; -my $dllbox = create_box( "dllinfo", "dllinfo", "Dll info" ); +$box->{data} .= "<h2>DLL version</h2>\n"; while ($_ = <IN>) { chomp; s/\r+$//; @@ -224,13 +225,14 @@ my ($lines,$total, $todo, $failed, $skipped); $dll = undef; # state machine starts $total = $todo = $failed = $skipped = 0; $lines = 0; +my $testbox; while (<IN>) { if (!defined $dll) { # new test next if /^\s*$/; m[([_.a-z0-9]+):([_a-z0-9]+) start ([/_.a-z0-9]+) (-|[.0-9a-f]+)\r?$] or next; ($dll,$unit,$source,$rev) = ($1,$2,$3,$4); - $box = create_box( "$dll:$unit", "testfile", "<a href=\"$gitweb/?a=history;f=$source;hb=$testbuild\">$source</a>" ); + $testbox = create_box( "$dll:$unit", "testfile", "<a href=\"$gitweb/?a=history;f=$source;hb=$testbuild\">$source</a>" ); if (defined($dllinfo{$dll}->{version}) && !defined($dllinfo{$dll}->{first})) { $dllinfo{$dll}->{first} = "$dll:$unit"; @@ -246,7 +248,7 @@ while (<IN>) { my $class = "test result"; if ($failed) { $class .= " failed"; } elsif ($todo) { $class .= " todo"; } - $box->{data} .= sprintf "<div class=\"%s\">%s</div>\n", $class, escapeHTML($_); + $testbox->{data} .= sprintf "<div class=\"%s\">%s</div>\n", $class, escapeHTML($_); } elsif (/$dll:$unit done $(-?\d+)$\r?$/) { chomp; # current test ended if ($lines==0 || $1 < 0) { @@ -254,13 +256,12 @@ while (<IN>) { my $reason = "test failed: error $1"; if ($1 == 258) { $reason = "test failed: timed out"; } elsif ($1 < 0) { $reason = "test failed: crash"; } - $box->{data} .= "<div class=\"test end\">$reason</div>\n"; + $testbox->{data} .= "<div class=\"test end\">$reason</div>\n"; } else { $result = "$total $todo $failed $skipped"; } FINISH: print SUM "- $dll $unit $result $source $rev\n"; - $box->{data} .= "</div>"; $dll = undef; $total = $todo = $failed = $skipped = 0; $lines = 0; @@ -275,12 +276,12 @@ while (<IN>) { elsif ($text =~ /^Test succeeded inside todo block: /) { $class = "test failed"; } elsif ($text =~ /^Test marked todo: /) { $class = "test todo"; } elsif ($text =~ /^Tests skipped: /) { $class = "test skipped"; } - $box->{data} .= sprintf "<div class=\"%s\"><a href=%s/?a=blob;f=%s;hb=%s#l%u>%s.c:%u</a>: %s</div>\n", + $testbox->{data} .= sprintf "<div class=\"%s\"><a href=%s/?a=blob;f=%s;hb=%s#l%u>%s.c:%u</a>: %s</div>\n", $class, $gitweb, $source, $testbuild, $line, $unit, $line, escapeHTML($text); } else { - $box->{data} .= sprintf "<div class=\"test trace\">%s</div>\n", escapeHTML($_); + $testbox->{data} .= sprintf "<div class=\"test trace\">%s</div>\n", escapeHTML($_); } } } @@ -289,7 +290,7 @@ if (defined $dll) { $_=""; if ($filesize == $maxfilesize) { $result = "failed filelimit - -"; - $box->{data} .= "<div class=\"test end\">test failed: file limit exceeded</div>\n"; + $testbox->{data} .= "<div class=\"test end\">test failed: file limit exceeded</div>\n"; } else { mydie "report truncated (winetest crash?)\n"; } @@ -300,33 +301,33 @@ close IN; # fill the dllinfo box -$dllbox->{data} .= "<table class=\"output\">\n"; +$box->{data} .= "<table class=\"output\">\n"; foreach my $dll (sort keys %dllinfo) { if ($dllinfo{$dll}->{version} eq "dll is missing") { - $dllbox->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} eq "load error 1157") { - $dllbox->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} =~ /^load error/) { - $dllbox->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n", + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } elsif (defined($dllinfo{$dll}->{first})) { - $dllbox->{data} .= sprintf "<tr><td><a href=\"report.html#%s\">%s</a></td><td>%s</td></tr>\n", + $box->{data} .= sprintf "<tr><td><a href=\"report.html#%s\">%s</a></td><td>%s</td></tr>\n", escapeHTML($dllinfo{$dll}->{first}), escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } else { - $dllbox->{data} .= sprintf "<tr><td>%s</td><td>%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); + $box->{data} .= sprintf "<tr><td>%s</td><td>%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); } } -$dllbox->{data} .= "</table>"; +$box->{data} .= "</table>"; # add the prev/next links to all the boxes @@ -367,8 +368,8 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE "<div class=\"navbar\">"; print FILE $boxes[$i]->{prev} ? "<a href=\"./$boxes[$i]->{prev}.html\">prev</a> | " : "prev | "; print FILE $boxes[$i]->{next} ? "<a href=\"./$boxes[$i]->{next}.html\">next</a> | " : "next | "; - print FILE "<a href=\"report.html#$boxes[$i]->{id}\">full report</a> | "; - print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>"; + printf FILE "<a href=\"report.html%s\">full report</a> | ", $i ? "#$boxes[$i]->{id}" : ""; + print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n"; printf FILE "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; printf FILE "<div class=\"updownbar\">%s</div>\n", $boxes[$i]->{title}; diff --git a/winetest/gather b/winetest/gather index ebc50f1..eda9203 100755 --- a/winetest/gather +++ b/winetest/gather @@ -343,6 +343,12 @@ sub build_header_footer($) <a href=\"$report->{dir}/dllinfo.html\">[info]</a> <a href=\"$report->{dir}/report.html\">[file]</a></small> EOF + } + elsif (-r "$datadir/$build/$report->{dir}/version.html") { + $msg = <<"EOF"; + $group->{name}<br><small> + <a href=\"$report->{dir}/version.html\">$report->{tag}</a></small> +EOF } else { $msg = <<"EOF"; $group->{name}<br><small>

1 0

Paul Vriens : ddraw/tests: Fix a test failure on VMware and some native boxes.
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: wine Branch: master Commit: 5974ad12005115d3f147a4a1fbe80b37668bd27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5974ad12005115d3f147a4a1f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 13 14:36:12 2009 +0100 ddraw/tests: Fix a test failure on VMware and some native boxes. --- dlls/ddraw/tests/visual.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index ec6ea13..3a29151 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1838,7 +1838,9 @@ static void D3D1_ViewportClearTest(void) red = (color & 0x00ff0000) >> 16; green = (color & 0x0000ff00) >> 8; blue = (color & 0x000000ff); - ok(red == 0xff && green == 0 && blue == 0, "Got color %08x, expected 00ff0000\n", color); + ok((red == 0xff && green == 0 && blue == 0) || + broken(red == 0 && green == 0 && blue == 0xff), /* VMware and some native boxes */ + "Got color %08x, expected 00ff0000\n", color); color = D3D1_getPixelColor(DirectDraw1, Surface1, 205, 205); red = (color & 0x00ff0000) >> 16;

1 0

Paul Vriens : gdi32/tests: Fix some test failures on Win9x.
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: wine Branch: master Commit: 3668edcdf40257d069e14322c4a81af0c98a0306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3668edcdf40257d069e14322c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 13 13:23:20 2009 +0100 gdi32/tests: Fix some test failures on Win9x. --- dlls/gdi32/tests/pen.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 2948467..f53dac4 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -93,7 +93,9 @@ static void test_logpen(void) ok(lp.lopnStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, lp.lopnStyle); ok(lp.lopnWidth.x == pen[i].ret_width, "expected %u, got %d\n", pen[i].ret_width, lp.lopnWidth.x); - ok(lp.lopnWidth.y == 0, "expected 0, got %d\n", lp.lopnWidth.y); + ok(lp.lopnWidth.y == 0 || + broken(lp.lopnWidth.y == 0xb), /* Win9x */ + "expected 0, got %d\n", lp.lopnWidth.y); ok(lp.lopnColor == pen[i].ret_color, "expected %08x, got %08x\n", pen[i].ret_color, lp.lopnColor); DeleteObject(hpen); @@ -114,7 +116,9 @@ static void test_logpen(void) memset(&lp, 0xb0, sizeof(lp)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(lp.lopnStyle), &lp); - ok(!size, "GetObject should fail: size %d, error %d\n", size, GetLastError()); + ok(!size || + broken(size == sizeof(lp.lopnStyle)), /* Win9x */ + "GetObject should fail: size %d, error %d\n", size, GetLastError()); /* see how larger buffer sizes are handled */ memset(&lp, 0xb0, sizeof(lp)); @@ -226,12 +230,17 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style), + ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style) || + broken(size == 0 && GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry), + ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) || + broken(size == sizeof(LOGPEN)) || /* Win9x */ + broken(pen[i].style == PS_ALTERNATE && + size == 0 && + GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -240,7 +249,9 @@ static void test_logpen(void) memset(&elp, 0xb0, sizeof(elp)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(elp.elpPenStyle), &elp); - ok(!size, "GetObject should fail: size %d, error %d\n", size, GetLastError()); + ok(!size || + broken(size == sizeof(elp.elpPenStyle)), /* Win9x */ + "GetObject should fail: size %d, error %d\n", size, GetLastError()); /* see how larger buffer sizes are handled */ memset(&ext_pen, 0xb0, sizeof(ext_pen)); @@ -278,7 +289,11 @@ static void test_logpen(void) break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry), + ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) || + broken(size == sizeof(LOGPEN)) || /* Win9x */ + broken(pen[i].style == PS_ALTERNATE && + size == 0 && + GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen.elp.elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen.elp.elpHatch); ok(ext_pen.elp.elpNumEntries == 0, "expected 0, got %x\n", ext_pen.elp.elpNumEntries);

1 0

Paul Vriens : ddraw/tests: Fix two test failures on W2K/VMware.
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: wine Branch: master Commit: 27f52727e406b8b9ceb32d33342272d061dd82f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f52727e406b8b9ceb32d333… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 13 14:30:32 2009 +0100 ddraw/tests: Fix two test failures on W2K/VMware. --- dlls/ddraw/tests/visual.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index fa96e5a..ec6ea13 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -834,7 +834,9 @@ static void rhw_zero_test(IDirect3DDevice7 *device) } color = getPixelColor(device, 5, 5); - ok(color == 0xffffff, "Got color %08x, expected 00ffffff\n", color); + ok(color == 0xffffff || + broken(color == 0), /* VMware */ + "Got color %08x, expected 00ffffff\n", color); color = getPixelColor(device, 105, 105); ok(color == 0, "Got color %08x, expected 00000000\n", color); @@ -2289,7 +2291,9 @@ static void p8_primary_test(void) ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 8; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &offscreen, NULL); - ok(hr == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", hr); + ok(hr == DD_OK || + broken(hr == DDERR_INVALIDPIXELFORMAT), /* VMware */ + "IDirectDraw_CreateSurface returned %08x\n", hr); if (FAILED(hr)) goto out; memset(entries, 0, sizeof(entries));

1 0

Piotr Caban : mshtml: Added HTMLWindow2_prompt implementation.
by Alexandre Julliard 13 Mar '09

13 Mar '09

Module: wine Branch: master Commit: 147cf1da55b29ddae517a36f98d4f9895a80e950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147cf1da55b29ddae517a36f9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Mar 12 19:08:06 2009 +0100 mshtml: Added HTMLWindow2_prompt implementation. --- dlls/mshtml/En.rc | 11 ++++++ dlls/mshtml/htmlwindow.c | 85 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/resource.h | 4 ++ 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index f438f98..09370de 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -53,3 +53,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6984a43..f143832 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -230,12 +230,93 @@ static HRESULT WINAPI HTMLWindow2_confirm(IHTMLWindow2 *iface, BSTR message, return E_NOTIMPL; } +typedef struct +{ + BSTR message; + BSTR dststr; + VARIANT *textdata; +}prompt_arg; + +static INT_PTR CALLBACK prompt_dlgproc(HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + switch(msg) + { + case WM_INITDIALOG: + { + prompt_arg *arg = (prompt_arg*)lparam; + WCHAR wszTitle[100]; + + if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, + sizeof(wszTitle)/sizeof(WCHAR))) { + WARN("Could not load message box title: %d\n", GetLastError()); + EndDialog(hwnd, wparam); + return FALSE; + } + + SetWindowLongPtrW(hwnd, DWLP_USER, lparam); + SetWindowTextW(hwnd, wszTitle); + SetWindowTextW(GetDlgItem(hwnd, ID_PROMPT_PROMPT), arg->message); + SetWindowTextW(GetDlgItem(hwnd, ID_PROMPT_EDIT), arg->dststr); + return FALSE; + } + case WM_COMMAND: + switch(wparam) + { + case MAKEWPARAM(IDCANCEL, BN_CLICKED): + EndDialog(hwnd, wparam); + return TRUE; + case MAKEWPARAM(IDOK, BN_CLICKED): + { + prompt_arg *arg = + (prompt_arg*)GetWindowLongPtrW(hwnd, DWLP_USER); + HWND hwndPrompt = GetDlgItem(hwnd, ID_PROMPT_EDIT); + INT len = GetWindowTextLengthW(hwndPrompt); + + if(!arg->textdata) + { + EndDialog(hwnd, wparam); + return TRUE; + } + + V_VT(arg->textdata) = VT_BSTR; + if(!len && !arg->dststr) + V_BSTR(arg->textdata) = NULL; + else + { + V_BSTR(arg->textdata) = SysAllocStringLen(NULL, len); + GetWindowTextW(hwndPrompt, V_BSTR(arg->textdata), len+1); + } + EndDialog(hwnd, wparam); + return TRUE; + } + } + return FALSE; + case WM_CLOSE: + EndDialog(hwnd, IDCANCEL); + return TRUE; + default: + return FALSE; + } +} + static HRESULT WINAPI HTMLWindow2_prompt(IHTMLWindow2 *iface, BSTR message, BSTR dststr, VARIANT *textdata) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(message), debugstr_w(dststr), textdata); - return E_NOTIMPL; + prompt_arg arg; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(message), debugstr_w(dststr), textdata); + + if(textdata) V_VT(textdata) = VT_NULL; + + arg.message = message; + arg.dststr = dststr; + arg.textdata = textdata; + + DialogBoxParamW(hInst, MAKEINTRESOURCEW(ID_PROMPT_DIALOG), + This->doc->hwnd, prompt_dlgproc, (LPARAM)&arg); + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageElementFactory **p) diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index c96749c..f409380 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -26,6 +26,10 @@ #define ID_DWL_INSTALL 7602 #define ID_DWL_STATUS 7603 +#define ID_PROMPT_DIALOG 7700 +#define ID_PROMPT_PROMPT 7701 +#define ID_PROMPT_EDIT 7702 + #define IDS_MESSAGE_BOX_TITLE 2213 #define IDS_PRINT_HEADER_TEMPLATE 8403

1 0