wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

Andrew Talbot : shlwapi: Replace inline static with static inline.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 0810a923535d08f82cab92b648c07c74f80f5d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0810a923535d08f82cab92b64… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:08:37 2007 +0000 shlwapi: Replace inline static with static inline. --- dlls/shlwapi/clist.c | 2 +- dlls/shlwapi/string.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index a313074..0b59fb0 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -49,7 +49,7 @@ HRESULT WINAPI SHAddDataBlock(LPSHLWAPI_CLIST*,LPCSHLWAPI_CLIST); * * Internal helper: move a DataBlock pointer to the next item. */ -inline static LPSHLWAPI_CLIST NextItem(LPSHLWAPI_CLIST lpList) +static inline LPSHLWAPI_CLIST NextItem(LPSHLWAPI_CLIST lpList) { char* address = (char*)lpList; address += lpList->ulSize; diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index fd85d07..a12c41e 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1958,7 +1958,7 @@ HRESULT WINAPI SHStrDupW(LPCWSTR src, LPWSTR * dest) * * Internal helper for SHLWAPI_WriteTimeClass. */ -inline static LPWSTR SHLWAPI_WriteReverseNum(LPWSTR lpszOut, DWORD dwNum) +static inline LPWSTR SHLWAPI_WriteReverseNum(LPWSTR lpszOut, DWORD dwNum) { *lpszOut-- = '\0'; @@ -1978,7 +1978,7 @@ inline static LPWSTR SHLWAPI_WriteReverseNum(LPWSTR lpszOut, DWORD dwNum) * * Internal helper for SHLWAPI_WriteTimeClass. */ -inline static int SHLWAPI_FormatSignificant(LPWSTR lpszNum, int dwDigits) +static inline int SHLWAPI_FormatSignificant(LPWSTR lpszNum, int dwDigits) { /* Zero non significant digits, return remaining significant digits */ while (*lpszNum)

1 0

Andrew Talbot : include: Replace inline static with static inline.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 7c6ef46cb900e2def802fbc0ccabc92d293cfab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6ef46cb900e2def802fbc0c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Mar 23 15:12:17 2007 +0000 include: Replace inline static with static inline. --- include/vfw.h | 14 +++++++------- include/win.h | 4 ++-- include/wincon.h | 2 +- include/winsock.h | 4 ++-- include/winternl.h | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/vfw.h b/include/vfw.h index ea17703..bfb6f0d 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -387,7 +387,7 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,L LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD_PTR dw1, DWORD_PTR dw2); -inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, +static inline LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc, int xSrc, int ySrc, int dxSrc, int dySrc, LPBITMAPINFOHEADER lpbiDst, LPVOID lpDst, @@ -411,7 +411,7 @@ inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, return ICSendMessage(hic, ICM_DECOMPRESSEX, (DWORD_PTR)&ic, sizeof(ic)); } -inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, +static inline LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc, int xSrc, int ySrc, int dxSrc, int dySrc, @@ -439,7 +439,7 @@ inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, ic.dyDst = dyDst; return ICSendMessage(hic, ICM_DECOMPRESSEX_BEGIN, (DWORD_PTR)&ic, sizeof(ic)); } -inline static LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, +static inline LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc, int xSrc, int ySrc, int dxSrc, int dySrc, @@ -519,14 +519,14 @@ HIC VFWAPI ICGetDisplayFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHE #define ICGetStateSize(hic) \ ICGetState(hic, NULL, 0) -inline static DWORD ICGetDefaultQuality(HIC hic) +static inline DWORD ICGetDefaultQuality(HIC hic) { DWORD dwICValue; ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD)); return dwICValue; } -inline static DWORD ICGetDefaultKeyFrameRate(HIC hic) +static inline DWORD ICGetDefaultKeyFrameRate(HIC hic) { DWORD dwICValue; ICSendMessage(hic, ICM_GETDEFAULTKEYFRAMERATE, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD)); @@ -609,7 +609,7 @@ typedef struct { DWORD VFWAPIV ICDraw(HIC hic,DWORD dwFlags,LPVOID lpFormat,LPVOID lpData,DWORD cbData,LONG lTime); -inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, +static inline LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, int dxSrc, int dySrc, int dxDst, int dyDst, @@ -666,7 +666,7 @@ inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb #define ICDrawRenderBuffer(hic) \ ICSendMessage(hic, ICM_DRAW_RENDERBUFFER, 0, 0) -inline static LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam, +static inline LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam, LONG (CALLBACK *fpfnStatus)(LPARAM, UINT, LONG)) { ICSETSTATUSPROC ic; diff --git a/include/win.h b/include/win.h index 951eeac..1857422 100644 --- a/include/win.h +++ b/include/win.h @@ -90,14 +90,14 @@ extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, extern void USER_Lock(void); extern void USER_Unlock(void); -inline static HWND WIN_GetFullHandle( HWND hwnd ) +static inline HWND WIN_GetFullHandle( HWND hwnd ) { if (!HIWORD(hwnd) && hwnd) hwnd = WIN_Handle32( LOWORD(hwnd) ); return hwnd; } /* to release pointers retrieved by WIN_GetPtr */ -inline static void WIN_ReleasePtr( WND *ptr ) +static inline void WIN_ReleasePtr( WND *ptr ) { USER_Unlock(); } diff --git a/include/wincon.h b/include/wincon.h index 61bdea5..49130c3 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -176,7 +176,7 @@ typedef struct tagINPUT_RECORD * structures is different between Windows and gcc on i386. */ DWORD WINAPI GetLargestConsoleWindowSize(HANDLE); -inline static COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h) +static inline COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h) { union { COORD c; diff --git a/include/winsock.h b/include/winsock.h index d31c84d..80266f2 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -523,11 +523,11 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set)*); #else /* WORDS_BIGENDIAN */ -inline static u_short __wine_ushort_swap(u_short s) +static inline u_short __wine_ushort_swap(u_short s) { return (s >> 8) | (s << 8); } -inline static u_long __wine_ulong_swap(u_long l) +static inline u_long __wine_ulong_swap(u_long l) { return ((u_long)__wine_ushort_swap((u_short)l) << 16) | __wine_ushort_swap((u_short)(l >> 16)); } diff --git a/include/winternl.h b/include/winternl.h index e128268..1dc6011 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2278,7 +2278,7 @@ extern NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRI #define RtlRetrieveUlonglong(p,s) memcpy((p), (s), sizeof(ULONGLONG)) #define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length)) -inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) +static inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) { if (lpBits && ulBit < lpBits->SizeOfBitMap && lpBits->Buffer[ulBit >> 5] & (1 << (ulBit & 31))) @@ -2287,11 +2287,11 @@ inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) } /* These are implemented as __fastcall, so we can't let Winelib apps link with them */ -inline static USHORT RtlUshortByteSwap(USHORT s) +static inline USHORT RtlUshortByteSwap(USHORT s) { return (s >> 8) | (s << 8); } -inline static ULONG RtlUlongByteSwap(ULONG i) +static inline ULONG RtlUlongByteSwap(ULONG i) { #if defined(__i386__) && defined(__GNUC__) ULONG ret;

