November 2009 - Wine-commits

Maarten Lankhorst : include: Add DEFINE_ENUM_FLAG_OPERATORS to winnt.h.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 912f040748a39e2a2a83f22f81e4cd1204da870a URL: http://source.winehq.org/git/wine.git/?a=commit;h=912f040748a39e2a2a83f22f8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 11 12:34:46 2009 +0100 include: Add DEFINE_ENUM_FLAG_OPERATORS to winnt.h. --- include/winnt.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 032e9c1..a77a607 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -309,6 +309,21 @@ extern "C" { #define ERROR_SEVERITY_WARNING 0x80000000 #define ERROR_SEVERITY_ERROR 0xC0000000 +#ifdef __cplusplus +#define DEFINE_ENUM_FLAG_OPERATORS(ENUMTYPE) \ +extern "C++" { \ + inline ENUMTYPE operator | (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)|((int)b)); } \ + inline ENUMTYPE operator |= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) |= ((int)b)); } \ + inline ENUMTYPE operator & (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)&((int)b)); } \ + inline ENUMTYPE operator &= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) &= ((int)b)); } \ + inline ENUMTYPE operator ~ (ENUMTYPE a) { return (ENUMTYPE)(~((int)a)); } \ + inline ENUMTYPE operator ^ (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)^((int)b)); } \ + inline ENUMTYPE operator ^= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) ^= ((int)b)); } \ +} +#else +#define DEFINE_ENUM_FLAG_OPERATORS(ENUMTYPE) /* */ +#endif + /* Microsoft's macros for declaring functions */ #ifdef __cplusplus

1 0

