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

Michael Stefaniuc : notepad: Fix the Swedish translation.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: 20feb3700f0522dedb129b3b7ccbe43a85b6770e URL: http://source.winehq.org/git/wine.git/?a=commit;h=20feb3700f0522dedb129b3b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 4 01:05:19 2008 +0200 notepad: Fix the Swedish translation. --- programs/notepad/Sv.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index 72761f5..59ebf7f 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -29,6 +29,7 @@ MAIN_MENU MENU MENUITEM "�&ppna...\tCtrl+O", CMD_OPEN MENUITEM "&Spara\tCtrl+S", CMD_SAVE MENUITEM "Spara s&om...", CMD_SAVE_AS + MENUITEM SEPARATOR MENUITEM "&Skriv ut...\tCtrl+P", CMD_PRINT MENUITEM "Sidla&yout...", CMD_PAGE_SETUP MENUITEM "Skrivar&konfiguration...", CMD_PRINTER_SETUP @@ -47,6 +48,7 @@ POPUP "&Redigera" { MENUITEM "&Tid/Datum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Dela l�nga meningar", CMD_WRAP + MENUITEM "&Font...", CMD_FONT } POPUP "&S�k" { MENUITEM "S�k...", CMD_SEARCH

1 0

Alistair Leslie-Hughes : snmpapi: Correct snmpapi tests under win98.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: 294573a5940ae6f4f1f1de90d4718a471bd896ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=294573a5940ae6f4f1f1de90d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 3 20:08:02 2008 +1000 snmpapi: Correct snmpapi tests under win98. --- dlls/snmpapi/tests/util.c | 154 ++++++++++++++++++++++++++++++--------------- 1 files changed, 104 insertions(+), 50 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 428040d..1aa245f 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -92,10 +92,14 @@ static void test_SnmpUtilOidToA(void) "1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1"; static const char expect4[] = "-1"; - ret = SnmpUtilOidToA(NULL); - ok(ret != NULL, "SnmpUtilOidToA failed\n"); - ok(!strcmp(ret, expect0), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", - ret, expect1); + /* This crashes under win98 */ + if(0) + { + ret = SnmpUtilOidToA(NULL); + ok(ret != NULL, "SnmpUtilOidToA failed\n"); + ok(!strcmp(ret, expect0), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", + ret, expect1); + } ret = SnmpUtilOidToA(&oid0); ok(ret != NULL, "SnmpUtilOidToA failed\n"); @@ -195,17 +199,43 @@ static void test_SnmpUtilOidCpyFree(void) static UINT ids[] = { 1, 3, 6, 1, 4, 1, 311 }; static AsnObjectIdentifier dst, src = { sizeof(ids) / sizeof(ids[0]), ids }; - ret = SnmpUtilOidCpy(NULL, NULL); - ok(!ret, "SnmpUtilOidCpy succeeded\n"); + /* These crashes under win98 */ + if(0) + { + ret = SnmpUtilOidCpy(NULL, NULL); + ok(!ret, "SnmpUtilOidCpy succeeded\n"); + + memset(&dst, 1, sizeof(AsnObjectIdentifier)); + ret = SnmpUtilOidCpy(&dst, NULL); + ok(ret, "SnmpUtilOidCpy failed\n"); + ok(dst.idLength == 0, "SnmpUtilOidCpy failed\n"); + ok(dst.ids == NULL, "SnmpUtilOidCpy failed\n"); + + ret = SnmpUtilOidCpy(NULL, &src); + ok(!ret, "SnmpUtilOidCpy succeeded\n"); + } - memset(&dst, 1, sizeof(AsnObjectIdentifier)); - ret = SnmpUtilOidCpy(&dst, NULL); + memset(&dst, 0, sizeof(AsnObjectIdentifier)); + ret = SnmpUtilOidCpy(&dst, &src); ok(ret, "SnmpUtilOidCpy failed\n"); - ok(dst.idLength == 0, "SnmpUtilOidCpy failed\n"); - ok(dst.ids == NULL, "SnmpUtilOidCpy failed\n"); + ok(src.idLength == dst.idLength, "SnmpUtilOidCpy failed\n"); + ok(!memcmp(src.ids, dst.ids, dst.idLength * sizeof(UINT)), "SnmpUtilOidCpy failed\n"); - ret = SnmpUtilOidCpy(NULL, &src); - ok(!ret, "SnmpUtilOidCpy succeeded\n"); + /* These crashes under win98 */ + if(0) + { + ret = SnmpUtilOidCpy(NULL, NULL); + ok(!ret, "SnmpUtilOidCpy succeeded\n"); + + memset(&dst, 1, sizeof(AsnObjectIdentifier)); + ret = SnmpUtilOidCpy(&dst, NULL); + ok(ret, "SnmpUtilOidCpy failed\n"); + ok(dst.idLength == 0, "SnmpUtilOidCpy failed\n"); + ok(dst.ids == NULL, "SnmpUtilOidCpy failed\n"); + + ret = SnmpUtilOidCpy(NULL, &src); + ok(!ret, "SnmpUtilOidCpy succeeded\n"); + } memset(&dst, 0, sizeof(AsnObjectIdentifier)); ret = SnmpUtilOidCpy(&dst, &src); @@ -213,7 +243,11 @@ static void test_SnmpUtilOidCpyFree(void) ok(src.idLength == dst.idLength, "SnmpUtilOidCpy failed\n"); ok(!memcmp(src.ids, dst.ids, dst.idLength * sizeof(UINT)), "SnmpUtilOidCpy failed\n"); - SnmpUtilOidFree(NULL); + /* This crashes under win98 */ + if(0) + { + SnmpUtilOidFree(NULL); + } SnmpUtilOidFree(&dst); ok(dst.idLength == 0, "SnmpUtilOidFree failed\n"); ok(dst.ids == NULL, "SnmpUtilOidFree failed\n"); @@ -292,23 +326,27 @@ static void test_SnmpUtilOidNCmp(void) static AsnObjectIdentifier oid1 = { 4, ids1 }; static AsnObjectIdentifier oid2 = { 4, ids2 }; - ret = SnmpUtilOidNCmp(NULL, NULL, 0); - ok(!ret, "SnmpUtilOidNCmp succeeded\n"); + /* This crashes under win98 */ + if(0) + { + ret = SnmpUtilOidNCmp(NULL, NULL, 0); + ok(!ret, "SnmpUtilOidNCmp succeeded\n"); - ret = SnmpUtilOidNCmp(NULL, NULL, 1); - ok(!ret, "SnmpUtilOidNCmp succeeded\n"); + ret = SnmpUtilOidNCmp(NULL, NULL, 1); + ok(!ret, "SnmpUtilOidNCmp succeeded\n"); - ret = SnmpUtilOidNCmp(&oid1, NULL, 0); - ok(!ret, "SnmpUtilOidNCmp succeeded\n"); + ret = SnmpUtilOidNCmp(&oid1, NULL, 0); + ok(!ret, "SnmpUtilOidNCmp succeeded\n"); - ret = SnmpUtilOidNCmp(&oid1, NULL, 1); - ok(!ret, "SnmpUtilOidNCmp succeeded\n"); + ret = SnmpUtilOidNCmp(&oid1, NULL, 1); + ok(!ret, "SnmpUtilOidNCmp succeeded\n"); - ret = SnmpUtilOidNCmp(NULL, &oid2, 0); - ok(!ret, "SnmpUtilOidNCmp succeeded\n"); + ret = SnmpUtilOidNCmp(NULL, &oid2, 0); + ok(!ret, "SnmpUtilOidNCmp succeeded\n"); - ret = SnmpUtilOidNCmp(NULL, &oid2, 1); - ok(!ret, "SnmpUtilOidNCmp succeeded\n"); + ret = SnmpUtilOidNCmp(NULL, &oid2, 1); + ok(!ret, "SnmpUtilOidNCmp succeeded\n"); + } ret = SnmpUtilOidNCmp(&oid1, &oid1, 0); ok(!ret, "SnmpUtilOidNCmp failed\n"); @@ -379,14 +417,18 @@ static void test_SnmpUtilOidAppend(void) oid1.idLength = 3; oid1.ids = ids1; - ret = SnmpUtilOidAppend(NULL, NULL); - ok(!ret, "SnmpUtilOidAppend succeeded\n"); + /* This crashes under win98 */ + if(0) + { + ret = SnmpUtilOidAppend(NULL, NULL); + ok(!ret, "SnmpUtilOidAppend succeeded\n"); - ret = SnmpUtilOidAppend(&oid1, NULL); - ok(ret, "SnmpUtilOidAppend failed\n"); + ret = SnmpUtilOidAppend(&oid1, NULL); + ok(ret, "SnmpUtilOidAppend failed\n"); - ret = SnmpUtilOidAppend(NULL, &oid2); - ok(!ret, "SnmpUtilOidAppend succeeded\n"); + ret = SnmpUtilOidAppend(NULL, &oid2); + ok(!ret, "SnmpUtilOidAppend succeeded\n"); + } ret = SnmpUtilOidAppend(&oid1, &oid2); ok(ret, "SnmpUtilOidAppend failed\n"); @@ -403,19 +445,23 @@ static void test_SnmpUtilVarBindCpyFree(void) static UINT ids[] = { 1, 3, 6, 1, 4, 1, 311 }; static SnmpVarBind dst, src = { { 7, ids }, { ASN_INTEGER, { 1 } } }; - ret = SnmpUtilVarBindCpy(NULL, NULL); - ok(!ret, "SnmpUtilVarBindCpy succeeded\n"); - - memset(&dst, 0, sizeof(SnmpVarBind)); - ret = SnmpUtilVarBindCpy(&dst, NULL); - ok(ret, "SnmpUtilVarBindCpy failed\n"); - ok(dst.name.idLength == 0, "SnmpUtilVarBindCpy failed\n"); - ok(dst.name.ids == NULL, "SnmpUtilVarBindCpy failed\n"); - ok(dst.value.asnType == ASN_NULL, "SnmpUtilVarBindCpy failed\n"); - ok(dst.value.asnValue.number == 0, "SnmpUtilVarBindCpy failed\n"); - - ret = SnmpUtilVarBindCpy(NULL, &src); - ok(!ret, "SnmpUtilVarBindCpy succeeded\n"); + /* This crashes under win98 */ + if(0) + { + ret = SnmpUtilVarBindCpy(NULL, NULL); + ok(!ret, "SnmpUtilVarBindCpy succeeded\n"); + + memset(&dst, 0, sizeof(SnmpVarBind)); + ret = SnmpUtilVarBindCpy(&dst, NULL); + ok(ret, "SnmpUtilVarBindCpy failed\n"); + ok(dst.name.idLength == 0, "SnmpUtilVarBindCpy failed\n"); + ok(dst.name.ids == NULL, "SnmpUtilVarBindCpy failed\n"); + ok(dst.value.asnType == ASN_NULL, "SnmpUtilVarBindCpy failed\n"); + ok(dst.value.asnValue.number == 0, "SnmpUtilVarBindCpy failed\n"); + + ret = SnmpUtilVarBindCpy(NULL, &src); + ok(!ret, "SnmpUtilVarBindCpy succeeded\n"); + } memset(&dst, 0, sizeof(SnmpVarBind)); ret = SnmpUtilVarBindCpy(&dst, &src); @@ -426,7 +472,11 @@ static void test_SnmpUtilVarBindCpyFree(void) ok(!memcmp(&src.value, &dst.value, sizeof(AsnObjectSyntax)), "SnmpUtilVarBindCpy failed\n"); - SnmpUtilVarBindFree(NULL); + /* This crashes under win98 */ + if(0) + { + SnmpUtilVarBindFree(NULL); + } SnmpUtilVarBindFree(&dst); ok(dst.name.idLength == 0, "SnmpUtilVarBindFree failed\n"); ok(dst.name.ids == NULL, "SnmpUtilVarBindFree failed\n"); @@ -449,11 +499,15 @@ static void test_SnmpUtilVarBindListCpyFree(void) ok(!ret, "SnmpUtilVarBindListCpy succeeded\n"); } - memset(&dst_list, 0xff, sizeof(SnmpVarBindList)); - ret = SnmpUtilVarBindListCpy(&dst_list, NULL); - ok(ret, "SnmpUtilVarBindListCpy failed\n"); - ok(dst_list.list == NULL, "SnmpUtilVarBindListCpy failed\n"); - ok(dst_list.len == 0, "SnmpUtilVarBindListCpy failed\n"); + /* This crashes under win98 */ + if(0) + { + memset(&dst_list, 0xff, sizeof(SnmpVarBindList)); + ret = SnmpUtilVarBindListCpy(&dst_list, NULL); + ok(ret, "SnmpUtilVarBindListCpy failed\n"); + ok(dst_list.list == NULL, "SnmpUtilVarBindListCpy failed\n"); + ok(dst_list.len == 0, "SnmpUtilVarBindListCpy failed\n"); + } ret = SnmpUtilVarBindListCpy(&dst_list, &src_list); ok(ret, "SnmpUtilVarBindListCpy failed\n");

