January 2008 - Wine-commits

Alexander Nicolaysen Sørnes : testData: Display confirmation box when changing Wine version
by Chris Morgan 03 Jan '08

03 Jan '08

Module: appdb Branch: master Commit: 7273d4cc247a92b6bcd1ceff7f6539192b94218f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7273d4cc247a92b6bcd1ceff… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 2 20:26:08 2008 +0100 testData: Display confirmation box when changing Wine version --- include/testData.php | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/testData.php b/include/testData.php index f61a75c..e3a3c29 100644 --- a/include/testData.php +++ b/include/testData.php @@ -936,6 +936,23 @@ class testData{ echo '<input type="hidden" name="iTestingId" value="'.$this->iTestingId.'" >'; echo '<input type="hidden" name="iTestDataId" value="'.$this->iTestingId.'" >'; + // Display confirmation box for changing the Wine version + $oOldTest = new testData($this->iTestingId); + if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease) + { + if(getInput('bConfirmTestedVersionChange', $aClean) != 'true') + { + echo '<tr><td class="color1"> </td><td class="color0">'; + echo 'You have changed the Wine version of the report. Are you sure you want to do this? Please submit a new test report for every Wine version you test; this is useful for tracking Wine’s progress.<br />'; + echo '<input type="checkbox" name="bConfirmTestedVersionChange" value="true" /> '; + echo 'Yes, I want to change the Wine version'; + echo '</td></tr>'; + } else + { + echo '<input type="hidden" name="bConfirmTestedVersionChange" value="true" />'; + } + } + echo "</table>\n"; echo html_frame_end(); @@ -960,6 +977,17 @@ class testData{ if (empty($aValues['sTestedRelease'])) $errors .= "<li>Please enter the version of Wine that you tested with.</li>\n"; + // Ask for confirmation if changing the tested Wine versions, becase we want users + // 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') + { + $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. '. + 'Tick the box above the submit button if you want to proceed</li>'; + } + // No Distribution entered, and nothing in the list is selected if (empty($aValues['sDistribution']) && !$aValues['iDistributionId']) $errors .= "<li>Please enter a distribution.</li>\n";

1 0

Alexander Nicolaysen Sørnes : Update version rating when updating test results
by Chris Morgan 03 Jan '08

03 Jan '08

Module: appdb Branch: master Commit: e8bfc0024cb6b491e85ec83b845e34fcc44fb40c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e8bfc0024cb6b491e85ec83b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Dec 25 20:01:00 2007 +0100 Update version rating when updating test results --- include/testData.php | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/testData.php b/include/testData.php index 9b8a968..096ae65 100644 --- a/include/testData.php +++ b/include/testData.php @@ -92,6 +92,9 @@ class testData{ $this->iTestingId = query_appdb_insert_id(); $this->testData($this->iTestingId); $this->SendNotificationMail(); + + if(!$this->sState == 'accepted') + $oVersion->updateRatingInfo(); return true; } else @@ -165,24 +168,36 @@ class testData{ "$this->sRuns.\n"; } + $bUpdateRatingInfo = false; if($this->sTestedRating != $oOldTest->sTestedRating) { + $bUpdateRatingInfo = true; $sWhatChanged .= "Rating was changed from $oOldTest->sTestedRating ". "to $this->sTestedRating.\n"; } if($this->sTestedRelease != $oOldTest->sTestedRelease) { + $bUpdateRatingInfo = true; $sWhatChanged .= "Tested release was changed from ". $oOldTest->sTestedRelease." to $this->sTestedRelease.\n"; } + if($bUpdateRatingInfo && $this->sState == 'accepted') + $oVersion->updateRatingInfo(); + if($this->iVersionId != $oOldTest->iVersionId) { $sWhatChanged .= 'Moved from '.version::fullName($oOldTest->iVersionId).' to '.version::fullName($this->iVersionId)."\n"; $oNewVersion = new version($this->iVersionId); if($oNewVersion->objectGetState() == 'accepted' && $this->sState == 'pending') $this->sState = 'queued'; + + if($this->sState == 'accepted') + { + $oOldVersion->updateRatingInfo(); + $oNewVersion->updateRatingInfo(); + } } if(query_parameters("UPDATE testResults SET @@ -268,6 +283,9 @@ class testData{ return false; } + if($this->sState == 'accepted') + $oVersion->updateRatingInfo(); + return true; } @@ -299,6 +317,8 @@ class testData{ return false; } + $oVersion->updateRatingInfo(); + return true; }

1 0

Alexander Nicolaysen Sørnes : Remove ' maintainer' from version rating fields
by Chris Morgan 03 Jan '08

03 Jan '08

Module: appdb Branch: master Commit: 2c2c6fffc13fa8c7dd801d4de6c87f9a1b2bc91a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2c2c6fffc13fa8c7dd801d4d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Dec 28 22:57:02 2007 +0100 Remove 'maintainer' from version rating fields --- include/application.php | 4 ++-- include/util.php | 4 ++-- include/version.php | 16 ++++++++-------- tables/appdb_tables.sql | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/application.php b/include/application.php index fcbde66..b1db516 100644 --- a/include/application.php +++ b/include/application.php @@ -450,7 +450,7 @@ class Application { { $sQuery = "SELECT DISTINCT count(appId) as total FROM appVersion - WHERE maintainer_rating = '?' + WHERE rating = '?' AND state = 'accepted'"; if($hResult = query_parameters($sQuery, $sRating)) @@ -465,7 +465,7 @@ class Application { $aApps = array(); $sQuery = "SELECT DISTINCT appId FROM appVersion - WHERE maintainer_rating = '?' + WHERE rating = '?' AND state = 'accepted' ORDER BY appId ASC LIMIT ?, ?"; diff --git a/include/util.php b/include/util.php index 2628ca7..0048da7 100644 --- a/include/util.php +++ b/include/util.php @@ -293,7 +293,7 @@ function outputTopXRowAppsFromRating($sRating, $iNumApps) $sQuery = "SELECT appVotes.versionId, COUNT( appVotes.versionId ) AS c FROM appVotes, appVersion - WHERE appVersion.maintainer_rating = '?' + WHERE appVersion.rating = '?' AND appVersion.versionId = appVotes.versionId GROUP BY appVotes.versionId ORDER BY c DESC @@ -313,7 +313,7 @@ function outputTopXRowAppsFromRating($sRating, $iNumApps) /* if we have any empty spots in the list, get these from applications with images */ $sQuery = "SELECT DISTINCT appVersion.versionId FROM appVersion, appData - WHERE appVersion.maintainer_rating = '$sRating' + WHERE appVersion.rating = '$sRating' AND appVersion.versionId = appData.versionId AND appData.type = 'screenshot' AND appData.queued = 'false'"; diff --git a/include/version.php b/include/version.php index 1a910e3..d3ebff3 100644 --- a/include/version.php +++ b/include/version.php @@ -75,8 +75,8 @@ class version { $this->sSubmitTime = $oRow->submitTime; $this->sName = $oRow->versionName; $this->sDescription = $oRow->description; - $this->sTestedRelease = $oRow->maintainer_release; - $this->sTestedRating = $oRow->maintainer_rating; + $this->sTestedRelease = $oRow->ratingRelease; + $this->sTestedRating = $oRow->rating; $this->sState = $oRow->state; $this->sLicense = $oRow->license; $this->iObsoleteBy = $oRow->obsoleteBy; @@ -99,8 +99,8 @@ class version { $this->sState = $this->mustBeQueued() ? 'queued' : 'accepted'; $hResult = query_parameters("INSERT INTO appVersion - (versionName, description, maintainer_release, - maintainer_rating, appId, submitTime, submitterId, + (versionName, description, ratingRelease, + rating, appId, submitTime, submitterId, state, license) VALUES ('?', '?', '?', '?', '?', ?, '?', '?', '?')", $this->sName, $this->sDescription, $this->sTestedRelease, @@ -180,7 +180,7 @@ class version { if ($this->sTestedRelease && ($this->sTestedRelease!=$oVersion->sTestedRelease)) { - if (!query_parameters("UPDATE appVersion SET maintainer_release = '?' WHERE versionId = '?'", + if (!query_parameters("UPDATE appVersion SET ratingRelease = '?' WHERE versionId = '?'", $this->sTestedRelease, $this->iVersionId)) return false; @@ -192,7 +192,7 @@ class version { if ($this->sTestedRating && ($this->sTestedRating!=$oVersion->sTestedRating)) { - if (!query_parameters("UPDATE appVersion SET maintainer_rating = '?' WHERE versionId = '?'", + if (!query_parameters("UPDATE appVersion SET rating = '?' WHERE versionId = '?'", $this->sTestedRating, $this->iVersionId)) return false; @@ -791,8 +791,8 @@ class version { $aRatingInfo = $this->getRatingInfo(); $hResult = query_parameters("UPDATE appVersion SET - maintainer_rating = '?', - maintainer_release = '?' + rating = '?', + ratingRelease = '?' WHERE versionId = '?'", $aRatingInfo[0], $aRatingInfo[1], diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 8c444cc..5f486e7 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -54,8 +54,8 @@ create table appVersion ( appId int not null, versionName varchar(100) not null, description text, - maintainer_rating text, - maintainer_release text, + rating text, + ratingRelease text, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', license enum('Retail','Open Source','Freeware','Demo','Shareware'),

1 0

Alexander Nicolaysen Sørnes : Allow to calculate rating at a given point in time
by Chris Morgan 03 Jan '08

03 Jan '08

Module: appdb Branch: master Commit: 6508c7f430da1d37fa08b296357a50e19e3c0efd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6508c7f430da1d37fa08b296… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Dec 29 01:31:52 2007 +0100 Allow to calculate rating at a given point in time --- include/testData.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/testData.php b/include/testData.php index 096ae65..f61a75c 100644 --- a/include/testData.php +++ b/include/testData.php @@ -741,8 +741,9 @@ class testData{ /* Gets rating info for the selected version: an array with the elements 0 - Rating - 1 - Wine version */ - public function getRatingInfoForVersionId($iVersionId) + 1 - Wine version + The $sDate parameter can be used to calculate the rating at a given point in time */ + public function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') { $sQuery = "SELECT testedRating,testedDate,testedRelease,versions.id as versionId FROM testResults, ?.versions WHERE @@ -753,10 +754,10 @@ class testData{ AND state = '?' AND - TO_DAYS(testedDate) > (TO_DAYS(NOW()) - ?) + TO_DAYS(testedDate) > (TO_DAYS(?) - ?) ORDER BY versions.id DESC,testedDate DESC"; - $hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $iVersionId, 'accepted', TESTDATA_AGED_THRESHOLD); + $hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $iVersionId, 'accepted', $sDate, TESTDATA_AGED_THRESHOLD); $aEntries = array();

1 0

Alexander Nicolaysen Sørnes : Generate ratings from test results
by Chris Morgan 03 Jan '08

03 Jan '08

Module: appdb Branch: master Commit: 6a82a4fe3ab487d6b0c4e8b6ad2fb455bf19fc48 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6a82a4fe3ab487d6b0c4e8b6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Dec 25 19:26:35 2007 +0100 Generate ratings from test results --- cron/cleanup.php | 16 ++++++ include/config.php.sample | 3 + include/testData.php | 112 +++++++++++++++++++++++++++++++++++++++++++++ include/version.php | 35 ++++++++++++-- 4 files changed, 161 insertions(+), 5 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 19619a8..473b057 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -33,6 +33,8 @@ removeScreenshotsWithMissingFiles(); /* status since they aren't really maintaining the application/version */ maintainerCheck(); +/* Updates the rating info for all versions based on test results */ +updateRatings(); /* * Warn users that have been inactive for some number of months @@ -356,4 +358,18 @@ function maintainerCheck() maintainer::notifyMaintainersOfQueuedData(); } +function updateRatings() +{ + $hResult = query_parameters("SELECT * FROM appVersion"); + + if(!$hResult) + return; + + while($oRow = mysql_fetch_object($hResult)) + { + $oVersion = new version(0, $oRow); + $oVersion->updateRatingInfo(); + } +} + ?> diff --git a/include/config.php.sample b/include/config.php.sample index c0399ce..4a33336 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -30,6 +30,9 @@ define("BUGZILLA_ROOT","http://bugs.winehq.org/"); // path to bugzilla //if(!defined("PRINT_EMAIL")) // define("PRINT_EMAIL", true); // print email, see mail_appdb() in include/mail.php +// How old (days) a test report has to before it is judged to be aged +define("TESTDATA_AGED_THRESHOLD", 175); + /* * apps database info */ diff --git a/include/testData.php b/include/testData.php index 7146dd8..9b8a968 100644 --- a/include/testData.php +++ b/include/testData.php @@ -683,6 +683,118 @@ class testData{ echo '</div>',"\n"; // end of the 'info_container' div } + /* Convert a given rating string to a numeric scale */ + public function ratingToNumber($sRating) + { + switch($sRating) + { + case GARBAGE_RATING: + return 0; + case BRONZE_RATING: + return 1; + case SILVER_RATING: + return 2; + case GOLD_RATING: + return 3; + case PLATINUM_RATING: + return 4; + } + } + + /* Convert a numeric rating scale to a rating name */ + public function numberToRating($iNumber) + { + switch($iNumber) + { + case 0: + return GARBAGE_RATING; + case 1: + return BRONZE_RATING; + case 2: + return SILVER_RATING; + case 3: + return GOLD_RATING; + case 4: + return PLATINUM_RATING; + } + } + + /* Gets rating info for the selected version: an array with the elements + 0 - Rating + 1 - Wine version */ + public function getRatingInfoForVersionId($iVersionId) + { + $sQuery = "SELECT testedRating,testedDate,testedRelease,versions.id as versionId + FROM testResults, ?.versions WHERE + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND versionId = '?' + AND + state = '?' + AND + TO_DAYS(testedDate) > (TO_DAYS(NOW()) - ?) + ORDER BY versions.id DESC,testedDate DESC"; + + $hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $iVersionId, 'accepted', TESTDATA_AGED_THRESHOLD); + + $aEntries = array(); + + if($hResult) + { + $iPrevVersion = 0; + $iIndex = -1; + for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) + { + if($iPrevRelease != $oRow->versionId) + { + $iIndex++; + $iPrevRelease = $oRow->versionId; + } + + if(!$aEntries[$iIndex]) + { + $aEntries[$iIndex] = array(); + $aEntries[$iIndex][0] = 0; + $aEntries[$iIndex][1] = 0; + $aEntries[$iIndex][2] = $oRow->testedRelease; + } + + $aEntries[$iIndex][0] += testData::RatingToNumber($oRow->testedRating); + $aEntries[$iIndex][1]++; + } + } + + $sRelease = ''; + + if(sizeof($aEntries)) + { + $fRating = 0.0; + + for($i = 0; $i < sizeof($aEntries); $i++) + { + /* Discard the rating if it's the only one for that Wine version + and its score is lower than previous averages */ + if(($aEntries[$i][1] < 2) && sizeof($aEntries) > ($i+1) && ($aEntries[$i][0] < ($aEntries[$i+1][0] / $aEntries[$i+1][1]))) + continue; + + $fRating = $aEntries[$i][0] / $aEntries[$i][1]; + $sRelease = $aEntries[$i][2]; + break; + } + + $sRating = testData::NumberToRating(round($fRating, 0)); + } + + if(!$sRelease) + { + $iNewestId = testData::getNewestTestIdFromVersionId($iVersionId); + $oTestData = new testData($iNewestId); + return array($oTestData->sTestedRating, $oTestData->sTestedRelease); + } + return array($sRating,$sRelease); + } + /* retrieve the latest test result for a given version id */ function getNewestTestIdFromVersionId($iVersionId, $sState = 'accepted') { diff --git a/include/version.php b/include/version.php index f2df2cf..2017c1d 100644 --- a/include/version.php +++ b/include/version.php @@ -820,6 +820,29 @@ class version { return new application($this->iAppId); } + public function getRatingInfo() + { + return testData::getRatingInfoForVersionId($this->iVersionId); + } + + public function updateRatingInfo() + { + $aRatingInfo = $this->getRatingInfo(); + + $hResult = query_parameters("UPDATE appVersion SET + maintainer_rating = '?', + maintainer_release = '?' + WHERE versionId = '?'", + $aRatingInfo[0], + $aRatingInfo[1], + $this->iVersionId); + + if(!$hResult) + return false; + + return true; + } + public function display($aVars = array()) { /* is this user supposed to view this version? */ @@ -863,10 +886,12 @@ class version { vote_count_version_total($this->iVersionId).$shVoteLink), "color0"); - if($this->sTestedRating != "/" && $this->sTestedRating) - $sMaintainerColor = $this->sTestedRating; + $sRating = $this->sTestedRating; + $sRelease = $this->sTestedRelease; + if($sRating != "/" && $sRating) + $sRatingColor = $sRating; else - $sMaintainerColor = "color0"; + $sRatingColor = 'color0'; // URLs if($sUrls = url::display($this->iVersionId)) @@ -875,8 +900,8 @@ class version { } // rating Area - echo "<tr class=\"$sMaintainerColor\" valign=\"top\"><td><b>Maintainer’s Rating</b></td><td>".$this->sTestedRating."</td></tr>\n"; - echo "<tr class=\"$sMaintainerColor\" valign=\"top\"><td><b>Maintainer’s Version</b></td><td>".$this->sTestedRelease."</td></tr>\n"; + echo "<tr class=\"$sRatingColor\" valign=\"top\"><td><b>Rating</b></td><td>".$sRating."</td></tr>\n"; + echo "<tr class=\"$sRatingColor\" valign=\"top\"><td><b>Wine Version</b></td><td>".$sRelease."</td></tr>\n"; // Download URLs if($sDownloadurls = downloadurl::display($this->iVersionId))

1 0

Alexander Nicolaysen Sørnes : version: Remove rating editor
by Chris Morgan 03 Jan '08

03 Jan '08

Module: appdb Branch: master Commit: 9db2c4b701a780463e2f39ce1048238ddeb6bfda URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9db2c4b701a780463e2f39ce… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Dec 25 19:33:04 2007 +0100 version: Remove rating editor --- include/version.php | 39 --------------------------------------- 1 files changed, 0 insertions(+), 39 deletions(-) diff --git a/include/version.php b/include/version.php index 2017c1d..1a910e3 100644 --- a/include/version.php +++ b/include/version.php @@ -674,43 +674,6 @@ class version { if($this->sState == 'accepted' && $this->iVersionId) { - echo html_frame_start("Info", "90%", "", 0); - - $oTable = new Table(); - $oTable->SetBorder(0); - $oTable->SetCellPadding(2); - $oTable->SetCellSpacing(0); - - $oTableRow = new TableRow(); - - $oTableCell = new TableCell("Rating"); - $oTableCell->SetClass("color4"); - $oTableRow->AddCell($oTableCell); - - $oTableCell = new TableCell(make_maintainer_rating_list("sMaintainerRating", - $this->sTestedRating)); - $oTableCell->SetClass("color0"); - $oTableRow->AddCell($oTableCell); - - $oTable->AddRow($oTableRow); - $oTableRow = new TableRow(); - - $oTableCell = new TableCell("Release"); - $oTableCell->SetClass("color1"); - $oTableRow->AddCell($oTableCell); - - $oTableCell = new TableCell(make_bugzilla_version_list("sMaintainerRelease", $this->sTestedRelease)); - $oTableCell->SetClass("color0"); - - $oTableRow->AddCell($oTableCell); - - $oTable->AddRow($oTableRow); - - // output the table - echo $oTable->GetString(); - - echo html_frame_end(); - /* Mark as obsolete */ $oApp = new application($this->iAppId); $oVersionInDB = new version($this->iVersionId); @@ -768,8 +731,6 @@ class version { $this->sName = $aValues['sVersionName']; $this->sDescription = $aValues['shVersionDescription']; - $this->sTestedRating = $aValues['sMaintainerRating']; - $this->sTestedRelease = $aValues['sMaintainerRelease']; $this->sLicense = $aValues['sLicense']; $this->iMaintainerRequest = $aValues['iMaintainerRequest'];

1 0

Rob Shearman : kernel32: Add tests for RegisterWaitForSingleObject and UnregisterWait.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 910cf617230ca5ca9c1e04589a8c846dfeb4541e URL: http://source.winehq.org/git/wine.git/?a=commit;h=910cf617230ca5ca9c1e04589… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 1 22:37:34 2008 +0000 kernel32: Add tests for RegisterWaitForSingleObject and UnregisterWait. --- dlls/kernel32/tests/thread.c | 74 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 6b90ad1..5989ccc 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -68,6 +68,12 @@ static SetThreadIdealProcessor_t pSetThreadIdealProcessor=NULL; typedef BOOL (WINAPI *SetThreadPriorityBoost_t)(HANDLE,BOOL); static SetThreadPriorityBoost_t pSetThreadPriorityBoost=NULL; +typedef BOOL (WINAPI *RegisterWaitForSingleObject_t)(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); +static RegisterWaitForSingleObject_t pRegisterWaitForSingleObject=NULL; + +typedef BOOL (WINAPI *UnregisterWait_t)(HANDLE); +static UnregisterWait_t pUnregisterWait=NULL; + static HANDLE create_target_process(const char *arg) { char **argv; @@ -878,6 +884,71 @@ static void test_QueueUserWorkItem(void) ok(times_executed == 100, "didn't execute all of the work items\n"); } +static void CALLBACK signaled_function(PVOID p, BOOLEAN TimerOrWaitFired) +{ + HANDLE event = p; + SetEvent(event); + ok(!TimerOrWaitFired, "wait shouldn't have timed out\n"); +} + +static void CALLBACK timeout_function(PVOID p, BOOLEAN TimerOrWaitFired) +{ + HANDLE event = p; + SetEvent(event); + ok(TimerOrWaitFired, "wait should have timed out\n"); +} + +static void test_RegisterWaitForSingleObject(void) +{ + BOOL ret; + HANDLE wait_handle; + HANDLE handle; + HANDLE complete_event; + + if (!pRegisterWaitForSingleObject || !pUnregisterWait) + { + skip("RegisterWaitForSingleObject or UnregisterWait not implemented\n"); + return; + } + + /* test signaled case */ + + handle = CreateEvent(NULL, TRUE, TRUE, NULL); + complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); + + ret = pRegisterWaitForSingleObject(&wait_handle, handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + WaitForSingleObject(complete_event, INFINITE); + /* give worker thread chance to complete */ + Sleep(100); + + ret = pUnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + /* test cancel case */ + + ResetEvent(handle); + + ret = pRegisterWaitForSingleObject(&wait_handle, handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + ret = pUnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + /* test timeout case */ + + ret = pRegisterWaitForSingleObject(&wait_handle, handle, timeout_function, complete_event, 0, WT_EXECUTEONLYONCE); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + WaitForSingleObject(complete_event, INFINITE); + /* give worker thread chance to complete */ + Sleep(100); + + ret = pUnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); +} + START_TEST(thread) { HINSTANCE lib; @@ -894,6 +965,8 @@ START_TEST(thread) pQueueUserWorkItem=(QueueUserWorkItem_t)GetProcAddress(lib,"QueueUserWorkItem"); pSetThreadIdealProcessor=(SetThreadIdealProcessor_t)GetProcAddress(lib,"SetThreadIdealProcessor"); pSetThreadPriorityBoost=(SetThreadPriorityBoost_t)GetProcAddress(lib,"SetThreadPriorityBoost"); + pRegisterWaitForSingleObject=(RegisterWaitForSingleObject_t)GetProcAddress(lib,"RegisterWaitForSingleObject"); + pUnregisterWait=(UnregisterWait_t)GetProcAddress(lib,"UnregisterWait"); if (argc >= 3) { @@ -934,4 +1007,5 @@ START_TEST(thread) test_SetThreadContext(); #endif test_QueueUserWorkItem(); + test_RegisterWaitForSingleObject(); }

1 0

Eric Pouech : richedit: Don't force repaint while the redraw flag is off.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: d5478118a1fb4c468ddaf7bccd94b70e855ea7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5478118a1fb4c468ddaf7bcc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:05:40 2008 +0100 richedit: Don't force repaint while the redraw flag is off. --- dlls/riched20/editor.c | 3 ++- dlls/riched20/paint.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 518f86b..bbc5622 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2660,7 +2660,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_SendRequestResize(editor, TRUE); return 0; case WM_SETREDRAW: - editor->bRedraw = wParam; + if ((editor->bRedraw = wParam)) + ME_RewrapRepaint(editor); return 0; case WM_SIZE: { diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 216ef0f..91e283a 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -109,7 +109,8 @@ void ME_UpdateRepaint(ME_TextEditor *editor) { /* Should be called whenever the contents of the control have changed */ ME_Cursor *pCursor; - + + if (!editor->bRedraw) return; if (ME_WrapMarkedParagraphs(editor)) ME_UpdateScrollBar(editor); @@ -135,10 +136,12 @@ ME_RewrapRepaint(ME_TextEditor *editor) * looks, but not content. Like resizing. */ ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); - ME_UpdateScrollBar(editor); - - ME_Repaint(editor); + if (editor->bRedraw) + { + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); + ME_Repaint(editor); + } } int ME_twips2pointsX(ME_Context *c, int x)

1 0

Eric Pouech : richedit: Simplify first para style handling by creating a context.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 39aa3beaf286a30c66743f24599c8bc652f49b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39aa3beaf286a30c66743f245… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:05:46 2008 +0100 richedit: Simplify first para style handling by creating a context. --- dlls/riched20/editor.c | 7 ++----- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index bbc5622..a9948b2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1159,14 +1159,12 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) ME_TextEditor *ME_MakeEditor(HWND hWnd) { ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); - HDC hDC; int i; ed->hWnd = hWnd; ed->bEmulateVersion10 = FALSE; ed->pBuffer = ME_MakeText(); - hDC = GetDC(hWnd); - ME_MakeFirstParagraph(hDC, ed->pBuffer); - ReleaseDC(hWnd, hDC); + ed->nZoomNumerator = ed->nZoomDenominator = 0; + ME_MakeFirstParagraph(ed); ed->bCaretShown = FALSE; ed->nCursors = 4; ed->pCursors = ALLOC_N_OBJ(ME_Cursor, ed->nCursors); @@ -1191,7 +1189,6 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); - ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->bRedraw = TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8e99175..145dc91 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -219,7 +219,7 @@ int ME_twips2pointsY(ME_Context *c, int y); /* para.c */ ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run); void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end); -void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *editor); +void ME_MakeFirstParagraph(ME_TextEditor *editor); ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *rp, ME_Style *style); ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp); void ME_DumpParaStyle(ME_Paragraph *s); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 3b2750b..af292f1 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -25,16 +25,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static const WCHAR wszParagraphSign[] = {0xB6, 0}; -void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *text) +void ME_MakeFirstParagraph(ME_TextEditor *editor) { + ME_Context c; + HDC hDC; PARAFORMAT2 fmt; CHARFORMAT2W cf; LOGFONTW lf; HFONT hf; + ME_TextBuffer *text = editor->pBuffer; ME_DisplayItem *para = ME_MakeDI(diParagraph); ME_DisplayItem *run; ME_Style *style; + hDC = GetDC(editor->hWnd); + + ME_InitContext(&c, editor, hDC); hf = (HFONT)GetStockObject(SYSTEM_FONT); assert(hf); GetObjectW(hf, sizeof(LOGFONTW), &lf); @@ -48,9 +54,8 @@ void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *text) cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; lstrcpyW(cf.szFaceName, lf.lfFaceName); - cf.yHeight=lf.lfHeight*1440/GetDeviceCaps(hDC, LOGPIXELSY); - if (lf.lfWeight>=700) /* FIXME correct weight ? */ - cf.dwEffects |= CFE_BOLD; + cf.yHeight = ME_twips2pointsY(&c, lf.lfHeight); + if (lf.lfWeight >= 700) cf.dwEffects |= CFE_BOLD; cf.wWeight = lf.lfWeight; if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC; cf.bUnderlineType = (lf.lfUnderline) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; @@ -79,6 +84,9 @@ void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *text) text->pLast->member.para.prev_para = para; text->pLast->member.para.nCharOfs = 1; + + ME_DestroyContext(&c); + ReleaseDC(editor->hWnd, hDC); } void ME_MarkAllForWrapping(ME_TextEditor *editor)

1 0

Rob Shearman : ntdll: Implement RtlRegisterWait, RtlDeregisterWait and RtlDeregisterWaitEx.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 25bc7023ba66660aad847b93b4bc5f4ea964075b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bc7023ba66660aad847b93b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 1 22:37:16 2008 +0000 ntdll: Implement RtlRegisterWait, RtlDeregisterWait and RtlDeregisterWaitEx. --- dlls/ntdll/ntdll.spec | 6 +- dlls/ntdll/threadpool.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 4 + 3 files changed, 224 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25bc7023ba66660aad847…

1 0