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

appdb/tables create_tables
by WineHQ 29 Jul '07

29 Jul '07

ChangeSet ID: 31286 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/29 18:01:34 Modified files: tables : create_tables Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a note so users don't think that the user creation failure isn't necessarily a bad thing Patch: http://cvs.winehq.org/patch.py?id=31286 Old revision New revision Changes Path 1.11 1.12 +4 -0 appdb/tables/create_tables Index: appdb/tables/create_tables diff -u -p appdb/tables/create_tables:1.11 appdb/tables/create_tables:1.12 --- appdb/tables/create_tables:1.11 29 Jul 2007 23: 1:34 -0000 +++ appdb/tables/create_tables 29 Jul 2007 23: 1:34 -0000 @@ -1,6 +1,10 @@ #! /bin/sh echo Create the base user +echo NOTE: It's ok for this to fail if the user already exists +echo there doesn't appear to be a way to create a user only +echo if they don't exist so we have to live with a potential +echo error after we try. mysql -p -u root < create_user.sql echo Create the apidb database, and tables

1 0

appdb/unit_test test_om_objects.php
by WineHQ 29 Jul '07

29 Jul '07

ChangeSet ID: 31285 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/29 11:01:26 Modified files: unit_test : test_om_objects.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Call $oObject->objectGetId() to retrieve an object's id instead of directly accessing the objects member variables Patch: http://cvs.winehq.org/patch.py?id=31285 Old revision New revision Changes Path 1.19 1.20 +1 -36 appdb/unit_test/test_om_objects.php Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.19 appdb/unit_test/test_om_objects.php:1.20 --- appdb/unit_test/test_om_objects.php:1.19 29 Jul 2007 16: 1:26 -0000 +++ appdb/unit_test/test_om_objects.php 29 Jul 2007 16: 1:26 -0000 @@ -68,42 +68,7 @@ function test_class($sClassName, $aTestM } $oNewTestObject = new $sClassName(null, $oRow); - switch($sClassName) - { - case "application": - $iReceived = $oNewTestObject->iAppId; - break; - case "application_queue": - $iReceived = $oNewTestObject->oApp->iAppId; - break; - case "distribution": - $iReceived = $oNewTestObject->iDistributionId; - break; - case "downloadurl": - $iReceived = $oNewTestObject->iId; - break; - case "maintainer": - $iReceived = $oNewTestObject->iMaintainerId; - break; - case "testData": - $iReceived = $oNewTestObject->iTestingId; - break; - case "testData_queue": - $iReceived = $oNewTestObject->oTestData->iTestingId; - break; - case "vendor": - $iReceived = $oNewTestObject->iVendorId; - break; - case "version": - $iReceived = $oNewTestObject->iVersionId; - break; - case "version_queue": - $iReceived = $oNewTestObject->oVersion->iVersionId; - break; - case "screenshot": - $iReceived = $oNewTestObject->iScreenshotId; - break; - } + $iReceived = $oNewTestObject->objectGetId(); if(!$iReceived || !is_numeric($iReceived)) {

1 0

appdb/include objectManager.php
by WineHQ 29 Jul '07

29 Jul '07

ChangeSet ID: 31284 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/28 22:51:15 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Avoid stating 0 as the total page count Patch: http://cvs.winehq.org/patch.py?id=31284 Old revision New revision Changes Path 1.40 1.41 +2 -0 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.40 appdb/include/objectManager.php:1.41 --- appdb/include/objectManager.php:1.40 29 Jul 2007 3:51:15 -0000 +++ appdb/include/objectManager.php 29 Jul 2007 3:51:15 -0000 @@ -698,6 +698,8 @@ class ObjectManager $iTotalEntries = $oObject->objectGetEntriesCount($this->bIsQueue, $this->bIsRejected); $iNumPages = ceil($iTotalEntries / $iItemsPerPage); + if($iNumPages == 0) + $iNumPages = 1; /* Check current page value */ $iPage = isset($aClean['iPage']) ? $aClean['iPage'] : 1;

1 0

appdb/include version.php version_queue.php
by WineHQ 28 Jul '07

28 Jul '07

