August 2009 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : screenshot : Allow filtering by category when browsing
by Alexander Nicolaysen Sørnes Aug. 9, 2009

Aug. 9, 2009

Module: appdb Branch: master Commit: d759c2cc56d98b7d1d4208be9731d05db46d4430 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d759c2cc56d98b7d1d4208be… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 9 17:52:54 2009 +0200 screenshot: Allow filtering by category when browsing --- include/appData.php | 41 ++++++++++++++++++++++++++++++++--------- include/screenshot.php | 27 +++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 13 deletions(-) diff --git a/include/appData.php b/include/appData.php index bc3142e..91c0e58 100644 --- a/include/appData.php +++ b/include/appData.php @@ -226,13 +226,24 @@ class appData return $hResult; } - function objectGetEntriesCount($sState, $sType = null) + function objectGetEntriesCount($sState, $sType = null, $oFilters = null) { /* Not implemented for appData */ if($sState == 'rejected') return FALSE; $sSelectType = ""; + $sWhereFilter = ''; + + if($oFilters) + { + $aOptions = $oFilters->getOptions(); + if($aOptions['appCategory']) + { + $oCategory = new category($aOptions['appCategory']); + $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); + } + } if(($sState != 'accepted') && !$_SESSION['current']->hasPriv("admin")) @@ -275,7 +286,7 @@ class appData AND appVersion.state = 'accepted' AND - appFamily.state = 'accepted'"; + appFamily.state = 'accepted'$sWhereFilter"; if($sState != 'all') $sQuery .= " AND appData.state = '$sState'"; @@ -307,7 +318,7 @@ class appData appData.versionId = '0' ) AND - appFamily.state = 'accepted'$sAppDataQueued$sSelectType) UNION + appFamily.state = 'accepted'$sAppDataQueued$sSelectType$sWhereFilter) UNION ( SELECT COUNT(DISTINCT appData.id) as count FROM appData, appFamily, appVersion WHERE @@ -319,7 +330,7 @@ class appData AND appVersion.state = 'accepted' AND - appFamily.state = 'accepted'$sAppDataQueued$sSelectType)"; + appFamily.state = 'accepted'$sAppDataQueued$sSelectType$sWhereFilter)"; if($sType) $hResult = query_parameters($sQuery, $sType, $sType); @@ -346,7 +357,7 @@ class appData return $oTableRow; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $sType = null) + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $sType = null, $oFilters = null) { /* Not implemented for appData */ if($sState == 'rejected') @@ -354,6 +365,17 @@ class appData $sSelectType = ""; $sLimit = ""; + $sWhereFilter = ''; + + if($oFilters) + { + $aOptions = $oFilters->getOptions(); + if($aOptions['appCategory']) + { + $oCategory = new category($aOptions['appCategory']); + $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); + } + } if($sState != 'accepted' && !$_SESSION['current']->hasPriv("admin")) { @@ -402,6 +424,7 @@ class appData appData.state = '?' AND appData.type = '?' + $sWhereFilter ORDER BY appFamily.appName"; if(!$iRows && !$iStart) { @@ -410,7 +433,7 @@ class appData } else { if(!$iRows) - $iRows = appData::objectGetEntriesCount($sState, $sType); + $iRows = appData::objectGetEntriesCount($sState, $sType, $oFilters); $sQuery .= " LIMIT ?,?"; $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sState, $sType, @@ -435,7 +458,7 @@ class appData AND appData.state = '?' AND - appData.type = '?' ORDER BY appFamily.appName $sLimit + appData.type = '?' $sWhereFilter ORDER BY appFamily.appName $sLimit ) UNION ( @@ -453,7 +476,7 @@ class appData AND appData.state = '?' AND - appData.type = '?' ORDER BY appFamily.appName $sLimit + appData.type = '?' $sWhereFilter ORDER BY appFamily.appName $sLimit )"; if(!$iRows && !$iStart) { @@ -462,7 +485,7 @@ class appData } else { if(!$iRows) - $iRows = appData::objectGetEntriesCount($sState, $sType); + $iRows = appData::objectGetEntriesCount($sState, $sType, $oFilters); $hResult = query_parameters($sQuery, $sState, $sType, $iStart, $iRows, $sState, $sType, diff --git a/include/screenshot.php b/include/screenshot.php index 2f542f5..6e2ccf9 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -668,15 +668,34 @@ class screenshot echo "</tr></table></div><br>\n"; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true) + public function objectGetFilterInfo() + { + $oFilter = new filterInterface(); + + $aCatNames = array(); + $aCatIds = array(); + + $aCategories = category::getOrderedList(); + foreach($aCategories as $oCategory) + { + $aCatNames[] = $oCategory->sName; + $aCatIds[] = $oCategory->objectGetId(); + } + + $oFilter->addFilterInfo('appCategory', 'App category', array(FILTER_OPTION_ENUM), FILTER_VALUES_OPTION_ENUM, $aCatIds, $aCatNames); + + return $oFilter; + } + + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = true) { return appData::objectGetEntries($sState, $iRows, $iStart, $sOrderBy, $bAscending, - 'screenshot'); + 'screenshot', $oFilters); } - function objectGetEntriesCount($sState) + function objectGetEntriesCount($sState, $oFilters = true) { - return appData::objectGetEntriesCount($sState, 'screenshot'); + return appData::objectGetEntriesCount($sState, 'screenshot', $oFilters); } function objectGetHeader()

