Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cwittich] 40561: don't crash on setupapi stringtable winetest

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 17 23:37:13 2009 New Revision: 40561 URL: http://svn.reactos.org/svn/reactos?rev=40561&view=rev Log: don't crash on setupapi stringtable winetest Modified: trunk/reactos/dll/win32/setupapi/stringtable.c Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Fri Apr 17 23:37:13 2009 @@ -607,13 +607,14 @@ PSTRING_TABLE pStringTable; DWORD i; - TRACE("%p %s %lx\n", (PVOID)hStringTable, debugstr_w(lpString), dwFlags); + TRACE("%p %s %x %p, %x\n", hStringTable, debugstr_w(lpString), dwFlags, + lpExtraData, lpReserved); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) { ERR("Invalid hStringTable!\n"); - return (DWORD)-1; + return ~0u; } /* Search for existing string in the string table */ @@ -625,10 +626,12 @@ { if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { - memcpy(lpExtraData, - pStringTable->pSlots[i].pData, - pStringTable->pSlots[i].dwSize); - *lpReserved = 0; + if (lpExtraData) + { + memcpy(lpExtraData, + pStringTable->pSlots[i].pData, + pStringTable->pSlots[i].dwSize); + } return i + 1; } } @@ -636,10 +639,12 @@ { if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { - memcpy(lpExtraData, - pStringTable->pSlots[i].pData, - pStringTable->pSlots[i].dwSize); - *lpReserved = 0; + if (lpExtraData) + { + memcpy(lpExtraData, + pStringTable->pSlots[i].pData, + pStringTable->pSlots[i].dwSize); + } return i + 1; } }

15 years, 9 months

[cfinck] 40560: Remove the underscores in front of the variable names again after speaking with Daniel. RosBE-Unix and -Windows now use the same names for them again.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 17 21:17:45 2009 New Revision: 40560 URL: http://svn.reactos.org/svn/reactos?rev=40560&view=rev Log: Remove the underscores in front of the variable names again after speaking with Daniel. RosBE-Unix and -Windows now use the same names for them again. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Fri Apr 17 21:17:45 2009 @@ -86,18 +86,18 @@ if ($_ROSBE_MODE -eq "MinGW") { $ENV:C_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" - $ENV:_ROSBE_HOST_CFLAGS = $null - $ENV:_ROSBE_HOST_CXXFLAGS = $null - $ENV:_ROSBE_TARGET_CFLAGS = $null - $ENV:_ROSBE_TARGET_CXXFLAGS = $null + $ENV:ROSBE_HOST_CFLAGS = $null + $ENV:ROSBE_HOST_CXXFLAGS = $null + $ENV:ROSBE_TARGET_CFLAGS = $null + $ENV:ROSBE_TARGET_CXXFLAGS = $null } else { $ENV:C_INCLUDE_PATH = $null $ENV:CPLUS_INCLUDE_PATH = $null - $ENV:_ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" - $ENV:_ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" - $ENV:_ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" - $ENV:_ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" + $ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" + $ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" + $ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" + $ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" } if ($_ROSBE_HOST_GCCVERSION -eq "3.4.5") { $ENV:PATH = "$_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH" @@ -106,8 +106,8 @@ $ENV:C_INCLUDE_PATH = "$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include" $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include" $ENV:LIBRARY_PATH = "$_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5" - $ENV:_ROSBE_HOST_CFLAGS = $null - $ENV:_ROSBE_HOST_CXXFLAGS = $null - $ENV:_ROSBE_TARGET_CFLAGS = $null - $ENV:_ROSBE_TARGET_CXXFLAGS = $null + $ENV:ROSBE_HOST_CFLAGS = $null + $ENV:ROSBE_HOST_CXXFLAGS = $null + $ENV:ROSBE_TARGET_CFLAGS = $null + $ENV:ROSBE_TARGET_CXXFLAGS = $null } Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Fri Apr 17 21:17:45 2009 @@ -99,18 +99,18 @@ if "%_ROSBE_MODE%" == "MinGW" ( set C_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include set CPLUS_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set _ROSBE_HOST_CFLAGS= - set _ROSBE_HOST_CXXFLAGS= - set _ROSBE_TARGET_CFLAGS= - set _ROSBE_TARGET_CXXFLAGS= + set ROSBE_HOST_CFLAGS= + set ROSBE_HOST_CXXFLAGS= + set ROSBE_TARGET_CFLAGS= + set ROSBE_TARGET_CXXFLAGS= ) else ( set C_INCLUDE_PATH= set CPLUS_INCLUDE_PATH= - set _ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" - set _ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" - set _ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" - set _ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" + set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" + set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" ) if "%_ROSBE_HOST_GCCVERSION%" == "3.4.5" ( set PATH=%_ROSBE_BASEDIR%\3.4.5\bin;%_ROSBE_BASEDIR%\3.4.5\libexec\gcc\mingw32\3.4.5;%PATH% @@ -119,8 +119,8 @@ set C_INCLUDE_PATH=%_ROSBE_BASEDIR%\3.4.5\include;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5\include set CPLUS_INCLUDE_PATH=%_ROSBE_BASEDIR%\3.4.5\include;%_ROSBE_BASEDIR%\3.4.5\include\c++\3.4.5;%_ROSBE_BASEDIR%\3.4.5\include\c++\3.4.5\mingw32;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5\include set LIBRARY_PATH=%_ROSBE_BASEDIR%\3.4.5\lib;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5 - set _ROSBE_HOST_CFLAGS= - set _ROSBE_HOST_CXXFLAGS= - set _ROSBE_TARGET_CFLAGS= - set _ROSBE_TARGET_CXXFLAGS= + set ROSBE_HOST_CFLAGS= + set ROSBE_HOST_CXXFLAGS= + set ROSBE_TARGET_CFLAGS= + set ROSBE_TARGET_CXXFLAGS= )

