July 2006 - Wine-Commits - list.winehq.org

appdb/ ./commentview.php ./preferences.php ./u ...
by WineHQ July 20, 2006

July 20, 2006

ChangeSet ID: 26697 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/20 23:25:00 Modified files: . : commentview.php preferences.php updatevote.php viewbugs.php votestats.php admin : adminCommentView.php adminScreenshots.php adminUsers.php editBundle.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Use require() instead of include() because we can't operate properly if we can't find all listed include files Patch: http://cvs.winehq.org/patch.py?id=26697 Old revision New revision Changes Path 1.14 1.15 +3 -3 appdb/commentview.php 1.32 1.33 +2 -2 appdb/preferences.php 1.6 1.7 +3 -3 appdb/updatevote.php 1.9 1.10 +1 -1 appdb/viewbugs.php 1.26 1.27 +1 -1 appdb/votestats.php 1.15 1.16 +2 -2 appdb/admin/adminCommentView.php 1.14 1.15 +2 -2 appdb/admin/adminScreenshots.php 1.12 1.13 +2 -2 appdb/admin/adminUsers.php 1.14 1.15 +2 -2 appdb/admin/editBundle.php Index: appdb/commentview.php diff -u -p appdb/commentview.php:1.14 appdb/commentview.php:1.15 --- appdb/commentview.php:1.14 21 Jul 2006 4:25: 0 -0000 +++ appdb/commentview.php 21 Jul 2006 4:25: 0 -0000 @@ -8,9 +8,9 @@ /* * application environment */ -include("path.php"); -include(BASE."include/incl.php"); -include(BASE."include/filter.php"); +require("path.php"); +require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require_once(BASE."include/comment.php"); apidb_header("Comments"); Index: appdb/preferences.php diff -u -p appdb/preferences.php:1.32 appdb/preferences.php:1.33 --- appdb/preferences.php:1.32 21 Jul 2006 4:25: 0 -0000 +++ appdb/preferences.php 21 Jul 2006 4:25: 0 -0000 @@ -22,8 +22,8 @@ */ // application environment -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); function build_prefs_list($oUser) { Index: appdb/updatevote.php diff -u -p appdb/updatevote.php:1.6 appdb/updatevote.php:1.7 --- appdb/updatevote.php:1.6 21 Jul 2006 4:25: 0 -0000 +++ appdb/updatevote.php 21 Jul 2006 4:25: 0 -0000 @@ -6,9 +6,9 @@ /* * application environment */ -include("path.php"); -include(BASE."include/incl.php"); -include(BASE."include/vote.php"); +require("path.php"); +require(BASE."include/incl.php"); +require(BASE."include/vote.php"); vote_update($_POST); Index: appdb/viewbugs.php diff -u -p appdb/viewbugs.php:1.9 appdb/viewbugs.php:1.10 --- appdb/viewbugs.php:1.9 21 Jul 2006 4:25: 0 -0000 +++ appdb/viewbugs.php 21 Jul 2006 4:25: 0 -0000 @@ -10,7 +10,7 @@ */ // application environment -include("path.php"); +require("path.php"); require(BASE."include/incl.php"); require(BASE."include/filter.php"); Index: appdb/votestats.php diff -u -p appdb/votestats.php:1.26 appdb/votestats.php:1.27 --- appdb/votestats.php:1.26 21 Jul 2006 4:25: 0 -0000 +++ appdb/votestats.php 21 Jul 2006 4:25: 0 -0000 @@ -8,7 +8,7 @@ */ // application environment -include("path.php"); +require("path.php"); require(BASE."include/incl.php"); require(BASE."include/filter.php"); require_once(BASE."include/category.php"); Index: appdb/admin/adminCommentView.php diff -u -p appdb/admin/adminCommentView.php:1.15 appdb/admin/adminCommentView.php:1.16 --- appdb/admin/adminCommentView.php:1.15 21 Jul 2006 4:25: 0 -0000 +++ appdb/admin/adminCommentView.php 21 Jul 2006 4:25: 0 -0000 @@ -4,8 +4,8 @@ /* Without having go into each application version to do so */ /************************************************************/ -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); apidb_header("Comments"); Index: appdb/admin/adminScreenshots.php diff -u -p appdb/admin/adminScreenshots.php:1.14 appdb/admin/adminScreenshots.php:1.15 --- appdb/admin/adminScreenshots.php:1.14 21 Jul 2006 4:25: 0 -0000 +++ appdb/admin/adminScreenshots.php 21 Jul 2006 4:25: 0 -0000 @@ -4,8 +4,8 @@ /* Without having go into each application version to do so */ /************************************************************/ -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); require_once(BASE."include/screenshot.php"); require_once(BASE."include/application.php"); Index: appdb/admin/adminUsers.php diff -u -p appdb/admin/adminUsers.php:1.12 appdb/admin/adminUsers.php:1.13 --- appdb/admin/adminUsers.php:1.12 21 Jul 2006 4:25: 0 -0000 +++ appdb/admin/adminUsers.php 21 Jul 2006 4:25: 0 -0000 @@ -3,8 +3,8 @@ /* Users Management */ /********************/ -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); $aClean = array(); //filtered user input Index: appdb/admin/editBundle.php diff -u -p appdb/admin/editBundle.php:1.14 appdb/admin/editBundle.php:1.15 --- appdb/admin/editBundle.php:1.14 21 Jul 2006 4:25: 0 -0000 +++ appdb/admin/editBundle.php 21 Jul 2006 4:25: 0 -0000 @@ -1,7 +1,7 @@ <?php -include("path.php"); -include(BASE."include/"."incl.php"); +require("path.php"); +require(BASE."include/"."incl.php"); if(!$_SESSION['current']->hasPriv("admin")) util_show_error_page_and_exit();

