April 2007 - Wine-commits - list.winehq.org

Chris Robinson : quartz: Use a safe APC to kill the PullPin thread when the PullPin is being released .
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: b1bfae286f24303e0ca254e92c4859d55dce8b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1bfae286f24303e0ca254e92… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Mar 31 20:13:08 2007 -0700 quartz: Use a safe APC to kill the PullPin thread when the PullPin is being released. --- dlls/quartz/pin.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 84a2c30..06313e4 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1121,6 +1121,15 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const return hr; } +static void CALLBACK PullPin_SafeThreadStop(ULONG_PTR handle) +{ + HANDLE hThread = (HANDLE)handle; + + if (hThread) + CloseHandle(hThread); + ExitThread(0); +} + HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { PullPin *This = (PullPin *)iface; @@ -1155,7 +1164,14 @@ ULONG WINAPI PullPin_Release(IPin * iface) if (!refCount) { if (This->hThread) - PullPin_StopProcessing(This); + { + HRESULT hr; + + if (!QueueUserAPC(PullPin_SafeThreadStop, This->hThread, (ULONG_PTR)This->hThread)) + ERR("Cannot stop PullPin thread (GetLastError() = %d)!", GetLastError()); + if (This->pAlloc && FAILED(hr = IMemAllocator_Decommit(This->pAlloc))) + ERR("Allocator decommit failed with error %x. Possible memory leak\n", hr); + } if(This->pAlloc) IMemAllocator_Release(This->pAlloc); if(This->pReader)

1 0

Chris Robinson : quartz: Don't fill the dsound buffer with small amounts.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 4eea356e2d39f1a958afb4d8f5b54381e8972ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eea356e2d39f1a958afb4d8f… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Mar 30 03:13:54 2007 -0700 quartz: Don't fill the dsound buffer with small amounts. --- dlls/quartz/dsoundrender.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 259a25b..23c522d 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -203,13 +203,13 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, ERR("Error GetCurrentPosition: %x\n", hr); break; } - if (This->write_pos < play_pos) + if (This->write_pos <= play_pos) buf_free = play_pos-This->write_pos; else buf_free = DSBUFFERSIZE - This->write_pos + play_pos; - /* This situation is ambiguous; Assume full when playing */ - if(buf_free == DSBUFFERSIZE) + /* Wait for enough of the buffer to empty before filling it */ + if(buf_free < DSBUFFERSIZE/4) { Sleep(10); continue; @@ -234,11 +234,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, size -= dwsize1 + dwsize2; data += dwsize1 + dwsize2; This->write_pos = (This->write_pos + dwsize1 + dwsize2) % DSBUFFERSIZE; - - if (!size) - break; - Sleep(10); - } while (This->state == State_Running); + } while (size && This->state == State_Running); return hr; }

1 0

appdb/include testData.php version.php
by WineHQ 01 Apr '07

01 Apr '07

ChangeSet ID: 31023 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/01 17:34:33 Modified files: include : testData.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Rename testData::get_test_for_versionid() to testData::getNewestTestIdFromVersionId() so the name of the method better describes the value the method is returning Patch: http://cvs.winehq.org/patch.py?id=31023 Old revision New revision Changes Path 1.36 1.37 +1 -1 appdb/include/testData.php 1.109 1.110 +1 -1 appdb/include/version.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.36 appdb/include/testData.php:1.37 --- appdb/include/testData.php:1.36 1 Apr 2007 22:34:33 -0000 +++ appdb/include/testData.php 1 Apr 2007 22:34:33 -0000 @@ -466,7 +466,7 @@ class testData{ } /* retrieve the latest test result for a given version id */ - function get_test_for_versionid($iVersionId) + function getNewestTestIdFromVersionId($iVersionId) { $sQuery = "SELECT testingId FROM testResults WHERE versionId = '?' Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.109 appdb/include/version.php:1.110 --- appdb/include/version.php:1.109 1 Apr 2007 22:34:33 -0000 +++ appdb/include/version.php 1 Apr 2007 22:34:33 -0000 @@ -881,7 +881,7 @@ class Version { if(!$oTest->iTestingId) { /* fetch a new test id for this version */ - $iTestingId = testData::get_test_for_versionid($this->iVersionId); + $iTestingId = testData::getNewestTestIdFromVersionId($this->iVersionId); $oTest = new testData($iTestingId); }

