wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 37d7c519053b0cf30334acf087db67f804892ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d7c519053b0cf30334acf08… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Sat Jun 3 20:42:16 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 53 ++++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/po/pl.po b/po/pl.po index 50231bc..de2a989 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,20 +2,20 @@ # # Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. # Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. -# Marcin Mikołajczak <marcin123407(a)vivaldi.net>, 2017. +# Marcin Mikołajczak <me(a)m4sk.in>, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-05 21:48+0200\n" -"Last-Translator: Marcin Mikołajczak <marcin123407(a)vivaldi.net>\n" +"PO-Revision-Date: 2017-06-03 20:40+0200\n" +"Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.1\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -11807,11 +11807,8 @@ msgid "&About Registry Editor" msgstr "Edytor rejestru - i&nformacje" #: regedit.rc:91 regedit.rc:98 regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "rozwinięty" +msgstr "Rozwiń" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -11914,13 +11911,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Zawiera polecenia dla dostępu do często używanych klawiszy" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "Zawiera polecenia wyświetlające informacje o programie" +msgstr "" +"Zawiera polecenia wyświetlające pomoc i informacje dotyczące edytora rejestru" #: regedit.rc:166 msgid "Contains commands for creating new keys or values" @@ -12161,14 +12155,10 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Nie udało się usunąć klasy rejestru '%1'.\n" #: regedit.rc:430 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Nie rozpoznano linii '%1'.\n" +msgstr "regedit: Wiersz zawiera nieprawidłową składnię.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Kończy działanie edytora rejestru" @@ -12185,10 +12175,8 @@ msgid "Shows or hides the status bar" msgstr "Pokazuje lub ukrywa pasek stanu" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Zmienia pozycję podziału pomiędzy dwoma okienkami" +msgstr "Zmienia pozycję podziału pomiędzy dwoma oknami" #: regedit.rc:194 msgid "Refreshes the window" @@ -12232,10 +12220,8 @@ msgid "Adds a new binary value" msgstr "Dodaje nową wartość binarną" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Dodaje nową wartość binarną" +msgstr "Dodaje nową wartość 32-bitową" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12250,10 +12236,8 @@ msgid "Prints all or part of the registry" msgstr "Drukuje całość lub część rejestru" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Edytor rejestru" +msgstr "Otwiera pomoc edytora rejestru" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12296,26 +12280,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Nie można odnaleźć klucza rejestru '%1'." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Umożliwia zmianę wartości danej" +msgstr "Modyfikuje wartość rejestru w formie binarnej" #: regedit.rc:177 msgid "Adds a new multi-string value" msgstr "Dodaje nową wartość ciągu rozwijalnego" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksportuje zaznaczoną gałąź rejestru do pliku tekstowego" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Dodaje nową wartość ciągu" +msgstr "Dodaje nową rozwiniętą wartość ciągu" #: regedit.rc:213 msgid "Confirm Key Delete" @@ -12328,11 +12306,8 @@ msgstr "" "Czy na pewno chcesz usunąć klucz rejestru '%1' i wszystkie jego pochodne?" #: regedit.rc:232 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "zwinięty" +msgstr "Zwiń" #: regsvr32.rc:32 msgid ""

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e6f225fc5f36a22a709d2cb0dfe0a53a722309ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f225fc5f36a22a709d2cb0d… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 3 07:44:47 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/po/lt.po b/po/lt.po index 651dce7..33e1718 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-05-25 08:05+0300\n" +"PO-Revision-Date: 2017-06-03 07:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11027,7 +11027,7 @@ msgstr "&Sistemos konfigūracija" #: oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "Paleisti &registro tvarkytuvę" +msgstr "Paleisti &Registro tvarkytuvę" #: oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -11199,7 +11199,7 @@ msgstr "Keisti paskirstytojo COM kompiuterio nustatymus" #: oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "Paleisti „Wine“ registro tvarkytuvę" +msgstr "Paleisti „Wine“ Registro tvarkytuvę" #: oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -11871,14 +11871,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Pateikiamos komandos dažnai naudojamų raktų prieigai" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Pateikiamos komandos žinyno ir informacijos apie registro tvarkytuvę rodymui" +"Pateikiamos komandos žinyno ir informacijos apie Registro tvarkytuvę rodymui" #: regedit.rc:166 msgid "Contains commands for creating new keys or values" @@ -12119,10 +12115,8 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: Eilutėje yra netinkama sintaksė.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Išeina iš registro tvarkytuvės" +msgstr "Išeina iš Registro tvarkytuvės" #: regedit.rc:190 msgid "Adds keys to the favorites list" @@ -12137,8 +12131,6 @@ msgid "Shows or hides the status bar" msgstr "Parodo arba paslepia būsenos juostą" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Pakeičia polangių skirtuko poziciją tarp polangių" @@ -12183,10 +12175,8 @@ msgid "Adds a new binary value" msgstr "Prideda naują dvejetainę reikšmę" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Prideda naują dvejetainę reikšmę" +msgstr "Prideda naują 32-bitų reikšmę" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12201,10 +12191,8 @@ msgid "Prints all or part of the registry" msgstr "Atspausdina visą ar dalį registro" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registro tvarkytuvė" +msgstr "Atveria Registro tvarkytuvės žinyną" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12247,26 +12235,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Nepavyko užklausti registro rakto „%1“." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifikuoja reikšmės duomenis" +msgstr "Modifikuoja reikšmės duomenis dvejetainiu formatu" #: regedit.rc:177 msgid "Adds a new multi-string value" msgstr "Prideda naują kelių eilučių reikšmę" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Prideda naują eilutės reikšmę" +msgstr "Prideda naują išplečiamos eilutės reikšmę" #: regedit.rc:213 msgid "Confirm Key Delete"

