June 2006 - Wine-commits - list.winehq.org

Ivan Leo : shell32/tests: Comment out a test that crashes on windows nt 4.0 .
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: 48374cf630f27d7e35b3ff83503cd6b7c3c85607 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48374cf630f27d7e35b3ff8… Author: Ivan Leo <ivanleo(a)gmail.com> Date: Thu Jun 29 19:51:49 2006 +0100 shell32/tests: Comment out a test that crashes on windows nt 4.0. --- dlls/shell32/tests/shlfileop.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a1180fc..12b2862 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -343,10 +343,12 @@ static void test_rename(void) retval = SHFileOperationA(&shfo); ok(retval == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", retval); - /* pFrom is NULL */ + /* pFrom is NULL, commented out because it crashes on nt 4.0 */ +#if 0 shfo.pFrom = NULL; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", retval); + ok(retval == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", retval); +#endif } /* tests the FO_COPY action */

1 0

appdb/include testResults.php
by WineHQ 30 Jun '06

30 Jun '06

ChangeSet ID: 26135 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/30 11:38:05 Modified files: include : testResults.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Make the back link in the test results email useful to everyone, not just appdb admins and app maintainers Patch: http://cvs.winehq.org/patch.py?id=26135 Old revision New revision Changes Path 1.25 1.26 +21 -4 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.25 appdb/include/testResults.php:1.26 --- appdb/include/testResults.php:1.25 30 Jun 2006 16:38: 5 -0000 +++ appdb/include/testResults.php 30 Jun 2006 16:38: 5 -0000 @@ -274,13 +274,15 @@ class testData{ $oVersion = new Version($this->iVersionId); $oApp = new Application($oVersion->iAppId); + $sBacklink = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."&iTestingId=".$this->iTestingId."\n"; + switch($sAction) { case "add": if($this->sQueued == "false") { $sSubject = "Test Results added to version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; - $sMsg = $sMsg .= APPDB_ROOT."appview.php?versionId=".$this->iVersionId."&iTestingId=".$this->iTestingId."\n"; + $sMsg .= $sBacklink; if($this->iSubmitterId) { $oSubmitter = new User($this->iSubmitterId); @@ -296,7 +298,7 @@ class testData{ } else // testing data queued. { $sSubject = "Test Results submitted for version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; - $sMsg .= APPDB_ROOT."admin/adminTestResults.php?sub=view&iTestingId=".$this->iTestingId."\n"; + $sMsg .= $sBacklink; $sMsg .= "This testing data has been queued."; $sMsg .= "\n"; addmsg("The testing data you submitted will be added to the database after being reviewed.", "green"); @@ -304,7 +306,7 @@ class testData{ break; case "edit": $sSubject = "Test Results modified for version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; - $sMsg .= APPDB_ROOT."admin/adminTestResults.php?sub=view&iTestingId=".$this->iTestingId."\n"; + $sMsg .= $sBacklink; addmsg("testing data modified.", "green"); break; case "delete": @@ -320,7 +322,7 @@ class testData{ break; case "reject": $sSubject = "Test Results rejected for version ".$oVersion->sName." of ".$oApp->sName." submitted by ".$_SESSION['current']->sRealname; - $sMsg .= APPDB_ROOT."admin/adminTestResults.php?sub=view&iTestingId=".$this->iTestingId."\n"; + $sMsg .= $sBacklink; // if replyText is set we should report the reason the data was rejected if($aClean['replyText']) { @@ -402,6 +404,7 @@ class testData{ echo '<td>Installs?</td>',"\n"; echo '<td>Runs?</td>',"\n"; echo '<td>Rating</td>',"\n"; + echo '<td>Status</td>',"\n"; echo '</tr></thead>',"\n"; while($oRow = mysql_fetch_object($hResult)) { @@ -426,6 +429,19 @@ 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 '<a href="'.BASE.'distributionView.php?iDistributionId='.$oTest->iDistributionId.'">',"\n"; echo $oDistribution->sName.'</a>',"\n"; @@ -435,6 +451,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"; if ($_SESSION['current']->hasAppVersionModifyPermission($oTest->iVersionId)) { echo '<td><a href="'.BASE.'admin/adminTestResults.php?sub=view&iTestingId='.$oTest->iTestingId.'">',"\n";

1 0

appdb/ ./distributionView.php ./vendorview.php ...
by WineHQ 30 Jun '06

30 Jun '06

ChangeSet ID: 26134 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/30 11:33:03 Modified files: . : distributionView.php vendorview.php votestats.php admin : adminAppDataQueue.php adminAppQueue.php adminCommentView.php adminMaintainers.php include : appdb.php application.php category.php session.php testResults.php user.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Rename some variables to match our current naming scheme Patch: http://cvs.winehq.org/patch.py?id=26134 Old revision New revision Changes Path 1.11 1.12 +2 -2 appdb/distributionView.php 1.16 1.17 +2 -2 appdb/vendorview.php 1.21 1.22 +5 -5 appdb/votestats.php 1.24 1.25 +7 -7 appdb/admin/adminAppDataQueue.php 1.59 1.60 +15 -15 appdb/admin/adminAppQueue.php 1.12 1.13 +4 -4 appdb/admin/adminCommentView.php 1.21 1.22 +10 -10 appdb/admin/adminMaintainers.php 1.6 1.7 +2 -2 appdb/include/appdb.php 1.52 1.53 +2 -2 appdb/include/application.php 1.18 1.19 +8 -8 appdb/include/category.php 1.10 1.11 +2 -2 appdb/include/session.php 1.24 1.25 +2 -2 appdb/include/testResults.php 1.71 1.72 +10 -10 appdb/include/user.php 1.61 1.62 +2 -2 appdb/include/version.php

1 0

appdb/include incl.php
by WineHQ 30 Jun '06

30 Jun '06

ChangeSet ID: 26133 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/30 11:10:17 Modified files: include : incl.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Remove redirectref(), this function isn't used Patch: http://cvs.winehq.org/patch.py?id=26133 Old revision New revision Changes Path 1.30 1.31 +0 -11 appdb/include/incl.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.30 appdb/include/incl.php:1.31 --- appdb/include/incl.php:1.30 30 Jun 2006 16:10:17 -0000 +++ appdb/include/incl.php 30 Jun 2006 16:10:17 -0000 @@ -173,17 +173,6 @@ function redirect($url) exit; } -/** - * redirect back to referrer, or else to the main page - */ -function redirectref($url = null) -{ - if(!$url) - $url = $_SERVER['HTTP_REFERER']; - if(!$url) - $url = apidb_fullurl(); - redirect($url); -} /** * format a date as required for HTTP by RFC 2068 sec 3.3.1

1 0

appdb/ ./appview.php include/note.php include/ ...
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26132 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 14:22:26 Modified files: . : appview.php include : note.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Cleanup note class, move display of notes into the class. External code creates and calls Note::show() to display the note. Patch: http://cvs.winehq.org/patch.py?id=26132 Old revision New revision Changes Path 1.84 1.85 +0 -49 appdb/appview.php 1.11 1.12 +48 -0 appdb/include/note.php 1.60 1.61 +5 -3 appdb/include/version.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.84 appdb/appview.php:1.85 --- appdb/appview.php:1.84 29 Jun 2006 19:22:26 -0000 +++ appdb/appview.php 29 Jun 2006 19:22:26 -0000 @@ -82,55 +82,6 @@ function display_bundle($iAppId) echo html_frame_end(); } -/* Show note */ -function show_note($sType,$oData) -{ - global $oVersion; - - switch($sType) - { - case 'WARNING': - $color = 'red'; - $title = 'Warning'; - break; - - case 'HOWTO'; - $color = 'green'; - $title = 'HOWTO'; - break; - - default: - - if(!empty($oData->noteTitle)) - $title = $oData->noteTitle; - else - $title = 'Note'; - - $color = 'blue'; - } - - $s = html_frame_start("","98%",'',0); - - $s .= "<table width=\"100%\" border=\"0\" cellspacing=\"0\">\n"; - $s .= "<tr bgcolor=\"".$color."\" align=\"center\" valign=\"top\"><td><b>".$title."</b></td></tr>\n"; - $s .= "<tr><td class=\"note\">\n"; - $s .= $oData->noteDesc; - $s .= "</td></tr>\n"; - - if ($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($oVersion->iVersionId) || $_SESSION['current']->isSuperMaintainer($oVersion->iAppId)) - { - $s .= "<tr class=\"color1\" align=\"center\" valign=\"top\"><td>"; - $s .= "<form method=\"post\" name=\"message\" action=\"admin/editAppNote.php?noteId={$oData->noteId}\">"; - $s .= '<input type="submit" value="Edit Note" class="button">'; - $s .= '</form></td></tr>'; - } - - $s .= "</table>\n"; - $s .= html_frame_end(); - - return $s; -} - if(!is_numeric($aClean['appId']) && !is_numeric($aClean['versionId'])) { util_show_error_page("Something went wrong with the application or version id"); Index: appdb/include/note.php diff -u -p appdb/include/note.php:1.11 appdb/include/note.php:1.12 --- appdb/include/note.php:1.11 29 Jun 2006 19:22:26 -0000 +++ appdb/include/note.php 29 Jun 2006 19:22:26 -0000 @@ -158,5 +158,53 @@ class Note { if($sEmail) mail_appdb($sEmail, $sSubject ,$sMsg); } + + /* Show note */ + function show() + { + switch($this->sTitle) + { + case 'WARNING': + $sColor = 'red'; + $sTitle = 'Warning'; + break; + + case 'HOWTO': + $sColor = 'green'; + $sTitle = 'HOWTO'; + break; + + default: + if(!empty($this->sTitle)) + $sTitle = $this->sTitle; + else + $sTitle = 'Note'; + + $sColor = 'blue'; + } + + $shOutput = html_frame_start("","98%",'',0); + + $shOutput .= "<table width=\"100%\" border=\"0\" cellspacing=\"0\">\n"; + $shOutput .= "<tr bgcolor=\"".$sColor."\" align=\"center\" valign=\"top\"><td><b>".$sTitle."</b></td></tr>\n"; + $shOutput .= "<tr><td class=\"note\">\n"; + $shOutput .= $this->sDescription; + $shOutput .= "</td></tr>\n"; + + if ($_SESSION['current']->hasPriv("admin") || + $_SESSION['current']->isMaintainer($this->iVersionId) || + $_SESSION['current']->isSuperMaintainer($this->iAppId)) + { + $shOutput .= "<tr class=\"color1\" align=\"center\" valign=\"top\"><td>"; + $shOutput .= "<form method=\"post\" name=\"message\" action=\"admin/editAppNote.php?noteId={$this->iNoteId}\">"; + $shOutput .= '<input type="submit" value="Edit Note" class="button">'; + $shOutput .= '</form></td></tr>'; + } + + $shOutput .= "</table>\n"; + $shOutput .= html_frame_end(); + + echo $shOutput; + } } ?> Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.60 appdb/include/version.php:1.61 --- appdb/include/version.php:1.60 29 Jun 2006 19:22:26 -0000 +++ appdb/include/version.php 29 Jun 2006 19:22:26 -0000 @@ -827,12 +827,14 @@ class Version { view_version_bugs($this->iVersionId, $this->aBuglinkIds); - $rNotes = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", + /* display the notes for the application */ + $hNotes = query_parameters("SELECT noteId FROM appNotes WHERE versionId = '?'", $this->iVersionId); - while( $oNote = mysql_fetch_object($rNotes) ) + while( $oRow = mysql_fetch_object($hNotes) ) { - echo show_note($oNote->noteTitle,$oNote); + $oNote = new Note($oRow->noteId); + $oNote->show(); } // Comments Section

1 0

appdb/. screenshots.php
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26131 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 14:00:41 Modified files: . : screenshots.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix missed lookup_version_name() -> Version::lookup_name() in version cleanup patch Patch: http://cvs.winehq.org/patch.py?id=26131 Old revision New revision Changes Path 1.33 1.34 +1 -1 appdb/screenshots.php Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.33 appdb/screenshots.php:1.34 --- appdb/screenshots.php:1.33 29 Jun 2006 19: 0:41 -0000 +++ appdb/screenshots.php 29 Jun 2006 19: 0:41 -0000 @@ -75,7 +75,7 @@ if($hResult && mysql_num_rows($hResult)) $c=1; } $currentVersionId=$oRow->versionId; - echo html_frame_start("Version ".lookup_version_name($currentVersionId)); + echo html_frame_start("Version ".Version::lookup_name($currentVersionId)); echo "<div align=center><table><tr>\n"; } $img = get_thumbnail($oRow->id);

1 0

appdb/include monitor.php
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26130 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 13:05:44 Modified files: include : monitor.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> No need to create Version object, use the monitor classes iAppId and iVersionId instead Patch: http://cvs.winehq.org/patch.py?id=26130 Old revision New revision Changes Path 1.6 1.7 +2 -4 appdb/include/monitor.php Index: appdb/include/monitor.php diff -u -p appdb/include/monitor.php:1.6 appdb/include/monitor.php:1.7 --- appdb/include/monitor.php:1.6 29 Jun 2006 18: 5:44 -0000 +++ appdb/include/monitor.php 29 Jun 2006 18: 5:44 -0000 @@ -95,16 +95,15 @@ class Monitor { { /* set $aAppName appropriately */ if(isset($this->iVersionId)) - $sAppName = Application::lookup_name($oVersion->iAppId)." ".Version::lookup_name($this->iVersionId); + $sAppName = Application::lookup_name($this->iAppId)." ".Version::lookup_name($this->iVersionId); else - $sAppName = Application::lookup_name($oVersion->iAppId); + $sAppName = Application::lookup_name($this->iAppId); switch($sAction) { case "add": if (isset($this->iVersionId)) { - $oVersion = new Version($this->iVersionId); $sSubject = "Monitor for ".$sAppName; $sSubject .= " added: ".$_SESSION['current']->sRealname; $sMsg .= APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; @@ -119,7 +118,6 @@ class Monitor { case "delete": if (isset($this->iVersionId)) { - $oVersion = new Version($this->iVersionId); $sSubject = "Monitor for ".$sAppName; $sSubject .= " removed: ".$_SESSION['current']->sRealname; $sMsg .= APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n";

1 0

appdb/. appsubmit.php
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26129 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 11:39:15 Modified files: . : appsubmit.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Fix typo in appsubmit Patch: http://cvs.winehq.org/patch.py?id=26129 Old revision New revision Changes Path 1.45 1.46 +1 -1 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.45 appdb/appsubmit.php:1.46 --- appdb/appsubmit.php:1.45 29 Jun 2006 16:39:15 -0000 +++ appdb/appsubmit.php 29 Jun 2006 16:39:15 -0000 @@ -66,7 +66,7 @@ function newSubmition($errors) //deny access if not logged on if(!$_SESSION['current']->isLoggedIn()) { - util_show_error_page("Insufficient privilages to create application. Are you sure you are logged in?"); + util_show_error_page("Insufficient privileges to create application. Are you sure you are logged in?"); exit; }

1 0

appdb/. account.php
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26128 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 11:34:18 Modified files: . : account.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix requesting a new password. Missed a user::update() -> user::update_password() call. Add a more explicit message in the case where the user doesn't enter any email address. Patch: http://cvs.winehq.org/patch.py?id=26128 Old revision New revision Changes Path 1.21 1.22 +10 -2 appdb/account.php Index: appdb/account.php diff -u -p appdb/account.php:1.21 appdb/account.php:1.22 --- appdb/account.php:1.21 29 Jun 2006 16:34:18 -0000 +++ appdb/account.php 29 Jun 2006 16:34:18 -0000 @@ -143,11 +143,19 @@ function cmd_do_new() */ function cmd_send_passwd() { - $aClean = array(); //array of filtered user input $aClean['ext_email'] = makeSafe($_POST['ext_email']); + /* if the user didn't enter any email address we should */ + /* ask them to */ + if($aClean['ext_email'] == "") + { + addmsg("Please enter your email address in the 'E-mail' field and re-request a new password", + "green"); + redirect(apidb_fullurl("account.php?cmd=login")); + } + $note = '(<b>Note</b>: accounts for <b>appdb</b>.winehq.org and <b>bugs</b>.winehq.org ' .'are separated, so You might need to <b>create second</b> account for appdb.)'; @@ -156,7 +164,7 @@ function cmd_send_passwd() $user = new User($userid); if ($userid) { - if ($user->update(null, $passwd)) + if ($user->update_password($passwd)) { $sSubject = "Application DB Lost Password"; $sMsg = "We have received a request that you lost your password.\r\n";

1 0

appdb/ ./account.php ./addcomment.php ./appbro ...
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26127 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 11:13:36 Modified files: . : account.php addcomment.php appbrowse.php appimage.php appsubmit.php appview.php commentview.php deletecomment.php distributionView.php maintainerdelete.php maintainersubmit.php preferences.php testResults.php vendorview.php viewbugs.php admin : addAppNote.php addCategory.php adminAppDataQueue.php adminAppQueue.php adminBugs.php adminMaintainerQueue.php adminMaintainers.php adminScreenshots.php adminTestResults.php adminUsers.php deleteAny.php editAppFamily.php editAppNote.php editAppVersion.php editBundle.php editDistribution.php editVendor.php moveAppVersion.php include : application.php incl.php util.php version.php vote.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Rename errorpage() to util_show_error_page() and move util_show_error_page() into include/util.php Patch: http://cvs.winehq.org/patch.py?id=26127 Old revision New revision Changes Path 1.20 1.21 +1 -2 appdb/account.php 1.24 1.25 +1 -1 appdb/addcomment.php 1.14 1.15 +1 -1 appdb/appbrowse.php 1.18 1.19 +2 -2 appdb/appimage.php 1.44 1.45 +3 -3 appdb/appsubmit.php 1.83 1.84 +2 -2 appdb/appview.php 1.8 1.9 +1 -1 appdb/commentview.php 1.23 1.24 +1 -1 appdb/deletecomment.php 1.10 1.11 +1 -1 appdb/distributionView.php 1.17 1.18 +1 -1 appdb/maintainerdelete.php 1.25 1.26 +2 -2 appdb/maintainersubmit.php 1.25 1.26 +1 -1 appdb/preferences.php 1.6 1.7 +1 -1 appdb/testResults.php 1.15 1.16 +1 -1 appdb/vendorview.php 1.3 1.4 +1 -1 appdb/viewbugs.php 1.23 1.24 +1 -1 appdb/admin/addAppNote.php 1.10 1.11 +1 -1 appdb/admin/addCategory.php 1.23 1.24 +1 -1 appdb/admin/adminAppDataQueue.php 1.58 1.59 +3 -3 appdb/admin/adminAppQueue.php 1.5 1.6 +1 -1 appdb/admin/adminBugs.php 1.24 1.25 +2 -2 appdb/admin/adminMaintainerQueue.php 1.20 1.21 +1 -1 appdb/admin/adminMaintainers.php 1.8 1.9 +1 -1 appdb/admin/adminScreenshots.php 1.6 1.7 +1 -1 appdb/admin/adminTestResults.php 1.8 1.9 +1 -1 appdb/admin/adminUsers.php 1.17 1.18 +4 -4 appdb/admin/deleteAny.php 1.37 1.38 +3 -3 appdb/admin/editAppFamily.php 1.22 1.23 +2 -2 appdb/admin/editAppNote.php 1.35 1.36 +2 -2 appdb/admin/editAppVersion.php 1.10 1.11 +1 -1 appdb/admin/editBundle.php 1.4 1.5 +1 -1 appdb/admin/editDistribution.php 1.10 1.11 +1 -1 appdb/admin/editVendor.php 1.4 1.5 +2 -2 appdb/admin/moveAppVersion.php 1.51 1.52 +1 -1 appdb/include/application.php 1.29 1.30 +0 -17 appdb/include/incl.php 1.62 1.63 +14 -0 appdb/include/util.php 1.59 1.60 +3 -3 appdb/include/version.php 1.18 1.19 +1 -1 appdb/include/vote.php

1 0