November 2007 - Wine-Commits

Maarten Lankhorst : dsound: Make AngleBetweenVectorsRad when vectors have no magnitude.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 3f965d582fbcc7f6e596a61541b93a1286501706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f965d582fbcc7f6e596a6154… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Nov 9 20:13:01 2007 +0100 dsound: Make AngleBetweenVectorsRad when vectors have no magnitude. --- dlls/dsound/sound3d.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index db4390f..2397f52 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -110,6 +110,9 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT product = ScalarProduct (a,b); la = VectorMagnitude (a); lb = VectorMagnitude (b); + if (!la || !lb) + return 0; + cos = product/(la*lb); angle = acos(cos); TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x,

1 0

Maarten Lankhorst : dsound: Implement AngleBetweenVectorsDeg as a call to AngleBetweenVectorsRad.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 545a774fccd2d66dba79a6319ebe4d207fef1c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545a774fccd2d66dba79a6319… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Nov 9 20:12:09 2007 +0100 dsound: Implement AngleBetweenVectorsDeg as a call to AngleBetweenVectorsRad. --- dlls/dsound/sound3d.c | 24 ++++++------------------ 1 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index cd64cc2..db4390f 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -102,8 +102,8 @@ static inline D3DVALUE RadToDeg (D3DVALUE angle) return newangle; } -/* angle between vectors - deg version */ -static inline D3DVALUE AngleBetweenVectorsDeg (const D3DVECTOR *a, const D3DVECTOR *b) +/* angle between vectors - rad version */ +static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECTOR *b) { D3DVALUE la, lb, product, angle, cos; /* definition of scalar product: a*b = |a|*|b|*cos...therefore: */ @@ -112,26 +112,14 @@ static inline D3DVALUE AngleBetweenVectorsDeg (const D3DVECTOR *a, const D3DVECT lb = VectorMagnitude (b); cos = product/(la*lb); angle = acos(cos); - /* we now have angle in radians */ - angle = RadToDeg(angle); - TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f degrees\n", a->x, a->y, a->z, b->x, - b->y, b->z, angle); + TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x, + b->y, b->z, angle, RadToDeg(angle)); return angle; } -/* angle between vectors - rad version */ -static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECTOR *b) +static inline D3DVALUE AngleBetweenVectorsDeg (const D3DVECTOR *a, const D3DVECTOR *b) { - D3DVALUE la, lb, product, angle, cos; - /* definition of scalar product: a*b = |a|*|b|*cos...therefore: */ - product = ScalarProduct (a,b); - la = VectorMagnitude (a); - lb = VectorMagnitude (b); - cos = product/(la*lb); - angle = acos(cos); - TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians\n", a->x, a->y, a->z, b->x, - b->y, b->z, angle); - return angle; + return RadToDeg(AngleBetweenVectorsRad(a, b)); } /* calculates vector between two points */

1 0

Paul Millar : libwine: Fix naked getuid() to allow compilation under MinGW.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 8d571e28f1779c82ba91973dc540d0d7ec5ef867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d571e28f1779c82ba91973dc… Author: Paul Millar <paul(a)astro.gla.ac.uk> Date: Fri Nov 9 18:07:36 2007 +0100 libwine: Fix naked getuid() to allow compilation under MinGW. --- libs/wine/config.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 860cae2..eb187e5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -230,7 +230,9 @@ static void init_paths(void) } } if (!S_ISDIR(st.st_mode)) fatal_error( "%s is not a directory\n", config_dir ); +#ifdef HAVE_GETUID if (st.st_uid != getuid()) fatal_error( "%s is not owned by you\n", config_dir ); +#endif init_server_dir( st.st_dev, st.st_ino ); }

1 0

Alexander Nicolaysen Sørnes : Fix comments display
by Chris Morgan Nov. 12, 2007

Nov. 12, 2007