ChangeSet ID: 31283 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/28 15:10:54 Modified files: include : version.php version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use multipage controls for version lists Patch: http://cvs.winehq.org/patch.py?id=31283 Old revision New revision Changes Path 1.140 1.141 +42 -7 appdb/include/version.php 1.16 1.17 +13 -2 appdb/include/version_queue.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.140 appdb/include/version.php:1.141 --- appdb/include/version.php:1.140 28 Jul 2007 20:10:54 -0000 +++ appdb/include/version.php 28 Jul 2007 20:10:54 -0000 @@ -1408,10 +1408,30 @@ class version { return $aCells; } - function objectGetEntries($bQueued, $bRejected, $sOrderBy = "versionId") + function objectGetItemsPerPage($bQueued = false) + { + $aItemsPerPage = array(25, 50, 100, 200); + $iDefaultPerPage = 25; + return array($aItemsPerPage, $iDefaultPerPage); + } + + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sOrderBy = "versionId") { $sQueued = objectManager::getQueueString($bQueued, $bRejected); + $sLimit = ""; + + /* Should we add a limit clause to the query? */ + if($iRows || $iStart) + { + $sLimit = " LIMIT ?,?"; + + /* Selecting 0 rows makes no sense, so we assume the user wants to select all of them + after an offset given by iStart */ + if(!$iRows) + $iRows = maintainer::objectGetEntriesCount($bQueued, $bRejected); + } + if($bQueued && !$this->canEdit()) { /* Users should see their own rejected entries, but maintainers should @@ -1425,7 +1445,7 @@ class version { AND appVersion.submitterId = '?' AND - appVersion.queued = '?' ORDER BY '?'"; + appVersion.queued = '?' ORDER BY '?'$sLimit"; else $sQuery = "SELECT appVersion.* FROM appVersion, appMaintainers, appFamily WHERE @@ -1451,10 +1471,17 @@ class version { AND appMaintainers.queued = 'false' AND - appVersion.queued = '?' ORDER BY '?'"; + appVersion.queued = '?' ORDER BY '?'$sLimit"; - $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sQueued, - $sOrderBy); + if($sLimit) + { + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sQueued, $sOrderBy, $iStart, $iRows); + } else + { + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sQueued, $sOrderBy); + } } else { $sQuery = "SELECT appVersion.* @@ -1463,8 +1490,16 @@ class version { AND appFamily.queued = 'false' AND - appVersion.queued = '?' ORDER BY '?'"; - $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); + appVersion.queued = '?' ORDER BY '?'$sLimit"; + + if($sLimit) + { + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy, + $iStart, $iRows); + } else + { + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); + } } if(!$hResult) Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.16 appdb/include/version_queue.php:1.17 --- appdb/include/version_queue.php:1.16 28 Jul 2007 20:10:54 -0000 +++ appdb/include/version_queue.php 28 Jul 2007 20:10:54 -0000 @@ -168,9 +168,20 @@ class version_queue /* $this->oVersion->displayAddItemHelp(); */ } - function objectGetEntries($bQueued, $bRejected) + function objectGetItemsPerPage($bQueued = false) { - return $this->oVersion->objectGetEntries($bQueued, $bRejected); + return $this->oVersion->objectGetItemsPerPage($bQueued); + } + + function objectGetEntriesCount($bQueued, $bRejected) + { + return $this->oVersion->objectGetEntriesCount($bQueued, $bRejected); + } + + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sOrderBy = "versionId") + { + return $this->oVersion->objectGetEntries($bQueued, $bRejected, $iRows, $iStart, + $sOrderBy); } function objectGetHeader()

1 0

appdb/include application.php application_queu ...
by WineHQ 28 Jul '07

28 Jul '07