1 0

appdb/ ./distributionView.php ./testResults.ph ...
by WineHQ July 20, 2006

July 20, 2006

ChangeSet ID: 26696 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/20 23:21:04 Modified files: . : distributionView.php testResults.php admin : adminTestResults.php editDistribution.php include : sidebar.php sidebar_admin.php testData.php Added files: include : distribution.php Removed files: include : distributions.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Rename include/distributions.php to include/distribution.php so the name of the file matches exactly the name of the distribution class Patch: http://cvs.winehq.org/patch.py?id=26696 Old revision New revision Changes Path 1.19 1.20 +1 -1 appdb/distributionView.php 1.16 1.17 +1 -1 appdb/testResults.php 1.14 1.15 +1 -1 appdb/admin/adminTestResults.php 1.10 1.11 +1 -1 appdb/admin/editDistribution.php 1.21 1.22 +1 -1 appdb/include/sidebar.php 1.23 1.24 +1 -1 appdb/include/sidebar_admin.php 1.4 1.5 +1 -1 appdb/include/testData.php Added 1.1 +0 -0 appdb/include/distribution.php 1.14 Removed +0 -0 appdb/include/distributions.php

1 0

appdb/ ./apidb.css ./screenshots.php include/a ...
by WineHQ July 20, 2006

July 20, 2006

