February 2007 - Wine-commits

Francois Gouget : shell32: Remove an unneeded local variable initialization .
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: fbfe9a72de562788e48e9883928b14ac5d1b40c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbfe9a72de562788e48e98839… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 26 18:23:57 2007 +0100 shell32: Remove an unneeded local variable initialization. --- dlls/shell32/shelllink.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index a27b957..8a3d69d 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2483,12 +2483,12 @@ ShellLink_QueryContextMenu( IContextMenu static LPWSTR shelllink_get_msi_component_path( LPWSTR component ) { - LPWSTR path = NULL; + LPWSTR path; DWORD r, sz = 0; r = CommandLineFromMsiDescriptor( component, NULL, &sz ); if (r != ERROR_SUCCESS) - return path; + return NULL; sz++; path = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) );

1 0

appdb/include objectManager.php
by WineHQ 03 Feb '07

03 Feb '07

ChangeSet ID: 30928 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/02/03 13:55:15 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Pass an object as the first argument to method_exists() Patch: http://cvs.winehq.org/patch.py?id=30928 Old revision New revision Changes Path 1.2 1.3 +1 -1 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.2 appdb/include/objectManager.php:1.3 --- appdb/include/objectManager.php:1.2 3 Feb 2007 19:55:15 -0000 +++ appdb/include/objectManager.php 3 Feb 2007 19:55:15 -0000 @@ -172,7 +172,7 @@ class ObjectManager function display_queue_processing_help() { /* No help text defined, so do nothing */ - if(!method_exists($this->sClass, "ObjectDisplayQueueProcessingHelp")) + if(!method_exists(new $this->sClass(), "ObjectDisplayQueueProcessingHelp")) return FALSE; call_user_func(array($this->sClass,

1 0

appdb/include objectManager.php
by WineHQ 03 Feb '07

03 Feb '07

ChangeSet ID: 30927 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/02/03 13:33:20 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Pass an object as the first argument to method_exists(), required by php4 ---------------------------------------------------------------------- Patch: http://cvs.winehq.org/patch.py?id=30927 Old revision New revision Changes Path 1.1 1.2 +4 -1 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.1 appdb/include/objectManager.php:1.2 --- appdb/include/objectManager.php:1.1 3 Feb 2007 19:33:20 -0000 +++ appdb/include/objectManager.php 3 Feb 2007 19:33:20 -0000 @@ -20,7 +20,10 @@ class ObjectManager /* Check whether the associated class has the given method */ function checkMethod($sMethodName, $bEnableOutput) { - if(!method_exists($this->sClass, $sMethodName)) + // NOTE: we only 'new' here because php4 requires an instance + // of an object as the first argument to method_exists(), php5 + // doesn't + if(!method_exists(new $this->sClass(), $sMethodName)) { if($bEnableOutput) echo "class '".$this->sClass."' lacks method '".$sMethodName."'\n"; return false;

1 0

appdb/include sidebar_admin.php
by WineHQ 03 Feb '07

03 Feb '07

ChangeSet ID: 30926 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/02/03 13:04:41 Modified files: include : sidebar_admin.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Change url for add vendor in admin menu to use the objectManager Patch: http://cvs.winehq.org/patch.py?id=30926 Old revision New revision Changes Path 1.25 1.26 +2 -1 appdb/include/sidebar_admin.php Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.25 appdb/include/sidebar_admin.php:1.26 --- appdb/include/sidebar_admin.php:1.25 3 Feb 2007 19: 4:41 -0000 +++ appdb/include/sidebar_admin.php 3 Feb 2007 19: 4:41 -0000 @@ -10,7 +10,8 @@ function global_admin_menu() { $g = new htmlmenu("Global Admin"); $g->add("Add Category", BASE."admin/addCategory.php"); - $g->add("Add Vendor", BASE."admin/editVendor.php"); + $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&bQueue=". + "false&sAction=add&sTitle=Add%20Vendor"); $g->addmisc(" "); $g->add("View App Queue (".$_SESSION['current']->getQueuedAppCount()."/".$_SESSION['current']->getQueuedVersionCount().")", BASE."admin/adminAppQueue.php");

1 0

appdb/ include/distribution.php include/sideba ...
by WineHQ 03 Feb '07

03 Feb '07

