wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Jacek Caban : wininet: Move InternetQueryOption(INTERNET_OPTION_USER_AGENT) to vtbl.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 13a95f16488f62c64e3e77777f2e81d08a6d88e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a95f16488f62c64e3e77777… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 19 12:29:01 2008 +0200 wininet: Move InternetQueryOption(INTERNET_OPTION_USER_AGENT) to vtbl. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.c | 64 +++++++++++++++++----------------------- dlls/wininet/tests/internet.c | 4 +- 3 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 38023a8..cefa836 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3473,7 +3473,7 @@ static DWORD HTTPSESSION_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, voi } FIXME("Not implemented option %d\n", option); - return ERROR_INTERNET_INVALID_OPTION; + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; } static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b054765..cce504f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -495,6 +495,8 @@ static VOID APPINFO_Destroy(WININETHANDLEHEADER *hdr) static DWORD APPINFO_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { + LPWININETAPPINFOW ai = (LPWININETAPPINFOW)hdr; + switch(option) { case INTERNET_OPTION_HANDLE_TYPE: TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); @@ -505,6 +507,30 @@ static DWORD APPINFO_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b *size = sizeof(DWORD); *(DWORD*)buffer = INTERNET_HANDLE_TYPE_INTERNET; return ERROR_SUCCESS; + + case INTERNET_OPTION_USER_AGENT: { + DWORD bufsize; + + TRACE("INTERNET_OPTION_USER_AGENT\n"); + + bufsize = *size; + + if (unicode) { + *size = (strlenW(ai->lpszAgent) + 1) * sizeof(WCHAR); + if(!buffer || bufsize < *size) + return ERROR_INSUFFICIENT_BUFFER; + + strcpyW(buffer, ai->lpszAgent); + }else { + *size = WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, NULL, 0, NULL, NULL); + if(!buffer || bufsize < *size) + return ERROR_INSUFFICIENT_BUFFER; + + WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, buffer, *size, NULL, NULL); + } + + return ERROR_SUCCESS; + } } FIXME("Not implemented option %d\n", option); @@ -1959,43 +1985,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d break; } - case INTERNET_OPTION_USER_AGENT: - { - DWORD required; - LPWININETAPPINFOW ai = (LPWININETAPPINFOW)lpwhh; - - TRACE("INTERNET_OPTION_USER_AGENT\n"); - - if (!lpwhh || lpwhh->htype != INTERNET_HANDLE_TYPE_INTERNET) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; - } - if (bIsUnicode) - { - required = (strlenW(ai->lpszAgent) + 1) * sizeof(WCHAR); - if (*lpdwBufferLength < required) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else if (lpBuffer) - { - strcpyW(lpBuffer, ai->lpszAgent); - bSuccess = TRUE; - } - } - else - { - required = WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, NULL, 0, NULL, NULL); - if (*lpdwBufferLength < required) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else if (lpBuffer) - { - WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, lpBuffer, required, NULL, NULL); - bSuccess = TRUE; - } - } - *lpdwBufferLength = required; - break; - } case INTERNET_OPTION_HTTP_VERSION: { if (*lpdwBufferLength < sizeof(HTTP_VERSION_INFO)) @@ -2230,6 +2219,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d SetLastError(res); }else { FIXME("Stub! %d\n", dwOption); + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); break; } } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 2c5f4e3..14adc43 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -161,7 +161,7 @@ static void test_InternetQueryOptionA(void) err=GetLastError(); ok(len == strlen(useragent)+1,"Got wrong user agent length %d instead of %d\n",len,lstrlenA(useragent)); ok(retval == 0,"Got wrong return value %d\n",retval); - todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %d\n",err); SetLastError(0xdeadbeef); len=strlen(useragent)+1; @@ -221,7 +221,7 @@ static void test_InternetQueryOptionA(void) err=GetLastError(); todo_wine ok(len == 1,"Got wrong user agent length %d instead of %d\n",len,1); ok(retval == 0,"Got wrong return value %d\n",retval); - todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); InternetCloseHandle(hinet); }

1 0