ChangeSet ID: 31282 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/28 15:08:50 Modified files: include : application.php application_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use multipage controls for application lists Patch: http://cvs.winehq.org/patch.py?id=31282 Old revision New revision Changes Path 1.120 1.121 +42 -6 appdb/include/application.php 1.9 1.10 +13 -2 appdb/include/application_queue.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.120 appdb/include/application.php:1.121 --- appdb/include/application.php:1.120 28 Jul 2007 20: 8:50 -0000 +++ appdb/include/application.php 28 Jul 2007 20: 8:50 -0000 @@ -343,6 +343,14 @@ class Application { addmsg("The application has been rejected.", "green"); } } + + function objectGetItemsPerPage($bQueued = false) + { + $aItemsPerPage = array(25, 50, 100, 200); + $iDefaultPerPage = 25; + return array($aItemsPerPage, $iDefaultPerPage); + } + function ReQueue() { if(!$_SESSION['current']->canRequeueApplication($this)) @@ -818,8 +826,21 @@ class Application { return $sLink; } - function objectGetEntries($bQueued, $bRejected, $sOrderBy = "appId") + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sOrderBy = "appId") { + $sLimit = ""; + + /* Should we add a limit clause to the query? */ + if($iRows || $iStart) + { + $sLimit = " LIMIT ?,?"; + + /* Selecting 0 rows makes no sense, so we assume the user wants to select all of them + after an offset given by iStart */ + if(!$iRows) + $iRows = maintainer::objectGetEntriesCount($bQueued, $bRejected); + } + $sQuery = "SELECT * FROM appFamily WHERE appFamily.queued = '?'"; @@ -831,13 +852,28 @@ class Application { if(!$bRejected) return FALSE; - $sQuery .= " AND appFamily.submitterId = '?' ORDER BY '?'"; - $hResult = query_parameters($sQuery, $sQueued, - $_SESSION['current']->iUserId, $sOrderBy); + $sQuery .= " AND appFamily.submitterId = '?' ORDER BY '?'$sLimit"; + if($sLimit) + { + $hResult = query_parameters($sQuery, $sQueued, + $_SESSION['current']->iUserId, $sOrderBy, + $iStart, $iRows); + } else + { + $hResult = query_parameters($sQuery, $sQueued, + $_SESSION['current']->iUserId, $sOrderBy); + } } else { - $sQuery .= " ORDER BY '?'"; - $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); + $sQuery .= " ORDER BY '?'$sLimit"; + if($sLimit) + { + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy, + $iStart, $iRows); + } else + { + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); + } } if(!$hResult) Index: appdb/include/application_queue.php diff -u -p appdb/include/application_queue.php:1.9 appdb/include/application_queue.php:1.10 --- appdb/include/application_queue.php:1.9 28 Jul 2007 20: 8:50 -0000 +++ appdb/include/application_queue.php 28 Jul 2007 20: 8:50 -0000 @@ -292,9 +292,20 @@ class application_queue return TRUE; } - function objectGetEntries($bQueued, $bRejected) + function objectGetItemsPerPage($bQueued = false) { - return $this->oApp->objectGetEntries($bQueued, $bRejected); + return $this->oApp->objectGetItemsPerPage($bQueued); + } + + function objectGetEntriesCount($bQueued, $bRejected) + { + return $this->oApp->objectGetEntriesCount($bQueued, $bRejected); + } + + function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sOrderBy = "appId") + { + return $this->oApp->objectGetEntries($bQueued, $bRejected, $iRows, $iStart, + $sOrderBy); } function objectGetHeader()

1 0

lostwages/ include/winehq.conf news/2007072701.xml
by Alexandre Julliard 27 Jul '07

27 Jul '07

ChangeSet ID: 31281 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/07/27 10:33:27 Modified files: include : winehq.conf Added files: news : 2007072701.xml Log message: Release 0.9.42 Patch: http://cvs.winehq.org/patch.py?id=31281 Old revision New revision Changes Path 1.64 1.65 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007072701.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.64 lostwages/include/winehq.conf:1.65 --- lostwages/include/winehq.conf:1.64 27 Jul 2007 15:33:27 -0000 +++ lostwages/include/winehq.conf 27 Jul 2007 15:33:27 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.41 +snapshot_date: 0.9.42 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007072701.xml diff -u -p /dev/null lostwages/news/2007072701.xml:1.1 --- /dev/null 27 Jul 2007 15:33:27 -0000 +++ lostwages/news/2007072701.xml 27 Jul 2007 15:33:27 -0000 @@ -0,0 +1,25 @@ +<news> +<date>July 27, 2007</date> +<title>Wine 0.9.42 Released</title> +<body> +<p>Wine 0.9.42 was released today, with the following main changes:</p> + +<ul> +<li>Support for activation contexts and side-by-side assemblies.</li> +<li>Many more gdiplus functions.</li> +<li>More messaging support in crypt32.dll.</li> +<li>Many HTTP protocol handling fixes.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.42.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.42">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.42.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 58080159cafc97a4dc64c9fb53ec0df752c8b1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=58080159cafc97a4dc64c9fb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 27 17:11:43 2007 +0200 Release 0.9.42. --- ANNOUNCE | 904 +++++++++++++++++--------------- ChangeLog | 1735 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2218 insertions(+), 441 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58080159cafc97a4dc64c…

