January 2008 - Wine-commits

Francois Gouget : wwn335: Spelling fixes.
by Jeremy Newman 23 Jan '08

23 Jan '08

Module: website Branch: master Commit: f29b92376b5610ec51d98719bdcafa47f230856b URL: http://source.winehq.org/git/website.git/?a=commit;h=f29b92376b5610ec51d987… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 23 20:13:16 2008 +0100 wwn335: Spelling fixes. --- wwn/wn20071217_335.xml | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/wwn/wn20071217_335.xml b/wwn/wn20071217_335.xml index f96332d..5b39640 100644 --- a/wwn/wn20071217_335.xml +++ b/wwn/wn20071217_335.xml @@ -155,7 +155,7 @@ the actual conversation! So, a bit of background on these funky acronyms before we dive into the thread itself (Most of the info from -<a href="http://wikipedia.org">wikipedia</a> +<a href="http://wikipedia.org">wikipedia</a>): <quote> <a href="http://en.wikipedia.org/wiki/GLSL">GLSL</a> (OpenGL Shading Language): also known as GLslang, is a high level @@ -176,15 +176,15 @@ in making use of advanced GPU programmability features. </quote> The issue is that writing shaders can often be complicated and difficult. -So GLSL was born, a higher level shading language to hopeuflly make -programming these things easier. HLSL is another lanuage, similar to GLSL, +So GLSL was born, a higher level shading language to hopefully make +programming these things easier. HLSL is another language, similar to GLSL, from Microsoft; and the translation of HLSL to something workable with Linux/BSD etc. will be necessary to continue WineD3D. How this will happen is the subject of this wine devel discussion: <quote> -hlsl2glsl is the good solution for implementing shaders on directX 10. +hlsl2glsl is the right solution for implementing shaders on directX 10. Nevertheless, the hlsl compilation to tokens has to be done for d3d9. On the other hand, if we implement d3dx9_xx, it is likely that the application will be using the compile D3DX9CompileShader to get the @@ -221,7 +221,7 @@ and the most feasible way to implement it I've heard so far would be to embed GLSL code a comment section inside the shader byte code, which would be rather ugly. -And finally, the actual hardware has it's own hardware specific +And finally, the actual hardware has its own hardware specific language for shaders. HLSL or D3D bytecode isn't really any closer to the actual hardware language than GLSL or ARB asm, so it isn't even guaranteed to gain us much. @@ -231,7 +231,7 @@ guaranteed to gain us much. Keep in mind that getting shaders translated into GLSL, which we can then send to the card, is only a small part of the whole dx10 topic. We will need our -own codepath anyway(HLSL -> d3d asm -> GLSL). We have to investigate wether a +own codepath anyway(HLSL -> d3d asm -> GLSL). We have to investigate whether a direct HLSL -> GLSL path will gain us any performance. We can optimize the HLSL -> d3d asm ourselves, and the d3d asm->GLSL->card native code is lossless in theory. If the GLSL compiler is good, then it will recognise the @@ -258,20 +258,20 @@ idea, and immediatly caught my attention: Hello to all. -I have something in mind that I would like to ask to Wine developers. +I have something in mind that I would like to ask Wine developers. Is it possible using a hack/trick or a hidden option to change the -name of wine in the proccess lists? -I mean, Is it possible to list 'wine' proccess as, for example +name of wine in the process lists? +I mean, is it possible to list 'wine' process as, for example 'iexplorer' when I use Internet Explorer under Wine? -Thanks a lot for your work, hope my question find the answer here. +Thanks a lot for your work, hope my question finds the answer here. </quote> -Apparently this had been thought up of before: Stefan Dosinger writes in: +Apparently this had been thought of before: Stefan Dosinger writes in: <quote> -This is done since quite some time. apps are usually called "iexplore.exe", or +This is done since quite some time. Apps are usually called "iexplore.exe", or they have the name of the file that was passed to wine, like C:\Program Files\Internet Explorer\iexplore.exe @@ -280,7 +280,7 @@ outdated version of wine. </quote> -Apparently, this already existed! Alright, so whats the deal? Apparently +Apparently, this already existed! Alright, so what's the deal? Apparently it only works on linux! Poor Gonzalo is on FreeBSD. Stefan writes in with the unfortunate news: @@ -288,10 +288,10 @@ the unfortunate news: Ow, ah, this is a different business. I think we use some Linux-only feature to set the name, and Alexandre told me that at least MacOS doesn't have it. I have no idea if there is a way to change the process name under BSD. If there -is, feel free to implement it and send a patch +is, feel free to implement it and send a patch. </quote> -There are of course ways to do this on FreeBSD, Alex Juillard lets us know +There are of course ways to do this on FreeBSD, Alexandre Julliard lets us know that it may be possible: <quote> @@ -299,14 +299,14 @@ I wouldn't [accept a hack which involves copying the process to /tmp], but on FreeBSD you can use setproctitle() for this. </quote> -Another important point brought up later in this thread, is that its not wise -to killall wineserver or killall explorer.exe. Its much smarter to +Another important point brought up later in this thread, is that it is not wise +to killall wineserver or killall explorer.exe. It's much smarter to "wineserver -k". L Rahyen writes: <quote> wineserver -k - This kills all processes which belongs to current WINE prefix (as + This kills all processes which belong to current WINE prefix (as specified in WINEPREFIX environment variable or ~/.wine otherwise). For me this works in 100% of cases so I see no problem here. @@ -349,7 +349,7 @@ IF this is true, WHY? Rich </quote> -This indeed doesn't seem to make sense; alas we recieve the voice of +This indeed doesn't seem to make sense; alas we receive the voice of reason and policy. Bryan Haskins writes: <quote> It really depends on the case, if a program is entirely superseded by