ChangeSet ID: 26695 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/20 23:18:28 Modified files: . : apidb.css screenshots.php include : application.php screenshot.php version.php Added files: images : xmag_32.png Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a magnifying glass image overlay on top of screenshot thumbnails to make it more obvious to users that clicking on the image will allow them to see a larger version of the thumbnail Patch: http://cvs.winehq.org/patch.py?id=26695 Old revision New revision Changes Path 1.15 1.16 +3 -0 appdb/apidb.css 1.40 1.41 +1 -0 appdb/screenshots.php Added 1.1 +0 -0 appdb/images/xmag_32.png 1.68 1.69 +1 -1 appdb/include/application.php 1.48 1.49 +23 -5 appdb/include/screenshot.php 1.78 1.79 +1 -1 appdb/include/version.php Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.15 appdb/apidb.css:1.16 --- appdb/apidb.css:1.15 21 Jul 2006 4:18:28 -0000 +++ appdb/apidb.css 21 Jul 2006 4:18:28 -0000 @@ -232,3 +232,6 @@ TD.app_name { width: 150px } /* Editor textarea */ #editor { height: 25em; width:700px; } + +/* zoom image overlay style */ +.zoom_overlay { position:relative; top:10px; left:0px; margin-left:-32px; padding:0px; } Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.40 appdb/screenshots.php:1.41 --- appdb/screenshots.php:1.40 21 Jul 2006 4:18:28 -0000 +++ appdb/screenshots.php 21 Jul 2006 4:18:28 -0000 @@ -32,6 +32,7 @@ if($aClean['sCmd']) // process screenshot upload if($aClean['sCmd'] == "screenshot_upload") { + //FIXME: use a defined value here instead of just 600000 if($_FILES['sImageFile']['size']>600000) { addmsg("Your screenshot was not accepted because it is too big. Please try to keep your screenshots under 600KB by saving games/video screenshots to jpeg and normal applications to png you might be able to achieve very good results with less bytes", "red"); Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.68 appdb/include/application.php:1.69 --- appdb/include/application.php:1.68 21 Jul 2006 4:18:28 -0000 +++ appdb/include/application.php 21 Jul 2006 4:18:28 -0000 @@ -546,7 +546,7 @@ class Application { } // image - $img = Screenshot::get_random_screenshot_img($this->iAppId); + $img = Screenshot::get_random_screenshot_img($this->iAppId, null, false); echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n"; echo " </table>\n"; /* close of name/vendor/bugs/url table */ Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.48 appdb/include/screenshot.php:1.49 --- appdb/include/screenshot.php:1.48 21 Jul 2006 4:18:28 -0000 +++ appdb/include/screenshot.php 21 Jul 2006 4:18:28 -0000 @@ -360,6 +360,21 @@ class Screenshot { mail_appdb($sEmail, $sSubject ,$sMsg); } + function get_zoomicon_overlay() + { + /* if the user is using mozilla or firefox show the zoom icon over images */ + /* otherwise because IE doesn't support transparent PNGs or proper css we have to */ + /* skip it for IE */ + if(strpos($_SERVER['HTTP_USER_AGENT'], "MSIE") === false) + { + $sZoomIcon = '<img class="zoom_overlay" src="'.BASE.'images/xmag_32.png">'; + } + else + $sZoomIcon = ""; + + return $sZoomIcon; + } + /** * Get a random image for a particular version of an app. * If the version is not set, get a random app image @@ -407,19 +422,22 @@ class Screenshot { if($bFormatting) $sImg = html_frame_start("",'128','',2); + /* retrieve the url for the zoom icon overlay */ + $sZoomIcon = Screenshot::get_zoomicon_overlay(); + /* we have screenshots */ if(mysql_num_rows($hResult)) { if($iVersionId) - $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>$sImgFile<center>View/Submit Screenshot</center></a>"; + $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>View/Submit Screenshot</center></a>"; else - $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>$sImgFile<center>View Screenshot</center></a>"; + $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>View Screenshot</center></a>"; } else if($iVersionId) /* we are asking for a specific app version but it has no screenshots */ { - $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>$sImgFile<center>Submit Screenshot</center></a>"; + $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>Submit Screenshot</center></a>"; } else /* we have no screenshots and we aren't a specific version, we don't allow adding screenshots for an app */ { - $sImg .= $sImgFile; + $sImg .= $sImgFile.$sZoomIcon; } if($bFormatting) @@ -476,7 +494,7 @@ class Screenshot { '?iId='.$this->iScreenshotId.'\',\''.$sRandName.'\','. ($this->get_screenshot_width() + 20).','. ($this->get_screenshot_height() + 6). - ');return false;">'.$shImgSRC.'</a>'; + ');return false;">'.$shImgSRC.Screenshot::get_zoomicon_overlay().'</a>'; // set image link based on user pref if ($_SESSION['current']->isLoggedIn()) Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.78 appdb/include/version.php:1.79 --- appdb/include/version.php:1.78 21 Jul 2006 4:18:28 -0000 +++ appdb/include/version.php 21 Jul 2006 4:18:28 -0000 @@ -658,7 +658,7 @@ class Version { echo "<tr class=\"color0\" valign=\"top\"><td><b>Maintainers Version</b></td><td>".$this->sTestedRelease."</td></tr>\n"; // image - $img = Screenshot::get_random_screenshot_img($oApp->iAppId, $this->iVersionId); + $img = Screenshot::get_random_screenshot_img($oApp->iAppId, $this->iVersionId, false); echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n"; // display all maintainers of this application