1 0

Tag wine-0.9.42 : Alexandre Julliard : Release 0.9.42
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: refs/tags/wine-0.9.42 Tag: fbbfc50c104d94930597847636a1b2daab017d56 URL: http://source.winehq.org/git/wine.git/?a=tag;h=fbbfc50c104d94930597847636a1… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 27 17:11:44 2007 +0200 Release 0.9.42

1 0

Paul Vriens : advapi32/service: Fix buffersize calculations for GetServiceDisplayNameW.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: dc6653887c2494a1fbbc56c7544f55ea8fef4a93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6653887c2494a1fbbc56c75… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 26 16:15:44 2007 +0200 advapi32/service: Fix buffersize calculations for GetServiceDisplayNameW. --- dlls/advapi32/service.c | 4 ++++ dlls/advapi32/tests/service.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index bee4847..0c37313 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2356,6 +2356,10 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, SetLastError(ret); return FALSE; } + + /* Always return the correct needed size on success */ + *lpcchBuffer = (size / sizeof(WCHAR)) - 1; + return TRUE; } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 77fc85a..8fc1af9 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -527,12 +527,9 @@ static void test_get_displayname(void) GetLastError() == ERROR_IO_PENDING /* W2K */ || GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); - todo_wine - { ok(displaysize == tempsizeW, "Expected the needed buffersize\n"); ok(lstrlenW(displaynameW) == displaysize, "Expected the buffer to be the length of the string\n") ; - } ok(tempsize / 2 == tempsizeW, "Expected the needed buffersize (in bytes) to be the same for the A and W call\n");

1 0

Paul Vriens : advapi32/service: Test GetServiceDisplayNameA for service with no displayname.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 23d61ac86638462aa7bd127625127cc68b060923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d61ac86638462aa7bd12762… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 26 13:54:22 2007 +0200 advapi32/service: Test GetServiceDisplayNameA for service with no displayname. --- dlls/advapi32/tests/service.c | 61 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index e5711e4..cf01726 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -387,6 +387,8 @@ static void test_get_displayname(void) DWORD displaysize, tempsize, tempsizeW; static const CHAR deadbeef[] = "Deadbeef"; static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; + static const CHAR servicename[] = "Winetest"; + static const CHAR pathname[] = "we_dont_care.exe"; /* Having NULL for the size of the buffer will crash on W2K3 */ @@ -541,6 +543,65 @@ static void test_get_displayname(void) } CloseServiceHandle(scm_handle); + + /* Test for a service without a displayname (which is valid). This should return + * the servicename itself. + */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights to get a handle to the manager\n"); + return; + } + + SetLastError(0xdeadbeef); + svc_handle = CreateServiceA(scm_handle, servicename, NULL, DELETE, + SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(svc_handle != NULL, "Could not create the service : %d\n", GetLastError()); + if (!svc_handle) + { + CloseServiceHandle(scm_handle); + return; + } + + /* Retrieve the needed size for the buffer */ + SetLastError(0xdeadbeef); + displaysize = -1; + ret = GetServiceDisplayNameA(scm_handle, servicename, NULL, &displaysize); + ok(!ret, "Expected failure\n"); + todo_wine + { + ok(displaysize == lstrlen(servicename) * 2, + "Expected the displaysize to be twice the size of the servicename\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + } + + /* Get the displayname */ + SetLastError(0xdeadbeef); + ret = GetServiceDisplayNameA(scm_handle, servicename, displayname, &displaysize); + todo_wine + { + ok(ret, "Expected success\n"); + ok(!lstrcmpi(displayname, servicename), + "Expected displayname to be %s, got %s\n", servicename, displayname); + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == ERROR_IO_PENDING /* W2K */ || + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + } + + /* Delete the service */ + ret = DeleteService(svc_handle); + ok(ret, "Expected success\n"); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); + + /* Wait a while. Just in case one of the following tests does a CreateService again */ + Sleep(1000); } static void test_get_servicekeyname(void)

1 0