1 0

Alexander Nicolaysen Sørnes : Move matching of categories in SQL statements to a separate functions
by Alexander Nicolaysen Sørnes Aug. 9, 2009

Aug. 9, 2009

Module: appdb Branch: master Commit: 0fe5512f08392647b183d25332f6f5581dbc43ea URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0fe5512f08392647b183d253… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 9 15:38:38 2009 +0200 Move matching of categories in SQL statements to a separate functions --- include/application.php | 18 ++---------------- include/category.php | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/include/application.php b/include/application.php index 75f1bb5..256afa1 100644 --- a/include/application.php +++ b/include/application.php @@ -1022,14 +1022,7 @@ class Application { if($aOptions['appCategory']) { $oCategory = new Category($aOptions['appCategory']); - $aSubCats = $oCategory->getSubCatList(); - $sWhereFilter .= " AND ( catId = '{$aOptions['appCategory']}' "; - foreach($aSubCats as $oCat) - { - $iCatId = $oCat->objectGetId(); - $sWhereFilter .= " OR catId = '$iCatId' "; - } - $sWhereFilter .= ") "; + $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); } /* Should we add a limit clause to the query? */ if($iRows || $iStart) @@ -1278,14 +1271,7 @@ class Application { if($aOptions['appCategory']) { $oCategory = new Category($aOptions['appCategory']); - $aSubCats = $oCategory->getSubCatList(); - $sWhereFilter .= " AND ( catId = '{$aOptions['appCategory']}' "; - foreach($aSubCats as $oCat) - { - $iCatId = $oCat->objectGetId(); - $sWhereFilter .= " OR catId = '$iCatId' "; - } - $sWhereFilter .= ") "; + $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); } if($sState != 'accepted' && !application::canEdit()) diff --git a/include/category.php b/include/category.php index daab5be..6156d1a 100644 --- a/include/category.php +++ b/include/category.php @@ -176,6 +176,23 @@ class Category { return $aCats; } + /* Returns an SQL statement that will match items in the current category + and all sub-categories */ + public function getSqlQueryPart() + { + $sRet = ''; + $aSubCats = $this->getSubCatList(); + $sRet .= " ( catId = '{$this->iCatId}' "; + foreach($aSubCats as $oCat) + { + $iCatId = $oCat->objectGetId(); + $sRet .= " OR catId = '$iCatId' "; + } + $sRet .= ") "; + + return $sRet; + } + function objectGetMail($sAction, $bMailSubmitter, $bParentAction) { /* We don't send notification mails */

1 0

Alexander Nicolaysen Sørnes : objectManager: Avoid losing data when session times out while filling out a form
by Alexander Nicolaysen Sørnes Aug. 9, 2009

Aug. 9, 2009

Module: appdb Branch: master Commit: e40aec5d8404f00601c42ff65a0d5b132b193c91 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e40aec5d8404f00601c42ff6… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sat Aug 8 23:09:32 2009 +0200 objectManager: Avoid losing data when session times out while filling out a form --- include/objectManager.php | 18 ++++++++++++++++-- objectManager.php | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 593c0d2..182b373 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -406,8 +406,10 @@ class ObjectManager } /* Only show the edit screen if the user has sufficient rights */ - if(!$oObject->canEdit()) + if(!$oObject->canEdit() && !getInput('sSubmit', $aClean)) $this->error_exit('You do not have sufficient privileges to edit this entry'); + else if(!$oObject->canEdit()) + $this->show_form_help_session_timeout(); /* Display errors, if any, and fetch form data */ if($this->displayErrors($sErrors)) @@ -1214,12 +1216,24 @@ class ObjectManager echo '<input type="submit" name="sSubmit" class="button" value="Preview">'; } - public function handle_anonymous_submission() + public function show_form_help_session_timeout() + { + $this->error_exit("Your session has timed out. <a target=\"_blank\" href=\"".BASE."account.php?sCmd=login\">Log in</a> and then <a href=\"javascript:location.reload();\">refresh thise page</a>."); + } + + public function handle_anonymous_submission($aClean) { $oObject = new $this->sClass(); if($oObject->allowAnonymousSubmissions() || $_SESSION['current']->isLoggedIn()) return; + // Allow the user to continue filling out a form + if(getInput('sSubmit', $aClean)) + { + apidb_header($this->get_title(getInput($sAction, $aClean))); + $this->show_form_help_session_timeout(); + } + login_form(); exit; } diff --git a/objectManager.php b/objectManager.php index aa1db6d..65b867d 100644 --- a/objectManager.php +++ b/objectManager.php @@ -82,7 +82,7 @@ if($sAction) switch($aClean['sAction']) { case 'add': - $oObject->handle_anonymous_submission(); + $oObject->handle_anonymous_submission($aClean); break; case 'changeParent':

1 0

Maik Schulz : Website: insert link to licensing page in German About page
by Maik Schulz Aug. 8, 2009

Aug. 8, 2009

Module: website Branch: master Commit: 658c085f9be2f2003351b351e2d8be8ef7679317 URL: http://source.winehq.org/git/website.git/?a=commit;h=658c085f9be2f2003351b3… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Aug 8 15:58:03 2009 +0200 Website: insert link to licensing page in German About page --- templates/de/about.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 1838fae..6882634 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -9,7 +9,7 @@ <h3>Open Source und benutzergetrieben</h3> -<p>Wine wird immer <a href="" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Unterstützung verkaufen.</p> +<p>Wine wird immer <a href="http://wiki.winehq.org/Licensing" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Unterstützung verkaufen.</p> <p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> zur Dokumentation davon, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p>

1 0

Alexander Nicolaysen Sørnes : note: When showing for specific versions, make sure at least one version is selected
by Alexander Nicolaysen Sørnes Aug. 7, 2009

Aug. 7, 2009

Module: appdb Branch: master Commit: c7bdd32b9f2098d2a48ec6f1f13877e4b6e1e003 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c7bdd32b9f2098d2a48ec6f1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 8 04:13:20 2009 +0200 note: When showing for specific versions, make sure at least one version is selected --- include/note.php | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index b88727b..92891b5 100644 --- a/include/note.php +++ b/include/note.php @@ -443,7 +443,10 @@ class Note { public function getNoteLinksFromInput($aValues) { - $oApp = new application($this->iAppId); + $iAppId = $this->iAppId; + if(!$iAppId) + $iAppId = getInput('iAppId', $aValues); + $oApp = new application($iAppId); $iCount = sizeof($oApp->getVersions()); $aLinkedVersions = html_read_input_series('iVersionId', $aValues, $iCount); $aLinks = array(); @@ -595,6 +598,20 @@ class Note { echo html_frame_end(); } + public function checkOutputEditorInput($aClean) + { + $shErrors = ''; + $iVersionId = getInput('iVersionId', $aClean); + + if($iVersionId == APPNOTE_SHOW_FOR_SPECIFIC_VERSIONS) + { + $aNoteLinks = $this->getNoteLinksFromInput($aClean); + if(!sizeof($aNoteLinks)) + $shErrors .= '<li>You need to show the note for at least one version, or choose another display mode</li>'; + } + return $shErrors; + } + /* retrieves values from $aValue that were output by outputEditor() */ /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ function GetOutputEditorValues($aValues)

1 0

Maik Schulz : Website: German translation of 1.1.27 release news item
by Maik Schulz Aug. 7, 2009

Aug. 7, 2009

Module: website Branch: master Commit: 3568d91255bdcb0f265d1fbe45369f125f3fb97d URL: http://source.winehq.org/git/website.git/?a=commit;h=3568d91255bdcb0f265d1f… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Aug 8 00:21:08 2009 +0200 Website: German translation of 1.1.27 release news item --- news/de/2009080701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2009080701.xml b/news/de/2009080701.xml new file mode 100644 index 0000000..0656191 --- /dev/null +++ b/news/de/2009080701.xml @@ -0,0 +1,16 @@ +<news> +<date>7. August 2009</date> +<title>Wine 1.1.27 Freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.1.27 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.1.27">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko-Engine.</li> + <li>Unterstützung für den Codec GSM 06.10.</li> + <li>Verbesserte Unterstützung der disk volume APIs.</li> + <li>Unterstützung von XShm Pixmaps für bessere Performanz.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul></p> +<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.27.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.1.27
by Alexandre Julliard Aug. 7, 2009

Aug. 7, 2009

Module: website Branch: master Commit: 0c32a07cd89ddde129401630d1ecc69fea28578a URL: http://source.winehq.org/git/website.git/?a=commit;h=0c32a07cd89ddde1294016… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 7 18:06:14 2009 +0200 Wine release 1.1.27 --- news/en/2009080701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2009080701.xml b/news/en/2009080701.xml new file mode 100644 index 0000000..b0007db --- /dev/null +++ b/news/en/2009080701.xml @@ -0,0 +1,16 @@ +<news> +<date>August 7, 2009</date> +<title>Wine 1.1.27 Released</title> +<body> +<p> The Wine development release 1.1.27 is now available.</p> +<p> <a href="{$root}/announce/1.1.27">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine.</li> + <li>New GSM 06.10 codec support.</li> + <li>Improved support for the disk volume APIs.</li> + <li>Support for XShm pixmaps for better performance.</li> + <li>Various bug fixes.</li> +</ul></p> +<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.27.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.1.27 : Alexandre Julliard : Release 1.1.27
by Alexandre Julliard Aug. 7, 2009

Aug. 7, 2009

Module: wine Branch: refs/tags/wine-1.1.27 Tag: 4d1a53742a8ac3e01bc9e34ebf3df47cf6337a62 URL: http://source.winehq.org/git/wine.git/?a=tag;h=4d1a53742a8ac3e01bc9e34ebf3d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 7 18:00:17 2009 +0200 Release 1.1.27

1 0

Alexandre Julliard : Release 1.1.27.
by Alexandre Julliard Aug. 7, 2009

Aug. 7, 2009

Module: wine Branch: master Commit: b79639699766e7c8f3e236f3fef54e5daac0e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79639699766e7c8f3e236f3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 7 18:00:17 2009 +0200 Release 1.1.27. --- ANNOUNCE | 1347 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 677 insertions(+), 690 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b79639699766e7c8f3e23…

1 0

Juan Lang : secur32: Trace values of SCHANNEL_CRED structure.
by Alexandre Julliard Aug. 7, 2009

Aug. 7, 2009

Module: wine Branch: master Commit: 570c57ac95c9feeb4a3b504943571352cbfbf64f URL: http://source.winehq.org/git/wine.git/?a=commit;h=570c57ac95c9feeb4a3b50494… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 5 15:13:33 2009 -0700 secur32: Trace values of SCHANNEL_CRED structure. --- dlls/secur32/schannel.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index dc4f3b3..201304b 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -288,6 +288,21 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesW( static SECURITY_STATUS schan_CheckCreds(const SCHANNEL_CRED *schanCred) { SECURITY_STATUS st; + DWORD i; + + TRACE("dwVersion = %d\n", schanCred->dwVersion); + TRACE("cCreds = %d\n", schanCred->cCreds); + TRACE("hRootStore = %p\n", schanCred->hRootStore); + TRACE("cMappers = %d\n", schanCred->cMappers); + TRACE("cSupportedAlgs = %d:\n", schanCred->cSupportedAlgs); + for (i = 0; i < schanCred->cSupportedAlgs; i++) + TRACE("%08x\n", schanCred->palgSupportedAlgs[i]); + TRACE("grbitEnabledProtocols = %08x\n", schanCred->grbitEnabledProtocols); + TRACE("dwMinimumCipherStrength = %d\n", schanCred->dwMinimumCipherStrength); + TRACE("dwMaximumCipherStrength = %d\n", schanCred->dwMaximumCipherStrength); + TRACE("dwSessionLifespan = %d\n", schanCred->dwSessionLifespan); + TRACE("dwFlags = %08x\n", schanCred->dwFlags); + TRACE("dwCredFormat = %d\n", schanCred->dwCredFormat); switch (schanCred->dwVersion) {

1 0