1 0

appdb/ ./apidb.css include/application.php inc ...
by WineHQ July 20, 2006

July 20, 2006

ChangeSet ID: 26697 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/20 20:41:47 Modified files: . : apidb.css include : application.php screenshot.php version.php Added files: images : xmag_32.png Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a magnifying glass image overlay on screenshots to make it more apparent that clicking on them zooms into the image Patch: http://cvs.winehq.org/patch.py?id=26697 Old revision New revision Changes Path 1.15 1.16 +3 -0 appdb/apidb.css Added 1.1 +0 -0 appdb/images/xmag_32.png 1.68 1.69 +1 -1 appdb/include/application.php 1.48 1.49 +23 -5 appdb/include/screenshot.php 1.78 1.79 +1 -1 appdb/include/version.php Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.15 appdb/apidb.css:1.16 --- appdb/apidb.css:1.15 21 Jul 2006 1:41:47 -0000 +++ appdb/apidb.css 21 Jul 2006 1:41:47 -0000 @@ -232,3 +232,6 @@ TD.app_name { width: 150px } /* Editor textarea */ #editor { height: 25em; width:700px; } + +/* zoom image overlay style */ +.zoom_overlay { position:relative; top:10px; left:10px; margin-left:-32px; padding:0px; } Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.68 appdb/include/application.php:1.69 --- appdb/include/application.php:1.68 21 Jul 2006 1:41:47 -0000 +++ appdb/include/application.php 21 Jul 2006 1:41:47 -0000 @@ -546,7 +546,7 @@ class Application { } // image - $img = Screenshot::get_random_screenshot_img($this->iAppId); + $img = Screenshot::get_random_screenshot_img($this->iAppId, null, false); echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n"; echo " </table>\n"; /* close of name/vendor/bugs/url table */ Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.48 appdb/include/screenshot.php:1.49 --- appdb/include/screenshot.php:1.48 21 Jul 2006 1:41:47 -0000 +++ appdb/include/screenshot.php 21 Jul 2006 1:41:47 -0000 @@ -360,6 +360,21 @@ class Screenshot { mail_appdb($sEmail, $sSubject ,$sMsg); } + function get_zoomicon_overlay() + { + /* if the user is using mozilla or firefox show the zoom icon over images */ + /* otherwise because IE doesn't support transparent PNGs or proper css we have to */ + /* skip it for IE */ + if(strpos($_SERVER['HTTP_USER_AGENT'], "MSIE") === false) + { + $sZoomIcon = '<img class="zoom_overlay" src="'.BASE.'images/xmag_32.png">'; + } + else + $sZoomIcon = ""; + + return $sZoomIcon; + } + /** * Get a random image for a particular version of an app. * If the version is not set, get a random app image @@ -407,19 +422,22 @@ class Screenshot { if($bFormatting) $sImg = html_frame_start("",'128','',2); + /* retrieve the url for the zoom icon overlay */ + $sZoomIcon = Screenshot::get_zoomicon_overlay(); + /* we have screenshots */ if(mysql_num_rows($hResult)) { if($iVersionId) - $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>$sImgFile<center>View/Submit Screenshot</center></a>"; + $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>View/Submit Screenshot</center></a>"; else - $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>$sImgFile<center>View Screenshot</center></a>"; + $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>View Screenshot</center></a>"; } else if($iVersionId) /* we are asking for a specific app version but it has no screenshots */ { - $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>$sImgFile<center>Submit Screenshot</center></a>"; + $sImg .= "<a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>Submit Screenshot</center></a>"; } else /* we have no screenshots and we aren't a specific version, we don't allow adding screenshots for an app */ { - $sImg .= $sImgFile; + $sImg .= $sImgFile.$sZoomIcon; } if($bFormatting) @@ -476,7 +494,7 @@ class Screenshot { '?iId='.$this->iScreenshotId.'\',\''.$sRandName.'\','. ($this->get_screenshot_width() + 20).','. ($this->get_screenshot_height() + 6). - ');return false;">'.$shImgSRC.'</a>'; + ');return false;">'.$shImgSRC.Screenshot::get_zoomicon_overlay().'</a>'; // set image link based on user pref if ($_SESSION['current']->isLoggedIn()) Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.78 appdb/include/version.php:1.79 --- appdb/include/version.php:1.78 21 Jul 2006 1:41:47 -0000 +++ appdb/include/version.php 21 Jul 2006 1:41:47 -0000 @@ -658,7 +658,7 @@ class Version { echo "<tr class=\"color0\" valign=\"top\"><td><b>Maintainers Version</b></td><td>".$this->sTestedRelease."</td></tr>\n"; // image - $img = Screenshot::get_random_screenshot_img($oApp->iAppId, $this->iVersionId); + $img = Screenshot::get_random_screenshot_img($oApp->iAppId, $this->iVersionId, false); echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n"; // display all maintainers of this application