Vincent Povirk : ole32: Remove the term "property type", it's just an STGTY .
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: b1baa05e28235e275c484a145d2418639b7bc969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1baa05e28235e275c484a145… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:21:31 2009 -0600 ole32: Remove the term "property type", it's just an STGTY. According to the MS spec, the types in compound storage files are simply STGTY values, with an extra value named STGTY_ROOT for the root storage. --- dlls/ole32/storage32.c | 26 +++++++++++++------------- dlls/ole32/storage32.h | 8 +++----- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e5b0717..50dbfe6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -451,7 +451,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( * If it was found, construct the stream object and return a pointer to it. */ if ( (foundPropertyIndex!=PROPERTY_NULL) && - (currentProperty.propertyType==PROPTYPE_STREAM) ) + (currentProperty.propertyType==STGTY_STREAM) ) { newStream = StgStreamImpl_Construct(This, grfMode, foundPropertyIndex); @@ -556,7 +556,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( &currentProperty); if ( (foundPropertyIndex!=PROPERTY_NULL) && - (currentProperty.propertyType==PROPTYPE_STORAGE) ) + (currentProperty.propertyType==STGTY_STORAGE) ) { newStorage = StorageInternalImpl_Construct( This->ancestorStorage, @@ -858,7 +858,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( strcpyW(newStreamProperty.name, pwcsName); - newStreamProperty.propertyType = PROPTYPE_STREAM; + newStreamProperty.propertyType = STGTY_STREAM; newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN; newStreamProperty.size.u.LowPart = 0; newStreamProperty.size.u.HighPart = 0; @@ -1041,7 +1041,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( strcpyW(newProperty.name, pwcsName); - newProperty.propertyType = PROPTYPE_STORAGE; + newProperty.propertyType = STGTY_STORAGE; newProperty.startingBlock = BLOCK_END_OF_CHAIN; newProperty.size.u.LowPart = 0; newProperty.size.u.HighPart = 0; @@ -1744,14 +1744,14 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( return STG_E_FILENOTFOUND; } - if ( propertyToDelete.propertyType == PROPTYPE_STORAGE ) + if ( propertyToDelete.propertyType == STGTY_STORAGE ) { hr = deleteStorageProperty( This, foundPropertyIndexToDelete, propertyToDelete); } - else if ( propertyToDelete.propertyType == PROPTYPE_STREAM ) + else if ( propertyToDelete.propertyType == STGTY_STREAM ) { hr = deleteStreamProperty( This, @@ -2269,7 +2269,7 @@ static HRESULT StorageImpl_Construct( MultiByteToWideChar( CP_ACP, 0, rootPropertyName, -1, rootProp.name, sizeof(rootProp.name)/sizeof(WCHAR) ); rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR); - rootProp.propertyType = PROPTYPE_ROOT; + rootProp.propertyType = STGTY_ROOT; rootProp.leftChild = PROPERTY_NULL; rootProp.rightChild = PROPERTY_NULL; rootProp.dirProperty = PROPERTY_NULL; @@ -2295,7 +2295,7 @@ static HRESULT StorageImpl_Construct( if (readSuccessful) { if ( (currentProperty.sizeOfNameString != 0 ) && - (currentProperty.propertyType == PROPTYPE_ROOT) ) + (currentProperty.propertyType == STGTY_ROOT) ) { This->base.rootPropertySetIndex = currentPropertyIndex; } @@ -3054,7 +3054,7 @@ void UpdateRawDirEntry(BYTE *buffer, const StgProperty *newData) newData->name, PROPERTY_NAME_BUFFER_LEN ); - memcpy(buffer + OFFSET_PS_PROPERTYTYPE, &newData->propertyType, 1); + memcpy(buffer + OFFSET_PS_STGTYPE, &newData->propertyType, 1); StorageUtl_WriteWord( buffer, @@ -3140,7 +3140,7 @@ BOOL StorageImpl_ReadProperty( PROPERTY_NAME_BUFFER_LEN ); TRACE("storage name: %s\n", debugstr_w(buffer->name)); - memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_PROPERTYTYPE, 1); + memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_STGTYPE, 1); StorageUtl_ReadWord( currentProperty, @@ -4074,11 +4074,11 @@ void StorageUtl_CopyPropertyToSTATSTG( switch (source->propertyType) { - case PROPTYPE_STORAGE: - case PROPTYPE_ROOT: + case STGTY_STORAGE: + case STGTY_ROOT: destination->type = STGTY_STORAGE; break; - case PROPTYPE_STREAM: + case STGTY_STREAM: destination->type = STGTY_STREAM; break; default: diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 1f3d264..6f78fec 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -53,7 +53,7 @@ static const ULONG OFFSET_EXTBBDEPOTCOUNT = 0x00000048; static const ULONG OFFSET_BBDEPOTSTART = 0x0000004C; static const ULONG OFFSET_PS_NAME = 0x00000000; static const ULONG OFFSET_PS_NAMELENGTH = 0x00000040; -static const ULONG OFFSET_PS_PROPERTYTYPE = 0x00000042; +static const ULONG OFFSET_PS_STGTYPE = 0x00000042; static const ULONG OFFSET_PS_LEFTCHILD = 0x00000044; static const ULONG OFFSET_PS_RIGHTCHILD = 0x00000048; static const ULONG OFFSET_PS_DIRPROP = 0x0000004C; @@ -87,11 +87,9 @@ static const ULONG PROPERTY_NULL = 0xFFFFFFFF; #define PROPERTY_RELATION_DIR 2 /* - * Property type constants + * type constant used in files for the root storage */ -#define PROPTYPE_STORAGE 0x01 -#define PROPTYPE_STREAM 0x02 -#define PROPTYPE_ROOT 0x05 +#define STGTY_ROOT 0x05 /* * These defines assume a hardcoded blocksize. The code will assert

1 0