1 0

Alexander Nicolaysen Sørnes : test_om_objects: Cleanup properly when testing objectGetEntries
by Chris Morgan 23 Jan '08

23 Jan '08

Module: appdb Branch: master Commit: 55d9f32c0a50aac2aaa63b04e5e50e676ab2fc81 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55d9f32c0a50aac2aaa63b04… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 14:28:19 2008 +0100 test_om_objects: Cleanup properly when testing objectGetEntries --- unit_test/test_om_objects.php | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php index 26c2081..5531d06 100644 --- a/unit_test/test_om_objects.php +++ b/unit_test/test_om_objects.php @@ -111,13 +111,12 @@ function test_class($sClassName, $aTestMethods) { error("Got $iReceived instead of >= $iExpected"); error("FAILED\t\t$sClassName::$sMethod"); - $oTestObject->purge(); + cleanup_and_purge($oTestObject, $oUser); return FALSE; } /* Class specific clean-up */ - cleanup($oTestObject); - $oTestObject->purge(); + cleanup_and_purge($oTestObject, $oUser); echo "PASSED\t\t$sClassName::$sMethod\n"; break; @@ -183,6 +182,18 @@ function cleanup($oObject) } } +function cleanup_and_purge($oObject, $oUser) +{ + $bWasAdmin = $oUser->hasPriv('admin'); + + $oUser->addPriv('admin'); + cleanup($oObject); + $oObject->purge(); + + if(!$bWasAdmin) + $oUser->delPriv('admin'); +} + function create_object($sClassName, $oUser, $bAsAdmin = true) { if($bAsAdmin)

1 0

Alexander Nicolaysen Sørnes : test_om_objects: Extend objectGetEntries test
by Chris Morgan 23 Jan '08

23 Jan '08

Module: appdb Branch: master Commit: d8c67b4740e636ff0f7c5e9d380c6a481d1c120e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d8c67b4740e636ff0f7c5e9d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 15:10:49 2008 +0100 test_om_objects: Extend objectGetEntries test --- include/downloadurl.php | 5 ++++ include/note.php | 14 +++++++++++ unit_test/test_om_objects.php | 50 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index 91c5f47..68c35fd 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -437,6 +437,11 @@ class downloadurl return appData::objectGetEntries($sState, $iRows, $iStart, 'downloadurl'); } + function objectGetEntriesCount($sState) + { + return appData::objectGetEntriesCount($sState, 'downloadurl'); + } + function objectGetHeader() { return appData::objectGetHeader("downloadurl"); diff --git a/include/note.php b/include/note.php index b5a7a9e..0e640b9 100644 --- a/include/note.php +++ b/include/note.php @@ -327,6 +327,20 @@ class Note { return $hResult; } + function objectGetEntriesCount($sState) + { + $sQuery = "SELECT COUNT(DISTINCT noteId) as count FROM appNotes"; + $hResult = query_parameters($sQuery); + + if(!$hResult) + return false; + + if(($oRow = mysql_fetch_object($hResult))) + return $oRow->count; + + return false; + } + //TODO: not sure how to best let users view a table of notes // since the note contents could be very long we would only // want to show a small amount of the text. Implement this diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php index 5531d06..a1d7c23 100644 --- a/unit_test/test_om_objects.php +++ b/unit_test/test_om_objects.php @@ -97,9 +97,7 @@ function test_class($sClassName, $aTestMethods) { switch($sMethod) { - /* Should also test for queued entries, but vendor does not support - queueing yet */ - case "objectGetEntries": + case 'objectGetEntries': if(!$oTestObject = create_object($sClassName, $oUser)) return FALSE; @@ -115,8 +113,38 @@ function test_class($sClassName, $aTestMethods) return FALSE; } + /* Create an object as a regular user */ + $oTestObject2 = create_object($sClassName, $oUser, false); + + /* objectGetEntries() and objectGetEntriesCount() should return matching results */ + $iExpected = mysql_num_rows($oTestObject2->objectGetEntries('accepted')); + $iReceived = $oTestObject2->objectGetEntriesCount('accepted'); + if($iExpected != $iReceived) + { + error("ObjectGetEntriesCount returned $iReceived, objectGetEntries fetched $iExpected rows\n"); + error("FAILED\t\t$sClassName::$sMethod"); + cleanup_and_purge($oTestObject, $oUser); + cleanup_and_purge($oTestObject2, $oUser); + return false; + } + + /* Now test for queued objects, as admin */ + $oUser->addPriv('admin'); + $iExpected = mysql_num_rows($oTestObject2->objectGetEntries('queued')); + $iReceived = $oTestObject2->objectGetEntriesCount('queued'); + $oUser->delPriv('admin'); + if($iExpected != $iReceived) + { + error("ObjectGetEntriesCount returned $iReceived, objectGetEntries fetched $iExpected rows\n"); + error("FAILED\t\t$sClassName::$sMethod"); + cleanup_and_purge($oTestObject, $oUser); + cleanup_and_purge($oTestObject2, $oUser); + return false; + } + /* Class specific clean-up */ cleanup_and_purge($oTestObject, $oUser); + cleanup_and_purge($oTestObject2, $oUser); echo "PASSED\t\t$sClassName::$sMethod\n"; break; @@ -190,6 +218,14 @@ function cleanup_and_purge($oObject, $oUser) cleanup($oObject); $oObject->purge(); + switch(get_class($oObject)) + { + case 'application': + $oVendor = new vendor($oObject->iVendorId); + $oVendor->purge(); + break; + } + if(!$bWasAdmin) $oUser->delPriv('admin'); } @@ -203,6 +239,13 @@ function create_object($sClassName, $oUser, $bAsAdmin = true) /* Set up one test entry, depending on class */ switch($sClassName) { + // Some application functions require a vendor to be set + case 'application': + $oVendor = new vendor(); + $oVendor->create(); + $oTestObject->iVendorId = $oVendor->objectGetId(); + break; + case "bug": // create a bug in the bugzilla database, we need a valid // bug id to create a bug entry @@ -304,6 +347,7 @@ function test_object_methods() "mustBeQueued", "objectGetChildren", "objectGetEntries", + 'objectGetEntriesCount', "objectGetHeader", "objectGetId", "objectGetMail",

1 0

Francois Gouget : wwn334: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful .
by Jeremy Newman 23 Jan '08

23 Jan '08

Module: website Branch: master Commit: fed1c91abf5e209872b9266917f6094e4e5bf78f URL: http://source.winehq.org/git/website.git/?a=commit;h=fed1c91abf5e209872b926… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 18 13:00:10 2008 +0100 wwn334: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful. --- wwn/wn20071210_334.xml | 717 +++++++++++++++++++++++++++--------------------- 1 files changed, 400 insertions(+), 317 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fed1c91abf5e209872…

1 0

Francois Gouget : wwn333: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful .
by Jeremy Newman 23 Jan '08

23 Jan '08

Module: website Branch: master Commit: b95f8a1dc1bd7e45753a752bb2721c53c1d4286f URL: http://source.winehq.org/git/website.git/?a=commit;h=b95f8a1dc1bd7e45753a75… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 18 13:03:11 2008 +0100 wwn333: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful. --- wwn/wn20071203_333.xml | 889 ++++++++++++++++++++++++++---------------------- 1 files changed, 475 insertions(+), 414 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=b95f8a1dc1bd7e4575…

1 0

Francois Gouget : wwn335: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful .
by Jeremy Newman 23 Jan '08

23 Jan '08

Module: website Branch: master Commit: 44ba86a3bf0f0da5842c320a5bda695d0d7c58f0 URL: http://source.winehq.org/git/website.git/?a=commit;h=44ba86a3bf0f0da5842c32… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 18 13:06:16 2008 +0100 wwn335: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful. --- wwn/wn20071217_335.xml | 88 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 68 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=44ba86a3bf0f0da584…

1 0

Alexander Nicolaysen Sørnes : test_om_objects: Test unQueue()
by Chris Morgan 23 Jan '08

23 Jan '08

Module: appdb Branch: master Commit: 1f081f4be1e15f9a62d0fd7ae9e89c3e63cae5ee URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1f081f4be1e15f9a62d0fd7a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 14:18:43 2008 +0100 test_om_objects: Test unQueue() --- include/application_queue.php | 5 ++++ include/bugs.php | 5 ++++ include/downloadurl.php | 5 ++++ include/maintainer.php | 5 ++++ include/monitor.php | 11 ++++++++++ include/note.php | 10 +++++++++ include/screenshot.php | 5 ++++ include/testData_queue.php | 5 ++++ include/version_queue.php | 5 ++++ unit_test/test_om_objects.php | 45 ++++++++++++++++++++++++++++++++++++++-- 10 files changed, 98 insertions(+), 3 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 82c8383..5727a28 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -259,6 +259,11 @@ class application_queue return $sErrors; } + function objectGetState() + { + return $this->oApp->objectGetState(); + } + function canEdit() { return $this->oApp->canEdit(); diff --git a/include/bugs.php b/include/bugs.php index 34cdd5d..a65caa5 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -462,6 +462,11 @@ class Bug return $sLink; } + function objectGetState() + { + return ($this->bQueued) ? 'queued' : 'accepted'; + } + function canEdit() { if($_SESSION['current']->hasPriv("admin")) diff --git a/include/downloadurl.php b/include/downloadurl.php index c4346ef..91c5f47 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -249,6 +249,11 @@ class downloadurl return TRUE; } + function objectGetState() + { + return ($this->bQueued) ? 'queued' : 'accepted'; + } + function canEdit($iVersionId = NULL) { if($_SESSION['current']->hasPriv("admin") || diff --git a/include/maintainer.php b/include/maintainer.php index 3449b80..4ad898b 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -675,6 +675,11 @@ class maintainer echo "</td></tr></table></div>\n\n"; } + function objectGetState() + { + return $this->sState; + } + function canEdit() { if($_SESSION['current']->hasPriv("admin") || $this->iUserId == $_SESSION['current']->iUserId) diff --git a/include/monitor.php b/include/monitor.php index 7726fb6..afa724d 100644 --- a/include/monitor.php +++ b/include/monitor.php @@ -107,6 +107,11 @@ class Monitor { return TRUE; } + function unQueue() + { + return true; // We don't queue monitors + } + function objectGetSubmitterId() { return $this->iUserId; @@ -226,6 +231,12 @@ class Monitor { mail_appdb($sEmail, $sSubject ,$sMsg); } + function objectGetState() + { + // We don't queue monitors + return 'accepted'; + } + function canEdit() { if($_SESSION['current']->hasPriv("admin") || diff --git a/include/note.php b/include/note.php index 0535a9e..b5a7a9e 100644 --- a/include/note.php +++ b/include/note.php @@ -77,6 +77,11 @@ class Note { } + function unQueue() + { + return true; // We don't queue notes + } + /** * Update note. * Returns true on success and false on failure. @@ -372,6 +377,11 @@ class Note { return $sLink; } + function objectGetState() + { + return 'accepted'; // We don't queue notes + } + // users can edit the note if they: // - have "admin" privileges // - maintain the version, or supermaintain the application that diff --git a/include/screenshot.php b/include/screenshot.php index b0c6ca2..6838814 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -665,6 +665,11 @@ class screenshot return appData::objectGetHeader("screenshot"); } + function objectGetState() + { + return ($this->bQueued) ? 'queued' : 'accepted'; + } + function canEdit() { if($this) diff --git a/include/testData_queue.php b/include/testData_queue.php index e08f756..7831015 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -122,6 +122,11 @@ class testData_queue return $this->oTestData->checkOutputEditorInput($aClean); } + function objectGetState() + { + return $this->oTestData->objectGetState(); + } + function canEdit() { return $this->oTestData->canEdit(); diff --git a/include/version_queue.php b/include/version_queue.php index c29916b..08e9a69 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -205,6 +205,11 @@ class version_queue return $sErrors; } + function objectGetState() + { + return $this->oVersion->objectGetState(); + } + function canEdit() { return $this->oVersion->canEdit(); diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php index 404100f..26c2081 100644 --- a/unit_test/test_om_objects.php +++ b/unit_test/test_om_objects.php @@ -121,6 +121,30 @@ function test_class($sClassName, $aTestMethods) echo "PASSED\t\t$sClassName::$sMethod\n"; break; + case 'unQueue': + $bSuccess = true; + $oTestObject = create_object($sClassName, $oUser, false); + + $oUser->addPriv('admin'); + $oTestObject->unQueue(); + + $iReceived = $oTestObject->objectGetState(); + $iExpected = 'accepted'; + if($iReceived != $iExpected) + { + error("Got queue state of $iReceived instead of $iExpected\n"); + error("FAILED\t\t$sClassName::$sMethod"); + $bSuccess = false; + } + cleanup($oTestObject); + $oTestObject->purge(); + $oUser->delPriv('admin'); + + if(!$bSuccess) + return $bSuccess; + + echo "PASSED\t\t$sClassName::$sMethod\n"; + break; } } @@ -159,9 +183,11 @@ function cleanup($oObject) } } -function create_object($sClassName, $oUser) +function create_object($sClassName, $oUser, $bAsAdmin = true) { - $oUser->addPriv("admin"); + if($bAsAdmin) + $oUser->addPriv("admin"); + $oTestObject = new $sClassName(); /* Set up one test entry, depending on class */ switch($sClassName) @@ -188,7 +214,15 @@ function create_object($sClassName, $oUser) $oTestObject->iVersionId = create_version_and_parent_app("create_object_downloadurl"); break; case "maintainer": + /* We create the version as admin anyway to avoid the maintainer entry getting a state of 'pending' */ + if(!$bAsAdmin) + $oUser->addPriv('admin'); + $iVersionId = create_version_and_parent_app("create_object_maintainer"); + + if(!$bAsAdmin) + $oUser->delPriv('admin'); + $oVersion = new version($iVersionId); $oTestObject->iUserId = $oUser->iUserId; $oTestObject->iAppId = $oVersion->iAppId; @@ -242,6 +276,9 @@ function create_object($sClassName, $oUser) $oTestObject->iScreenshotId = query_appdb_insert_id(); } + if($bAsAdmin) + $oUser->delPriv('admin'); + return $oTestObject; } @@ -260,12 +297,14 @@ function test_object_methods() "objectGetId", "objectGetMail", "objectGetMailOptions", + 'objectGetState', "objectGetSubmitterId", "objectGetTableRow", "objectMakeLink", "objectMakeUrl", "outputEditor", - "purge" + 'purge', + 'unQueue' ); $aTestClasses = array("application",

1 0

Alexander Nicolaysen Sørnes : vendor: Update sState mmeber on successful unQueue()
by Chris Morgan 23 Jan '08

23 Jan '08

Module: appdb Branch: master Commit: 70c992a37987254ebe015f7b3cf3589d1d3e2ba2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=70c992a37987254ebe015f7b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 14:18:17 2008 +0100 vendor: Update sState mmeber on successful unQueue() --- include/vendor.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index a0d7cad..2cb80b6 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -114,6 +114,8 @@ class Vendor { if(!$hResult) return FALSE; + $this->sState = 'accepted'; + return TRUE; }

1 0

Alexander Nicolaysen Sørnes : Fix AppDB stats page
by Chris Morgan 23 Jan '08

23 Jan '08

Module: appdb Branch: master Commit: 663894bed4ba8d66174de63b2cbdb7815902ddd5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=663894bed4ba8d66174de63b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 15:17:33 2008 +0100 Fix AppDB stats page --- appdbStats.php | 12 ++++++------ include/maintainer.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appdbStats.php b/appdbStats.php index d3dcef2..0915839 100644 --- a/appdbStats.php +++ b/appdbStats.php @@ -60,13 +60,13 @@ echo "</tr>\n\n"; /* Display the number of application familes */ echo "<tr class=color4>\n"; echo " <td>Application families:</td>\n"; -echo " <td>".application::objectGetEntriesCount(false, false)."</td>\n"; +echo " <td>".application::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of versions */ echo "<tr class=color4>\n"; echo " <td>Versions:</td>\n"; -echo " <td>".version::objectGetEntriesCount(false, false)."</td>\n"; +echo " <td>".version::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of application maintainers */ @@ -75,16 +75,16 @@ echo " <td>Application maintainers:</td>\n"; echo " <td>".Maintainer::getNumberOfMaintainers()."</td>\n"; echo "</tr>\n\n"; -/* Display the number of testing reports */ +/* Display the number of test reports */ echo "<tr class=color4>\n"; -echo " <td>Testing reports:</td>\n"; -echo " <td>".testData::objectGetEntriescount(false, false)."</td>\n"; +echo " <td>Test reports:</td>\n"; +echo " <td>".testData::objectGetEntriescount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of images */ echo "<tr class=color4>\n"; echo " <td>Screenshots:</td>\n"; -echo " <td>".appData::objectGetEntriesCount("false", false, "screenshot")."</td>\n"; +echo " <td>".screenshot::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; echo "</table>\n\n"; diff --git a/include/maintainer.php b/include/maintainer.php index b886d4a..3449b80 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -514,7 +514,7 @@ class maintainer /* see how many unique maintainers we actually have */ function getNumberOfMaintainers() { - $hResult = query_parameters("SELECT DISTINCT userId FROM appMaintainers WHERE queued='false';"); + $hResult = query_parameters("SELECT DISTINCT userId FROM appMaintainers WHERE state='accepted';"); return query_num_rows($hResult); }

1 0

Alexander Nicolaysen Sørnes : Fix distribution count in sidebar menu
by Chris Morgan 23 Jan '08

23 Jan '08

Module: appdb Branch: master Commit: ecfc92a01f00aa74e10a74177cb832b1c12e8853 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ecfc92a01f00aa74e10a7417… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 13:41:25 2008 +0100 Fix distribution count in sidebar menu --- include/sidebar.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sidebar.php b/include/sidebar.php index dc748cf..bf7823c 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -29,8 +29,8 @@ function global_sidebar_menu() "sTitle=Submit+Application&sAction=add"); $g->add("Help & Documentation", BASE."help/"); $g->add("Statistics", BASE."appdbStats.php"); - $g->add("Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions'); - $g->add("Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE.'objectManager.php?sClass=vendor&sTitle=View%20Vendors'); + $g->add('Distributions ('.distribution::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions'); + $g->add('Vendors ('.vendor::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=vendor&sTitle=View%20Vendors'); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); $g->done();

1 0