1 0

appdb/include testData.php
by WineHQ 01 Apr '07

01 Apr '07

ChangeSet ID: 31022 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/01 11:49:28 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix testData::unQueue() emails by passing 'add' to ::mailSubmitter(). Previously 'unQueue' was passed but testData::mailSubmitter() doesn't recognize this so likely the response email had an empty subject Patch: http://cvs.winehq.org/patch.py?id=31022 Old revision New revision Changes Path 1.35 1.36 +1 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.35 appdb/include/testData.php:1.36 --- appdb/include/testData.php:1.35 1 Apr 2007 16:49:28 -0000 +++ appdb/include/testData.php 1 Apr 2007 16:49:28 -0000 @@ -195,7 +195,7 @@ class testData{ { $this->sQueued = 'false'; // we send an e-mail to interested people - $this->mailSubmitter("unQueue"); + $this->mailSubmitter("add"); $this->SendNotificationMail(); } }

1 0

appdb/ ./appbrowse.php ./browse_by_rating.php ...
by WineHQ 31 Mar '07

31 Mar '07

ChangeSet ID: 31021 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/31 20:21:58 Modified files: . : appbrowse.php browse_by_rating.php browse_downloadable.php browse_newest_apps.php votestats.php include : sidebar_login.php vendor.php version.php vote.php Log message: Alexander Nicolaysen Srnes <alex(a)thehandofagony.com> Use objectMakeLink() in more places Patch: http://cvs.winehq.org/patch.py?id=31021 Old revision New revision Changes Path 1.23 1.24 +1 -1 appdb/appbrowse.php 1.2 1.3 +1 -1 appdb/browse_by_rating.php 1.3 1.4 +3 -3 appdb/browse_downloadable.php 1.3 1.4 +2 -1 appdb/browse_newest_apps.php 1.30 1.31 +1 -2 appdb/votestats.php 1.19 1.20 +4 -3 appdb/include/sidebar_login.php 1.20 1.21 +1 -2 appdb/include/vendor.php 1.108 1.109 +1 -1 appdb/include/version.php 1.25 1.26 +1 -5 appdb/include/vote.php Index: appdb/appbrowse.php diff -u -p appdb/appbrowse.php:1.23 appdb/appbrowse.php:1.24 --- appdb/appbrowse.php:1.23 1 Apr 2007 1:21:58 -0000 +++ appdb/appbrowse.php 1 Apr 2007 1:21:58 -0000 @@ -107,7 +107,7 @@ if($apps) //display row echo "<tr class=$bgcolor>\n"; - echo " <td><a href='appview.php?iAppId=$iAppId'>".$oApp->sName."</a></td>\n"; + echo " <td>".$oApp->objectMakeLink()."</td>\n"; echo " <td>$desc  </td>\n"; echo " <td>".sizeof($oApp->aVersionsIds)."</td>\n"; echo "</tr>\n\n"; Index: appdb/browse_by_rating.php diff -u -p appdb/browse_by_rating.php:1.2 appdb/browse_by_rating.php:1.3 --- appdb/browse_by_rating.php:1.2 1 Apr 2007 1:21:58 -0000 +++ appdb/browse_by_rating.php 1 Apr 2007 1:21:58 -0000 @@ -160,7 +160,7 @@ if (empty($aClean['sRating'])) //display row echo "<tr class=$bgcolor>\n"; - echo " <td><a href='appview.php?iAppId=$iAppId&sRating=".$aClean['sRating']."'>".$oApp->sName."</a></td>\n"; + echo " <td>".$oApp->objectMakeLink()."</td>\n"; echo " <td>$desc  </td>\n"; echo " <td>".sizeof($oApp->aVersionsIds)."</td>\n"; echo "</tr>\n\n"; Index: appdb/browse_downloadable.php diff -u -p appdb/browse_downloadable.php:1.3 appdb/browse_downloadable.php:1.4 --- appdb/browse_downloadable.php:1.3 1 Apr 2007 1:21:58 -0000 +++ appdb/browse_downloadable.php 1 Apr 2007 1:21:58 -0000 @@ -113,13 +113,13 @@ if($hResult && mysql_num_rows($hResult)) for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) { + $oVersion = new version($oRow->versionId); echo html_tr_highlight_clickable( - "appview.php?iVersionId=$oRow->versionId", + $oVersion->objectMakeUrl(), ($i % 2) ? "color1" : "color0", ($i % 2) ? "color1" : "color0", ($i % 2) ? "color1" : "color0"); - echo "<td><a href=\"appview.php?iVersionId=$oRow->versionId\">". - "$oRow->appName $oRow->versionName</a></td>\n"; + echo "<td>".version::fullNameLink($oVersion->iVersionId)."</td>\n"; echo "<td>$oRow->description</td>\n"; echo "</tr>\n"; } Index: appdb/browse_newest_apps.php diff -u -p appdb/browse_newest_apps.php:1.3 appdb/browse_newest_apps.php:1.4 --- appdb/browse_newest_apps.php:1.3 1 Apr 2007 1:21:58 -0000 +++ appdb/browse_newest_apps.php 1 Apr 2007 1:21:58 -0000 @@ -50,8 +50,9 @@ if($hResult) $c = 1; while($row = mysql_fetch_object($hResult)) { + $oApp = new application($row->appId); $bgcolor = ($c % 2) ? "color0" : "color1"; - $link = "<a href=\"appview.php?iAppId=$row->appId\"> $row->appName </a>"; + $link = $oApp->objectMakeLink(); echo "<tr class=\"$bgcolor\">"; echo "<td width=\"20%\">".print_short_date(mysqltimestamp_to_unixtimestamp($row->submitTime))."</td>\n"; echo "<td>$link </td>\n"; Index: appdb/votestats.php diff -u -p appdb/votestats.php:1.30 appdb/votestats.php:1.31 --- appdb/votestats.php:1.30 1 Apr 2007 1:21:58 -0000 +++ appdb/votestats.php 1 Apr 2007 1:21:58 -0000 @@ -168,8 +168,7 @@ if($hResult) while($row = mysql_fetch_object($hResult)) { $bgcolor = ($c % 2) ? "color0" : "color1"; - $link = "<a href='appview.php?iVersionId=$row->versionId'>$row->appName ". - "$row->versionName</a>"; + $link = version::fullNameLink($row->versionId); echo "<tr class=$bgcolor><td width='90%'>$c. $link </td> <td> $row->count ". "</td></tr>\n"; $c++; Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.19 appdb/include/sidebar_login.php:1.20 --- appdb/include/sidebar_login.php:1.19 1 Apr 2007 1:21:58 -0000 +++ appdb/include/sidebar_login.php 1 Apr 2007 1:21:58 -0000 @@ -27,10 +27,11 @@ function global_sidebar_login() { $g->addmisc("You maintain:\n"); while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains)) { + $oApp = new application($appId); if($superMaintainer) - $g->addmisc("<a href='".BASE."appview.php?iAppId=$appId'>".Application::lookup_name($appId)."*</a>", "center"); + $g->addmisc($oApp->objectMakeLink()."*", "center"); else - $g->addmisc("<a href='".BASE."appview.php?iVersionId=$versionId'>".Application::lookup_name($appId)." ".Version::lookup_name($versionId)."</a>", "center"); + $g->addmisc(version::fullNameLink($versionId), "center"); } } $appsRejected = $_SESSION['current']->getAllRejectedApps(); @@ -44,7 +45,7 @@ function global_sidebar_login() { $g->addmisc("You monitor:\n"); while(list($i, list($iAppId, $iVersionId)) = each($aMonitored)) - $g->addmisc("<a href=\"".BASE."appview.php?iVersionId=$iVersionId\">".Application::lookup_name($iAppId)." ".Version::lookup_name($iVersionId)."</a>","center"); + $g->addmisc(version::fullNameLink($iVersionId),"center"); } /* Display a link to the user's queued items, Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.20 appdb/include/vendor.php:1.21 --- appdb/include/vendor.php:1.20 1 Apr 2007 1:21:58 -0000 +++ appdb/include/vendor.php 1 Apr 2007 1:21:58 -0000 @@ -244,8 +244,7 @@ class Vendor { foreach($this->aApplicationsIds as $iAppId) { $oApp = new Application($iAppId); - echo '<li> <a href="appview.php?iAppId='.$oApp->iAppId.'">'. - $oApp->sName.'</a> </li>',"\n"; + echo '<li>'.$oApp->objectMakeLink().'</li>',"\n"; } echo '</ol>',"\n"; } Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.108 appdb/include/version.php:1.109 --- appdb/include/version.php:1.108 1 Apr 2007 1:21:58 -0000 +++ appdb/include/version.php 1 Apr 2007 1:21:58 -0000 @@ -1037,7 +1037,7 @@ class Version { //display row echo "<tr class=$bgcolor>\n"; - echo " <td><a href=\"".BASE."appview.php?iVersionId=".$iVersionId."\">".$oVersion->sName."</a></td>\n"; + echo " <td>".$oVersion->objectMakeLink()."</td>\n"; echo " <td>".util_trim_description($oVersion->sDescription)."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n"; Index: appdb/include/vote.php diff -u -p appdb/include/vote.php:1.25 appdb/include/vote.php:1.26 --- appdb/include/vote.php:1.25 1 Apr 2007 1:21:58 -0000 +++ appdb/include/vote.php 1 Apr 2007 1:21:58 -0000 @@ -122,11 +122,7 @@ function vote_menu() for($i = 1;$i <= MAX_VOTES; $i++) { if(isset($votes[$i])) - { - $sName = Version::fullName($votes[$i]->versionId); - $str = "<a href='appview.php?iVersionId=".$votes[$i]->versionId."'>". - "$sName</a>"; - } + $str = Version::fullNameLink($votes[$i]->versionId); else $str = "No App Selected";