Alexander Nicolaysen Sørnes : Fix admin check in updateMaintainerStates.php
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: c7745b5b18a331c9e02b1580a1af87da8002b77f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c7745b5b18a331c9e02b1580… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Nov 12 10:54:33 2009 +0100 Fix admin check in updateMaintainerStates.php --- updateMaintainerStates.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/updateMaintainerStates.php b/updateMaintainerStates.php index f368e00..8791c51 100644 --- a/updateMaintainerStates.php +++ b/updateMaintainerStates.php @@ -4,7 +4,7 @@ require_once('path.php'); require_once('include/incl.php'); require_once('include/maintainer.php'); -if($_SESSION['current']->hasPriv('admin')) +if(!$_SESSION['current']->hasPriv('admin')) util_show_error_page_and_exit("Only admins are allowed in here"); $hResult = application::objectGetEntries('accepted');

1 0

Alexander Nicolaysen Sørnes : version: Use an apps cached maintainer state for Has Maintainer in lists
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: 69efc412a157a5e4d1a7e029f2d8fae12c923289 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=69efc412a157a5e4d1a7e029… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Nov 11 23:07:50 2009 +0100 version: Use an apps cached maintainer state for Has Maintainer in lists --- include/version.php | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/version.php b/include/version.php index 6af2864..bc42f22 100644 --- a/include/version.php +++ b/include/version.php @@ -1668,15 +1668,13 @@ class version { $oApp = new application($this->iAppId); $oVendor = new vendor($oApp->iVendorId); - $aMaintainers = Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId); - $oTableRow = new TableRow(); $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime))); $oTableRow->AddTextCell($oUser->objectMakeLink()); $oTableRow->AddTextCell($oVendor->objectMakeLink()); $oTableRow->AddTextCell($oApp->objectMakeLink()); $oTableRow->AddTextCell($this->sName); - $oTableRow->AddTextCell(sizeof($aMaintainers) ? "YES" : "No"); + $oTableRow->AddTextCell($oApp->bHasMaintainer ? "YES" : "No"); $oOMTableRow = new OMTableRow($oTableRow); return $oOMTableRow;

1 0

