November 2009 - Wine-Commits

Alexandre Julliard : mshtml: Register a few more MIME types.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 56e729726bc6cd5873da60933ca64003a2613b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e729726bc6cd5873da60933… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 21:16:43 2009 +0100 mshtml: Register a few more MIME types. --- dlls/mshtml/mshtml.inf | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index dd5a266..aa7e814 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -273,6 +273,7 @@ HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:47 [FileAssoc.Reg] ;; AVI +HKCR,"MIME\Database\Content Type\video/avi","CLSID",,"{CD3AFA88-B84F-48F0-9393-7EDC34128127}" HKCR,"MIME\Database\Content Type\video/avi","Extension",,".avi" HKCR,".avi","Content Type",,"video/avi" @@ -312,6 +313,10 @@ HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%IEXPLORE%,9" +;; GZIP +HKCR,"MIME\Database\Content Type\application/x-gzip","Extension",,".gz" +HKCR,".gz","Content Type",,"application/x-gzip" + ;; HTC HKCR,"MIME\Database\Content Type\text/x-component","CLSID",,"%CLSID_CHtmlComponentConstructor%" HKCR,"MIME\Database\Content Type\text/x-component","Extension",,".htc" @@ -391,6 +396,18 @@ HKCR,"mhtmlfile",,,"MHTML Document" HKCR,"mhtmlfile\BrowseInPlace",,,"" HKCR,"mhtmlfile\CLSID",,,"%CLSID_MHTMLDocument%" +;; MPEG +HKCR,"MIME\Database\Content Type\audio/mpeg","CLSID",,"{CD3AFA76-B84F-48F0-9393-7EDC34128127}" +HKCR,"MIME\Database\Content Type\audio/mpeg","Extension",,".mp3" +HKCR,"MIME\Database\Content Type\audio/mpg","CLSID",,"{CD3AFA76-B84F-48F0-9393-7EDC34128127}" +HKCR,"MIME\Database\Content Type\audio/mpg","Extension",,".mp3" +HKCR,"MIME\Database\Content Type\video/mpeg","CLSID",,"{CD3AFA89-B84F-48F0-9393-7EDC34128127}" +HKCR,"MIME\Database\Content Type\video/mpeg","Extension",,".mpeg" +HKCR,".mp3","Content Type",,"audio/mpeg" +HKCR,".mpe","Content Type",,"video/mpeg" +HKCR,".mpeg","Content Type",,"video/mpeg" +HKCR,".mpg","Content Type",,"video/mpeg" + ;; PJPG HKCR,"MIME\Database\Content Type\image/pjpeg","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\image/pjpeg","Extension",,".jpg" @@ -419,6 +436,20 @@ HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%IEXPLORE%,9" +;; PS +HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" +HKCR,".ai","Content Type",,"application/postscript" +HKCR,".eps","Content Type",,"application/postscript" +HKCR,".ps","Content Type",,"application/postscript" + +;; TAR +HKCR,"MIME\Database\Content Type\application/x-tar","Extension",,".tar" +HKCR,".tar","Content Type",,"application/x-tar" + +;; TGZ +HKCR,"MIME\Database\Content Type\application/x-compressed","Extension",,".tgz" +HKCR,".tgz","Content Type",,"application/x-compressed" + ;; TIFF HKCR,"MIME\Database\Content Type\image/tiff","Extension",,".tiff" HKCR,".tif","Content Type",,"image/tiff" @@ -432,6 +463,8 @@ HKCR,".txt",,,"txtfile" HKCR,".txt","Content Type",,"text/plain" ;; WAV +HKCR,"MIME\Database\Content Type\audio/wav","CLSID",,"{CD3AFA7B-B84F-48F0-9393-7EDC34128127}" +HKCR,"MIME\Database\Content Type\audio/wav","Extension",,".wav" HKCR,".wav","Content Type",,"audio/wav" ;; XBM @@ -447,7 +480,17 @@ HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%IEXPLORE%,9" ;; XML +HKCR,"MIME\Database\Content Type\application/xml","CLSID",,"{48123BC4-99D9-11D1-A6B3-00C04FD91555}" +HKCR,"MIME\Database\Content Type\application/xml","Extension",,".xml" +HKCR,"MIME\Database\Content Type\application/xml","Encoding",1,08,00,00,00 +HKCR,"MIME\Database\Content Type\text/xml","CLSID",,"{48123BC4-99D9-11D1-A6B3-00C04FD91555}" +HKCR,"MIME\Database\Content Type\text/xml","Extension",,".xml" +HKCR,"MIME\Database\Content Type\text/xml","Encoding",1,08,00,00,00 HKCR,".xml",,,"xmlfile" HKCR,".xml","Content Type",,"text/xml" HKCR,".xsl",,,"xslfile" HKCR,".xsl","Content Type",,"text/xml" + +;; ZIP +HKCR,"MIME\Database\Content Type\application/x-zip-compressed","Extension",,".zip" +HKCR,".zip","Content Type",,"application/x-zip-compressed"

1 0

Alexandre Julliard : ntdll: Implemented RtlCaptureStackBackTrace for i386.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

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

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

Nov. 12, 2009

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 Nov. 12, 2009

Nov. 12, 2009

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 : Fix admin check in updateMaintainerStates.php
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

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 : Cache whether an app is maintained
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

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 Nov. 12, 2009