1 0

appdb/. appdbStats.php
by WineHQ 26 Mar '07

26 Mar '07

ChangeSet ID: 31013 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 19:39:53 Modified files: . : appdbStats.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add 'testing reports' count to appdb stats page Patch: http://cvs.winehq.org/patch.py?id=31013 Old revision New revision Changes Path 1.15 1.16 +6 -0 appdb/appdbStats.php Index: appdb/appdbStats.php diff -u -p appdb/appdbStats.php:1.15 appdb/appdbStats.php:1.16 --- appdb/appdbStats.php:1.15 26 Mar 2007 0:39:53 -0000 +++ appdb/appdbStats.php 26 Mar 2007 0:39:53 -0000 @@ -71,6 +71,12 @@ echo " <td>Application maintainers:</ echo " <td>".Maintainer::getNumberOfMaintainers()."</td>\n"; echo "</tr>\n\n"; +/* Display the number of testing reports */ +echo "<tr class=color4>\n"; +echo " <td>Testing reports:</td>\n"; +echo " <td>".testData::objectGetEntriescount(false, false)."</td>\n"; +echo "</tr>\n\n"; + /* Display the number of images */ echo "<tr class=color4>\n"; echo " <td>Screenshots:</td>\n";

1 0

appdb/include testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31012 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 16:04:33 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Implement Alexander's suggestion and use version::fullName() to reduce code duplication Patch: http://cvs.winehq.org/patch.py?id=31012 Old revision New revision Changes Path 1.33 1.34 +2 -12 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.33 appdb/include/testData.php:1.34 --- appdb/include/testData.php:1.33 25 Mar 2007 21: 4:33 -0000 +++ appdb/include/testData.php 25 Mar 2007 21: 4:33 -0000 @@ -244,16 +244,6 @@ class testData{ } } - function getFormattedApplicationVersionName() - { - $oVersion = new Version($this->iVersionId); - $sAppName = application::lookup_name($oVersion->iAppId); - $sVersionName = version::lookup_name($oVersion->iVersionId); - $sName = "$sAppName: $sVersionName"; - - return $sName; - } - function mailSubmitter($sAction="add") { global $aClean; @@ -263,7 +253,7 @@ class testData{ $oSubmitter = new User($this->iSubmitterId); /* Get the full app/version name to display */ - $sName = $this->getFormattedApplicationVersionName(); + $sName = version::fullName($this->iVersionId); switch($sAction) { @@ -493,7 +483,7 @@ class testData{ { HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); - $sName = $this->getFormattedApplicationVersionName(); + $sName = version::fullName($this->iVersionId); echo html_frame_start("Test Form - $sName", "90%", "", 0); echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";