15 years, 9 months

[cfinck] 377: - Remove "Tests marked as TODO", that's a Wine-specific thing we don't need to know about - Change the layout, so that everything fits into one line (idea by Christoph) - Don't compare differences for a specific result in case the test crashed

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 17 21:13:01 2009 New Revision: 377 URL: http://svn.reactos.org/svn/reactos?rev=377&view=rev Log: - Remove "Tests marked as TODO", that's a Wine-specific thing we don't need to know about - Change the layout, so that everything fits into one line (idea by Christoph) - Don't compare differences for a specific result in case the test crashed Modified: branches/danny-web/resources/testman/testman.sql branches/danny-web/www/www.reactos.org/testman/compare.php branches/danny-web/www/www.reactos.org/testman/css/compare.css branches/danny-web/www/www.reactos.org/testman/detail.php branches/danny-web/www/www.reactos.org/testman/js/compare.js.php branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… Modified: branches/danny-web/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/resources/testman/tes… ============================================================================== --- branches/danny-web/resources/testman/testman.sql [iso-8859-1] (original) +++ branches/danny-web/resources/testman/testman.sql [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -16,7 +16,6 @@ `test_id` int(10) unsigned NOT NULL, `suite_id` int(10) unsigned NOT NULL, `count` int(10) NOT NULL COMMENT 'Number of all executed tests', - `todo` int(10) unsigned NOT NULL COMMENT 'Tests marked as TODO', `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', `skipped` int(10) unsigned NOT NULL COMMENT 'Number of skipped tests', PRIMARY KEY (`id`), Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -17,22 +17,22 @@ GetLanguage(); require_once("lang/$lang.inc.php"); - - function GetValueForResult($result) - { - // If a test crashed, return a numeric value of 0, so that the comparison is accurate - if($result == -1) - return 0; - - return $result; - } function GetDifference(&$current_result_row, &$prev_result_row, $subject) { - if(!$prev_result_row["id"] || $current_result_row[$subject] == $prev_result_row[$subject]) + // Return   ("" is not possible because of IE...) if + // - we have nothing to compare + // - both values are identical + // - a crash occured in one of the results + if(!$prev_result_row["id"] || + $current_result_row[$subject] == $prev_result_row[$subject] || + $current_result_row[$subject] == -1 || + $prev_result_row[$subject] == -1) + { return " "; - - $diff = GetValueForResult($current_result_row[$subject]) - GetValueForResult($prev_result_row[$subject]); + } + + $diff = $current_result_row[$subject] - $prev_result_row[$subject]; if($diff > 0) return "(+$diff)"; @@ -104,9 +104,6 @@ <div class="real_failedtests" style="border: solid 1px black; border-left: none; width: 7px;"></div> <div class="desc"><?php echo $testman_langres["failedtests"]; ?></div> - <div class="box todotests"></div> - <div class="desc"><?php echo $testman_langres["todotests"]; ?></div> - <div class="box skippedtests"></div> <div class="desc"><?php echo $testman_langres["skippedtests"]; ?></div> @@ -142,7 +139,7 @@ for($i = 0; $i < count($id_array); $i++) { $result_stmt[$i] = $dbh->prepare( - "SELECT e.id, e.count, e.todo, e.failures, e.skipped " . + "SELECT e.id, e.count, e.failures, e.skipped " . "FROM " . DB_TESTMAN . ".winetest_suites s " . "LEFT JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id AND e.test_id = :testid " . "WHERE s.id IN (" . $suite_idlist . ")" . @@ -198,7 +195,6 @@ $prev_result_row = null; $temp_totaltests = -2; $temp_failedtests = -2; - $temp_todotests = -2; $temp_skippedtests = -2; for($i = 0; $i < count($result_stmt); $i++) @@ -215,19 +211,13 @@ // Check whether there are any changes within the test results of several runs CheckIfChanged($changed, $temp_totaltests, $result_row["count"]); CheckIfChanged($changed, $temp_failedtests, $result_row["failures"]); - CheckIfChanged($changed, $temp_todotests, $result_row["todo"]); CheckIfChanged($changed, $temp_skippedtests, $result_row["skipped"]); if($result_row["id"]) { - echo '<table class="celltable">'; - echo '<tr>'; - printf('<td colspan="3" title="%s" class="totaltests">%s <span class="diff">%s</span></td>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); - echo '</tr><tr>'; - printf('<td title="%s" class="%s_failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["count"] == -1) ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); - printf('<td title="%s" class="todotests">%d <span class="diff">%s</span></td>', $testman_langres["todotests"], $result_row["todo"], GetDifference($result_row, $prev_result_row, "todo")); - printf('<td title="%s" class="skippedtests">%d <span class="diff">%s</span></td>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); - echo '</tr></table>'; + printf('<div title="%s" class="box totaltests">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); + printf('<div title="%s" class="box %s_failedtests">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["count"] == -1) ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); + printf('<div title="%s" class="box skippedtests">%d <span class="diff">%s</span></div>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); } else { Modified: branches/danny-web/www/www.reactos.org/testman/css/compare.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -45,10 +45,6 @@ background-color: #FF6666 !important; } -.todotests { - background-color: #9999FF !important; -} - .skippedtests { background-color: #CCCCCC !important; } @@ -65,6 +61,8 @@ background: #5984C3; color: white; font-weight: bold; + position: absolute; + width: 325px; } #comparetable { @@ -82,7 +80,7 @@ width: 200px; } -#comparetable td { +#comparetable td, #comparetable td div.box { border-right: solid 1px #BBBBBB; border-bottom: solid 1px #BBBBBB; padding: 3px; @@ -92,14 +90,16 @@ cursor: pointer; } -.celltable { - width: 215px; -} - -.celltable td { +#comparetable td div { text-align: center; } -.celltable td.totaltests { +#comparetable td div.box { + float: left; + width: 95px; +} + +#comparetable td div.totaltests { font-weight: bold; + width: 120px; } Modified: branches/danny-web/www/www.reactos.org/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -52,7 +52,7 @@ // Get information about this result $stmt = $dbh->prepare( - "SELECT l.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . + "SELECT l.log, e.count, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . "FROM " . DB_TESTMAN . ".winetest_results e " . "JOIN " . DB_TESTMAN . ".winetest_logs l ON e.id = l.id " . "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . @@ -81,10 +81,6 @@ <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["failedtests"]; ?>:</td> <td><?php echo $row["failures"]; ?></td> - </tr> - <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> - <td class="info"><?php echo $testman_langres["todotests"]; ?>:</td> - <td><?php echo $row["todo"]; ?></td> </tr> <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["skippedtests"]; ?>:</td> Modified: branches/danny-web/www/www.reactos.org/testman/js/compare.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/compare.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/compare.js.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -76,12 +76,12 @@ // Remove all difference data in this case as there is no previous element for(var i = 0; i < trs.length; i++) { - var tds = trs[i].childNodes[Index].getElementsByTagName("td"); - - for(var j = 0; j < tds.length; j++) + var divs = trs[i].childNodes[Index].getElementsByTagName("div"); + + for(var j = 0; j < divs.length; j++) { // \u00A0 =   - tds[j].getElementsByTagName("span")[0].firstChild.data = "\u00A0"; + divs[j].getElementsByTagName("span")[0].firstChild.data = "\u00A0"; } } @@ -91,28 +91,35 @@ // No, then add the difference data accordingly for(var i = 0; i < trs.length; i++) { - // We can only add difference data if the current table and the previous one contain tables with result data - if(trs[i].childNodes[Index].firstChild.nodeName != "TABLE" || trs[i].childNodes[Index - 1].firstChild.nodeName != "TABLE") + // We can only add difference data if the current table and the previous one contain result data + if(trs[i].childNodes[Index].firstChild.nodeName != "DIV" || trs[i].childNodes[Index - 1].firstChild.nodeName != "DIV") continue; - var tds = trs[i].childNodes[Index].getElementsByTagName("td"); - - for(var j = 0; j < tds.length; j++) + var divs = trs[i].childNodes[Index].childNodes; + + for(var j = 0; j < divs.length; j++) { - var CurrentValue = GetValueForResult(tds[j]); - var PreviousValue = GetValueForResult(trs[i].childNodes[Index - 1].getElementsByTagName("td")[j]); - - // Calculate the difference - var Diff = CurrentValue - PreviousValue; - - if(Diff > 0) - var DiffString = String("(+" + Diff + ")"); - else if(Diff < 0) - var DiffString = String("(" + Diff + ")"); + var CurrentValue = divs[j].firstChild.data; + var PreviousValue = trs[i].childNodes[Index - 1].childNodes[j].firstChild.data; + + if(CurrentValue == PreviousValue || CurrentValue == -1 || PreviousValue == -1) + { + var DiffString = "\u00A0"; + } else - var DiffString = "\u00A0"; - - tds[j].getElementsByTagName("span")[0].firstChild.data = DiffString; + { + // Calculate the difference + var Diff = CurrentValue - PreviousValue; + + if(Diff > 0) + var DiffString = String("(+" + Diff + ")"); + else if(Diff < 0) + var DiffString = String("(" + Diff + ")"); + else + var DiffString = "\u00A0"; + } + + divs[j].getElementsByTagName("span")[0].firstChild.data = DiffString; } } } @@ -188,7 +195,6 @@ TempBlock.appendChild(DragColumn.childNodes[i].cloneNode(true)); TempBlock.id = "TempBlock"; - TempBlock.style.position = "absolute"; TempBlock.style.top = GetAbsoluteOffsetTop(DragColumn) + "px"; document.body.insertBefore(TempBlock, document.getElementById("comparetable")); Modified: branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -44,7 +44,6 @@ "legend" => "Legende", "totaltests" => "Alle Tests", "failedtests" => "Fehlgeschlagene Tests", - "todotests" => "Als TODO markierte Tests", "skippedtests" => "Ãbersprungene Tests", "difference" => "Unterschied zum vorherigen Ergebnis", Modified: branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -44,7 +44,6 @@ "legend" => "Legend", "totaltests" => "Total Tests", "failedtests" => "Failed Tests", - "todotests" => "Tests marked as TODO", "skippedtests" => "Skipped tests", "difference" => "Difference to the previous result", Modified: branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -45,7 +45,6 @@ "legend" => "Legenda", "totaltests" => "Wszystkie testy", "failedtests" => "Nieudane", - "todotests" => "Oznaczone jako TODO", "skippedtests" => "PominiÄte", "difference" => "RÃ³Å¼nica wzglÄdem poprzedniego wyniku", Modified: branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -78,17 +78,15 @@ // We found no summary line, so the test probably crashed // Indicate this by setting count to -1 and set the rest to zero. $count = -1; - $todo = 0; $failures = 0; $skipped = 0; } // Add the information into the DB - $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, count, todo, failures, skipped) VALUES (:testid, :suiteid, :count, :todo, :failures, :skipped)"); + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, count, failures, skipped) VALUES (:testid, :suiteid, :count, :failures, :skipped)"); $stmt->bindValue(":testid", (int)$test_id); $stmt->bindValue(":suiteid", (int)$suite_id); $stmt->bindParam(":count", $count); - $stmt->bindParam(":todo", $todo); $stmt->bindParam(":failures", $failures); $stmt->bindParam(":skipped", $skipped); $stmt->execute() or die("Submit(): SQL failed #2");