ChangeSet ID: 30925 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/02/03 13:03:42 Modified files: include : distribution.php sidebar.php vendor.php unit_test : run_tests.php Added files: . : objectManager.php include : objectManager.php unit_test : test_om_objects.php Removed files: admin : editDistribution.php editVendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use objectManager to display and edit vendors and distributions. Based on a patch by Chris Morgan Patch: http://cvs.winehq.org/patch.py?id=30925 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/objectManager.php 1.13 Removed +0 -0 appdb/admin/editDistribution.php 1.18 Removed +0 -0 appdb/admin/editVendor.php 1.11 1.12 +7 -9 appdb/include/distribution.php 1.26 1.27 +2 -3 appdb/include/sidebar.php 1.13 1.14 +12 -8 appdb/include/vendor.php Added 1.1 +0 -0 appdb/include/objectManager.php 1.10 1.11 +2 -0 appdb/unit_test/run_tests.php Added 1.1 +0 -0 appdb/unit_test/test_om_objects.php

1 0

appdb/include bugs.php
by WineHQ 02 Feb '07

02 Feb '07

ChangeSet ID: 30924 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/02/02 21:39:52 Modified files: include : bugs.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Don't call mailSubmitter() if the submitter is performing the auction Patch: http://cvs.winehq.org/patch.py?id=30924 Old revision New revision Changes Path 1.20 1.21 +2 -1 appdb/include/bugs.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.20 appdb/include/bugs.php:1.21 --- appdb/include/bugs.php:1.20 3 Feb 2007 3:39:52 -0000 +++ appdb/include/bugs.php 3 Feb 2007 3:39:52 -0000 @@ -159,7 +159,8 @@ class Bug { if(!$bSilent) $this->SendNotificationMail(true); } - if($this->iSubmitterId && ($this->iSubmitterId != $oUser->iUserId)) + if($this->iSubmitterId && + ($this->iSubmitterId != $_SESSION['current']->iUserId)) { $this->mailSubmitter(true); }

1 0

appdb/. votestats.php
by WineHQ 01 Feb '07

01 Feb '07

ChangeSet ID: 30923 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/02/01 19:01:34 Modified files: . : votestats.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display version name in vote stats Patch: http://cvs.winehq.org/patch.py?id=30923 Old revision New revision Changes Path 1.29 1.30 +12 -8 appdb/votestats.php Index: appdb/votestats.php diff -u -p appdb/votestats.php:1.29 appdb/votestats.php:1.30 --- appdb/votestats.php:1.29 2 Feb 2007 1: 1:34 -0000 +++ appdb/votestats.php 2 Feb 2007 1: 1:34 -0000 @@ -125,8 +125,8 @@ echo ' '; if(empty($aClean['iCategoryId'])) { /* leave out the appFamily.catId = '$aClean['iCategoryId']' */ - $hResult = query_parameters("SELECT appVotes.versionId, appName, count(userId) as - count + $hResult = query_parameters("SELECT appVotes.versionId, versionName, appName, + count(userId) as count FROM appVotes, appFamily, appVersion WHERE appVotes.versionId = appVersion.versionId AND appFamily.appId = appVersion.appId @@ -141,8 +141,9 @@ if(empty($aClean['iCategoryId'])) AND ( c.catId =29 OR c.catParent =29)*/ - - $hResult = query_parameters("SELECT v.versionId, f.appName, count( v.versionId ) AS count + + $hResult = query_parameters("SELECT v.versionId, appVersion.versionName, + f.appName, count( v.versionId ) AS count FROM appFamily AS f, appCategory AS c, appVotes AS v, appVersion WHERE appVersion.appId = f.appId AND appVersion.versionId = v.versionId @@ -152,7 +153,8 @@ if(empty($aClean['iCategoryId'])) OR c.catParent = '?' ) GROUP BY v.versionId - ORDER BY count DESC LIMIT ?", $aClean['iCategoryId'], $aClean['iCategoryId'], $aClean['iTopNumber']); + ORDER BY count DESC LIMIT ?", + $aClean['iCategoryId'], $aClean['iCategoryId'], $aClean['iTopNumber']); } if($hResult) @@ -161,13 +163,15 @@ if($hResult) echo html_table_begin("width='100%' align=center"); echo "<tr class=color4><td>Application Name</td>\n"; echo "<td>Votes</td></tr>\n"; - + $c = 1; while($row = mysql_fetch_object($hResult)) { $bgcolor = ($c % 2) ? "color0" : "color1"; - $link = "<a href='appview.php?iVersionId=$row->versionId'>$row->appName</a>"; - echo "<tr class=$bgcolor><td width='90%'>$c. $link </td> <td> $row->count </td></tr>\n"; + $link = "<a href='appview.php?iVersionId=$row->versionId'>$row->appName ". + "$row->versionName</a>"; + echo "<tr class=$bgcolor><td width='90%'>$c. $link </td> <td> $row->count ". + "</td></tr>\n"; $c++; }