1 0

appdb/include maintainer.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31011 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 15:29:58 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> maintainer::deleteMaintainersForVersion() should properly return $hResult Patch: http://cvs.winehq.org/patch.py?id=31011 Old revision New revision Changes Path 1.35 1.36 +1 -0 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.35 appdb/include/maintainer.php:1.36 --- appdb/include/maintainer.php:1.35 25 Mar 2007 20:29:58 -0000 +++ appdb/include/maintainer.php 25 Mar 2007 20:29:58 -0000 @@ -184,6 +184,7 @@ class maintainer $hResult = query_parameters("DELETE from appMaintainers WHERE versionId='?'", $oVersion->iVersionId); + return $hResult; } function deleteMaintainersForApplication($oApp)

1 0

appdb/include testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31010 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 14:58:34 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> testData should display the application name and version in outputEditor() Patch: http://cvs.winehq.org/patch.py?id=31010 Old revision New revision Changes Path 1.32 1.33 +14 -5 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.32 appdb/include/testData.php:1.33 --- appdb/include/testData.php:1.32 25 Mar 2007 19:58:34 -0000 +++ appdb/include/testData.php 25 Mar 2007 19:58:34 -0000 @@ -244,6 +244,16 @@ class testData{ } } + function getFormattedApplicationVersionName() + { + $oVersion = new Version($this->iVersionId); + $sAppName = application::lookup_name($oVersion->iAppId); + $sVersionName = version::lookup_name($oVersion->iVersionId); + $sName = "$sAppName: $sVersionName"; + + return $sName; + } + function mailSubmitter($sAction="add") { global $aClean; @@ -253,10 +263,7 @@ class testData{ $oSubmitter = new User($this->iSubmitterId); /* Get the full app/version name to display */ - $oVersion = new Version($this->iVersionId); - $sAppName = application::lookup_name($oVersion->iAppId); - $sVersionName = version::lookup_name($oVersion->iVersionId); - $sName = "$sAppName: $sVersionName"; + $sName = $this->getFormattedApplicationVersionName(); switch($sAction) { @@ -486,7 +493,9 @@ class testData{ { HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); - echo html_frame_start("Test Form", "90%", "", 0); + $sName = $this->getFormattedApplicationVersionName(); + + echo html_frame_start("Test Form - $sName", "90%", "", 0); echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; // What works

1 0