Nov. 12, 2009

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 : maintainerdelete.php: use delete() when deleting super maintianers
by Alexander Nicolaysen Sørnes Nov. 12, 2009

Nov. 12, 2009

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 Nov. 12, 2009

Nov. 12, 2009

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

Huw Davies : include: Add asynot.idl.
by Alexandre Julliard Nov. 11, 2009

Nov. 11, 2009

Module: wine Branch: master Commit: cf8c3eca416a00aaf22ec7cd85267ef88c480050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8c3eca416a00aaf22ec7cd8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 11 10:48:44 2009 +0000 include: Add asynot.idl. --- dlls/msdaps/usrmarshal.c | 44 ++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/asynot.idl | 59 ++++++++++++++++++++++++++++++++++++++++++++++ include/dbs.idl | 17 +++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 6 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 2337b5e..6a436a3 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -773,3 +773,47 @@ HRESULT __RPC_STUB ICommandText_SetCommandText_Stub(ICommandText* This, REFGUID return hr; } + +HRESULT CALLBACK IDBAsynchNotify_OnLowResource_Proxy(IDBAsynchNotify* This, DB_DWRESERVE dwReserved) +{ + FIXME("(%p)->(%08x): stub\n", This, dwReserved); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchNotify_OnLowResource_Stub(IDBAsynchNotify* This, DB_DWRESERVE dwReserved) +{ + FIXME("(%p)->(%08x): stub\n", This, dwReserved); + return E_NOTIMPL; +} + +HRESULT CALLBACK IDBAsynchNotify_OnProgress_Proxy(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase, + LPOLESTR pwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %d, %d, %d, %s): stub\n", This, hChapter, eOperation, ulProgress, ulProgressMax, + eAsynchPhase, debugstr_w(pwszStatusText)); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchNotify_OnProgress_Stub(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + DBCOUNTITEM ulProgress, DBCOUNTITEM ulProgressMax, DBASYNCHPHASE eAsynchPhase, + LPOLESTR pwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %d, %d, %d, %s): stub\n", This, hChapter, eOperation, ulProgress, ulProgressMax, + eAsynchPhase, debugstr_w(pwszStatusText)); + return E_NOTIMPL; +} + +HRESULT CALLBACK IDBAsynchNotify_OnStop_Proxy(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + HRESULT hrStatus, LPOLESTR pwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %08x, %s): stub\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchNotify_OnStop_Stub(IDBAsynchNotify* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + HRESULT hrStatus, LPOLESTR pwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %08x, %s): stub\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 2a49856..e34d393 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -105,6 +105,7 @@ SRCDIR_INCLUDES = \ advpub.h \ af_irda.h \ appmgmt.h \ + asynot.idl \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ diff --git a/include/asynot.idl b/include/asynot.idl new file mode 100644 index 0000000..2f52713 --- /dev/null +++ b/include/asynot.idl @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a96-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBAsynchNotify : IUnknown +{ + [local] + HRESULT OnLowResource([in] DB_DWRESERVE dwReserved); + + [call_as(OnLowResource)] + HRESULT RemoteOnLowResource([in] DB_DWRESERVE dwReserved); + + [local] + HRESULT OnProgress([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in] DBCOUNTITEM ulProgress, + [in] DBCOUNTITEM ulProgressMax, + [in] DBASYNCHPHASE eAsynchPhase, + [in, annotation("__in_opt")] LPOLESTR pwszStatusText); + + [call_as(OnProgress)] + HRESULT RemoteOnProgress([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in] DBCOUNTITEM ulProgress, + [in] DBCOUNTITEM ulProgressMax, + [in] DBASYNCHPHASE eAsynchPhase, + [in, unique, string] LPOLESTR pwszStatusText); + + [local] + HRESULT OnStop([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in] HRESULT hrStatus, + [in, annotation("__in_opt")] LPOLESTR pwszStatusText); + + [call_as(OnStop)] + HRESULT RemoteOnStop([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in] HRESULT hrStatus, + [in, unique, string] LPOLESTR pwszStatusText); +} diff --git a/include/dbs.idl b/include/dbs.idl index dd12628..8b3bb0d 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -287,6 +287,23 @@ typedef struct tagDBPARAMS HACCESSOR hAccessor; } DBPARAMS; +typedef DWORD DBASYNCHOP; + +enum DBASYNCHOPENUM +{ + DBSYNCHOP_OPEN, +}; + +typedef DWORD DBASYNCHPHASE; + +enum DBASYNCHPHASEENUM +{ + DBASYNCHPHASE_INITIALIZATION, + DBASYNCHPHASE_POPULATION, + DBASYNCHPHASE_COMPLETE, + DBASYNCHPHASE_CANCELED, +}; + typedef struct tagRMTPACK { ISequentialStream *pISeqStream; diff --git a/include/oledb.idl b/include/oledb.idl index b525b56..b9f0654 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -54,6 +54,7 @@ typedef DWORD DBHASHVALUE; #include "dbprop.idl" #include "dbinit.idl" #include "dbdsad.idl" +#include "asynot.idl" #include "sesprp.idl" #include "opnrst.idl" #include "row.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 828e6b0..1ef571b 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -110,6 +110,7 @@ my %exported_wine_headers = ( my %private_idl_headers = ( "access.idl" => 1, + "asynot.idl" => 1, "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1,

1 0