1 0

appdb/ ./distributionView.php ./testResults.ph ...
by WineHQ July 20, 2006

July 20, 2006

ChangeSet ID: 26696 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/20 20:17:55 Modified files: . : distributionView.php testResults.php admin : adminTestResults.php editDistribution.php include : sidebar.php sidebar_admin.php testData.php Added files: include : distribution.php Removed files: include : distributions.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Rename include/distributions.php to include/distribution.php so the name of the file matches exactly the name of the class like the rest of the files/classes are named Patch: http://cvs.winehq.org/patch.py?id=26696 Old revision New revision Changes Path 1.19 1.20 +1 -1 appdb/distributionView.php 1.16 1.17 +1 -1 appdb/testResults.php 1.14 1.15 +1 -1 appdb/admin/adminTestResults.php 1.10 1.11 +1 -1 appdb/admin/editDistribution.php 1.21 1.22 +1 -1 appdb/include/sidebar.php 1.23 1.24 +1 -1 appdb/include/sidebar_admin.php 1.4 1.5 +1 -1 appdb/include/testData.php Added 1.1 +0 -0 appdb/include/distribution.php 1.14 Removed +0 -0 appdb/include/distributions.php

1 0

appdb/ ./commentview.php ./preferences.php ./u ...
by WineHQ July 20, 2006

July 20, 2006