appdb/include testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31009 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 13:58:13 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Only show checked test results in version display Patch: http://cvs.winehq.org/patch.py?id=31009 Old revision New revision Changes Path 1.31 1.32 +6 -17 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.31 appdb/include/testData.php:1.32 --- appdb/include/testData.php:1.31 25 Mar 2007 18:58:13 -0000 +++ appdb/include/testData.php 25 Mar 2007 18:58:13 -0000 @@ -380,13 +380,15 @@ class testData{ $sQuery = "SELECT * FROM testResults - WHERE versionId = '".$this->iVersionId."' + WHERE versionId = '?' + AND + queued = '?' ORDER BY testedDate DESC"; if(!$showAll) $sQuery.=" LIMIT 0,".$iDisplayLimit; - $hResult = query_appdb($sQuery); + $hResult = query_parameters($sQuery, $this->iVersionId, "false"); if(!$hResult) return; @@ -405,7 +407,7 @@ class testData{ echo '<td>Installs?</td>',"\n"; echo '<td>Runs?</td>',"\n"; echo '<td>Rating</td>',"\n"; - echo '<td>Status</td>',"\n"; + echo '<td>Submitter</td>',"\n"; echo '</tr></thead>',"\n"; while($oRow = mysql_fetch_object($hResult)) { @@ -433,19 +435,6 @@ class testData{ echo '">Show</a>]</td>',"\n"; } - switch($oTest->sQueued) - { - case "false": - $sStatus = "Checked"; - break; - case "true": - $sStatus = "Queued"; - break; - case "rejected": - $sStatus = "Rejected"; - break; - } - echo ' <td>',"\n"; echo $oDistribution->objectMakeLink()."\n"; echo ' </td>',"\n"; @@ -454,7 +443,7 @@ class testData{ echo ' <td>'.$oTest->sInstalls.'&nbsp</td>',"\n"; echo ' <td>'.$oTest->sRuns.'&nbsp</td>',"\n"; echo ' <td>'.$oTest->sTestedRating.'&nbsp</td>',"\n"; - echo ' <td>'.$sStatus.'&nbsp</td>',"\n"; + echo ' <td>'.$oSubmitter->objectMakeLink().'&nbsp</td>',"\n"; if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { $oObject = new objectManager("testData");

1 0