Module: appdb Branch: master Commit: eb75246a9e6b464e2671ab8ec183bad2b0992d63 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=eb75246a9e6b464e2671ab8e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Nov 11 23:07:48 2007 +0100 Fix comments display --- include/comment.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/comment.php b/include/comment.php index 38d419e..63554bf 100644 --- a/include/comment.php +++ b/include/comment.php @@ -292,15 +292,15 @@ class Comment { $iVersionId = query_escape_string($iVersionId); $iParentId = query_escape_string($iParentId); - $sExtra = ""; - - $sOrderingMode = "DESC"; - /* NOTE: we must compare against NULL here because $iParentId of 0 is valid */ if($iParentId) { $sExtra = "AND parentId = '".$iParentId."' "; $sOrderingMode = "ASC"; + } else + { + $sExtra = "AND parentId = '0'"; + $sOrderingMode = "DESC"; } $sQuery = "SELECT from_unixtime(unix_timestamp(appComments.time), \"%W %M %D %Y, %k:%i\") as time, ".

1 0

Alexander Nicolaysen Sørnes : comment: Show newest threads first
by Chris Morgan Nov. 11, 2007

Nov. 11, 2007

Module: appdb Branch: master Commit: 3aef9df655569a1bba7a75fe17aebd1ec6dfd40f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3aef9df655569a1bba7a75fe… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Nov 10 19:19:23 2007 +0100 comment: Show newest threads first --- include/comment.php | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/comment.php b/include/comment.php index 0a85529..38d419e 100644 --- a/include/comment.php +++ b/include/comment.php @@ -294,15 +294,21 @@ class Comment { $sExtra = ""; + $sOrderingMode = "DESC"; + /* NOTE: we must compare against NULL here because $iParentId of 0 is valid */ - if($iParentId != NULL) + if($iParentId) + { $sExtra = "AND parentId = '".$iParentId."' "; + $sOrderingMode = "ASC"; + } $sQuery = "SELECT from_unixtime(unix_timestamp(appComments.time), \"%W %M %D %Y, %k:%i\") as time, ". "appComments.commentId, appComments.parentId, appComments.versionId, appComments.userId, appComments.subject, appComments.body, appVersion.appId ". "FROM appComments, appVersion WHERE appComments.versionId = appVersion.versionId AND appComments.versionId = '".$iVersionId."' ". $sExtra. - "ORDER BY appComments.time ASC"; + "ORDER BY appComments.time $sOrderingMode"; + $hResult = query_appdb($sQuery); return $hResult;

1 0

Alexander Nicolaysen Sørnes : Don' t include vendor names in searches
by Chris Morgan Nov. 11, 2007

Nov. 11, 2007

Module: appdb Branch: master Commit: da4b3f638db157c5fc3de077c4e4ed5d60d43819 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=da4b3f638db157c5fc3de077… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Nov 10 17:20:53 2007 +0100 Don't include vendor names in searches --- include/util.php | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-) diff --git a/include/util.php b/include/util.php index 4f6f546..5853a10 100644 --- a/include/util.php +++ b/include/util.php @@ -416,37 +416,15 @@ function searchForApplication($search_words) array_push($split_words, $value); } - $vendorIdArray = array(); - - /* find all of the vendors whos names or urls match words in our */ - /* search parameters */ - foreach ($split_words as $key=>$value) - { - $sQuery = "SELECT vendorId from vendor where vendorName LIKE '%?%' - OR vendorURL LIKE '%?%'"; - $hResult = query_parameters($sQuery, $value, $value); - while($oRow = query_fetch_object($hResult)) - { - array_push($vendorIdArray, $oRow->vendorId); - } - } - $search_words = str_replace(' ', '%', query_escape_string($search_words)); /* base query */ $sQuery = "SELECT * - FROM appFamily, vendor + FROM appFamily WHERE appName != 'NONAME' - AND appFamily.vendorId = vendor.vendorId AND appFamily.queued = 'false' AND (appName LIKE '%" . $search_words . "%' OR keywords LIKE '%" . $search_words . "%'"; - - /* append to the query any vendors that we matched with */ - foreach($vendorIdArray as $key=>$value) - { - $sQuery.=" OR appFamily.vendorId=".query_escape_string($value); - } $sQuery.=" ) ORDER BY appName";

1 0

Alexander Nicolaysen Sørnes : Use AppDB search when JavaScript is unavailable
by Chris Morgan Nov. 10, 2007

Nov. 10, 2007

Module: appdb Branch: master Commit: 44d414d8960019d47fd82aa1e08445e99d2c1af5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=44d414d8960019d47fd82aa1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Nov 10 00:41:19 2007 +0100 Use AppDB search when JavaScript is unavailable --- include/sidebar.php | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/include/sidebar.php b/include/sidebar.php index 270adc1..4d43a0f 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -47,19 +47,31 @@ function app_search_box($q = '') // used in place of appdb specific search engine code // Chris Morgan <cmorgan(a)alum.wpi.edu> maintains // the search engine settings - $sSearchStr = ' + $shSearchStr = '  - <form id="searchbox_013271970634691685804:bc-56dvxydi" action="http://appdb.winehq.org/search_results.php"> - <input type="hidden" name="cx" value="013271970634691685804:bc-56dvxydi" /> - <input type="hidden" name="cof" value="FORID:11" /> - <input name="q" type="text" size="20" /> - <input type="submit" name="sa" value="Search" /> - </form> + <script type="text/javascript"> + document.write(\'<form id=\"searchbox_013271970634691685804:bc-56dvxydi\" action=\"http://appdb.winehq.org/search_results.php\">\') + document.write(\'<input type="hidden" name="cx" value="013271970634691685804:bc-56dvxydi" />\') + document.write(\'<input type=\"hidden\" name=\"cof" value=\"FORID:11\" />\') + document.write(\'<input name=\"q\" type=\"text\" size=\"20\" />\') + document.write(\'<input type=\"submit\" name=\"sa\" value=\"Search\" />\') + document.write(\'</form>\') + </script> <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_013271970634691685804%3…"></script>  '; + // Search dialog using our own search engine, displayed when + // JavaScript is unavailable + $shSearchStr .= ' + <noscript> + <form method="post" action="search.php"> + <input type="text" size="20" name="sSearchQuery" /> + <input type="submit" value="Search" /> + </form> + </noscript> +'; - return $sSearchStr; + return $shSearchStr; } ?>

1 0

Alexander Nicolaysen Sørnes : distribution: Fix spelling error
by Chris Morgan Nov. 10, 2007

Nov. 10, 2007

Module: appdb Branch: master Commit: 4c06d4103300db7cf8a181073bb3fbd5e64be4b1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4c06d4103300db7cf8a18107… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Nov 9 23:28:01 2007 +0100 distribution: Fix spelling error --- include/distribution.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 9dc45f6..e82ab54 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -598,7 +598,7 @@ class distribution { if($this->aTestingIds) { - echo '<p><span class="title">Testing Results for '.$this->sName.'</span><br />',"\n"; + echo '<p><span class="title">Test Results for '.$this->sName.'</span><br />',"\n"; echo '<table width="100%" border="1">',"\n"; echo '<thead class="historyHeader">',"\n"; echo '<tr>',"\n";

1 0

Alexander Nicolaysen Sørnes : Replace browse_newest_apps class using sorting
by Chris Morgan Nov. 10, 2007

Nov. 10, 2007

Module: appdb Branch: master Commit: 7e66843cc4b54c7173fae83affd95129f53fd41a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7e66843cc4b54c7173fae83a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Nov 9 23:10:34 2007 +0100 Replace browse_newest_apps class using sorting --- include/application.php | 2 +- include/browse_newest_apps.php | 176 ---------------------------------------- include/sidebar.php | 4 +- objectManager.php | 1 - unit_test/test_om_objects.php | 7 -- 5 files changed, 3 insertions(+), 187 deletions(-) diff --git a/include/application.php b/include/application.php index 8449e6a..c2e2501 100644 --- a/include/application.php +++ b/include/application.php @@ -943,7 +943,7 @@ class Application { public static function objectGetSortableFields() { - return array("submitTime", "appName"); + return array('submitTime', 'appName', 'appId'); } public static function objectGetHeader() diff --git a/include/browse_newest_apps.php b/include/browse_newest_apps.php deleted file mode 100644 index b7b5ba8..0000000 --- a/include/browse_newest_apps.php +++ /dev/null @@ -1,176 +0,0 @@ -<?php - -// class lists the newest applications and versions in the database - -class browse_newest_apps -{ - var $iAppId; - - // constructor doesn't need to perform any queries. we provide a constructor for - // browse_newest_apps because the objectManager requires an instance for some methods - function browse_newest_apps($iAppId = null, $oRow = null) - { - if(!$iAppId && !$oRow) - return; - - if(!$oRow) - { - $this->iAppId = $iAppId; - } - - if($oRow) - { - $this->iAppId = $oRow->appId; - } - } - - function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0) - { - // We don't implement queues or rejected applications - if($bQueued || $bRejected) - return false; - - - // if row limit is 0 we want to fetch all rows - if(!$iRows) - { - $iRows = browse_newest_apps::objectGetEntriesCount($bQueued, $bRejected); - } - - $sQuery = "SELECT appId, appName, description, submitTime FROM appFamily WHERE". - " queued = '?' ORDER BY appId DESC LIMIT ?,?"; - - return query_parameters($sQuery, $bQueued ? "true" : "false", - $iStart, $iRows); - } - - function objectGetEntriesCount($bQueued, $bRejected) - { - // We don't implement queues or rejected applications - if($bQueued || $bRejected) - { - return 0; - } - - return application::objectGetEntriesCount($bQueued, $bRejected); - } - - function objectGetHeader() - { - $oTableRow = new TableRow(); - - $oTableCell = new TableCell("Submission Date"); - $oTableRow->AddCell($oTableCell); - - $oTableCell = new TableCell("Application"); - $oTableRow->AddCell($oTableCell); - - $oTableCell = new TableCell("Description"); - $oTableRow->AddCell($oTableCell); - - return $oTableRow; - } - - function objectGetTableRow() - { - $oApp = new application($this->iAppId); - - $oTableRow = new TableRow(); - - $oTableCell = new TableCell(print_short_date(mysqldatetime_to_unixtimestamp($oApp->sSubmitTime))); - $oTableCell->SetWidth("20%"); - $oTableRow->AddCell($oTableCell); - $oTableRow->AddTextCell($oApp->objectMakeLink()); - $oTableRow->AddTextCell(util_trim_description($oApp->sDescription)); - - // make the row clickable - $oTableRowClick = new TableRowClick($oApp->objectMakeUrl()); - $oTableRow->SetRowClick($oTableRowClick); - - $oOMTableRow = new OMTableRow($oTableRow); - return $oOMTableRow; - } - - function objectGetItemsPerPage($bQueued = false) - { - $aItemsPerPage = array(25, 50, 100, 200); - $iDefaultPerPage = 25; - return array($aItemsPerPage, $iDefaultPerPage); - } - - function objectGetChildren() - { - $oApp = new application($this->iAppId); - return $oApp->objectGetChildren(); - } - - function objectGetSubmitterId() - { - $oApp = new application($this->iAppId); - return $oApp->objectGetSubmitterId(); - } - - function objectGetMailOptions($sAction, $bMailSubmitter, $bParentAction) - { - $oApp = new application($this->iAppId); - return $oApp->objectGetMailOptions($sAction, $bMailSubmitter, $bParentAction); - } - - function objectGetMail($sAction, $bMailSubmitter, $bParentAction) - { - $oApp = new application($this->iAppId); - return $oApp->objectGetMail($sAction, $bMailSubmitter, $bParentAction); - } - - function objectGetId() - { - return $this->iAppId; - } - - // stub implementation - function allowAnonymousSubmissions() - { - return false; - } - - // stub canEdit() out, no one can edit these entries - function canEdit() - { - return false; - } - - // stub implementation - function display() - { - } - - // stub implementation - function outputEditor() - { - } - - // stub implementation - function getOutputEditorValues($aValues) - { - } - - // stub implementation - function objectMakeLink() - { - $oApp = new Application($this->iAppId); - return $oApp->objectMakeLink(); - } - - // stub implementation - function objectMakeUrl() - { - } - - // stub implementation - function mustBeQueued() - { - return false; - } -} - -?> diff --git a/include/sidebar.php b/include/sidebar.php index b24fcaf..270adc1 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -20,8 +20,8 @@ function global_sidebar_menu() $g = new htmlmenu("AppDB"); $g->add("Screenshots", BASE."viewScreenshots.php"); $g->add("Browse Apps", BASE."appbrowse.php"); - $g->add("Browse Newest Apps", BASE."objectManager.php?sClass=browse_newest_apps&". - "bIsQueue=false&sTitle=Newest%20apps"); + $g->add("Browse Newest Apps", BASE."objectManager.php?sClass=application&". + "bIsQueue=false&sTitle=Newest%20apps&sOrderBy=appId&bAscending=false"); $g->add("Downloadable Apps", BASE."browse_downloadable.php"); $g->add("Browse Apps by Rating", BASE."browse_by_rating.php"); $g->add("Top 25", BASE."votestats.php"); diff --git a/objectManager.php b/objectManager.php index d50fe6f..11f1e23 100644 --- a/objectManager.php +++ b/objectManager.php @@ -22,7 +22,6 @@ require_once(BASE.'include/objectManager.php'); require_once(BASE.'include/application_queue.php'); require_once(BASE.'include/version_queue.php'); require_once(BASE.'include/testData_queue.php'); -require_once(BASE.'include/browse_newest_apps.php'); require_once(BASE.'include/bugs.php'); /* if we have no valid class name we should abort */ diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php index 82b018d..7e1695a 100644 --- a/unit_test/test_om_objects.php +++ b/unit_test/test_om_objects.php @@ -10,7 +10,6 @@ require_once(BASE.'include/maintainer.php'); require_once(BASE.'include/testData_queue.php'); require_once(BASE.'include/version_queue.php'); require_once(BASE.'include/application_queue.php'); -require_once(BASE.'include/browse_newest_apps.php'); require_once(BASE.'include/monitor.php'); require_once(BASE.'include/bugs.php'); @@ -28,11 +27,6 @@ function test_class($sClassName, $aTestMethods) return false; } - // TODO: work around for 'browse_newest_apps' class - // since we can't create a new database object of browse_newest_apps - if($sClassName == "browse_newest_apps") - return true; - /* Set up test user */ $sTestEmail = __FUNCTION__."@localhost.com"; $sTestPassword = "password"; @@ -275,7 +269,6 @@ function test_object_methods() $aTestClasses = array("application", "application_queue", - "browse_newest_apps", "bug", "distribution", "downloadurl",

1 0

Alexander Nicolaysen Sørnes : application: Show name as link if not queued
by Chris Morgan Nov. 10, 2007

Nov. 10, 2007

Module: appdb Branch: master Commit: 8fa22a5d2643de651884739bdb54806ccd7e1267 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8fa22a5d2643de651884739b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Nov 9 23:16:08 2007 +0100 application: Show name as link if not queued --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index c2e2501..9d723dd 100644 --- a/include/application.php +++ b/include/application.php @@ -967,7 +967,7 @@ class Application { $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime))); $oTableRow->AddTextCell($oUser->objectMakeLink()); $oTableRow->AddTextCell($sVendor); - $oTableRow->AddTextCell($this->sName); + $oTableRow->AddTextCell(($this->sQueued == 'false') ? $this->objectMakeLink() : $this->sName); $oOMTableRow = new OMTableRow($oTableRow); return $oOMTableRow;

1 0