1 0

Jeremy Newman : changes went live
by Jeremy Newman 05 Jun '17

05 Jun '17

Module: appdb Branch: master Commit: 160b16a39334d26186f3d56875216c6a744ea43b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=160b16a39334d26186f3d568… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 5 15:55:13 2017 -0500 changes went live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index b8187cd..457f8d9 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,3 +1,2 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ -ALTER TABLE testResults ADD column staging tinyint(1) not null default '0' AFTER testedRelease;

1 0

Rosanne DiMesio : Identify wine-staging versions in test data
by Jeremy Newman 05 Jun '17

05 Jun '17

Module: appdb Branch: master Commit: b40e6593fa26587f1bf2b1929358c137287a0beb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b40e6593fa26587f1bf2b192… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 5 15:49:51 2017 -0500 Identify wine-staging versions in test data Adds a "staging" field to the testResults table and a checkbox for wine-staging to the tested release section of the test submission form. Appends -staging to the version displayed in the test results table when it is checked. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 37 +++++++++++++++++++++++++++---------- tables/alter.sql | 1 + tables/testResults.sql | 1 + 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/include/testData.php b/include/testData.php index 07918bb..6a375ba 100644 --- a/include/testData.php +++ b/include/testData.php @@ -13,6 +13,7 @@ class testData{ var $shWhatDoesnt; var $shWhatNotTested; var $sTestedRelease; + var $iStaging; var $iDistributionId; var $sTestedDate; var $sInstalls; @@ -50,6 +51,7 @@ class testData{ $this->sTestedDate = $oRow->testedDate; $this->iDistributionId = $oRow->distributionId; $this->sTestedRelease = $oRow->testedRelease; + $this->iStaging = $oRow->staging; $this->sInstalls = $oRow->installs; $this->sRuns = $oRow->runs; $this->sTestedRating = $oRow->testedRating; @@ -71,16 +73,17 @@ class testData{ $hResult = query_parameters("INSERT INTO testResults (versionId, whatWorks, whatDoesnt,". "whatNotTested, testedDate, distributionId, testedRelease,". - "installs, runs, testedRating, comments,". + "staging, installs, runs, testedRating, comments,". "submitTime, submitterId, state)". "VALUES('?', '?', '?', '?', '?', '?', '?',". - "'?', '?', '?', '?',". + "'?', '?', '?', '?', '?',". "?, '?', '?')", $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, $this->shWhatNotTested, $this->sTestedDate, $this->iDistributionId, - $this->sTestedRelease, $this->sInstalls, + $this->sTestedRelease, $this->iStaging, + $this->sInstalls, $this->sRuns, $this->sTestedRating, $this->sComments, "NOW()", @@ -201,6 +204,7 @@ class testData{ testedDate = '?', distributionId = '?', testedRelease = '?', + staging = '?', installs = '?', runs = '?', testedRating = '?', @@ -214,6 +218,7 @@ class testData{ $this->sTestedDate, $this->iDistributionId, $this->sTestedRelease, + $this->iStaging, $this->sInstalls, $this->sRuns, $this->sTestedRating, @@ -588,7 +593,7 @@ class testData{ $oTableRow->AddCell($oTableCell); $oTableRow->AddTextCell($oDistribution->objectMakeLink()); $oTableRow->AddTextCell(date("M d Y", mysqldatetime_to_unixtimestamp($this->sTestedDate))); - $oTableRow->AddTextCell($this->sTestedRelease.' '); + $oTableRow->AddTextCell(($this->sTestedRelease).($this->iStaging != 0 ? '-staging':'')); $oTableRow->AddTextCell($this->sInstalls.' '); $oTableRow->AddTextCell($this->sRuns.' '); $oTableCell = new TableCell($this->sTestedRating); @@ -728,7 +733,7 @@ class testData{ The $sDate parameter can be used to calculate the rating at a given point in time */ public static function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') { - $sQuery = "SELECT testedRating,testedDate,testedRelease,versions.id as versionId + $sQuery = "SELECT testedRating,testedDate,testedRelease,staging,versions.id as versionId FROM testResults, ?.versions WHERE versions.value = testResults.testedRelease AND @@ -885,7 +890,15 @@ class testData{ echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); // Give the user some information about our available versions - echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span>"; + echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; + // Checkbox for Wine-staging + echo '<label class="btn btn-secondary">'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; + else + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging'; + echo '</label>'; echo '</td></tr>',"\n"; // Installs @@ -911,7 +924,8 @@ class testData{ // Display confirmation box for changing the Wine version $oOldTest = new testData($this->iTestingId); - if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease) + if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease + || $this-iTestingId && $oOldTest->iStaging != $this->iStaging) { if(getInput('bConfirmTestedVersionChange', $aClean) != 'true') { @@ -957,7 +971,9 @@ class testData{ // to submit new reports instead of updating existing ones when testing new Wines $oOldTest = new testData($this->iTestingId); if($this->iTestingId && $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) && - getInput('bConfirmTestedVersionChange', $aValues) != 'true') + getInput('bConfirmTestedVersionChange', $aValues) != 'true' + || $this->iTestingId && $oOldTest->iStaging != getInput('iStaging', $aValues) && + getInput('bConfirmTestedVersionChange', $aValues) != 'true') { $errors .= '<li>Are you sure you want to change the Wine version of the report? Please submit a new '. 'test report for every Wine version you test; this is useful for tracking Wine\'s progress. '. @@ -1013,6 +1029,7 @@ class testData{ $this->sTestedDate = $aValues['sTestedDate']; $this->iDistributionId = $aValues['iDistributionId']; $this->sTestedRelease = $aValues['sTestedRelease']; + $this->iStaging = $aValues['iStaging']; $this->sInstalls = $aValues['sInstalls']; $this->sRuns = $aValues['sRuns']; $this->sTestedRating = $aValues['sTestedRating']; @@ -1079,7 +1096,7 @@ class testData{ /* List test data submitted by a given user. Ignore test results for queued applications/versions */ public static function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); + $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.staging, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); if(!$hResult || !query_num_rows($hResult)) return false; @@ -1371,7 +1388,7 @@ class testData{ $oTableRow->AddCell(new TableCell($oUser->objectMakeLink())); $oTableRow->AddCell(new TableCell($oApp->objectMakeLink())); $oTableRow->AddCell(new TableCell($oVersion->objectMakeLink())); - $oTableRow->AddCell(new TableCell($this->sTestedRelease)); + $oTableRow->AddCell(new TableCell(($this->sTestedRelease) . ($this->iStaging != 0 ? '-staging':''))); $oTableRow->AddCell(new TableCell($bHasMaintainer ? "YES" : "no")); $oTableRow->AddCell(new TableCell($this->sTestedRating)); diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..b8187cd 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,2 +1,3 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ +ALTER TABLE testResults ADD column staging tinyint(1) not null default '0' AFTER testedRelease; diff --git a/tables/testResults.sql b/tables/testResults.sql index 7f88a54..44a52ae 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -14,6 +14,7 @@ create table testResults ( testedDate datetime not null, distributionId int not null, testedRelease tinytext, + staging tinyint(1) not null default '0', installs enum('Yes','No','No, but has workaround','N/A') NOT NULL default 'Yes', runs enum('Yes','No','Not Installable') NOT NULL default 'Yes', testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL,

1 0

Francois Gouget : winetest/dissect: Provide more information when rejecting a report.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 3de458939d5bc9fdd2e03f55027ab4e7da42f342 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3de458939d5bc9fdd2e03f55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:40:17 2017 +0200 winetest/dissect: Provide more information when rejecting a report. Log the test unit where the error occurred and the value of the limit that was exceeded. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 36ab635..99e50fb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -334,7 +334,7 @@ while ($_ = <IN>) { elsif ($2 eq "skipped") { print SUM "- $module - skipped - - - - -\n"; - mydie "too many dlls skipped by user request" if ++$user_skips > $maxuserskips; + mydie "too many dlls skipped by user request (>$maxuserskips at $module)" if ++$user_skips > $maxuserskips; } } @@ -365,8 +365,8 @@ while (<IN>) { { $testbox->{data} .= "<div class=\"test result skipped\">Skipped by user request.</div>\n"; print SUM "- $dll $unit skipped - - - $source $rev\n"; + mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$user_skips > $maxuserskips; $dll = undef; - mydie "too many tests skipped by user request" if ++$user_skips > $maxuserskips; } } elsif (/^((?:[0-9a-f]+:)?$unit: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; @@ -388,11 +388,11 @@ while (<IN>) { if ($1 == 258) { $reason = "test failed: timed out"; } elsif ($1 < 0) { $reason = "test failed: crash"; } $testbox->{data} .= "<div class=\"test end\">$reason</div>\n"; - mydie "too many test failures" if ++$failed_tests > $maxfailedtests; + mydie "too many failed test units (>$maxfailedtests at $dll:$unit)" if ++$failed_tests > $maxfailedtests; } else { $result = "$total $todo $failed $skipped"; if ($failed && ++$failed_tests > $maxfailedtests) { - mydie "too many test failures"; + mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } } print SUM "- $dll $unit $result $source $rev\n"; @@ -422,9 +422,9 @@ while (<IN>) { if (defined $dll) { # Either winetest crashed or the report file was cut off if ($filesize == $maxfilesize) { - mydie "report reached file limit (runaway test?)"; + mydie "report reached file size limit (>$maxfilesize bytes at $dll:$unit, runaway test?)"; } else { - mydie "report truncated (winetest crash?)"; + mydie "report truncated at $dll:$unit (winetest crash?)"; } } close SUM or mydie "error writing to '$tmpdir/summary.txt': $!";

1 0

Francois Gouget : winetest/dissect: Require the platform fields to be present.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 99a550fb03cc67fd9985bbfb3d329f18755e6c7f URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a550fb03cc67fd9985bbfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:40:05 2017 +0200 winetest/dissect: Require the platform fields to be present. Without them we were getting a lot of undefined value perl errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index ccfb15f..36ab635 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -236,6 +236,10 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { } $box->{data} .= "</table>\n"; +if (!defined $plid or !defined $major or !defined $minor or !defined $product) { + mydie "missing a PlatformId, dwMajorVersion, dwMinorVersion or wProductType field"; +} + my @idmatch = ( # Describes how to match a platform's version information # with a dissect platform id: @@ -284,7 +288,7 @@ if ($wine) { "Darwin" => "mac", "FreeBSD" => "bsd", "SunOS" => "solaris" ); - $version = $host && defined($known_hosts{$host}) ? $known_hosts{$host} : "wine"; + $version = $known_hosts{$host || ""} || "wine"; } if ($wine_build) { my $wine_commit;

1 0

Francois Gouget : winetest: Improve error reporting.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 91e530aba800b9146b16e5e6c5b466932da2da34 URL: http://source.winehq.org/git/tools.git/?a=commit;h=91e530aba800b9146b16e5e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:39:49 2017 +0200 winetest: Improve error reporting. Add a function to report errors. Always report renaming errors and the reason for the error. Standardize the file open error messages. die, and by extension mydie, does not need a trailing new-line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 14 ++++++++++++- winetest/build-index | 33 +++++++++++++++++++++++------ winetest/dissect | 57 +++++++++++++++++++++++++++++---------------------- winetest/gather | 45 ++++++++++++++++++++++++++++------------ 4 files changed, 104 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=91e530aba800b9146b16…

1 0

Francois Gouget : testbot/WineRunTask: Add consistency checks for todo and skip messages.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 031792f30bc9cac6c3ed5cde070050fe997bc740 URL: http://source.winehq.org/git/tools.git/?a=commit;h=031792f30bc9cac6c3ed5cde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:39:03 2017 +0200 testbot/WineRunTask: Add consistency checks for todo and skip messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 12b83f2..7122c57 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -467,9 +467,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if (open(my $LogFile, "<", $FullLogFileName)) { # There is more than one test unit when running the full test suite so keep - # track of the current one. Also note that for the TestBot we don't really - # care about the todos and skips - my ($CurrentDll, $CurrentUnit, $LineFailures, $SummaryFailures) = ("", "", 0, 0); + # track of the current one. Note that for the TestBot we don't count or + # complain about misplaced skips. + my ($CurrentDll, $CurrentUnit) = ("", ""); + my ($LineFailures, $LineTodos, $LineSkips) = (0, 0, 0); + my ($SummaryFailures, $SummaryTodos, $SummarySkips) = (0, 0, 0); my ($CurrentIsBroken, %CurrentPids, $CurrentRc, $LogFailures); sub CheckUnit($$) @@ -513,6 +515,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if (!$CurrentIsBroken) { CheckSummaryCounter($LineFailures, $SummaryFailures, "failure"); + CheckSummaryCounter($LineTodos, $SummaryTodos, "todo"); + CheckSummaryCounter($LineSkips, $SummarySkips, "skip"); } # Note that the summary lines may count some failures twice @@ -556,7 +560,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $LogFailures += $LineFailures; $CurrentDll = $CurrentUnit = ""; - $LineFailures = $SummaryFailures = 0; + $LineFailures = $LineTodos = $LineSkips = 0; + $SummaryFailures = $SummaryTodos = $SummarySkips = 0; $CurrentIsBroken = 0; $CurrentRc = undef; %CurrentPids = (); @@ -583,6 +588,23 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) CheckUnit($1, "failure"); $LineFailures++; } + elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: / or + ($CurrentUnit ne "" and + $Line =~ /($CurrentUnit)\.c:\d+: Test marked todo: /)) + { + CheckUnit($1, "todo"); + $LineTodos++; + } + # TestLauncher's skip message is quite broken + elsif ($Line =~ /^([_a-z0-9]+)(?:\.c)?:\d+:? Tests? skipped: / or + ($CurrentUnit ne "" and + $Line =~ /($CurrentUnit)(?:\.c)?:\d+:? Tests? skipped: /)) + { + # Don't complain and don't count misplaced skips. Only complain if they + # are misreported (see CloseTestUnit). Also TestLauncher uses the wrong + # name in its skip message when skipping tests. + $LineSkips++ if ($1 eq $CurrentUnit or $1 eq $CurrentDll); + } elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) { # This also replaces a test summary line. @@ -607,11 +629,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) CheckUnit($Unit, "unhandled exception"); $LineFailures++; } - elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./ or + elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($CurrentUnit ne "" and - $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./)) + $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) { - my ($Pid, $Unit, $Todos, $Failures) = ($1, $2, $3, $4); + my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); # Dlls that have only one test unit will run it even if there is # no argument. Also TestLauncher uses the wrong name in its test @@ -621,6 +643,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # There may be more than one summary line due to child processes $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures; + $SummaryTodos += $Todos; + $SummarySkips += $Skips; $IsWineTest = 1; } else

1 0

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_Simplify().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: e5733e7cd40b41bb4d8c0409e9ed5be8fe6d5618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5733e7cd40b41bb4d8c0409e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:35 2017 +0200 d2d1: Implement d2d_rectangle_geometry_Simplify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 4 + dlls/d2d1/geometry.c | 27 +++- dlls/d2d1/tests/d2d1.c | 347 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 375 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5733e7cd40b41bb4d8c0…

1 0

Henri Verbeet : d2d1: Implement d2d_transformed_geometry_GetBounds().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 828e62c8e257e2741f3d6354a175e0ad87672d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828e62c8e257e2741f3d6354a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:34 2017 +0200 d2d1: Implement d2d_transformed_geometry_GetBounds(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 +++++++++-- dlls/d2d1/tests/d2d1.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index d367f67..d07f68e 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3066,9 +3066,16 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetBounds(ID2D1TransformedGeometry *iface, const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds) { - FIXME("iface %p, transform %p, bounds %p stub!\n", iface, transform, bounds); + struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); + D2D1_MATRIX_3X2_F g; - return E_NOTIMPL; + TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds); + + g = geometry->transform; + if (transform) + d2d_matrix_multiply(&g, transform); + + return ID2D1Geometry_GetBounds(geometry->u.transformed.src_geometry, &g, bounds); } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetWidenedBounds(ID2D1TransformedGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f421b18..1387a05 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1838,6 +1838,7 @@ static void test_path_geometry(void) static void test_rectangle_geometry(void) { + ID2D1TransformedGeometry *transformed_geometry; ID2D1RectangleGeometry *geometry; D2D1_MATRIX_3X2_F matrix; D2D1_RECT_F rect, rect2; @@ -1964,8 +1965,46 @@ static void test_rectangle_geometry(void) ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); - ID2D1RectangleGeometry_Release(geometry); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 4.0f, 5.0f); + rotate_matrix(&matrix, M_PI / 3.0f); + translate_matrix(&matrix, 30.0f, 20.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry); + ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr); + + ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + rotate_matrix(&matrix, M_PI / -3.0f); + scale_matrix(&matrix, 0.25f, 0.2f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 2.0f, 0.0f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.0f, 0.5f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + ID2D1TransformedGeometry_Release(transformed_geometry); + ID2D1RectangleGeometry_Release(geometry); ID2D1Factory_Release(factory); }

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
60
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

2003

2002

2001

wine-commits June 2017