December 2009 - Wine-commits

Alexander Nicolaysen Sørnes : screenshot : Allow admins to only show unmaintained entries or their own maintained ones
by Alexander Nicolaysen Sørnes 06 Dec '09

06 Dec '09

Module: appdb Branch: master Commit: 5475ef97f15cd94e1e12c85588b55f4297042566 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5475ef97f15cd94e1e12c855… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Fri Dec 4 21:54:11 2009 +0100 screenshot: Allow admins to only show unmaintained entries or their own maintained ones --- include/appData.php | 80 ++++++++++++++++++++++++++++++++++++------------ include/screenshot.php | 8 +++++ 2 files changed, 68 insertions(+), 20 deletions(-) diff --git a/include/appData.php b/include/appData.php index 198aca7..caaa827 100644 --- a/include/appData.php +++ b/include/appData.php @@ -233,20 +233,39 @@ class appData return FALSE; $sSelectType = ""; + + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $sVersionWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oAppData = new appData(); - if($oFilters) + if(getInput('onlyMyMaintainedVersionEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oAppData->canEdit())) { - $aOptions = $oFilters->getOptions(); - if($aOptions['appCategory']) - { - $oCategory = new category($aOptions['appCategory']); - $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); - } + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutVersionMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedVersionEntries', $aOptions) == 'true') + { + return false; } - if(($sState != 'accepted') && - !$_SESSION['current']->hasPriv("admin")) + if(getInput('onlyWithoutVersionMaintainers', $aOptions) == 'true') + { + $sVersionWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = appData.versionId"; + } + + if(getInput('appCategory', $aOptions)) + { + $oCategory = new category($aOptions['appCategory']); + $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); + } + + if($bOnlyMyMaintainedEntries) { $sQuery = "SELECT COUNT(DISTINCT appData.id) as count FROM appData, appMaintainers, appVersion, appFamily WHERE @@ -286,7 +305,7 @@ class appData AND appVersion.state = 'accepted' AND - appFamily.state = 'accepted'$sWhereFilter"; + appFamily.state = 'accepted'$sVersionWhereFilter$sWhereFilter"; if($sState != 'all') $sQuery .= " AND appData.state = '$sState'"; @@ -330,7 +349,7 @@ class appData AND appVersion.state = 'accepted' AND - appFamily.state = 'accepted'$sAppDataQueued$sSelectType$sWhereFilter)"; + appFamily.state = 'accepted'$sVersionWhereFilter$sAppDataQueued$sSelectType$sWhereFilter)"; if($sType) $hResult = query_parameters($sQuery, $sType, $sType); @@ -366,19 +385,39 @@ class appData $sSelectType = ""; $sLimit = ""; + + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $sVersionWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; - if($oFilters) + $oAppData = new appData(); + + if(getInput('onlyMyMaintainedVersionEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oAppData->canEdit())) { - $aOptions = $oFilters->getOptions(); - if($aOptions['appCategory']) - { - $oCategory = new category($aOptions['appCategory']); - $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); - } + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutVersionMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedVersionEntries', $aOptions) == 'true') + { + return false; } - if($sState != 'accepted' && !$_SESSION['current']->hasPriv("admin")) + if(getInput('onlyWithoutVersionMaintainers', $aOptions) == 'true') + { + $sVersionWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = appData.versionId"; + } + + if(getInput('appCategory', $aOptions)) + { + $oCategory = new category($aOptions['appCategory']); + $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); + } + + if($bOnlyMyMaintainedEntries) { $sQuery = "SELECT DISTINCT appData.* FROM appData, appMaintainers, appVersion, appFamily WHERE @@ -426,6 +465,7 @@ class appData AND appData.type = '?' $sWhereFilter + $sVersionWhereFilter ORDER BY appFamily.appName"; if(!$iRows && !$iStart) { @@ -477,7 +517,7 @@ class appData AND appData.state = '?' AND - appData.type = '?' $sWhereFilter ORDER BY appFamily.appName $sLimit + appData.type = '?' $sVersionWhereFilter$sWhereFilter ORDER BY appFamily.appName $sLimit )"; if(!$iRows && !$iStart) { diff --git a/include/screenshot.php b/include/screenshot.php index 886682a..dc49935 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -692,6 +692,14 @@ class screenshot $oFilter->addFilterInfo('appCategory', 'App category', array(FILTER_OPTION_ENUM), FILTER_VALUES_OPTION_ENUM, $aCatIds, $aCatNames); + /* The following filters are only useful for admins */ + if(!$_SESSION['current']->hasPriv('admin')) + return $oFilter; + + $oFilter->AddFilterInfo('onlyWithoutVersionMaintainers', 'Only show screenshots for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + + $oFilter->AddFilterInfo('onlyMyMaintainedVersionEntries', 'Only show screenshots for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; }

1 0

Alexander Nicolaysen Sørnes : bug link queue: Replace app description with 'has maintainer'
by Alexander Nicolaysen Sørnes 06 Dec '09

06 Dec '09

Module: appdb Branch: master Commit: c22d51b49310f4fad83525d76bad5f6251384901 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c22d51b49310f4fad83525d7… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Fri Dec 4 22:58:31 2009 +0100 bug link queue: Replace app description with 'has maintainer' --- include/bugs.php | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 0a6d099..4e294a5 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -430,17 +430,17 @@ class Bug $oTableCell->SetAlign("center"); $oTableRow->AddCell($oTableCell); - $oTableRow->AddTextCell("Bug Description"); + $oTableRow->AddTextCell("Bug description"); - $oTableCell = new TableCell("Application Name"); + $oTableCell = new TableCell("Application name"); $oTableCell->SetAlign("center"); $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell("Application Description"); + $oTableCell = new TableCell("Version"); $oTableCell->SetAlign("center"); $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell("Version"); + $oTableCell = new TableCell("Has maintainer"); $oTableCell->SetAlign("center"); $oTableRow->AddCell($oTableCell); @@ -468,10 +468,10 @@ class Bug $oTableRow->AddTextCell($oApp->objectMakeLink()); - $oTableRow->AddTextCell(util_trim_description($oApp->sDescription)); - $oTableRow->AddTextCell($oVersion->objectMakeLink()); + $oTableRow->AddTextCell($oVersion->hasMaintainer() ? 'YES' : 'No'); + $oOMTableRow = new OMTableRow($oTableRow); // enable the deletion link, the objectManager will check

1 0

Alexander Nicolaysen Sørnes : bug link queue: Allow showing only entries for umaintained versions
by Alexander Nicolaysen Sørnes 06 Dec '09

06 Dec '09

Module: appdb Branch: master Commit: 2767903605ef2d591a324b71b7d15404240fc9f9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2767903605ef2d591a324b71… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Fri Dec 4 23:09:06 2009 +0100 bug link queue: Allow showing only entries for umaintained versions --- include/bugs.php | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 insertions(+), 5 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 4e294a5..9f59fa9 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -397,24 +397,59 @@ class Bug return $this->iLinkId; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true) + public function objectGetFilterInfo() { + $oFilter = new FilterInterface(); + + /* The following filters are only useful for admins */ + if(!$_SESSION['current']->hasPriv('admin')) + return null; + + $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show bug links for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + + return $oFilter; + } + + function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = null) + { + $sExtraTables = ''; + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $sWhereFilter = ''; + + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') + { + $sExtraTables = ',appVersion'; + + $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = buglinks.versionId"; + } + $sLimit = ""; /* Selecting 0 rows makes no sense, so we assume the user wants to select all of them after an offset given by iStart */ if(!$iRows) - $iRows = bug::objectGetEntriesCount($sState); + $iRows = bug::objectGetEntriesCount($sState, $oFilters); - $sQuery = "select * from buglinks where state = '?' LIMIT ?, ?"; + $sQuery = "select * from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter LIMIT ?, ?"; $hResult = query_parameters($sQuery, $sState, $iStart, $iRows); return $hResult; } - function objectGetEntriesCount($sState) + function objectGetEntriesCount($sState, $oFilters = null) { - $sQuery = "select count(*) as cnt from buglinks where state = '?'"; + $sExtraTables = ''; + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $sWhereFilter = ''; + + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') + { + $sExtraTables = ',appVersion'; + + $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = buglinks.versionId"; + } + + $sQuery = "select count(*) as cnt from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter"; $hResult = query_parameters($sQuery, $sState); $oRow = mysql_fetch_object($hResult); return $oRow->cnt;

1 0

Alexandre Julliard : Wine release 1.1.34
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: website Branch: master Commit: c4c7838e13a843e64d95432aaec60e37e696928b URL: http://source.winehq.org/git/website.git/?a=commit;h=c4c7838e13a843e64d9543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 19:14:56 2009 +0100 Wine release 1.1.34 --- news/en/2009120401.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009120401.xml b/news/en/2009120401.xml new file mode 100644 index 0000000..4b70a88 --- /dev/null +++ b/news/en/2009120401.xml @@ -0,0 +1,17 @@ +<news> +<date>December 4, 2009</date> +<title>Wine 1.1.34 Released</title> +<body> + The Wine development release 1.1.34 is now available. + <a href="{$root}/announce/1.1.34">What's new</a> in this release: +<ul> + <li>Many fixes for crypto certificates support.</li> + <li>A lot of MSHTML improvements.</li> + <li>Various fixes to support the Left 4 Dead 2 DRM.</li> + <li>A number of OLE marshalling fixes.</li> + <li>More Listview improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.34.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>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.34.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 17b7ee13fb55e872902be3156610e583e4cd324b URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b7ee13fb55e872902be3156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 19:05:35 2009 +0100 Release 1.1.34. --- ANNOUNCE | 1762 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 939 insertions(+), 843 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17b7ee13fb55e872902be…

1 0

Tag wine-1.1.34 : Alexandre Julliard : Release 1.1.34
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: refs/tags/wine-1.1.34 Tag: 78f3f3a5003d910f7a3a26f937b826654a283a65 URL: http://source.winehq.org/git/wine.git/?a=tag;h=78f3f3a5003d910f7a3a26f937b8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 19:05:36 2009 +0100 Release 1.1.34

1 0

Paul Vriens : kernel32/tests: Skip some tests on Win98/WinMe.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 0c67d1bddb5bcd3b542d7479e108c94244c26961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c67d1bddb5bcd3b542d7479e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 4 13:10:15 2009 +0100 kernel32/tests: Skip some tests on Win98/WinMe. --- dlls/kernel32/tests/path.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index c8ab0a8..02348c2 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -986,7 +986,14 @@ static void test_GetLongPathNameA(void) lstrcatA(temppath2, tempfile); explength = length + 4; + SetLastError(0xdeadbeef); length = pGetLongPathNameA(temppath2, NULL, 0); + if (length == 0 && GetLastError() == ERROR_BAD_NET_NAME) + { + win_skip("UNC syntax tests don't work on Win98/WinMe\n"); + DeleteFileA(tempfile); + return; + } ok(length == explength, "Wrong length %d, expected %d\n", length, explength); length = pGetLongPathNameA(temppath2, NULL, MAX_PATH);

1 0

Paul Vriens : kernel32/tests: Skip some tests if needed (WinXP Home).
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: c2f5442f2ae5b3c9fe4bc33cd8f70cab0b6ed9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f5442f2ae5b3c9fe4bc33cd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 4 13:43:08 2009 +0100 kernel32/tests: Skip some tests if needed (WinXP Home). --- dlls/kernel32/tests/path.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 02348c2..104a48c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1026,7 +1026,15 @@ static void test_GetLongPathNameA(void) lstrcatA(longpath, strchr(temppath, '\\') + 1); /* NULL test */ + SetLastError(0xdeadbeef); length = pGetLongPathNameA(unc_short, NULL, 0); + if (length == 0 && GetLastError() == ERROR_BAD_NETPATH) + { + /* Seen on Window XP Home */ + win_skip("UNC with computername is not supported\n"); + DeleteFileA(tempfile); + return; + } explength = lstrlenA(longpath) + 1; todo_wine ok(length == explength, "Wrong length %d, expected %d\n", length, explength);

1 0

Wolfram Sang : ntdll: Silence RtlNtStatusToDosErrorNoTeb() a bit.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: a7326271e032ad11cbfa2edae1b54e7bf26d9c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7326271e032ad11cbfa2edae… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Thu Dec 3 19:29:41 2009 +0100 ntdll: Silence RtlNtStatusToDosErrorNoTeb() a bit. --- dlls/ntdll/error.c | 719 ++++++++++++++++++++++++++-------------------------- 1 files changed, 361 insertions(+), 358 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7326271e032ad11cbfa2…

1 0

Huw Davies : user32: Pad lfFaceName so we don' t write uninitialised data to the registry.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 6fc823430043b559dc014deace6e1472a2b80d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc823430043b559dc014deac… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 4 14:28:04 2009 +0000 user32: Pad lfFaceName so we don't write uninitialised data to the registry. Found by Valgrind. --- dlls/user32/sysparams.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4092221..5113acb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -699,10 +699,20 @@ static BOOL SYSPARAMS_Save( LPCWSTR lpRegKey, LPCWSTR lpValName, LPCWSTR lpValue /* Convenience function to save logical fonts */ static BOOL SYSPARAMS_SaveLogFont( LPCWSTR lpRegKey, LPCWSTR lpValName, - LPLOGFONTW plf, UINT fWinIni ) + const LPLOGFONTW plf, UINT fWinIni ) { - return SYSPARAMS_SaveRaw( lpRegKey, lpValName, (const BYTE*)plf, - sizeof( LOGFONTW), REG_BINARY, fWinIni ); + LOGFONTW lf = *plf; + int len; + + /* Zero pad the end of lfFaceName so we don't write uninitialised + data to the registry */ + lf.lfFaceName[LF_FACESIZE-1] = 0; + len = strlenW(lf.lfFaceName); + if(len < LF_FACESIZE-1) + memset(lf.lfFaceName + len, 0, (LF_FACESIZE - 1 - len) * sizeof(WCHAR)); + + return SYSPARAMS_SaveRaw( lpRegKey, lpValName, (const BYTE*)&lf, + sizeof(LOGFONTW), REG_BINARY, fWinIni ); }

1 0