Alexander Nicolaysen Sørnes : version: Allow only showing unmaintained versions in version queue
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: fd98a49ba4746dadca89372f0dd470db629040d0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fd98a49ba4746dadca89372f… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Nov 11 23:26:49 2009 +0100 version: Allow only showing unmaintained versions in version queue --- include/version.php | 50 ++++++++++++++++++++++++++++++++------------ include/version_queue.php | 16 ++++++++++--- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/include/version.php b/include/version.php index bc42f22..70a5b37 100644 --- a/include/version.php +++ b/include/version.php @@ -1467,8 +1467,19 @@ class version { return $sLink; } - public static function objectGetEntriesCount($sState) + public static function objectGetEntriesCount($sState, $oFilters = null) { + $sExtraTables = ''; + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $sWhereFilter = ''; + + if($aOptions['onlyWithoutMaintainers'] == 'true') + { + $sExtraTables = ',appFamily'; + + $sWhereFilter .= " AND appFamily.hasMaintainer = 'false' AND appFamily.appId = appVersion.appId"; + } + $oVersion = new version(); if($sState != 'accepted' && !$oVersion->canEdit()) { @@ -1476,13 +1487,13 @@ class version { not be able to see rejected entries for versions they maintain */ if($sState == 'rejected') $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM - appVersion WHERE + appVersion$sExtraTables WHERE appVersion.submitterId = '?' AND - appVersion.state = '?'"; + appVersion.state = '?'$sWhereFilter"; else $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM - appVersion, appMaintainers WHERE + appVersion, appMaintainers$sExtraTables WHERE appMaintainers.appId = appVersion.appId AND superMaintainer = '1' @@ -1491,14 +1502,14 @@ class version { AND appMaintainers.state = 'accepted' AND - appVersion.state = '?'"; + appVersion.state = '?'$sWhereFilter"; $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sState); } else { $sQuery = "SELECT COUNT(DISTINCT versionId) as count - FROM appVersion WHERE - appVersion.state = '?'"; + FROM appVersion$sExtraTables WHERE + appVersion.state = '?'$sWhereFilter"; $hResult = query_parameters($sQuery, $sState); } @@ -1595,8 +1606,19 @@ class version { return 'versionId'; } - public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "versionId", $bAscending = true) + public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "versionId", $bAscending = true, $oFilters = null) { + $sExtraTables = ''; + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $sWhereFilter = ''; + + if($aOptions['onlyWithoutMaintainers'] == 'true') + { + $sExtraTables = ',appFamily'; + + $sWhereFilter .= " AND appFamily.hasMaintainer = 'false' AND appFamily.appId = appVersion.appId"; + } + $sLimit = ""; /* Should we add a limit clause to the query? */ @@ -1615,13 +1637,13 @@ class version { /* Users should see their own rejected entries, but maintainers should not be able to see rejected entries for versions they maintain */ if($sState == 'rejected') - $sQuery = "SELECT * FROM appVersion WHERE + $sQuery = "SELECT * FROM appVersion$sExtraTables WHERE appVersion.submitterId = '?' AND - appVersion.state = '?' ORDER BY ?$sLimit"; + appVersion.state = '?'$sWhereFilter ORDER BY ?$sLimit"; else $sQuery = "SELECT appVersion.* FROM - appVersion, appMaintainers WHERE + appVersion, appMaintainers$sExtraTables WHERE appMaintainers.appId = appVersion.appId and superMaintainer = '1' @@ -1630,7 +1652,7 @@ class version { AND appMaintainers.state = 'accepted' AND - appVersion.state = '?' ORDER BY ?$sLimit"; + appVersion.state = '?'$sWhereFilter ORDER BY ?$sLimit"; if($sLimit) { @@ -1643,8 +1665,8 @@ class version { } } else { - $sQuery = "SELECT * FROM appVersion WHERE - appVersion.state = '?' ORDER BY ?$sLimit"; + $sQuery = "SELECT * FROM appVersion$sExtraTables WHERE + appVersion.state = '?'$sWhereFilter ORDER BY ?$sLimit"; if($sLimit) { diff --git a/include/version_queue.php b/include/version_queue.php index 6dd5fe5..0be7ba4 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -240,9 +240,9 @@ class version_queue return $this->oVersion->objectGetItemsPerPage($sState); } - function objectGetEntriesCount($sState) + function objectGetEntriesCount($sState, $oFilters = null) { - return $this->oVersion->objectGetEntriesCount($sState); + return $this->oVersion->objectGetEntriesCount($sState, $oFilters); } public static function objectGetDefaultSort() @@ -250,10 +250,11 @@ class version_queue return version::objectGetDefaultSort(); } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "versionId", $bAscending = true) + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "versionId", $bAscending = true, $oFilters = null) { return $this->oVersion->objectGetEntries($sState, $iRows, $iStart, - $sOrderBy, $bAscending); + $sOrderBy, $bAscending, + $oFilters); } function objectGetHeader() @@ -261,6 +262,13 @@ class version_queue return $this->oVersion->objectGetHeader(); } + public function objectGetFilterInfo() + { + $oFilter = new FilterInterface(); + $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; + } + function objectGetTableRow() { return $this->oVersion->objectGetTableRow();

1 0

Alexander Nicolaysen Sørnes : Cache whether an app is maintained
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: dacc985d984fa0c87c1893b7fba9eafa153848b6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dacc985d984fa0c87c1893b7… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Nov 11 22:22:35 2009 +0100 Cache whether an app is maintained --- include/application.php | 9 +++++++++ include/maintainer.php | 25 +++++++++++++++++++++++++ tables/appdb_tables.sql | 1 + 3 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/application.php b/include/application.php index 256afa1..3251261 100644 --- a/include/application.php +++ b/include/application.php @@ -39,6 +39,7 @@ class Application { var $sSubmitTime; var $iSubmitterId; var $aVersionsIds; // an array that contains the versionId of every version linked to this app. + var $bHasMaintainer; var $aVersions; // Array of version objects belonging to this app var $iMaintainerRequest; /* Temporary variable for tracking maintainer requests on app submission. Value denotes type of request */ @@ -78,6 +79,7 @@ class Application { // and return an id into the appData table here $this->sWebpage = Url::normalize($oRow->webPage); $this->sState = $oRow->state; + $this->bHasMaintainer = $oRow->hasMaintainer == 'true' ? true : false; } /* fetch versions of this application, if there are any */ @@ -242,6 +244,13 @@ class Application { return true; } + public function updateMaintainerState() + { + $this->bHasMaintainer = maintainer::appHasMaintainer($this->iAppId); + + $hResult = query_parameters("UPDATE appFamily SET hasMaintainer = '?' WHERE appId = '?'", $this->bHasMaintainer ? 'true' : 'false', $this->iAppId); + } + /** * Deletes the application from the database. * and request the deletion of linked elements. diff --git a/include/maintainer.php b/include/maintainer.php index 3a39729..489bafb 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -229,6 +229,9 @@ class maintainer /* this objects id is the insert id returned by the database */ $this->iMaintainerId = query_appdb_insert_id(); + if(!$this->mustBeQueued()) + $this->updateAppMaintainerState(); + /* If this is a non-queued maintainer submission, remove the user's non- super maintainer entries for the application's versions. This check is also done in unQueue() */ @@ -257,6 +260,8 @@ class maintainer { $sStatusMessage = "<p>The maintainer was successfully added into the database</p>\n"; + $this->updateAppMaintainerState(); + //Send Status Email $sEmail = $oUser->sEmail; if ($sEmail) @@ -348,6 +353,8 @@ class maintainer if(!$hResult) return FALSE; + $this->updateAppMaintainerState(); + return TRUE; } @@ -406,6 +413,12 @@ class maintainer return $hResult; } + public function updateAppMaintainerState() + { + $oApp = new application($this->iAppId); + $oApp->updateMaintainerState(); + } + function getSubmitterEmails() { $sRecipients = ''; @@ -587,6 +600,18 @@ class maintainer return query_num_rows($hResult); } + /* Returns true if the given app has a maintainer, false otherwise */ + public function appHasMaintainer($iAppId) + { + $hResult = query_parameters("SELECT COUNT(maintainerId) as count FROM appMaintainers WHERE appId = '?' AND superMaintainer = '1' AND state = 'accepted'", $iAppId); + + if(!$hResult) + return false; + + $oRow = mysql_fetch_object($hResult); + return $oRow->count > 0; + } + /* if given an appid or a version id return a handle for a query that has */ /* the user ids that are maintainers for this particular appid or version id */ function getMaintainersForAppIdVersionId($iAppId = null, $iVersionId = null) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index f41c5fd..69ab049 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -41,6 +41,7 @@ create table appFamily ( submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', state enum('accepted','queued','rejected','deleted') NOT NULL default 'accepted', + hasMaintainer enum('true','false') NOT NULL default 'false', key(appId) );

1 0

Alexander Nicolaysen Sørnes : Add a page for updating all apps' maintainer states
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: 477a0396b550d8b0f2fe9b504376c0215af44ba2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=477a0396b550d8b0f2fe9b50… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Nov 12 10:39:34 2009 +0100 Add a page for updating all apps' maintainer states --- updateMaintainerStates.php | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/updateMaintainerStates.php b/updateMaintainerStates.php new file mode 100644 index 0000000..f368e00 --- /dev/null +++ b/updateMaintainerStates.php @@ -0,0 +1,22 @@ +<?php + +require_once('path.php'); +require_once('include/incl.php'); +require_once('include/maintainer.php'); + +if($_SESSION['current']->hasPriv('admin')) + util_show_error_page_and_exit("Only admins are allowed in here"); + +$hResult = application::objectGetEntries('accepted'); + +$i = 0; +while($oRow = mysql_fetch_object($hResult)) +{ + $oApp = new application(null, $oRow); + $oApp->updateMaintainerState(); + $i++; +} + +echo "Updated $i entries"; + +?>

1 0

Alexander Nicolaysen Sørnes : maintainer : Use logical instead of bitwise operator
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: b0245d5f14c0ee58e757ff5d23991b4d4cebda74 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b0245d5f14c0ee58e757ff5d… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Nov 11 21:27:51 2009 +0100 maintainer: Use logical instead of bitwise operator --- include/maintainer.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 2acbd5f..c2c73dc 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -232,7 +232,7 @@ class maintainer /* If this is a non-queued maintainer submission, remove the user's non- super maintainer entries for the application's versions. This check is also done in unQueue() */ - if(!$this->mustBeQueued() & $this->bSuperMaintainer) + if(!$this->mustBeQueued() && $this->bSuperMaintainer) $this->removeUserFromAppVersions(); return $hResult;

1 0

Alexander Nicolaysen Sørnes : maintainerdelete.php: use delete() when deleting super maintianers
by Alexander Nicolaysen Sørnes 12 Nov '09

12 Nov '09

Module: appdb Branch: master Commit: 236a6bc3bd9395d9b728f57b03a5421032c55a21 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=236a6bc3bd9395d9b728f57b… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Nov 11 22:17:48 2009 +0100 maintainerdelete.php: use delete() when deleting super maintianers --- include/maintainer.php | 11 +++++++++++ maintainerdelete.php | 3 ++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index c2c73dc..3a39729 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -351,6 +351,17 @@ class maintainer return TRUE; } + public function findAppMaintainer($iUserId, $iAppId) + { + $hResult = query_parameters("SELECT * FROM appMaintainers WHERE userId = '?' AND appId = '?' AND superMaintainer = '1'", $iUserId, $iAppId); + + if(!$hResult) + return null; + + $oRow = mysql_fetch_object($hResult); + return new maintainer(null, $oRow); + } + function deleteMaintainer($oUser, $iAppId = null, $iVersionId = null) { /* remove supermaintainer */ diff --git a/maintainerdelete.php b/maintainerdelete.php index 5f5d4f1..9ca069c 100644 --- a/maintainerdelete.php +++ b/maintainerdelete.php @@ -33,7 +33,8 @@ if($aClean['iConfirmed']) if($aClean['iSuperMaintainer']) { apidb_header("You have resigned as super maintainer of ".$oApp->sName); - $result = Maintainer::deleteMaintainer($_SESSION['current'], $aClean['iAppId'], null); + $oMaintainer = maintainer::findAppMaintainer($_SESSION['current']->iUserId, $aClean['iAppId']); + $result = $oMaintainer->delete(); } else { $oVersion = new Version($aClean['iVersionId']);

1 0

Hans Leidekker : ole32: Return success from OleLockRunning when the object does not support IRunnableObject .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: e265d534e4215855233b04cf701fd77c5e427e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e265d534e4215855233b04cf7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:21:11 2009 +0100 ole32: Return success from OleLockRunning when the object does not support IRunnableObject. --- dlls/ole32/ole2.c | 4 ++-- dlls/ole32/tests/ole2.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 3b87aac..c612f33 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1140,8 +1140,8 @@ HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCl return hres; } - else - return E_INVALIDARG; + + return S_OK; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 214c17e..8d23df5 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1556,6 +1556,45 @@ static void test_runnable(void) g_showRunnable = TRUE; } +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl UnknownVtbl = +{ + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release +}; + +static IUnknown Unknown = { &UnknownVtbl }; + +static void test_OleLockRunning(void) +{ + HRESULT hr; + + hr = OleLockRunning((LPUNKNOWN)&Unknown, TRUE, FALSE); + ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); +} + START_TEST(ole2) { DWORD dwRegister; @@ -1587,6 +1626,7 @@ START_TEST(ole2) test_data_cache(); test_default_handler(); test_runnable(); + test_OleLockRunning(); CoUninitialize(); }

1 0