15 years, 9 months

[cfinck] 376: Sort the results to compare by ID instead of clicking order

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 17 20:48:09 2009 New Revision: 376 URL: http://svn.reactos.org/svn/reactos?rev=376&view=rev Log: Sort the results to compare by ID instead of clicking order Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] Fri Apr 17 20:48:09 2009 @@ -14,7 +14,7 @@ var inputbox_endrev; var PageCount; var ResultCount; -var SelectedResults = new Array(); +var SelectedResults = new Object(); var SelectedResultCount = 0; var REQUESTTYPE_FULLLOAD = 1; @@ -422,28 +422,38 @@ PageSwitch(info[0], info[1]); } +function NumericComparison(a, b) +{ + return a - b; +} + function CompareButton_OnClick() { - var first = true; var parameters = "ids="; - + var IDArray = new Array(); + + // Sort the selected IDs for(id in SelectedResults) - { - if(first) - { - parameters += id; + IDArray.push(parseInt(id)); + + if(!IDArray.length) + { + alert("<?php echo addslashes($testman_langres["noselection"]); ?>"); + return; + } + + IDArray.sort(NumericComparison); + + for(i = 0; i < IDArray.length; i++) + { + if(!i) + { + parameters += IDArray[i]; first = false; continue; } - parameters += "," + id; - } - - // If first is still true, no results were selected at all - if(first) - { - alert("<?php echo addslashes($testman_langres["noselection"]); ?>"); - return; + parameters += "," + IDArray[i]; } window.open("compare.php?" + parameters);