1 0

Jeff Zaroyko : use googleapis.com to host prototype.js
by Chris Morgan June 3, 2008

June 3, 2008

Module: appdb Branch: master Commit: 041d0d2bc32a50968ff0c034daad036d5bd73d5a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=041d0d2bc32a50968ff0c034… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Wed Jun 4 10:47:39 2008 +1000 use googleapis.com to host prototype.js --- include/header.php | 3 +- prototype-1.6.0.2.js | 4221 -------------------------------------------------- 2 files changed, 2 insertions(+), 4222 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=041d0d2bc32a50968ff0…

1 0

Alexander Nicolaysen Sørnes : objectManager: only access filter object if it exists
by Chris Morgan June 3, 2008

June 3, 2008

Module: appdb Branch: master Commit: abe33cfe7d3b7fcf44669668279e55dca11198c8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=abe33cfe7d3b7fcf44669668… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jun 3 11:46:23 2008 +0200 objectManager: only access filter object if it exists --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index cec6fac..1b8fb4c 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -302,7 +302,7 @@ class ObjectManager /* did we get any entries? */ if(!$hResult || query_num_rows($hResult) == 0) { - if($this->oFilters->getFilterCount()) + if($this->oFilters && $this->oFilters->getFilterCount()) { echo '<center>No matches found</center>'; } else

1 0

Jeff Zaroyko : add a visual cue which shows the rating definition currently selected, it changes when a different rating is selected
by Chris Morgan June 3, 2008

June 3, 2008

Module: appdb Branch: master Commit: 4bf0bb6a27e2a4be537339bfa7c0a1eee1f537d7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4bf0bb6a27e2a4be537339bf… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Tue Jun 3 17:40:04 2008 +1000 add a visual cue which shows the rating definition currently selected, it changes when a different rating is selected --- include/util.php | 4 ++-- scripts.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/include/util.php b/include/util.php index e878ae6..57576ae 100644 --- a/include/util.php +++ b/include/util.php @@ -217,7 +217,7 @@ function make_bugzilla_version_list($sVarname, $sSelectedValue) // returns a string containing the html for the maintainer rating list function make_maintainer_rating_list($varname, $cvalue) { - $sTxt = "<select name='$varname'>\n"; + $sTxt = "<select id='ratingSelect' onchange='showHint(this)' name='$varname'>\n"; $sTxt .= "<option value=\"\">Choose ...</option>\n"; $aRating = array("Platinum", "Gold", "Silver", "Bronze", "Garbage"); $iMax = count($aRating); @@ -229,7 +229,7 @@ function make_maintainer_rating_list($varname, $cvalue) else $sTxt .= "<option class=$aRating[$i] value=$aRating[$i]>$aRating[$i]\n"; } - $sTxt .= "</select>\n"; + $sTxt .= "</select> <span id='hint'></span> \n"; return $sTxt; } diff --git a/scripts.js b/scripts.js index 48f6013..078f527 100644 --- a/scripts.js +++ b/scripts.js @@ -67,3 +67,32 @@ function showComment(commentid) elem.show(); } } +/* provide a hint to the user about the selected rating */ +var ratingdesc=[ + "", + " Works flawlessly out of the box - no problems ", + " Works flawlessly with DLL overrides, third party software or other settings ", + " Works excellently for normal use;works fine in singleplayer but not multi ", + " Works but has issues for normal use ", + " Does not run or cannot be installed with Wine " + ]; +var ratingstyle =[ + "", + "platinum", + "gold", + "silver", + "bronze", + "garbage" + ]; +function showHint(o){ + if(o) + { + $('hint').innerHTML=ratingdesc[o.selectedIndex]; + $w($('hint').className).map( function(x){ $('hint').removeClassName(x); }) + $('hint').addClassName(ratingstyle[o.selectedIndex]); + } +} +/* executed when document is ready */ +document.observe("dom:loaded", function() { + showHint($('ratingSelect')); + });

1 0

Alexander Nicolaysen Sørnes : Don' t pass titles as part of delete links
by Chris Morgan June 3, 2008

June 3, 2008

Module: appdb Branch: master Commit: 6bd6839995b1cbd7e4c42f0a3786495804454ff3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6bd6839995b1cbd7e4c42f0a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jun 3 12:19:17 2008 +0200 Don't pass titles as part of delete links --- include/application.php | 4 +++- include/version.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index b8bc19c..d663ed8 100644 --- a/include/application.php +++ b/include/application.php @@ -719,6 +719,8 @@ class Application { { switch($sAction) { + case 'delete': + return 'Delete '.$this->sName; case "view": return $this->sName; @@ -821,7 +823,7 @@ class Application { } if($_SESSION['current']->hasPriv("admin")) { - $url = BASE."objectManager.php?sClass=application&bIsQueue=false&sAction=delete&sTitle=Delete%20".$this->sName."&iId=".$this->iAppId; + $url = BASE."objectManager.php?sClass=application&bIsQueue=false&sAction=delete&iId=".$this->iAppId; echo " <form method=\"post\" name=\"sEdit\" action=\"javascript:self.location = '".$url."'\"><input type=\"submit\" value=\"Delete App\" class=\"button\"></form>"; echo ' <form method="post" name="sEdit" action="admin/editBundle.php"><input type="hidden" name="iBundleId" value="'.$this->iAppId.'"><input type="submit" value="Edit Bundle" class="button"></form>'; } diff --git a/include/version.php b/include/version.php index 674c180..04affed 100644 --- a/include/version.php +++ b/include/version.php @@ -745,6 +745,8 @@ class version { { switch($sAction) { + case 'delete': + return 'Delete '.version::fullName($this->iVersionId); case "view": return version::fullName($this->iVersionId); @@ -971,7 +973,7 @@ class version { echo "\t".'<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'."\n"; echo "\t".'<input type=submit value="Edit Version" class="button">'."\n"; echo '</form>'."\n"; - $url = BASE."objectManager.php?sClass=version&sAction=delete&bQueued=false&sTitle=Delete%20".version::fullName($this->iVersionId)."&iId=".$this->iVersionId; + $url = BASE."objectManager.php?sClass=version&sAction=delete&bQueued=false&iId=".$this->iVersionId; echo "<form method=\"post\" name=\"sDelete\" action=\"javascript:self.location = '".$url."'\">\n"; echo "\t".'<input type=submit value="Delete Version" class="button">'."\n"; echo '</form>'."\n";

1 0

Alexandre Julliard : winetest: Cosmetic improvements in the summary formatting.
by Alexandre Julliard June 3, 2008

June 3, 2008

Module: tools Branch: master Commit: ab8585123b837583702249b69434cf51bbac521f URL: http://source.winehq.org/git/tools.git/?a=commit;h=ab8585123b837583702249b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 3 18:11:16 2008 +0200 winetest: Cosmetic improvements in the summary formatting. --- winetest/dissect | 4 ++-- winetest/gather | 40 +++++++++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 9925d35..8ad85aa 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -82,10 +82,10 @@ print SUM "Version $summary_version\n"; $_ = <IN>; /^Tests from build ([-.0-9a-zA-Z]+)\r?$/ or mydie "no build header: $_"; my $testbuild = $1; -$testbuild =~ /^[0-9a-f]{40}$/ or mydie "not a valid commit id $testbuild"; +$testbuild =~ /^[0-9a-f]{40}$/ or mydie "not a valid commit id $testbuild\n"; my $commit = `git rev-parse --verify $testbuild^0 2>/dev/null`; chomp $commit; -$testbuild eq $commit or mydie "not an existing commit $testbuild"; +$testbuild eq $commit or mydie "not an existing commit $testbuild\n"; $_ = <IN>; /^Archive: (.*?)\r?$/ or mydie "no archive line: $_"; diff --git a/winetest/gather b/winetest/gather index 4682237..d962b83 100755 --- a/winetest/gather +++ b/winetest/gather @@ -27,7 +27,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; -use vars qw/$datadir/; +use vars qw/$datadir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -153,8 +153,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $source, $rev) = split; my $testname = "$dll:$unit"; - $alltests{$testname} = "http://source.winehq.org/git/wine.git/?a=history;f=$source;hb=$build" - unless exists $alltests{$testname}; + $alltests{$testname} = $source; # Leave this in for older type reports if ($unit =~ /_dll_missing/ or @@ -388,6 +387,7 @@ 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"; @@ -398,16 +398,17 @@ print OUT <<"EOF"; "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <title>$build</title> + <title>$short_build</title> <link rel="stylesheet" href="/summary.css" type="text/css"> <meta http-equiv="Content-Type" - content="text/html; charset=ISO-8859-1"> + content="text/html; charset=utf-8"> <meta name="Author" content="gather"> <meta http-equiv="Content-Script-Type" content="text/javascript"> </head> <body> +<div class="navbar"> <table class="navbar"> <tr> <td class="left"> @@ -420,14 +421,17 @@ print OUT <<"EOF"; </td> </tr> </table> +</div> +<div class="legend"> <h3>Legend</h3> -<p class="legend">All tests <span class="result pass">pass</span> in all reports<br> - Some tests <span class="result mixed">fail</span> in some reports<br> - Some tests <span class="result fail">fail</span> in all reports<br> - This <span class="result pass also-skip">border</span> signals that some tests are skipped<br> - This <span class="result pass also-todo">border</span> and this <span class="result todo">background</span> signal that the implementation needs some work -</p> -<h1>Main summary for build <a href="$url">$build</a></h1> +<p class="legend">All tests <span class="result pass">pass</span> in all reports.</p> +<p class="legend">Some tests <span class="result mixed">fail</span> in some reports.</p> +<p class="legend">Some tests <span class="result fail">fail</span> in all reports.</p> +<p class="legend">This <span class="result pass also-skip">border</span> signals that some tests are skipped.</p> +<p class="legend">This <span class="result pass also-todo">border</span> and this <span class="result todo">background</span> signal that the implementation needs some work.</p> +</div> +<div class="main"> +<h1>Main summary for build <a href="$url" title="$build">$short_build</a></h1> <table class="report"> $header_footer <tbody onDblClick="clone();"> @@ -537,10 +541,12 @@ EOF # Create the Main Summary foreach my $testname (sort keys %alltests) { + my $source = $alltests{$testname}; + my $url = $gitweb . "/?a=history;f=$source;hb=$build"; print OUT <<"EOF"; <tr> <td class="test"> - <a href="$alltests{$testname}" title="dll:unit_test source">$testname</a></td> + <a href="$url" title="$source">$testname</a></td> EOF foreach my $group (@groups) { if (!exists $group->{reports}) { @@ -554,6 +560,7 @@ EOF print OUT <<"EOF"; </tbody> </table> +</div> EOF # Take the groups with multiple reports @@ -563,19 +570,21 @@ foreach my $group (@groups) { $header_footer = build_header_footer($group->{reports}); print OUT <<"EOF"; -<hr> +<div class="group"> <h2><a name="group_$group->{name}">$group->{name} differences</a></h2> <table class="report"> $header_footer <tbody onDblClick="clone();"> EOF foreach my $testname (sort keys %alltests) { + my $source = $alltests{$testname}; + my $url = $gitweb . "/?a=history;f=$source;hb=$build"; my $result = $group->{$testname}; next if ($result->{omit}); print OUT <<"EOF"; <tr> <td class="test"> - <a href="$alltests{$testname}" name="group_$group->{name}:$testname" title="dll:unit_test source">$testname</a></td> + <a href="$url" name="group_$group->{name}:$testname" title="$source">$testname</a></td> EOF foreach my $report (@{$group->{reports}}) { singletest($report, $testname, $group->{name}); @@ -587,6 +596,7 @@ EOF print OUT <<"EOF"; </tbody> </table> +</div> EOF } print OUT <<"EOF";

1 0

Alexandre Julliard : winetest: Give a WineHQ look to the summary page.
by Alexandre Julliard June 3, 2008

June 3, 2008

Module: tools Branch: master Commit: f5ef9c5a94f6c807be0df1b8cc58b0da79ee5001 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f5ef9c5a94f6c807be0df1b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 3 18:11:42 2008 +0200 winetest: Give a WineHQ look to the summary page. --- winetest/index.css | 6 +-- winetest/summary.css | 83 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/winetest/index.css b/winetest/index.css index f90b133..020193d 100644 --- a/winetest/index.css +++ b/winetest/index.css @@ -5,7 +5,7 @@ body { color: #000000; font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; margin: 10px; - font-size: 12px; + font-size: small; } a { color: #A50D0D; text-decoration: none; } @@ -14,9 +14,6 @@ a:hover { color: #FF6666; text-decoration: underline; } a:active { color: #FF0000; } a.hidden { text-decoration: none; color: #000000; } -ol,ul,p { font-size: 12px; } -td,tr,th { font-size: 12px; } - table.builds { margin-right: auto; text-spacing: 0; @@ -44,6 +41,7 @@ tr.dark:hover { background-color: #f8e8e8; } td.build, td.date { font-family: monospace; + font-size: medium; } td.version { text-align: center; diff --git a/winetest/summary.css b/winetest/summary.css index 38fa00b..bd0f749 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -1,9 +1,65 @@ +/* give a WineHQ-ish look to the test summary */ +body { + background-color: #E2E2E2; + color: #000000; + font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; + margin: 10px; + font-size: small; +} + +a:link { 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; } + +h1 { font-size: 180%; } +h2 { font-size: 150%; } + :link, :visited { text-decoration: none; } -h3, p.legend { - text-align: center; + +h1, h2 { + text-align: center; + background-color: #601919; + color: #ffffff; + padding: 4px; + margin: 0; +} +h1 :link { + color: #ffe0e0; +} +div.main, div.group { + margin: 10px 0 0 0; + background-color: white; + width: 100%; + border: 1px solid #601919; +} +div.navbar { + padding: 0; + width: 100%; + text-align: center; + margin: 10px 0 0 0; + background-color: #e2e2e2; +} +div.legend { + text-align: center; + margin: 5px 0 0 0; + background-color: white; + border: 1px solid #601919; +} +div.legend h3 { + font-size: 120%; + text-align: center; + padding: 3px; + margin: 0; +} +p.legend { + padding: 0; + margin: 3px; } + .result { border-left-width: thick; border-left-style: solid; @@ -43,6 +99,8 @@ td { table.report { margin-left: auto; margin-right: auto; + padding: 10px; + background-color: white; } table.report th { line-height: 0.9; @@ -55,13 +113,19 @@ table.report th.test { } table.report thead th { border-bottom-style: solid; + border-bottom-color: #601919; } table.report tfoot th { border-top-style: solid; } -table.report td :link { - color: black; -} +table.report th.pass a:hover { color: black; text-decoration: none; } +table.report th.todo a:hover { color: black; text-decoration: none; } +table.report th.fail a:hover { color: black; text-decoration: none; } + +table.report td.result :link { color: black; } +table.report td.result :visited { color: black; } +table.report td.result :hover { color: black; } + table.report td.vis_note { border-right-style: solid; border-left-style: solid; @@ -69,13 +133,13 @@ table.report td.vis_note { border-left-color: #ffffff; border-right-color: #0070ff; } +table.report td.note { + background-color: #fff8f8; +} table.report td.note :link, table.report td.note :visited, table.report td.vis_note :link, table.report td.vis_note :visited { text-decoration: underline; } -table.report td.test :link { - color: blue; -} table.report td.test { text-align: left; } @@ -92,9 +156,6 @@ table.navbar { table.navbar td { width: 33% } -table.navbar td :link { - color: blue; -} table.navbar td.left { text-align: left; }

1 0

Roderick Colenbrander : wined3d: Add a WineD3D_ChoosePixelFormat line.
by Alexandre Julliard June 3, 2008

June 3, 2008

Module: wine Branch: master Commit: 0ca7d443acf120f3787dfd994c18ea0a8c94ef66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca7d443acf120f3787dfd994… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Jun 2 20:39:51 2008 +0000 wined3d: Add a WineD3D_ChoosePixelFormat line. --- dlls/wined3d/context.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0811f12..5eb1f6d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -121,6 +121,9 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF int nCfgs = This->adapter->nCfgs; WineD3D_PixelFormat *cfgs = This->adapter->cfgs; + TRACE("ColorFormat=%s, DepthStencilFormat=%s, auxBuffers=%d, numSamples=%d, pbuffer=%d, findCompatible=%d\n", + debug_d3dformat(ColorFormat), debug_d3dformat(DepthStencilFormat), auxBuffers, numSamples, pbuffer, findCompatible); + if(!getColorBits(ColorFormat, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { ERR("Unable to get color bits for format %s (%#x)!\n", debug_d3dformat(ColorFormat), ColorFormat); return 0;

1 0

Zac Brown : ntdll/tests: Actually verify right bytes received in aio test.
by Alexandre Julliard June 3, 2008

June 3, 2008

Module: wine Branch: master Commit: b483b680136944bdb59be89c27960906278c52b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b483b680136944bdb59be89c2… Author: Zac Brown <zac(a)zacbrown.org> Date: Mon Jun 2 13:14:26 2008 -0700 ntdll/tests: Actually verify right bytes received in aio test. --- dlls/ntdll/tests/file.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d824530..ae0bcef 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -65,6 +65,7 @@ static inline BOOL is_signaled( HANDLE obj ) } #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c" +#define TEST_BUF_LEN 3 static BOOL create_pipe( HANDLE *read, HANDLE *write, ULONG flags, ULONG size ) { @@ -533,7 +534,7 @@ static void test_iocp_fileio(HANDLE h) if (hPipeClt != INVALID_HANDLE_VALUE) { OVERLAPPED o = {0,}; - BYTE buf[3]; + BYTE send_buf[TEST_BUF_LEN], recv_buf[TEST_BUF_LEN]; DWORD read; long count; @@ -541,12 +542,14 @@ static void test_iocp_fileio(HANDLE h) ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); + memset( send_buf, 0, TEST_BUF_LEN ); + memset( recv_buf, 0xde, TEST_BUF_LEN ); count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); - ReadFile( hPipeSrv, buf, 3, &read, &o); + ReadFile( hPipeSrv, recv_buf, TEST_BUF_LEN, &read, &o); count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); - WriteFile( hPipeClt, buf, 3, &read, NULL ); + WriteFile( hPipeClt, send_buf, TEST_BUF_LEN, &read, NULL ); if (get_msg(h)) { @@ -554,14 +557,17 @@ static void test_iocp_fileio(HANDLE h) ok( ioSb.Information == 3, "Invalid ioSb.Information: %ld\n", ioSb.Information ); ok( U(ioSb).Status == STATUS_SUCCESS, "Invalid ioSb.Status: %x\n", U(ioSb).Status); ok( completionValue == (ULONG_PTR)&o, "Invalid completion value: %lx\n", completionValue ); + ok( !memcmp( send_buf, recv_buf, TEST_BUF_LEN ), "Receive buffer (%x %x %x) did not match send buffer (%x %x %x)\n", recv_buf[0], recv_buf[1], recv_buf[2], send_buf[0], send_buf[1], send_buf[2] ); } count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); - WriteFile( hPipeClt, buf, 2, &read, NULL ); + memset( send_buf, 0, TEST_BUF_LEN ); + memset( recv_buf, 0xde, TEST_BUF_LEN ); + WriteFile( hPipeClt, send_buf, 2, &read, NULL ); count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); - ReadFile( hPipeSrv, buf, 2, &read, &o); + ReadFile( hPipeSrv, recv_buf, 2, &read, &o); count = get_pending_msgs(h); ok( count == 1, "Unexpected msg count: %ld\n", count ); if (get_msg(h)) @@ -570,9 +576,10 @@ static void test_iocp_fileio(HANDLE h) ok( ioSb.Information == 2, "Invalid ioSb.Information: %ld\n", ioSb.Information ); ok( U(ioSb).Status == STATUS_SUCCESS, "Invalid ioSb.Status: %x\n", U(ioSb).Status); ok( completionValue == (ULONG_PTR)&o, "Invalid completion value: %lx\n", completionValue ); + ok( !memcmp( send_buf, recv_buf, 2 ), "Receive buffer (%x %x) did not match send buffer (%x %x)\n", recv_buf[0], recv_buf[1], send_buf[0], send_buf[1] ); } - ReadFile( hPipeSrv, buf, sizeof(buf), &read, &o); + ReadFile( hPipeSrv, recv_buf, TEST_BUF_LEN, &read, &o); CloseHandle( hPipeSrv ); count = get_pending_msgs(h); ok( count == 1, "Unexpected msg count: %ld\n", count );

1 0