1 0

appdb/include category.php
by WineHQ 31 Mar '07

31 Mar '07

ChangeSet ID: 31020 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/31 19:09:05 Modified files: include : category.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> category: use objectMakeLink() Patch: http://cvs.winehq.org/patch.py?id=31020 Old revision New revision Changes Path 1.23 1.24 +1 -1 appdb/include/category.php Index: appdb/include/category.php diff -u -p appdb/include/category.php:1.23 appdb/include/category.php:1.24 --- appdb/include/category.php:1.23 1 Apr 2007 0: 9: 5 -0000 +++ appdb/include/category.php 1 Apr 2007 0: 9: 5 -0000 @@ -237,7 +237,7 @@ class Category { if(!empty($versionId)) { $oVersion = new Version($versionId); - $str .= " > ".html_ahref($oApp->sName,"appview.php?iAppId=$appId"); + $str .= " > ".$oApp->objectMakeLink(); $str .= " > ".$oVersion->sName; } else {

1 0

appdb/ include/maintainer.php unit_test/test_m ...
by WineHQ 31 Mar '07

31 Mar '07

ChangeSet ID: 31019 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/31 19:08:12 Modified files: include : maintainer.php unit_test : test_maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Avoid overlapping maintainer entries. When a user becomes a super maintainer of an application remove all of their maintainer entries for the application versions. Update unit tests to test maintainter overlapping. Patch: http://cvs.winehq.org/patch.py?id=31019 Old revision New revision Changes Path 1.36 1.37 +29 -0 appdb/include/maintainer.php 1.7 1.8 +126 -18 appdb/unit_test/test_maintainer.php

1 0