ChangeSet ID: 26695 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/20 14:35:14 Modified files: . : commentview.php preferences.php updatevote.php viewbugs.php votestats.php admin : adminCommentView.php adminScreenshots.php adminUsers.php editBundle.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Use require() and not include() since we can't continue if critical files aren't present in the locations we expect to find them Patch: http://cvs.winehq.org/patch.py?id=26695 Old revision New revision Changes Path 1.14 1.15 +3 -3 appdb/commentview.php 1.32 1.33 +2 -2 appdb/preferences.php 1.6 1.7 +3 -3 appdb/updatevote.php 1.9 1.10 +1 -1 appdb/viewbugs.php 1.26 1.27 +1 -1 appdb/votestats.php 1.15 1.16 +2 -2 appdb/admin/adminCommentView.php 1.14 1.15 +2 -2 appdb/admin/adminScreenshots.php 1.12 1.13 +2 -2 appdb/admin/adminUsers.php 1.14 1.15 +2 -2 appdb/admin/editBundle.php Index: appdb/commentview.php diff -u -p appdb/commentview.php:1.14 appdb/commentview.php:1.15 --- appdb/commentview.php:1.14 20 Jul 2006 19:35:14 -0000 +++ appdb/commentview.php 20 Jul 2006 19:35:14 -0000 @@ -8,9 +8,9 @@ /* * application environment */ -include("path.php"); -include(BASE."include/incl.php"); -include(BASE."include/filter.php"); +require("path.php"); +require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require_once(BASE."include/comment.php"); apidb_header("Comments"); Index: appdb/preferences.php diff -u -p appdb/preferences.php:1.32 appdb/preferences.php:1.33 --- appdb/preferences.php:1.32 20 Jul 2006 19:35:14 -0000 +++ appdb/preferences.php 20 Jul 2006 19:35:14 -0000 @@ -22,8 +22,8 @@ */ // application environment -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); function build_prefs_list($oUser) { Index: appdb/updatevote.php diff -u -p appdb/updatevote.php:1.6 appdb/updatevote.php:1.7 --- appdb/updatevote.php:1.6 20 Jul 2006 19:35:14 -0000 +++ appdb/updatevote.php 20 Jul 2006 19:35:14 -0000 @@ -6,9 +6,9 @@ /* * application environment */ -include("path.php"); -include(BASE."include/incl.php"); -include(BASE."include/vote.php"); +require("path.php"); +require(BASE."include/incl.php"); +require(BASE."include/vote.php"); vote_update($_POST); Index: appdb/viewbugs.php diff -u -p appdb/viewbugs.php:1.9 appdb/viewbugs.php:1.10 --- appdb/viewbugs.php:1.9 20 Jul 2006 19:35:14 -0000 +++ appdb/viewbugs.php 20 Jul 2006 19:35:14 -0000 @@ -10,7 +10,7 @@ */ // application environment -include("path.php"); +require("path.php"); require(BASE."include/incl.php"); require(BASE."include/filter.php"); Index: appdb/votestats.php diff -u -p appdb/votestats.php:1.26 appdb/votestats.php:1.27 --- appdb/votestats.php:1.26 20 Jul 2006 19:35:14 -0000 +++ appdb/votestats.php 20 Jul 2006 19:35:14 -0000 @@ -8,7 +8,7 @@ */ // application environment -include("path.php"); +require("path.php"); require(BASE."include/incl.php"); require(BASE."include/filter.php"); require_once(BASE."include/category.php"); Index: appdb/admin/adminCommentView.php diff -u -p appdb/admin/adminCommentView.php:1.15 appdb/admin/adminCommentView.php:1.16 --- appdb/admin/adminCommentView.php:1.15 20 Jul 2006 19:35:14 -0000 +++ appdb/admin/adminCommentView.php 20 Jul 2006 19:35:14 -0000 @@ -4,8 +4,8 @@ /* Without having go into each application version to do so */ /************************************************************/ -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); apidb_header("Comments"); Index: appdb/admin/adminScreenshots.php diff -u -p appdb/admin/adminScreenshots.php:1.14 appdb/admin/adminScreenshots.php:1.15 --- appdb/admin/adminScreenshots.php:1.14 20 Jul 2006 19:35:14 -0000 +++ appdb/admin/adminScreenshots.php 20 Jul 2006 19:35:14 -0000 @@ -4,8 +4,8 @@ /* Without having go into each application version to do so */ /************************************************************/ -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); require_once(BASE."include/screenshot.php"); require_once(BASE."include/application.php"); Index: appdb/admin/adminUsers.php diff -u -p appdb/admin/adminUsers.php:1.12 appdb/admin/adminUsers.php:1.13 --- appdb/admin/adminUsers.php:1.12 20 Jul 2006 19:35:15 -0000 +++ appdb/admin/adminUsers.php 20 Jul 2006 19:35:15 -0000 @@ -3,8 +3,8 @@ /* Users Management */ /********************/ -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); $aClean = array(); //filtered user input Index: appdb/admin/editBundle.php diff -u -p appdb/admin/editBundle.php:1.14 appdb/admin/editBundle.php:1.15 --- appdb/admin/editBundle.php:1.14 20 Jul 2006 19:35:15 -0000 +++ appdb/admin/editBundle.php 20 Jul 2006 19:35:15 -0000 @@ -1,7 +1,7 @@ <?php -include("path.php"); -include(BASE."include/"."incl.php"); +require("path.php"); +require(BASE."include/incl.php"); if(!$_SESSION['current']->hasPriv("admin")) util_show_error_page_and_exit();