15 years, 9 months

[cwittich] 40559: revert 40488 as it breaks regsvr32

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 17 20:40:31 2009 New Revision: 40559 URL: http://svn.reactos.org/svn/reactos?rev=40559&view=rev Log: revert 40488 as it breaks regsvr32 Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Fri Apr 17 20:40:31 2009 @@ -213,30 +213,29 @@ for ( ; section; section = section->next) { - int len = 4; - - if (section->name[0]) len += wcslen(section->name); + int len = 0; + + if (section->name[0]) len += wcslen(section->name) + 4; for (key = section->key; key; key = key->next) { - len += wcslen(key->name); - if (key->value && key->value[0]) len += wcslen(key->value); - len += 3; /* '=' and "\r\n" */ + len += wcslen(key->name) + 2; + if (key->value) len += wcslen(key->value) + 1; } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!buffer) return; p = buffer; - *p++ = '['; if (section->name[0]) { + *p++ = '['; wcscpy( p, section->name ); p += wcslen(p); - } - *p++ = ']'; - *p++ = '\r'; - *p++ = '\n'; + *p++ = ']'; + *p++ = '\r'; + *p++ = '\n'; + } for (key = section->key; key; key = key->next) {

15 years, 9 months

[cfinck] 375: Also make the failed tests cell red in case a test crashed

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Apr 17 18:11:58 2009 New Revision: 375 URL: http://svn.reactos.org/svn/reactos?rev=375&view=rev Log: Also make the failed tests cell red in case a test crashed Modified: branches/danny-web/www/www.reactos.org/testman/compare.php Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Fri Apr 17 18:11:58 2009 @@ -224,7 +224,7 @@ echo '<tr>'; printf('<td colspan="3" title="%s" class="totaltests">%s <span class="diff">%s</span></td>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); echo '</tr><tr>'; - printf('<td title="%s" class="%s_failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], ($result_row["failures"] > 0 ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); + printf('<td title="%s" class="%s_failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["count"] == -1) ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); printf('<td title="%s" class="todotests">%d <span class="diff">%s</span></td>', $testman_langres["todotests"], $result_row["todo"], GetDifference($result_row, $prev_result_row, "todo")); printf('<td title="%s" class="skippedtests">%d <span class="diff">%s</span></td>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); echo '</tr></table>';