Andrew Talbot : advpack: Fix sign-compare warnings.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: a7d06e7430c50ebc331640f73112e37707d93283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d06e7430c50ebc331640f73… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 19 10:08:05 2008 +0100 advpack: Fix sign-compare warnings. --- dlls/advpack/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index c5a5df0..0ec5ceb 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); #define SPAPI_ERROR 0xE0000000L #define SPAPI_PREFIX 0x800F0000L #define SPAPI_MASK 0xFFFFL -#define HRESULT_FROM_SPAPI(x) ((x & SPAPI_MASK) | SPAPI_PREFIX) +#define HRESULT_FROM_SPAPI(x) ((HRESULT)((x & SPAPI_MASK) | SPAPI_PREFIX)) #define ADV_HRESULT(x) ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : HRESULT_FROM_WIN32(x))

1 0

Andrew Talbot : advpack: Remove a useless test.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: c230736bbe1c9a71784ac3e7c48e124bce124bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c230736bbe1c9a71784ac3e7c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 19 10:08:00 2008 +0100 advpack: Remove a useless test. --- dlls/advpack/files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 5e9ce30..3aabc08 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -709,7 +709,7 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, if (FileList) { szConvertedList = convert_file_list(FileList, &dwFileCount); - if (!szConvertedList || dwFileCount == -1) + if (!szConvertedList) { res = E_FAIL; goto done;

1 0

Mikołaj Zalewski : oleaut32: Use custom file version in VERSIONINFO.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 9907387b7eaadd6dd0b06b1161ebbf61d5bd009b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9907387b7eaadd6dd0b06b116… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jul 19 10:26:20 2008 +0200 oleaut32: Use custom file version in VERSIONINFO. --- dlls/oleaut32/version.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/version.rc b/dlls/oleaut32/version.rc index 5a3f1ff..6887af3 100644 --- a/dlls/oleaut32/version.rc +++ b/dlls/oleaut32/version.rc @@ -19,5 +19,7 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine OLE dll" #define WINE_FILENAME_STR "oleaut32.dll" +#define WINE_FILEVERSION 6, 0, 6001, 18000 /* version from Vista SP1 */ +#define WINE_FILEVERSION_STR "6.0.6001.18000" #include "wine/wine_common_ver.rc"

1 0

Maarten Lankhorst : include: Fix typo in vmrender.idl.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 3a4dcea213f9633bb8330f508beb83da6ea04c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4dcea213f9633bb8330f508… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 17 17:58:00 2008 -0700 include: Fix typo in vmrender.idl. --- include/vmrender.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vmrender.idl b/include/vmrender.idl index edf9e1e..360b5fe 100644 --- a/include/vmrender.idl +++ b/include/vmrender.idl @@ -268,7 +268,7 @@ typedef enum _VMRMode VMRMode_Windowed = 0x1, VMRMode_Windowless = 0x2, VMRMode_Renderless = 0x4, - VMRMODE_Mask = 0x7 + VMRMode_Mask = 0x7 } VMRMode; enum { MAX_NUMBER_OF_STREAMS = 16 };

1 0

Mikołaj Zalewski : comctl32: Fix the file version string declaration.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: e016078fdf655cdc8f9b5c4c3b183cfecbe15872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e016078fdf655cdc8f9b5c4c3… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jul 19 10:24:13 2008 +0200 comctl32: Fix the file version string declaration. --- dlls/comctl32/rsrc.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index 9028df9..772248a 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -30,9 +30,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine Common Controls" #define WINE_FILENAME_STR "comctl32.dll" #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100 -#define WINE_FILEVERSIONSTR "5.81" +#define WINE_FILEVERSION_STR "5.81" #define WINE_PRODUCTVERSION WINE_FILEVERSION -#define WINE_PRODUCTVERSION_STR WINE_FILEVERSIONSTR +#define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR #include "wine/wine_common_ver.rc"

1 0

Alexander Nicolaysen Sørnes : adminMaintainers: Link to contact from instead of mailto
by Chris Morgan 20 Jul '08

20 Jul '08

Module: appdb Branch: master Commit: 6e9abaab6874e8a5585e31b21012f4ee0e410bdc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6e9abaab6874e8a5585e31b2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Jul 19 22:58:49 2008 +0200 adminMaintainers: Link to contact from instead of mailto --- admin/adminMaintainers.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/admin/adminMaintainers.php b/admin/adminMaintainers.php index d474576..da56f47 100644 --- a/admin/adminMaintainers.php +++ b/admin/adminMaintainers.php @@ -90,7 +90,7 @@ else echo "<tr class=$bgcolor>\n"; echo " <td>".print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))."  </td>\n"; - echo " <td><a href=\"mailto:".$oUser->sEmail."\">".$oUser->sRealname."</a></td>\n"; + echo " <td>".$oUser->objectMakeLink()."</a></td>\n"; echo " <td>".$oApp->objectMakeLink()."</td>\n"; if($oRow->superMaintainer) {

1 0

Alexander Nicolaysen Sørnes : maintainerView: Fix viewing other users
by Chris Morgan 20 Jul '08

20 Jul '08

Module: appdb Branch: master Commit: 9964749f5a6ace6623ebb323b9b6b0a4425dedfd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9964749f5a6ace6623ebb323… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Jul 19 22:56:06 2008 +0200 maintainerView: Fix viewing other users --- include/maintainerView.php | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index b3241f3..fe89ff7 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -35,7 +35,7 @@ class maintainerView $oTableRow->AddCell($oTableCell); /* Get test reports submitted by the user */ - $aTestData = testData::getTestResultsForUser($_SESSION['current']->iUserId, + $aTestData = testData::getTestResultsForUser($this->iUserId, $oVersion->iVersionId); if(sizeof($aTestData)) @@ -63,10 +63,9 @@ class maintainerView including last tested release & rating */ function display() { - if(!$this->bViewingSelf) - $oUser = new user($this->iUserId); + $oUser = new user($this->iUserId); - $aMaintainedApps = maintainer::getAppsMaintained($_SESSION['current']); + $aMaintainedApps = maintainer::getAppsMaintained($oUser); if(!$aMaintainedApps || !sizeof($aMaintainedApps)) { if($this->bViewingSelf)

1 0

Alexander Nicolaysen Sørnes : adminMaintainers: Link to contact from instead of e-mail
by Chris Morgan 18 Jul '08

18 Jul '08

Module: appdb Branch: master Commit: 3226aef81b3c13987392a2fce0cdc2c2277b401f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3226aef81b3c13987392a2fc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 18 16:39:09 2008 +0200 adminMaintainers: Link to contact from instead of e-mail --- admin/adminMaintainers.php | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/admin/adminMaintainers.php b/admin/adminMaintainers.php index db9221c..d474576 100644 --- a/admin/adminMaintainers.php +++ b/admin/adminMaintainers.php @@ -62,10 +62,8 @@ else echo "<tr class=color4>\n"; echo " <td style=\"$style;border-left:thin solid\">Maintainer summary</td>\n"; - if($oUser->sRealname == "") - echo " <td style=\"$style\"><a href=\"mailto:".$oUser->sEmail."\"> </a></td>\n"; - else - echo " <td style=\"$style\"><a href=\"mailto:".$oUser->sEmail."\">".$oUser->sRealname."</a></td>\n"; + + echo " <td style=\"$style\">".$oUser->objectMakeLink()."</td>\n"; $count = Maintainer::getMaintainerCountForUser($oUser, true); if($count == 0)

1 0

Alexander Nicolaysen Sørnes : Add a detailed maintainer view
by Chris Morgan 18 Jul '08

18 Jul '08

Module: appdb Branch: master Commit: a084ec499165433375f52a573c67add2ba7cbf3e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a084ec499165433375f52a57… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 18 16:07:14 2008 +0200 Add a detailed maintainer view --- contact.php | 6 ++ include/maintainer.php | 5 +- include/maintainerView.php | 141 ++++++++++++++++++++++++++++++++++++++++++++ include/sidebar_login.php | 4 + include/testData.php | 21 +++++++ objectManager.php | 1 + 6 files changed, 177 insertions(+), 1 deletions(-) diff --git a/contact.php b/contact.php index f1a2b0c..06757c6 100644 --- a/contact.php +++ b/contact.php @@ -78,6 +78,12 @@ if(!$aClean['sSubmit']) "=100&sOrderBy=email\">User manager</a>"; } + if($oRecipient) + { + echo "<a href=\"".BASE."objectManager.php?sClass=maintainerView&iId=". + "{$oRecipient->iUserId}&sTitle=Maintained+Apps\">Maintained apps</a>"; + } + echo "E-mail $sRecipientText."; $oTable = new Table(); diff --git a/include/maintainer.php b/include/maintainer.php index 66e1f6b..1851f91 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -825,7 +825,10 @@ class maintainer echo "</td></tr>\n"; // Show which other apps the user maintains - echo '<tr valign="top"><td class="color0" style=\'text-align:right\'>This user also maintains these apps:</td><td>',"\n"; + echo '<tr valign="top"><td class="color0" style=\'text-align:right\'>This user also maintains these apps:'; + echo " <a href=\"".BASE."objectManager.php?sClass=maintainerView". + "&iId={$this->iUserId}&sTitle=Maintained+Apps\">Detailed view</a>"; + echo '</td><td>',"\n"; $oUser = new User($this->iUserId); $aOtherApps = Maintainer::getAppsMaintained($oUser); diff --git a/include/maintainerView.php b/include/maintainerView.php new file mode 100644 index 0000000..b3241f3 --- /dev/null +++ b/include/maintainerView.php @@ -0,0 +1,141 @@ +<?php + +/** + * Class to show an overview of a user's maintainership, including apps maintained + * and their ratings + */ +class maintainerView +{ + var $iUserId; + var $bViewingSelf; + + function maintainerView($iUserId = null) + { + if(!$iUserId) + $this->iUserId = $_SESSION['current']->iUserId; + else + $this->iUserId = $iUserId; + + if(!$iUserId || $this->iUserId == $_SESSION['current']->iUserId) + $this->bViewingSelf = true; + else + $this->bViewingSelf = false; + } + + function addVersionRatingInfo($oTableRow, $oVersion) + { + $oTableRow->AddTextCell($oVersion->objectMakeLink()); + + /* Rating info */ + $oTableCell = new TableCell($oVersion->sTestedRating); + $oTableCell->SetClass($oVersion->sTestedRating); + $oTableRow->AddCell($oTableCell); + $oTableCell = new TableCell($oVersion->sTestedRelease); + $oTableCell->SetClass($oVersion->sTestedRating); + $oTableRow->AddCell($oTableCell); + + /* Get test reports submitted by the user */ + $aTestData = testData::getTestResultsForUser($_SESSION['current']->iUserId, + $oVersion->iVersionId); + + if(sizeof($aTestData)) + { + $oTest = $aTestData[0]; + $sUserRating = $oTest->sTestedRating; + $sUserRelease = $oTest->sTestedRelease; + } else + { + $sUserRating = ''; + $sUserRelease = ''; + } + + $oTableCell = new TableCell($sUserRating); + $oTableCell->SetClass($sUserRating); + $oTableRow->AddCell($oTableCell); + $oTableCell = new TableCell($sUserRelease); + $oTableCell->SetClass($sUserRating); + $oTableRow->AddCell($oTableCell); + + return $oTableRow; + } + + /* Shows a detailed vis of the user's maintained applications, + including last tested release & rating */ + function display() + { + if(!$this->bViewingSelf) + $oUser = new user($this->iUserId); + + $aMaintainedApps = maintainer::getAppsMaintained($_SESSION['current']); + if(!$aMaintainedApps || !sizeof($aMaintainedApps)) + { + if($this->bViewingSelf) + echo 'You do not maintain any apps'; + else + echo "{$oUser->sRealname} does not maintain any apps"; + return; + } + + if($this->bViewingSelf) + echo 'Viewing your maintained apps'; + else + echo "Viewing {$oUser->sRealname}'s maintained apps"; + + $oTable = new Table(); + $oTableRow = new TableRow(); + $oTableRow->setClass('color4'); + $oTable->setCellSpacing(0); + $oTable->setCellPadding(3); + $oTableRow->AddTextCell('Application'); + $oTableRow->AddTextCell('Version'); + $oTableRow->AddTextCell('Current Rating'); + $oTableRow->AddTextCell('Current Version'); + $oTableRow->AddTextCell($this->bViewingSelf ? 'Your Rating' : "User's Rating"); + $oTableRow->AddTextCell($this->bViewingSelf ? 'Your Version' : "User's Version"); + $oTable->AddRow($oTableRow); + + $i = 1; + while(list($iIndex, list($iAppId, $iVersionId, $bSuperMaintainer)) = each($aMaintainedApps)) + { + $oApp = new application($iAppId); + $aVersions = array(); + + $oTableRow = new TableRow(); + $oTableRow->AddTextCell($oApp->objectMakeLink()); + + $oTableRow->SetClass(($i % 2) ? 'color0' : 'color1'); + $i++; + + if($iVersionId) + { + $oVersion = new version($iVersionId); + $oTableRow = maintainerView::addVersionRatingInfo($oTableRow, $oVersion); + $oTable->AddRow($oTableRow); + } else + { + $aVersions = $oApp->getVersions(true); + $oTableRow->AddTextCell('*'); + $oTableRow->AddTextCell(''); + $oTableRow->AddTextCell(''); + $oTableRow->AddTextCell(''); + $oTableRow->AddTextCell(''); + $oTable->AddRow($oTableRow); + } + + foreach($aVersions as $oVersion) + { + $oTableRow = new TableRow($oTableRow); + $oTableRow->AddTextCell(''); + $oTableRow = maintainerView::addVersionRatingInfo($oTableRow, $oVersion); + + $oTableRow->SetClass(($i % 2) ? 'color0' : 'color1'); + $i++; + + $oTable->AddRow($oTableRow); + } + } + echo $oTable->GetString(); + } +} + +?> diff --git a/include/sidebar_login.php b/include/sidebar_login.php index 536ad71..719647a 100644 --- a/include/sidebar_login.php +++ b/include/sidebar_login.php @@ -23,8 +23,12 @@ function global_sidebar_login() { $apps_user_maintains = Maintainer::getAppsMaintained($_SESSION['current']); if($apps_user_maintains) { + $g->add('Maintainership Overview', BASE.'objectManager.php?sClass=maintainerView&iId='. + $_SESSION['current']->iUserId.'&sTitle=Your+Maintained+Apps'); + $g->addmisc(""); $g->addmisc("You maintain:\n"); + while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains)) { $oApp = new application($appId); diff --git a/include/testData.php b/include/testData.php index c749c53..0183040 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1074,6 +1074,27 @@ class testData{ echo "</select>\n"; } + function getTestResultsForUser($iUserId, $iVersionId) + { + $hResult = query_parameters("SELECT * FROM testResults WHERE + submitterId = '?' + AND versionId = '?' + ORDER BY testingId DESC", $iUserId, $iVersionId); + + if(!$hResult) + return null; + + $aRet = array(); + + if(!mysql_num_rows($hResult)) + return $aRet; + + while(($oRow = mysql_fetch_object($hResult))) + $aRet[] = new testData(0, $oRow); + + return $aRet; + } + /* List test data submitted by a given user. Ignore test results for queued applications/versions */ function listSubmittedBy($iUserId, $bQueued = true) { diff --git a/objectManager.php b/objectManager.php index 30ad2f3..7cf3180 100644 --- a/objectManager.php +++ b/objectManager.php @@ -24,6 +24,7 @@ require_once(BASE.'include/version_queue.php'); require_once(BASE.'include/testData_queue.php'); require_once(BASE.'include/bugs.php'); require_once(BASE.'include/db_filter_ui.php'); +require_once(BASE.'include/maintainerView.php'); /* if we have no valid class name we should abort */ if(!isset($aClean['sClass']))

1 0

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 July 2008