December 2007 - Wine-commits

Alexander Nicolaysen Sørnes : Fix moving of testResults from qeueud to accepted versions
by Chris Morgan 16 Dec '07

16 Dec '07

Module: appdb Branch: master Commit: 0a9665b24f1a650edd36eadb3bc765d60ea65d07 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0a9665b24f1a650edd36eadb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 16 15:28:37 2007 +0100 Fix moving of testResults from qeueud to accepted versions --- include/testData.php | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index a49e373..3fcb9ba 100644 --- a/include/testData.php +++ b/include/testData.php @@ -177,6 +177,14 @@ class testData{ $oOldTest->sTestedRelease." to $this->sTestedRelease.\n"; } + if($this->iVersionId != $oOldTest->iVersionId) + { + $sWhatChanged .= 'Moved from '.version::fullName($oOldTest->iVersionId).' to '.version::fullName($this->iVersionId)."\n"; + $oNewVersion = new version($this->iVersionId); + if($oNewVersion->objectGetState() == 'accepted' && $this->sState == 'pending') + $this->sState = 'queued'; + } + if(query_parameters("UPDATE testResults SET versionId = '?', whatWorks = '?', @@ -188,7 +196,8 @@ class testData{ installs = '?', runs = '?', testedRating = '?', - comments = '?' + comments = '?', + state = '?' WHERE testingId = '?'", $this->iVersionId, $this->shWhatWorks, @@ -201,6 +210,7 @@ class testData{ $this->sRuns, $this->sTestedRating, $this->sComments, + $this->sState, $this->iTestingId)) { if(!$bSilent)

1 0

Alexander Nicolaysen Sørnes : application: Rename 'queued' to 'state'
by Chris Morgan 15 Dec '07

15 Dec '07

Module: appdb Branch: master Commit: 176377f025bea951836ac6a2e6d4d6f2bf6d8524 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=176377f025bea951836ac6a2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 22:25:01 2007 +0100 application: Rename 'queued' to 'state' --- include/appData.php | 14 ++++---- include/application.php | 75 ++++++++++++++++++++++------------------- include/application_queue.php | 2 +- include/category.php | 2 +- include/distribution.php | 2 +- include/maintainer.php | 2 +- include/user.php | 12 +++--- include/util.php | 4 +- include/version.php | 12 ++----- tables/appdb_tables.sql | 2 +- 10 files changed, 63 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=176377f025bea951836a…

1 0

Alexander Nicolaysen Sørnes : version: Rename 'queued' to 'state'
by Chris Morgan 15 Dec '07

15 Dec '07

Module: appdb Branch: master Commit: aee69c1735f014b4a16ec54014b0f3ce6088faa3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=aee69c1735f014b4a16ec540… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 20:56:04 2007 +0100 version: Rename 'queued' to 'state' --- browse_downloadable.php | 4 +- include/appData.php | 10 ++-- include/application.php | 4 +- include/distribution.php | 2 +- include/maintainer.php | 4 +- include/testData.php | 6 +- include/user.php | 10 ++-- include/util.php | 2 +- include/version.php | 89 ++++++++++++++++++++++++---------------- include/version_queue.php | 2 +- tables/appdb_tables.sql | 2 +- unit_test/test_application.php | 2 +- 12 files changed, 77 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=aee69c1735f014b4a16e…

1 0

Alexander Nicolaysen Sørnes : distribution: Make sState member private
by Chris Morgan 15 Dec '07

15 Dec '07

Module: appdb Branch: master Commit: 956e5391def0c3d9225fa969c0760bade43d2ec5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=956e5391def0c3d9225fa969… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 19:13:16 2007 +0100 distribution: Make sState member private --- include/distribution.php | 7 ++++++- include/testData_queue.php | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 16fc41b..d6c916a 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -13,7 +13,7 @@ class distribution { var $sUrl; var $sSubmitTime; var $iSubmitterId; - var $sState; + private $sState; var $aTestingIds; // constructor, fetches the data. @@ -556,6 +556,11 @@ class distribution { return $oOMTableRow; } + public function objectGetState() + { + return $this->sState; + } + // Whether the user has permission to edit distributions function canEdit() { diff --git a/include/testData_queue.php b/include/testData_queue.php index 4ef5ab6..d6ef874 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -49,7 +49,7 @@ class testData_queue $this->oTestData->unQueue(); /* Avoid a misguiding message about the distribution being unqueued */ - if($this->oDistribution->sStatus != 'accepted') + if($this->oDistribution->objectGetState() != 'accepted') $this->oDistribution->unQueue(); } @@ -77,7 +77,7 @@ class testData_queue /* If we are processing queued test results with a queued distribution, we display some additional help here */ if($this->oDistribution->iDistributionId && - $this->oDistribution->sStatus != 'accepted' && $this->canEdit()) + $this->oDistribution->objectGetState() != 'accepted' && $this->canEdit()) { echo "The user submitted a new distribution, which will be un-queued ". "together with the test data unless you select an existing one ". @@ -88,7 +88,7 @@ class testData_queue distribution is un-queued, there is no need to display the distribution form here */ if(!$this->oTestData->iDistributionId or - $this->oDistribution->sStatus != 'accepted') + $this->oDistribution->objectGetState() != 'accepted') { echo html_frame_start("New Distribution", "90%"); $this->oDistribution->outputEditor();

1 0

Alexander Nicolaysen Sørnes : testData: Rename 'queued' to 'state'
by Chris Morgan 15 Dec '07

15 Dec '07

Module: appdb Branch: master Commit: 06f693859fbf3dba9e22a82e3811ec004be56076 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=06f693859fbf3dba9e22a82e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 20:17:27 2007 +0100 testData: Rename 'queued' to 'state' --- include/distribution.php | 6 +- include/maintainer.php | 4 +- include/objectManager.php | 14 +++++++ include/testData.php | 93 +++++++++++++++++++++++--------------------- tables/testResults.sql | 2 +- 5 files changed, 69 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=06f693859fbf3dba9e22…

1 0

Alexander Nicolaysen Sørnes : vendor: Rename 'queued' to 'state'
by Chris Morgan 15 Dec '07

15 Dec '07

Module: appdb Branch: master Commit: 49d334d1d1cdb671aa5cf40c4ac8aa0822999528 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=49d334d1d1cdb671aa5cf40c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 19:03:21 2007 +0100 vendor: Rename 'queued' to 'state' --- include/application_queue.php | 4 ++-- include/vendor.php | 18 +++++++++++------- tables/appdb_tables.sql | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 3c98455..e48d887 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -94,7 +94,7 @@ class application_queue { /* The vendor is not necessarily queued, as it could have existed on beforehand */ - if($this->oVendor->sQueued != "false") + if($this->oVendor->objectGetState() != 'accepted') $this->oVendor->unQueue(); $this->oApp->unQueue(); @@ -188,7 +188,7 @@ class application_queue /* Display the new vendor form for new applications or if we are processing an application and the vendor is queued */ - if(!$this->oApp->iAppId || $this->oVendor->sQueued != "false") + if(!$this->oApp->iAppId || $this->oVendor->objectGetState() != 'accepted') { echo html_frame_start("New Vendor", "90%"); $this->oVendor->outputEditor(); diff --git a/include/vendor.php b/include/vendor.php index 0690415..1ede853 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -10,7 +10,7 @@ class Vendor { var $iVendorId; var $sName; var $sWebpage; - var $sQueued; + private $sState; var $aApplicationsIds; // an array that contains the appId of every application linked to this vendor /** @@ -39,7 +39,7 @@ class Vendor { $this->iVendorId = $oRow->vendorId; $this->sName = $oRow->vendorName; $this->sWebpage = $oRow->vendorURL; - $this->sQueued = $oRow->queued; + $this->sState = $oRow->state; } /* @@ -57,7 +57,6 @@ class Vendor { } } - /** * Creates a new vendor. * @@ -83,10 +82,10 @@ class Vendor { } } - $hResult = query_parameters("INSERT INTO vendor (vendorName, vendorURL, queued) ". + $hResult = query_parameters("INSERT INTO vendor (vendorName, vendorURL, state) ". "VALUES ('?', '?', '?')", $this->sName, $this->sWebpage, - $this->mustBeQueued() ? "true" : "false"); + $this->mustBeQueued() ? 'queued' : 'accepted'); if($hResult) { $this->iVendorId = query_appdb_insert_id(); @@ -109,8 +108,8 @@ class Vendor { if(!$this->canEdit()) return FALSE; - $hResult = query_parameters("UPDATE vendor SET queued = '?' WHERE vendorId = '?'", - 'false', $this->iVendorId); + $hResult = query_parameters("UPDATE vendor SET state = '?' WHERE vendorId = '?'", + 'accepted', $this->iVendorId); if(!$hResult) return FALSE; @@ -282,6 +281,11 @@ class Vendor { return $oOMTableRow; } + public function objectGetState() + { + return $this->sState; + } + function canEdit() { if($_SESSION['current']->hasPriv("admin")) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 4273e3e..6d265f4 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -23,7 +23,7 @@ create table vendor ( vendorId int not null auto_increment, vendorName varchar(100) not null, vendorURL varchar(200), - queued enum('true','false') NOT NULL default 'false', + state enum('accepted','queued') NOT NULL default 'accepted', key(vendorId) );

1 0

Alexandre Julliard : Wine release 0.9.51
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: website Branch: master Commit: d579f4d15bbd8b20066b6ca3ea019a7ba61bc587 URL: http://source.winehq.org/git/website.git/?a=commit;h=d579f4d15bbd8b20066b6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:45:21 2007 +0100 Wine release 0.9.51 --- news/2007121401.xml | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/news/2007121401.xml b/news/2007121401.xml new file mode 100644 index 0000000..1e0d31c --- /dev/null +++ b/news/2007121401.xml @@ -0,0 +1,26 @@ +<news> +<date>December 14, 2007</date> +<title>Wine 0.9.51 Released</title> +<body> +<p>Wine 0.9.51 was released today, with the following main changes:</p> + +<ul> +<li>A bunch of WinHelp improvements.</li> +<li>Better Japanese font support.</li> +<li>A ton of rpcrt4 fixes.</li> +<li>Several Alsa capture fixes.</li> +<li>Improved support for screen resolution changes.</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.51.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.51">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.51.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 0e7ca5863c4b4fd4df1275bde3809fae31cd39f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7ca5863c4b4fd4df1275bde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:35:21 2007 +0100 Release 0.9.51. --- ANNOUNCE | 1050 ++++++++++++++++------------------ ChangeLog | 1941 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2444 insertions(+), 567 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7ca5863c4b4fd4df127…

1 0

Tag wine-0.9.51 : Alexandre Julliard : Release 0.9.51
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: refs/tags/wine-0.9.51 Tag: 4bd720bbc49d02ef8198d529d71b0efae7c69a8d URL: http://source.winehq.org/git/wine.git/?a=tag;h=4bd720bbc49d02ef8198d529d71b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:35:21 2007 +0100 Release 0.9.51

1 0

Sam Dennis : advapi32: Fix undocumented behaviour in ReqQueryValueEx when ' count' and 'type' point to the same address.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 1590b1f73198f34a5f49a177e66c315aa0aa00a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1590b1f73198f34a5f49a177e… Author: Sam Dennis <samuel.howard.dennis(a)gmail.com> Date: Fri Dec 14 05:48:28 2007 +0000 advapi32: Fix undocumented behaviour in ReqQueryValueEx when 'count' and 'type' point to the same address. --- dlls/advapi32/registry.c | 9 +++++---- dlls/advapi32/tests/registry.c | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4b9f29d..d7f6dc4 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1217,7 +1217,7 @@ LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWO { NTSTATUS status; ANSI_STRING nameA; - DWORD total_size; + DWORD total_size, datalen = 0; char buffer[256], *buf_ptr = buffer; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); @@ -1228,6 +1228,7 @@ LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWO if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + if (count) datalen = *count; if (!data && count) *count = 0; /* this matches Win9x behaviour - NT sets *type to a random value */ @@ -1270,21 +1271,21 @@ LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWO total_size - info_size ); if (data && len) { - if (len > *count) status = STATUS_BUFFER_OVERFLOW; + if (len > datalen) status = STATUS_BUFFER_OVERFLOW; else { RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info_size), total_size - info_size ); /* if the type is REG_SZ and data is not 0-terminated * and there is enough space in the buffer NT appends a \0 */ - if (len < *count && data[len-1]) data[len] = 0; + if (len < datalen && data[len-1]) data[len] = 0; } } total_size = len + info_size; } else if (data) { - if (total_size - info_size > *count) status = STATUS_BUFFER_OVERFLOW; + if (total_size - info_size > datalen) status = STATUS_BUFFER_OVERFLOW; else memcpy( data, buf_ptr + info_size, total_size - info_size ); } } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1c50d2a..23af17c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -580,6 +580,10 @@ static void test_query_value_ex(void) ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Nonexistent Value", NULL, &type, buffer, &size); ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", ret); ok(size == sizeof(buffer), "size shouldn't have been changed to %d\n", size); + + size = 4; + ret = RegQueryValueExA(hkey_main, "BIN32", NULL, &size, buffer, &size); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); } static void test_get_value(void)

1 0