1 0

Christian Gmeiner : setupapi: Add stub for SetupDiCreateDeviceInfoW.
by Alexandre Julliard July 20, 2006

July 20, 2006

Module: wine Branch: refs/heads/master Commit: 41aefd8c62bf4798fec567cb00afd0d98328e23a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=41aefd8c62bf4798fec567c… Author: Christian Gmeiner <christian.gmeiner(a)students.fhv.at> Date: Wed Jul 19 19:58:47 2006 +0200 setupapi: Add stub for SetupDiCreateDeviceInfoW. --- dlls/setupapi/devinst.c | 21 +++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7d076b8..0b07ece 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -697,6 +697,27 @@ SetupDiCreateDeviceInfoListExW(const GUI } /*********************************************************************** + * SetupDiCreateDeviceInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiCreateDeviceInfoW( + HDEVINFO DeviceInfoSet, + PCWSTR DeviceName, + CONST GUID *ClassGuid, + PCWSTR DeviceDescription, + HWND hwndParent, + DWORD CreationFlags, + PSP_DEVINFO_DATA DeviceInfoData) +{ + TRACE("%p %s %s %s %p %lx %p\n", DeviceInfoSet, debugstr_w(DeviceName), + debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), + hwndParent, CreationFlags, DeviceInfoData); + + FIXME("stub"); + + return FALSE; +} + +/*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6f9536c..7f8b285 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -286,7 +286,7 @@ @ stdcall SetupDiCreateDeviceInfoList(ptr ptr) @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) @ stdcall SetupDiCreateDeviceInfoListExW(ptr long str ptr) -@ stub SetupDiCreateDeviceInfoW +@ stdcall SetupDiCreateDeviceInfoW(long wstr ptr wstr long long ptr) @ stub SetupDiDeleteDevRegKey @ stub SetupDiDeleteDeviceInfo @ stub SetupDiDeleteDeviceInterfaceData

1 0

Christian Gmeiner : setupapi: Remove unneeded NULL checks before MyFree().
by Alexandre Julliard July 20, 2006

July 20, 2006

Module: wine Branch: refs/heads/master Commit: bb80e2282e88c65a14cc0a1e82f4852baabcbcb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb80e2282e88c65a14cc0a1… Author: Christian Gmeiner <christian.gmeiner(a)students.fhv.at> Date: Wed Jul 19 19:39:48 2006 +0200 setupapi: Remove unneeded NULL checks before MyFree(). --- dlls/setupapi/devinst.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c4e0bec..7d076b8 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -148,8 +148,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExA ClassGuidListSize, RequiredSize, MachineNameW, Reserved); - if (MachineNameW) - MyFree(MachineNameW); + MyFree(MachineNameW); return bResult; } @@ -366,9 +365,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExA ClassGuidListSize, RequiredSize, MachineNameW, Reserved); - if (MachineNameW) - MyFree(MachineNameW); - + MyFree(MachineNameW); MyFree(ClassNameW); return bResult; @@ -636,8 +633,7 @@ SetupDiCreateDeviceInfoListExA(const GUI hDevInfo = SetupDiCreateDeviceInfoListExW(ClassGuid, hwndParent, MachineNameW, Reserved); - if (MachineNameW) - MyFree(MachineNameW); + MyFree(MachineNameW); return hDevInfo; } @@ -1303,8 +1299,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExA( hKey = SetupDiOpenClassRegKeyExW(ClassGuid, samDesired, Flags, MachineNameW, Reserved); - if (MachineNameW) - MyFree(MachineNameW); + MyFree(MachineNameW); return hKey; }

1 0

James Hawkins : msi: Implement the SetInstallLevel event.
by Alexandre Julliard July 20, 2006

July 20, 2006

Module: wine Branch: refs/heads/master Commit: ece0ae0a41b74f9ee37ad1dbe3835e82e997641c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ece0ae0a41b74f9ee37ad1d… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 19 11:17:46 2006 -0700 msi: Implement the SetInstallLevel event. --- dlls/msi/events.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 3d734d6..4d1525a 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -35,6 +35,7 @@ #include "msipriv.h" #include "action.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -368,6 +369,16 @@ UINT ACTION_DialogBox( MSIPACKAGE* packa return r; } +static UINT ControlEvent_SetInstallLevel(MSIPACKAGE* package, LPCWSTR argument, + msi_dialog* dialog) +{ + int iInstallLevel = atolW(argument); + + TRACE("Setting install level: %i\n", iInstallLevel); + + return MSI_SetInstallLevel( package, iInstallLevel ); +} + static const struct _events Events[] = { { "EndDialog",ControlEvent_EndDialog }, { "NewDialog",ControlEvent_NewDialog }, @@ -379,6 +390,7 @@ static const struct _events Events[] = { { "AddSource",ControlEvent_AddSource }, { "SetTargetPath",ControlEvent_SetTargetPath }, { "Reset",ControlEvent_Reset }, + { "SetInstallLevel",ControlEvent_SetInstallLevel }, { NULL,NULL }, };

1 0

James Hawkins : msi: Forward MsiSetInstallLevel to an internal MSI_SetInstallLevel that can be used internally .
by Alexandre Julliard July 20, 2006

July 20, 2006

Module: wine Branch: refs/heads/master Commit: de73481c894ccea076fe53af5b743c77cfe7d1f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de73481c894ccea076fe53a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 19 11:17:28 2006 -0700 msi: Forward MsiSetInstallLevel to an internal MSI_SetInstallLevel that can be used internally. --- dlls/msi/install.c | 31 +++++++++++++++++++++---------- dlls/msi/msipriv.h | 3 +++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 38888ef..f5e2c42 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -762,27 +762,19 @@ LANGID WINAPI MsiGetLanguage(MSIHANDLE h return langid; } -/*********************************************************************** - * MsiGetLanguage (MSI.@) - */ -UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) +UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ) { static const WCHAR szInstallLevel[] = { 'I','N','S','T','A','L','L','L','E','V','E','L',0 }; static const WCHAR fmt[] = { '%','d',0 }; - MSIPACKAGE* package; WCHAR level[6]; UINT r; - TRACE("%ld %i\n", hInstall, iInstallLevel); + TRACE("%p %i\n", package, iInstallLevel); if (iInstallLevel<1 || iInstallLevel>32767) return ERROR_INVALID_PARAMETER; - package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); - if ( !package ) - return ERROR_INVALID_HANDLE; - sprintfW( level, fmt, iInstallLevel ); r = MSI_SetPropertyW( package, szInstallLevel, level ); if ( r == ERROR_SUCCESS ) @@ -790,6 +782,25 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE r = MSI_SetFeatureStates( package ); } + return r; +} + +/*********************************************************************** + * MsiSetInstallLevel (MSI.@) + */ +UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) +{ + MSIPACKAGE* package; + UINT r; + + TRACE("%ld %i\n", hInstall, iInstallLevel); + + package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); + if ( !package ) + return ERROR_INVALID_HANDLE; + + r = MSI_SetInstallLevel( package, iInstallLevel ); + msiobj_release( &package->hdr ); return r; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a56b9fe..b2fe5bc 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -381,6 +381,9 @@ extern UINT MSI_ViewExecute( MSIQUERY*, extern UINT MSI_ViewFetch( MSIQUERY*, MSIRECORD ** ); extern UINT MSI_ViewClose( MSIQUERY* ); +/* install internals */ +extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ); + /* package internals */ extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE * ); extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE ** );

1 0