wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Alexandre Julliard : ntdll: Implemented RtlCaptureStackBackTrace for i386.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: d90f691e58ccf3deed6bd4a45bcae350bb7587ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90f691e58ccf3deed6bd4a45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 17:38:18 2009 +0100 ntdll: Implemented RtlCaptureStackBackTrace for i386. --- dlls/ntdll/signal_i386.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 18a574d..79e3806 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2285,8 +2285,30 @@ DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) */ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { - FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); - return 0; + CONTEXT context; + ULONG i; + ULONG *frame; + + RtlCaptureContext( &context ); + if (hash) *hash = 0; + frame = (ULONG *)context.Ebp; + + while (skip--) + { + if (((void *)frame < NtCurrentTeb()->Tib.StackLimit) || + ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase)) return 0; + frame = (ULONG *)*frame; + } + + for (i = 0; i < count; i++) + { + if (((void *)frame < NtCurrentTeb()->Tib.StackLimit) || + ((void *)(frame + 1) >= NtCurrentTeb()->Tib.StackBase)) break; + buffer[i] = (void *)frame[1]; + if (hash) *hash += frame[1]; + frame = (ULONG *)*frame; + } + return i; }

1 0

Alexandre Julliard : ntdll: Moved RtlCaptureStackBackTrace stub to the cpu-specific files.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: d45fca8f7cc295c0f7badca2bb136a098aac9278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45fca8f7cc295c0f7badca2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 17:19:23 2009 +0100 ntdll: Moved RtlCaptureStackBackTrace stub to the cpu-specific files. --- dlls/ntdll/exception.c | 24 ------------------------ dlls/ntdll/signal_i386.c | 10 ++++++++++ dlls/ntdll/signal_powerpc.c | 9 +++++++++ dlls/ntdll/signal_sparc.c | 9 +++++++++ dlls/ntdll/signal_x86_64.c | 10 ++++++++++ 5 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 5fe0c28..63fd281 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -248,30 +248,6 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) } -/************************************************************************* - * RtlCaptureStackBackTrace [NTDLL.@] - * - * Captures stack backtrace - * - * PARAMS - * Skip [I] Number of stack frames to skip before starting a capture - * Count [I] Number of stack frames to capture into Buffer - * Buffer [O] Array of backtrace pointers captured from stack - * Hash [O] Optional pointer to variable where backtrace hash should be stored - * - * RETURNS - * Number of captured stack frames or 0 if error occurred - * - * NOTES - * Unimplemented - */ -USHORT WINAPI RtlCaptureStackBackTrace(ULONG Skip, ULONG Count, PVOID *Buffer, ULONG *Hash) -{ - FIXME("(%d, %d, %p, %p) stub!\n", Skip, Count, Buffer, Hash); - return 0; -} - - /************************************************************* * __wine_spec_unimplemented_stub * diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9be32a6..18a574d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2280,6 +2280,16 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + + /* wrapper for apps that don't declare the thread function correctly */ extern void DECLSPEC_NORETURN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ); __ASM_GLOBAL_FUNC(call_thread_func, diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 67bee92..a1a6ccc 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1086,6 +1086,15 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) if (status) raise_status( status, rec ); } +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + /*********************************************************************** * call_thread_entry_point */ diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 5450402..2952f8e 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -828,6 +828,15 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) if (status) raise_status( status, rec ); } +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + /*********************************************************************** * call_thread_entry_point */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 94b3d3c..7e6c634 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2882,6 +2882,16 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) +{ + FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); + return 0; +} + + /*********************************************************************** * call_thread_func */

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 : 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 : 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 : 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 : 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 : 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

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

Peter Urbanec : winex11: Implement AlphaBlend mode for the case where SourceConstantAlpha is combined with source alpha .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: ab081aa84535e013b89a6c4c3a8a9fcee636840d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab081aa84535e013b89a6c4c3… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Wed Nov 11 02:58:41 2009 +1100 winex11: Implement AlphaBlend mode for the case where SourceConstantAlpha is combined with source alpha. --- dlls/winex11.drv/xrender.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 005296b..2eb1d1e 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1956,9 +1956,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid return FALSE; } - if ((blendfn.AlphaFormat & AC_SRC_ALPHA) && blendfn.SourceConstantAlpha != 0xff) - FIXME("Ignoring SourceConstantAlpha %d for AC_SRC_ALPHA\n", blendfn.SourceConstantAlpha); - if(dib.dsBm.bmBitsPixel != 32) { FIXME("not a 32 bpp dibsection\n"); return FALSE; @@ -1979,11 +1976,35 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid if (blendfn.AlphaFormat & AC_SRC_ALPHA) { - for(; y >= y2; y--) + if (blendfn.SourceConstantAlpha == 0xff) { - memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, - widthSrc * 4); - dstbits += (top_down ? -1 : 1) * widthSrc; + for (; y >= y2; y--) + { + memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, + widthSrc * 4); + dstbits += (top_down ? -1 : 1) * widthSrc; + } + } + else + { + /* SourceConstantAlpha combined with source alpha */ + for (; y >= y2; y--) + { + int x; + DWORD *srcbits = (DWORD *)((char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes) + xSrc; + for (x = 0; x < widthSrc; x++) + { + DWORD argb = *srcbits++; + BYTE *s = (BYTE *) &argb; + s[0] = (s[0] * blendfn.SourceConstantAlpha) / 255; + s[1] = (s[1] * blendfn.SourceConstantAlpha) / 255; + s[2] = (s[2] * blendfn.SourceConstantAlpha) / 255; + s[3] = (s[3] * blendfn.SourceConstantAlpha) / 255; + *dstbits++ = argb; + } + if (top_down) /* we traversed the row forward so we should go back by two rows */ + dstbits -= 2 * widthSrc; + } } } else

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009