15 years, 9 months

[mjmartin] 40558: - OutputDebugStringA: Handle freeing memory in case of an exception.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Apr 17 15:09:22 2009 New Revision: 40558 URL: http://svn.reactos.org/svn/reactos?rev=40558&view=rev Log: - OutputDebugStringA: Handle freeing memory in case of an exception. Modified: trunk/reactos/dll/win32/kernel32/debug/output.c Modified: trunk/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Fri Apr 17 15:09:22 2009 @@ -246,6 +246,8 @@ _SEH2_TRY { + volatile PCHAR a_cBuffer = NULL; + /* opening the mutex failed */ if(hDBMonMutex == NULL) { @@ -339,8 +341,13 @@ else { /* output in blocks of 512 characters */ - volatile PCHAR a_cBuffer; a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); + + if (!a_cBuffer) + { + DbgPrint("OutputDebugStringA: Failed\n"); + break; + } /* write a maximum of 511 bytes */ if(nOutputStringLen > 510) @@ -357,7 +364,11 @@ /* send the current block to the kernel debugger */ DbgPrint("%s", a_cBuffer); - HeapFree(GetProcessHeap(), 0, a_cBuffer); + if (a_cBuffer) + { + HeapFree(GetProcessHeap(), 0, a_cBuffer); + a_cBuffer = NULL; + } } /* move to the next block */ @@ -370,6 +381,9 @@ /* ignore access violations and let other exceptions fall through */ _SEH2_EXCEPT((_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { + if (a_cBuffer) + HeapFree(GetProcessHeap(), 0, a_cBuffer); + /* string copied verbatim from Microsoft's kernel32.dll */ DbgPrint("\nOutputDebugString faulted during output\n"); }