1 0

appdb/ ./vendorview.php include/vendor.php
by WineHQ 31 Jan '07

31 Jan '07

ChangeSet ID: 30922 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/31 20:07:24 Modified files: . : vendorview.php include : vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use vendor::objectGetInstanceFromRow() and vendor::objectOutputTableRow() Patch: http://cvs.winehq.org/patch.py?id=30922 Old revision New revision Changes Path 1.26 1.27 +3 -18 appdb/vendorview.php 1.12 1.13 +47 -11 appdb/include/vendor.php Index: appdb/vendorview.php diff -u -p appdb/vendorview.php:1.26 appdb/vendorview.php:1.27 --- appdb/vendorview.php:1.26 1 Feb 2007 2: 7:24 -0000 +++ appdb/vendorview.php 1 Feb 2007 2: 7:24 -0000 @@ -52,25 +52,10 @@ else vendor::objectOutputHeader("color4"); - $c = 1; - while($oRow = mysql_fetch_object($hResult)) + for($c = 0; $oRow = mysql_fetch_object($hResult); $c++) { - if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - $oVendor = new Vendor($oRow->vendorId); - echo '<tr class="'.$bgcolor.'">',"\n"; - echo '<td><a href="'.BASE.'vendorview.php?iVendorId='.$oVendor->iVendorId.'">'.$oVendor->sName.'</a></td>',"\n"; - echo '<td><a href="'.$oVendor->sWebpage.'">'.substr($oVendor->sWebpage,0,30).'</a></td>',"\n"; - echo '<td align="right">'.sizeof($oVendor->aApplicationsIds).'</td>',"\n"; - if ($_SESSION['current']->hasPriv("admin")) - { - echo '<td align="center">',"\n"; - echo '[<a href="'.BASE.'admin/editVendor.php?iVendorId='.$oVendor->iVendorId.'">edit</a>]',"\n"; - if(!sizeof($oVendor->aApplicationsIds)) - echo '&nbsp[<a href="'.$_SERVER['PHP_SELF'].'?sSub=delete&iVendorId='.$oVendor->iVendorId.'">delete</a>]',"\n"; - echo '</td>',"\n"; - } - echo '</tr>',"\n"; - $c++; + $oVendor = vendor::objectGetInstanceFromRow($oRow); + $oVendor->objectOutputTableRow(($c % 2) ? "color0" : "color1"); } echo '<tr><td>',"\n"; Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.12 appdb/include/vendor.php:1.13 --- appdb/include/vendor.php:1.12 1 Feb 2007 2: 7:24 -0000 +++ appdb/include/vendor.php 1 Feb 2007 2: 7:24 -0000 @@ -15,20 +15,25 @@ class Vendor { /** * constructor, fetches the data. */ - function Vendor($iVendorId = null) + function Vendor($iVendorId = null, $oRow = null) { // we are working on an existing vendor if(is_numeric($iVendorId)) { - /* - * We fetch the data related to this vendor. - */ - $sQuery = "SELECT * - FROM vendor - WHERE vendorId = '?'"; - if($hResult = query_parameters($sQuery, $iVendorId)) + if(!$oRow) + { + /* + * We fetch the data related to this vendor. + */ + $sQuery = "SELECT * + FROM vendor + WHERE vendorId = '?'"; + if($hResult = query_parameters($sQuery, $iVendorId)) + $oRow = mysql_fetch_object($hResult); + } + + if($oRow) { - $oRow = mysql_fetch_object($hResult); $this->iVendorId = $iVendorId; $this->sName = $oRow->vendorName; $this->sWebpage = $oRow->vendorURL; @@ -140,14 +145,18 @@ class Vendor { echo "</table>\n"; } - function objectGetEntries($bQueued) + function objectGetEntries($bQueued, $iRows = 0, $iStart = 0) { /* Vendor queueing is not implemented yet */ if($bQueued) return NULL; + if(!$iRows) + $iRows = getNumberOfVendors(); + $hResult = query_parameters("SELECT * FROM vendor - ORDER BY vendorName"); + ORDER BY vendorName LIMIT ?,?", + $iStart, $iRows); if(!$hResult) return FALSE; @@ -168,6 +177,33 @@ class Vendor { echo html_tr($sCells, $sClass); } + function objectGetInstanceFromRow($oRow) + { + return new vendor($oRow->vendorId, $oRow); + } + + function objectOutputTableRow($sClass = "") + { + $aCells = array( + "<a href=\"".BASE."vendorview.php?iVendorId=$this->iVendorId\">". + "$this->sName</a>", + "<a href=\"$this->sWebpage\">$this->sWebpage</a>", + array(sizeof($this->aApplicationsIds), "align=\"right\"")); + + if($this->canEdit()) + { + if(!sizeof($this->aApplicationsIds)) + $sDelete = "   [<a href=\"".BASE."vendorview.php?sSub=delete&". + "iVendorId=$this->iVendorId\">". + "delete</a>]"; + + $aCells[sizeof($aCells)] = "[<a href=\"".BASE."admin/editVendor.php?". + "iVendorId=$this->iVendorId\">edit</a>]$sDelete"; + } + + echo html_tr($aCells, $sClass); + } + function canEdit() { if($_SESSION['current']->hasPriv("admin"))