appdb/ ./objectManager.php include/objectManag ...
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31008 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 13:52:19 Modified files: . : objectManager.php include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> objectManager: check editor values Patch: http://cvs.winehq.org/patch.py?id=31008 Old revision New revision Changes Path 1.2 1.3 +8 -4 appdb/objectManager.php 1.9 1.10 +52 -11 appdb/include/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.2 appdb/objectManager.php:1.3 --- appdb/objectManager.php:1.2 25 Mar 2007 18:52:19 -0000 +++ appdb/objectManager.php 25 Mar 2007 18:52:19 -0000 @@ -40,8 +40,12 @@ if($aClean['bIsRejected'] == 'true') $oOtherObject = new $oObject->sClass($oObject->iId); -/* Certain actions must be performed before the header is set */ -$oObject->processForm($aClean); +/* Certain actions must be performed before the header is set + processForm return TRUE on success, or a user-readable list of errors + on failure */ +$sErrors = $oObject->processForm($aClean); +if($sErrors === TRUE) + $sErrors = ""; if($oObject->iId && $aClean['sAction'] == "delete") $oObject->delete_entry(); @@ -58,7 +62,7 @@ if($oObject->iId) break; case "edit": - $oObject->display_entry_for_editing($REQUEST_URI); + $oObject->display_entry_for_editing($REQUEST_URI, $sErrors); break; default: @@ -66,7 +70,7 @@ if($oObject->iId) break; } } else if ($aClean['sAction'] == "add") - $oObject->add_entry($REQUEST_URI); + $oObject->add_entry($REQUEST_URI, $sErrors); else { // if displaying a queue display the help for the given queue Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.9 appdb/include/objectManager.php:1.10 --- appdb/include/objectManager.php:1.9 25 Mar 2007 18:52:19 -0000 +++ appdb/include/objectManager.php 25 Mar 2007 18:52:19 -0000 @@ -116,7 +116,7 @@ class ObjectManager } /* display the entry for editing */ - function display_entry_for_editing($sBackLink) + function display_entry_for_editing($sBackLink, $sErrors) { $this->checkMethods(array("outputEditor", "getOutputEditorValues", "update", "create")); @@ -124,9 +124,17 @@ class ObjectManager // link back to the previous page echo html_back_link(1, $sBackLink); - echo '<form name="sQform" action="'.BASE.'objectManager.php?sClass='. - $this->sClass."&bIsQueue=".($this->bIsQueue ? "true" : "false"). - ' method="post" enctype="multipart/form-data">',"\n"; + $oObject = new $this->sClass($this->iId); + + /* Display errors, if any, and fetch form data */ + if($this->displayErrors($sErrors)) + { + global $aClean; + $oObject->getOutputEditorValues($aClean); + } + + echo '<form name="sQform" action="'.$this->makeUrl("edit", $this->iId). + '" method="post" enctype="multipart/form-data">',"\n"; echo '<input type="hidden" name="sClass" value="'.$this->sClass.'" />'; echo '<input type="hidden" name="sTitle" value="'.$this->sTitle.'" />'; @@ -136,8 +144,6 @@ class ObjectManager echo '<input type="hidden" name="bIsRejected" '. 'value='.($this->bIsRejected ? "true" : "false").' />'; - $oObject = new $this->sClass($this->iId); - $oObject->outputEditor(); /* if this is a queue add a dialog for replying to the submitter of the @@ -215,13 +221,24 @@ class ObjectManager } /* Display screen for submitting a new entry of given type */ - function add_entry($sBackLink) + function add_entry($sBackLink, $sErrors = "") { $this->checkMethods(array("outputEditor", "getOutputEditorValues", "update", "create")); + $oObject = new $this->sClass(); + /* Display help if it is exists */ + if(method_exists(new $this->sClass, "objectDisplayAddItemHelp")) + $oObject->objectDisplayAddItemHelp(); + + /* Display errors, if any, and fetch form data */ + if($this->displayErrors($sErrors)) + { + global $aClean; + $oObject->getOutputEditorValues($aClean); + } echo "<form method=\"post\">\n"; $oObject->outputEditor(); @@ -272,6 +289,14 @@ class ObjectManager $oObject->getOutputEditorValues($aClean); + /* Check input, if necessary */ + if(method_exists(new $this->sClass, "checkOutputEditorInput")) + { + $sErrors = $oObject->checkOutputEditorInput($aClean); + if($sErrors) + return $sErrors; + } + switch($aClean['sSubmit']) { case "Submit": @@ -299,12 +324,16 @@ class ObjectManager $this->delete_entry(); } - if(!$this->bIsQueue) - $sAction = "view"; + /* Displaying the entire un-queued list for a class is not a good idea, + so only do so for queued data */ + if($this->bIsQueue) + $sRedirectLink = $this->makeUrl("view", false, "$this->sClass list"); else - $sAction = false; + $sRedirectLink = APPDB_ROOT; + + util_redirect_and_exit($sRedirectLink); - util_redirect_and_exit($this->makeUrl($sAction, false, "$this->sClass list")); + return TRUE; } /* Make an objectManager URL based on the object and optional parameters */ @@ -362,6 +391,18 @@ class ObjectManager return $sQueueString; } + + function displayErrors($sErrors) + { + if($sErrors) + { + echo "<font color=\"red\">\n"; + echo "The following errors were found<br />\n"; + echo "<ul>$sErrors</ul>\n"; + echo "</font><br />"; + } else + return FALSE; + } } ?>

1 0