15 years, 9 months

[mjmartin] 40557: - Add volatile to variables in OutputDebugStringA. Fix #1 of ? for 3424.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Apr 17 13:59:03 2009 New Revision: 40557 URL: http://svn.reactos.org/svn/reactos?rev=40557&view=rev Log: - Add volatile to variables in OutputDebugStringA. Fix #1 of ? for 3424. Modified: trunk/reactos/dll/win32/kernel32/debug/output.c Modified: trunk/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Fri Apr 17 13:59:03 2009 @@ -219,9 +219,9 @@ static BOOL s_bDBMonMutexTriedOpen = FALSE; /* local copy of the mutex handle */ - HANDLE hDBMonMutex = s_hDBMonMutex; + volatile HANDLE hDBMonMutex = s_hDBMonMutex; /* handle to the Section of the shared buffer */ - HANDLE hDBMonBuffer = NULL; + volatile HANDLE hDBMonBuffer = NULL; /* pointer to the mapped view of the shared buffer. It consist of the current process id followed by the message string */ @@ -229,11 +229,11 @@ /* event: signaled by the debug message monitor when OutputDebugString can write to the shared buffer */ - HANDLE hDBMonBufferReady = NULL; + volatile HANDLE hDBMonBufferReady = NULL; /* event: to be signaled by OutputDebugString when it's done writing to the shared buffer */ - HANDLE hDBMonDataReady = NULL; + volatile HANDLE hDBMonDataReady = NULL; /* mutex not opened, and no previous attempts to open/create it */ if(hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) @@ -295,10 +295,10 @@ _SEH2_TRY { /* size of the current output block */ - SIZE_T nRoundLen; + volatile SIZE_T nRoundLen; /* size of the remainder of the string */ - SIZE_T nOutputStringLen; + volatile SIZE_T nOutputStringLen; /* output the whole string */ nOutputStringLen = strlen(_OutputString); @@ -339,11 +339,12 @@ else { /* output in blocks of 512 characters */ - CHAR a_cBuffer[512]; + volatile PCHAR a_cBuffer; + a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); /* write a maximum of 511 bytes */ - if(nOutputStringLen > (sizeof(a_cBuffer) - 2)) - nRoundLen = sizeof(a_cBuffer) - 2; + if(nOutputStringLen > 510) + nRoundLen = 510; else nRoundLen = nOutputStringLen; @@ -355,6 +356,8 @@ /* send the current block to the kernel debugger */ DbgPrint("%s", a_cBuffer); + + HeapFree(GetProcessHeap(), 0, a_cBuffer); } /* move to the next block */