1 0

appdb/include distribution.php
by WineHQ 31 Jan '07

31 Jan '07

ChangeSet ID: 30921 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/31 20:06:38 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow object creation from a mysql resource, allow objectGetEntries() to limit the range of entries requested, this will be necessary for future performance optimizations Patch: http://cvs.winehq.org/patch.py?id=30921 Old revision New revision Changes Path 1.10 1.11 +29 -34 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.10 appdb/include/distribution.php:1.11 --- appdb/include/distribution.php:1.10 1 Feb 2007 2: 6:38 -0000 +++ appdb/include/distribution.php 1 Feb 2007 2: 6:38 -0000 @@ -18,31 +18,30 @@ class distribution { var $aTestingIds; // constructor, fetches the data. - function distribution($iDistributionId = null) + function distribution($iDistributionId = null, $oRow = null) { // we are working on an existing distribution. if(is_numeric($iDistributionId)) { // We fetch the data related to this distribution. - if(!$this->$iDistributionId) + if(!$oRow) { $sQuery = "SELECT * FROM distributions WHERE distributionId = '?'"; if($hResult = query_parameters($sQuery, $iDistributionId)) - { $oRow = mysql_fetch_object($hResult); - if($oRow) - { - $this->iDistributionId = $iDistributionId; - $this->sName = $oRow->name; - $this->sDescription = $oRow->description; - $this->sUrl = $oRow->url; - $this->sSubmitTime = $oRow->submitTime; - $this->iSubmitterId = $oRow->submitterId; - $this->sQueued = $oRow->queued; - } - } + } + + if($oRow) + { + $this->iDistributionId = $iDistributionId; + $this->sName = $oRow->name; + $this->sDescription = $oRow->description; + $this->sUrl = $oRow->url; + $this->sSubmitTime = $oRow->submitTime; + $this->iSubmitterId = $oRow->submitterId; + $this->sQueued = $oRow->queued; } /* @@ -438,30 +437,26 @@ class distribution { echo html_tr($aCells, $sClass); } - function objectGetEntries($bQueued) + function objectGetEntries($bQueued, $iRows = 0, $iStart = 0) { - if($bQueued) - { - if(distribution::canEdit()) - { - /* Only users with edit privileges are allowed to view queued - items, so return NULL in that case */ - $sQuery = "SELECT distributionId FROM distributions - WHERE queued = '?' ORDER BY name"; - return query_parameters($sQuery, $bQueued ? "true" : "false"); - } else - return NULL; - } else - { - $sQuery = "SELECT distributionId FROM distributions - WHERE queued = '?' ORDER BY name"; - return query_parameters($sQuery, "false"); - } + /* Only users with edit privileges are allowed to view queued + items, so return NULL in that case */ + if($bQueued && !distribution::canEdit()) + return NULL; + + if(!$iRows) + $iRows = distribution::getNumberOfDistributions($bQueued); + + $sQuery = "SELECT * FROM distributions + WHERE queued = '?' ORDER BY name LIMIT ?,?"; + + return query_parameters($sQuery, $bQueued ? "true" : "false", + $iStart, $iRows); } - function ObjectGetInstanceFromRow($oRow) + function objectGetInstanceFromRow($oRow) { - return new distribution($oRow->distributionId); + return new distribution($oRow->distributionId, $oRow); } function objectOutputTableRow($sClass = "")

1 0