appdb/ ./testResults.php include/testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31007 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 11:10:15 Modified files: . : testResults.php include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use testData::objectDisplayAddItemHelp() Patch: http://cvs.winehq.org/patch.py?id=31007 Old revision New revision Changes Path 1.27 1.28 +1 -5 appdb/testResults.php 1.30 1.31 +11 -0 appdb/include/testData.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.27 appdb/testResults.php:1.28 --- appdb/testResults.php:1.27 25 Mar 2007 16:10:15 -0000 +++ appdb/testResults.php 25 Mar 2007 16:10:15 -0000 @@ -114,11 +114,7 @@ if ($aClean['sSub']) //help - echo "<p>This is the screen for inputing test information so that others looking at the database will know \n"; - echo "what was working on a particular release of Wine.</p>\n"; - echo "<p>Please be as detailed as you can.</p>\n"; - echo "<p>If you cannot find your distribution in the list of existing distributions, please add it in the \n"; - echo "provided field.</p>\n\n"; + $oTest->objectDisplayAddItemHelp(); if(!empty($errors)) { Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.30 appdb/include/testData.php:1.31 --- appdb/include/testData.php:1.30 25 Mar 2007 16:10:15 -0000 +++ appdb/include/testData.php 25 Mar 2007 16:10:15 -0000 @@ -862,6 +862,17 @@ class testData{ /* STUB */ return TRUE; } + + function objectDisplayAddItemHelp() + { + echo "<p>This is the screen for inputing test information so that others "; + echo "looking at the database will know \n"; + echo "what was working on a particular release of Wine.</p>\n"; + echo "<p>Please be as detailed as you can.</p>\n"; + echo "<p>If you cannot find your distribution in the list of existing "; + echo "distributions, please add it in the \n"; + echo "provided field.</p>\n\n"; + } } ?>

1 0

appdb/include sidebar_admin.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31006 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 11:05:37 Modified files: include : sidebar_admin.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Reorganize admin sidebar. Place the most used items higher and the least used items lower Patch: http://cvs.winehq.org/patch.py?id=31006 Old revision New revision Changes Path 1.35 1.36 +17 -12 appdb/include/sidebar_admin.php Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.35 appdb/include/sidebar_admin.php:1.36 --- appdb/include/sidebar_admin.php:1.35 25 Mar 2007 16: 5:37 -0000 +++ appdb/include/sidebar_admin.php 25 Mar 2007 16: 5:37 -0000 @@ -9,11 +9,6 @@ function global_admin_menu() { $g = new htmlmenu("Global Admin"); - $g->add("Add Category", BASE."admin/addCategory.php"); - $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&bQueue=". - "false&sAction=add&sTitle=Add%20Vendor"); - - $g->addmisc(" "); $g->add("View App Queue (".$_SESSION['current']->getQueuedAppCount().")", BASE."objectManager.php?sClass=application&bIsQueue=true&sTitle=". "Application%20Queue"); @@ -26,10 +21,6 @@ function global_admin_menu() { $g->add("View Maintainer Queue (".Maintainer::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=maintainer&bIsQueue=true&sTitle=". "Maintainer%20Queue"); - $g->add("View Maintainer Entries (".Maintainer::getMaintainerCount().")", - BASE."admin/adminMaintainers.php"); - $g->add("View Bug Links (".getNumberOfQueuedBugLinks()."/".getNumberOfBugLinks().")", - BASE."admin/adminBugs.php"); $g->add("View Test Results Queue (".testData::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=testData&bIsQueue=true&sTitle=". "Test%20Results%20Queue"); @@ -39,13 +30,27 @@ function global_admin_menu() { "Distribution%20Queue"); $g->addmisc(" "); + + $g->add("View Maintainer Entries (".Maintainer::getMaintainerCount().")", + BASE."admin/adminMaintainers.php"); + $g->add("View Bug Links (".getNumberOfQueuedBugLinks()."/".getNumberOfBugLinks().")", + BASE."admin/adminBugs.php"); + $g->add("Users Management", BASE."admin/adminUsers.php"); + $g->add("Comments Management", BASE."admin/adminCommentView.php"); + $g->add("Screenshots Management", BASE."admin/adminScreenshots.php"); + + $g->addmisc(" "); + $g->add("View Rejected Test Results (".testData::objectGetEntriesCount(true, true).")", BASE."objectManager.php?sClass=testData&bIsQueue=true&bIsRejected=true&". "sTitle=Rejected%20Test%20Results"); - $g->add("Users Management", BASE."admin/adminUsers.php"); - $g->add("Comments Management", BASE."admin/adminCommentView.php"); - $g->add("Screenshots Management", BASE."admin/adminScreenshots.php"); + + $g->addmisc(" "); + + $g->add("Add Category", BASE."admin/addCategory.php"); + $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&bQueue=". + "false&sAction=add&sTitle=Add%20Vendor"); $g->done(); }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
85
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 March 2007