15 years, 9 months

[dchapyshev] 40556: - More correct fix of a problem with loading dlls

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Apr 17 11:15:04 2009 New Revision: 40556 URL: http://svn.reactos.org/svn/reactos?rev=40556&view=rev Log: - More correct fix of a problem with loading dlls Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Fri Apr 17 11:15:04 2009 @@ -858,7 +858,6 @@ PLDR_DATA_TABLE_ENTRY ModulePtr; BOOLEAN ContainsPath; UNICODE_STRING AdjustedName; - unsigned i; DPRINT("LdrFindEntryForName(Name %wZ)\n", Name); @@ -882,14 +881,8 @@ return(STATUS_SUCCESS); } - LdrAdjustDllName (&AdjustedName, Name, TRUE); - - ContainsPath = (AdjustedName.Length >= 2 * sizeof(WCHAR) && L':' == AdjustedName.Buffer[1]); - for (i = 0; ! ContainsPath && i < AdjustedName.Length / sizeof(WCHAR); i++) - { - ContainsPath = L'\\' == AdjustedName.Buffer[i] || - L'/' == AdjustedName.Buffer[i]; - } + ContainsPath = (Name->Length >= 2 * sizeof(WCHAR) && L':' == Name->Buffer[1]); + LdrAdjustDllName (&AdjustedName, Name, !ContainsPath); if (LdrpLastModule) {

15 years, 9 months

[dchapyshev] 40555: - Add check on null-pointer. Fixes exception in some cases

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Apr 17 11:12:21 2009 New Revision: 40555 URL: http://svn.reactos.org/svn/reactos?rev=40555&view=rev Log: - Add check on null-pointer. Fixes exception in some cases Modified: trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=405… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Fri Apr 17 11:12:21 2009 @@ -117,12 +117,15 @@ DPRINT("Waiting on Critical Section Event: %p %p\n", CriticalSection, CriticalSection->LockSemaphore); - CriticalSection->DebugInfo->EntryCount++; + + if (CriticalSection->DebugInfo) + CriticalSection->DebugInfo->EntryCount++; for (;;) { /* Increase the number of times we've had contention */ - CriticalSection->DebugInfo->ContentionCount++; + if (CriticalSection->DebugInfo) + CriticalSection->DebugInfo->ContentionCount++; /* Wait on the Event */ Status = NtWaitForSingleObject(CriticalSection->LockSemaphore,

15 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009