Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgoette] 378: * fix some bugs * strip down front page * get front page xhtml1-strict compatible
by dgoette＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: dgoette Date: Sat Apr 18 00:51:44 2009 New Revision: 378 URL: http://svn.reactos.org/svn/reactos?rev=378&view=rev Log: * fix some bugs * strip down front page * get front page xhtml1-strict compatible Modified: branches/danny-web/www/www.reactos.org/compat/lib/Compat_Autoloader.class.p… branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php branches/danny-web/www/www.reactos.org/compat/lib/HTML_Item.class.php branches/danny-web/www/www.reactos.org/compat/lib/get/List_Item.class.php branches/danny-web/www/www.reactos.org/compat/lib/om/CUser.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/Breadcrumb.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Category.class.… branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Group.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Vendor.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_VendorInfo.clas… branches/danny-web/www/www.reactos.org/compat/lib/view/Home.class.php branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Details.class.p… branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Tests.class.php branches/danny-web/www/www.reactos.org/compat/notools/plugins.php Modified: branches/danny-web/www/www.reactos.org/compat/lib/Compat_Autoloader.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/Compat_Autoloader.class.p… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/Compat_Autoloader.class.p… [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -44,6 +44,9 @@ elseif (file_exists(CDB_PATH.'lib/om/'.$class.'.class.php')) { require_once(CDB_PATH.'lib/om/'.$class.'.class.php'); } + elseif (file_exists(CDB_PATH.'lib/get/'.$class.'.class.php')) { + require_once(CDB_PATH.'lib/get/'.$class.'.class.php'); + } elseif (file_exists(CDB_PATH.'lib/view/'.$class.'.class.php')) { require_once(CDB_PATH.'lib/view/'.$class.'.class.php'); } Modified: branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/HTML.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -120,24 +120,6 @@ } echo ' - <script> -  - </script> </head> <body> <div id="top"> @@ -163,17 +145,6 @@ include('rsdb_setting.php'); include('rsdb_config.php'); - global $roscms_intern_account_level; - global $roscms_intern_login_check; - global $roscms_intern_login_check_username; - global $roscms_intern_account_group; - global $roscms_intern_usrgrp_sadmin; - global $roscms_intern_usrgrp_admin; - global $roscms_intern_usrgrp_dev; - global $roscms_intern_usrgrp_team; - global $roscms_intern_usrgrp_trans; - global $roscms_intern_usrgrp_user; - global $RSDB_langres; global $RSDB_intern_link_db_sec; echo ' @@ -190,53 +161,35 @@ </ol> <br /> + <div class="navTitle">Browse Database</div> + <ol> + <li><a href="'.$RSDB_intern_link_db_sec.'name&letter=all">By Name</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'category&cat=0">By Category</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all">By Vendor</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'rank">By Rank</a></li> + </ol> + <br /> + <div class="navTitle">Compatibility</div> <ol> <li><a href="'.$RSDB_intern_link_db_sec.'home">Overview</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'category&cat=0">Browse Database</a></li>'; - - if (isset($_GET['page']) && ($_GET['page'] == 'category' || $_GET['page'] == 'name' || $_GET['page'] == 'vendor' || $_GET['page'] == 'rank')) { - echo ' - <li><a href="'.$RSDB_intern_link_db_sec.'category&cat=0"> - By Category</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'name&letter=all"> - By Name</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all"> - By Vendor</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'rank"> - By Rank</a></li>'; - } - - echo ' - <li id="noscriptsearchbar" style="display: block"><a href="'.$RSDB_intern_link_db_sec.'search">Search</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'submit">Submit Application</a></li> - <li><a href="'.$RSDB_intern_link_db_sec.'help">Help & FAQ</a></li> - </ol> - <br /> - - <div class="navTitle">Search</div> - <ol> - <li> - <div id="ajaxsearchbar" align="center" style="display: none"> - <div align="center"> - <label for="searchbar" accesskey="s"></label> - <input name="searchbar" type="text" id="searchbar" tabindex="0" onkeyup="'."loadItemList(this.value,'bar','comp','ajaxloadbar','sresultbar');".'" size="17" maxlength="50" style="font-family: Verdana; font-size: x-small; font-style: normal;" /> - </div> - <div id="sresultbar" style="display: none" align="left"></div> - <div style="text-align: center;"> - <img id="ajaxloadbar" src="images/ajax_loading.gif" style="display: none" /> - </div> - </li> - </ol> - <br /> - - <script type="text/javascript"> -  - </script> - - <div class="navTitle">Language</div> - <ol> - <li> - <div align="center">'; + <li><a href="'.$RSDB_intern_link_db_sec.'submit">Submit Application</a></li> + <li><a href="'.$RSDB_intern_link_db_sec.'help">Help & FAQ</a></li> + </ol> + <br /> + + <div class="navTitle"><label for="searchbar" accesskey="s">Search</label></div> + <ol> + <li> + <input name="searchbar" type="text" id="searchbar" tabindex="0" size="17" maxlength="50" style="font-family: Verdana; font-size: x-small; font-style: normal;" /> + <button>></button> + </li> + </ol> + <br /> + + <div class="navTitle">Language</div> + <ol> + <li>'; // get selected language if (empty($_GET['lang']) && isset($_COOKIE['roscms_usrset_lang'])) { @@ -294,10 +247,10 @@ </table> - <hr size="1" /> + <hr /> <address style="text-align:center"> - <a href="http://www.reactos.org" onmousedown="'."return clk(this.href,'res','');".'">ReactOS</a> is a registered trademark or a trademark of <a href="http://www.reactos.org/?page=foundation">ReactOS Foundation</a> in the United States and other countries.<br /> - Copyright © Klemens Friedl 2005-'.date('Y').', All rights reserved. + <a href="http://www.reactos.org">ReactOS</a> is a registered trademark or a trademark of <a href="http://www.reactos.org/?page=foundation">ReactOS Foundation</a> in the United States and other countries.<br /> + Copyright © Klemens Friedl 2005-2009, All rights reserved. </address> </body> Modified: branches/danny-web/www/www.reactos.org/compat/lib/HTML_Item.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/HTML_Item.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/HTML_Item.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -265,6 +265,7 @@ </table></td> </tr> </table> -<? +<?php } // end of member function header -} +} +?> Modified: branches/danny-web/www/www.reactos.org/compat/lib/get/List_Item.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/get/List_Item.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/get/List_Item.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -18,21 +18,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - +class List_Item +{ + + public function __construct() + { ?> <base href="<?php echo $RSDB_intern_path_server.$RSDB_intern_path; ?>" /> <table width="100%" border="0" > @@ -241,3 +231,7 @@ </td> </tr> </table> +<?php + } +} +?> Modified: branches/danny-web/www/www.reactos.org/compat/lib/om/CUser.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/om/CUser.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/om/CUser.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -18,44 +18,40 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ +class CUser +{ - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } + + // Get the user name from the RosCMS user table + public static function getName($user_id) { + + require_once(ROSCMS_PATH.'lib/RosCMS_Autoloader.class.php'); + $name = Subsystem::getUserName($user_id); + if ($name !== false) { + return $name; + } + return ''; + } // end of member function getName - $roscms_connected = 1; - - function usrfunc_GetUsername($RSDB_TEMP_getusrid) { // Get the user name from the RosCMS user table - require_once(ROSCMS_PATH.'lib/RosCMS_Autoloader.class.php'); - $RSDB_USER_name = Subsystem::getUserName($RSDB_TEMP_getusrid); - if ($RSDB_USER_name !== false) { - return $RSDB_USER_name; - } - return ''; - } - - function usrfunc_IsAdmin($RSDB_TEMP_getusrid) { // Check if the user is an developer, admin or super admin + // Check if the user is an developer, admin or super admin + public static function isAdmin($user_id) { //@IMPLEMENT Usergroup check return false; - } + } // end of member function isAdmin - function usrfunc_IsModerator($RSDB_TEMP_getusrid) { // Check if the user is an RSDB Moderator + + + public static function isModerator($user_id) { // Check if the user is an RSDB Moderator //@IMPLEMENT Usergroup check - return false; - } - + return false; + } // end of member function isModerator + + + +} // end of class CUser ?> Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Breadcrumb.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Breadcrumb.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Breadcrumb.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -122,12 +122,12 @@ // check if entry exists and is visible elseif ($param > 0 && $param_type === self::PARAM_ENTRY) { - $stmt=CDBConnection::getInstance()->prepare("SELECT grpentr_id, grpentr_category, grpentr_name FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id") ; + $stmt=CDBConnection::getInstance()->prepare("SELECT grpentr_category, grpentr_name FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id") ; $stmt->bindParam('group_id',$param,PDO::PARAM_INT); $stmt->execute(); - $category_id = $stmt->fetchOnce(PDO::FETCH_ASSOC); - - if ($group === false) { + $category_id = $stmt->fetchColumn(); + + if ($category_id === false) { echo 'Unknown Group'; return; } Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Category.class.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Category.class.… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Category.class.… [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -24,6 +24,8 @@ protected function body () { global $RSDB_intern_link_db_sec; + global $RSDB_intern_link_group; + global $RSDB_intern_link_vendor_id_EX; // show breadcrumb if (isset($_GET['cat'])) { Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Group.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Group.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Group.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -24,8 +24,13 @@ protected function body() { - - + global $RSDB_intern_user_id; + global $RSDB_SET_group; + global $RSDB_intern_link_vendor_sec; + global $RSDB_intern_link_item; + + + new Breadcrumb(Breadcrumb::MODE_TREE, $_GET['group'], Breadcrumb::PARAM_ENTRY); $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id AND grpentr_comp = '1' ORDER BY grpentr_name ASC") ; $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); @@ -290,7 +295,7 @@ <td width="40%" valign="top"> <?php - if (isset($_GET['group2']) && ($_GET['group2'] == '' || $_GET['group2'] == 'overview')) { + if (!isset($_GET['group2']) || ($_GET['group2'] == '' || $_GET['group2'] == 'overview')) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_groupid = :group_id AND comp_visible = '1' ORDER BY comp_award DESC, comp_appversion DESC, comp_osversion DESC LIMIT 1"); } else { @@ -300,7 +305,7 @@ } $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); $stmt->execute(); - $result_version_newest = $stmt->fetch(PDO::FETCH_ASSOC);; + $result_version_newest = $stmt->fetchOnce(PDO::FETCH_ASSOC); echo "<h3 align=\"center\"><font size=\"2\">".$result_entry_vendor['vendor_name']."</font> ".$result_version_newest['comp_name']."</h3>"; ?> @@ -761,7 +766,7 @@ <?php } // end if {$result_page['grpentr_type'] == "default"} } - if (usrfunc_IsModerator($RSDB_intern_user_id)) { + if (CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id AND grpentr_comp = '1'") ; $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); @@ -807,7 +812,7 @@ // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_group != "" && $RSDB_TEMP_appgroup != "" && $RSDB_TEMP_description != "" && $RSDB_TEMP_category != "" && $RSDB_TEMP_vendor != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_SET_group != "" && $RSDB_TEMP_appgroup != "" && $RSDB_TEMP_description != "" && $RSDB_TEMP_category != "" && $RSDB_TEMP_vendor != "" && CUser::isModerator($RSDB_intern_user_id)) { // Update group entry: $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_groups SET grpentr_name = :new_name, grpentr_category = :new_category, grpentr_vendor = :new_vendor, grpentr_description = :new_description WHERE grpentr_id = :group_id"); $stmt->bindParam('new_name',$RSDB_TEMP_appgroup,PDO::PARAM_STR); @@ -832,7 +837,7 @@ } // Special request: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs ( log_id, log_date, log_usrid, log_usrip, log_level, log_action, log_title, log_description, log_category, log_badusr, log_referrer, log_browseragent, log_read, log_taskdone_usr) VALUES ('', NOW(), :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agent, ';', '0')"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); @@ -843,7 +848,7 @@ $stmt->execute(); } // Report spam: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_groups SET grpentr_visible = '3' WHERE grpentr_id = :group_id"); $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); $stmt->execute(); @@ -858,7 +863,7 @@ $temp_verified = "yes"; } if ($result_maintainer_group['grpentr_checked'] == "1" || $result_maintainer_group['grpentr_checked'] == "no") { - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_groups SET grpentr_checked = :checked WHERE grpentr_id = :group_id"); $stmt->bindParam('checked',$temp_verified,PDO::PARAM_STR); $stmt->bindParam('group_id',$RSDB_SET_group,PDO::PARAM_STR); @@ -1170,14 +1175,14 @@ <br /> <?php - if (usrfunc_IsAdmin($RSDB_intern_user_id)) { + if (CUser::isAdmin($RSDB_intern_user_id)) { $RSDB_TEMP_padmin = ""; $RSDB_TEMP_done = ""; if (array_key_exists("padmin", $_POST)) $RSDB_TEMP_padmin=htmlspecialchars($_POST["padmin"]); if (array_key_exists("done", $_POST)) $RSDB_TEMP_done=htmlspecialchars($_POST["done"]); - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Vendor.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Vendor.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_Vendor.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -120,7 +120,7 @@ <?php } - if (usrfunc_IsModerator($RSDB_intern_user_id)) { + if (CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_vendor WHERE vendor_visible = '1' AND vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('vendor_id',@$_GET['vendor'],PDO::PARAM_STR); @@ -156,7 +156,7 @@ if (array_key_exists("txtinfo", $_POST)) $RSDB_TEMP_txtinfo=htmlspecialchars($_POST["txtinfo"]); // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && isset($_GET['page']) && $_GET['page'] == "vendor" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && isset($_GET['page']) && $_GET['page'] == "vendor" && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && CUser::isModerator($RSDB_intern_user_id)) { // Submit vendor entry: $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_item_vendor ( vendor_id, vendor_name, vendor_visible, vendor_fullname, vendor_url, vendor_email, vendor_infotext, vendor_usrid, vendor_usrip, vendor_date, vendor_checked ) VALUES ('', :name, '1', :fullname, :url, :email, :info, :user_id, :ip, NOW() , 'yes')"); @@ -178,7 +178,7 @@ } // Special request: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs (log_id, log_date, log_usrid, log_usrip, log_level, log_action, log_title, log_description, log_category, log_badusr, log_referrer, log_browseragent, log_read, log_taskdone_usr ) VALUES ('', NOW() , :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agent, ';', '0')"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); @@ -284,14 +284,14 @@ <br /> <?php - if (usrfunc_IsAdmin($RSDB_intern_user_id)) { + if (CUser::isAdmin($RSDB_intern_user_id)) { $RSDB_TEMP_padmin = ""; $RSDB_TEMP_done = ""; if (array_key_exists("padmin", $_POST)) $RSDB_TEMP_padmin=htmlspecialchars($_POST["padmin"]); if (array_key_exists("done", $_POST)) $RSDB_TEMP_done=htmlspecialchars($_POST["done"]); - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id LIMIT 1"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_VendorInfo.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_VendorInfo.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/HTML_VendorInfo.clas… [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -310,7 +310,7 @@ <p> </p> <?php - if (usrfunc_IsModerator($RSDB_intern_user_id)) { + if (CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepapare("SELECT * FROM rsdb_item_vendor WHERE vendor_visible = '1' AND vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('vendor_id',@$_GET['vendor'],PDO::PARAM_STR); @@ -347,7 +347,7 @@ // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && isset($_GET['vendor']) && $_GET['vendor'] != '' && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && isset($_GET['vendor']) && $_GET['vendor'] != '' && $RSDB_TEMP_vendname != "" && $RSDB_TEMP_txturl != "" && CUser::isModerator($RSDB_intern_user_id)) { // Update group entry: $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_name = :name, vendor_fullname = :fullname, vendor_url = :url, vendor_email = :email, vendor_infotext = :info WHERE vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('name',$RSDB_TEMP_vendname,PDO::PARAM_STR); @@ -367,7 +367,7 @@ } // Special request: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs (log_id, log_date, log_usrid, log_usrip, log_level, log_action, log_title, log_description, log_category, log_badusr, log_referrer, log_browseragent, log_read, log_taskdone_usr) VALUES ('', NOW(), :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agent, ';', '0')"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); @@ -378,7 +378,7 @@ $stmt->execute(); } // Report spam: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_visible = '3' WHERE vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('vendor_id',@$_GET['vendor'],PDO::PARAM_STR); $stmt->execute(); @@ -392,7 +392,7 @@ $temp_verified = "yes"; } if ($result_maintainer_vendor['vendor_checked'] == "1" || $result_maintainer_vendor['vendor_checked'] == "no") { - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_vendor SET vendor_checked = :checked WHERE vendor_id = :vendor_id LIMIT 1"); $stmt->bindParam('checked',$temp_verified,PDO::PARAM_STR); $stmt->bindParam('vendor_id',@$_GET['vendor'],PDO::PARAM_STR); @@ -627,14 +627,14 @@ <br /> <?php - if (usrfunc_IsAdmin($RSDB_intern_user_id)) { + if (CUser::isAdmin($RSDB_intern_user_id)) { $RSDB_TEMP_padmin = ""; $RSDB_TEMP_done = ""; if (array_key_exists("padmin", $_POST)) $RSDB_TEMP_padmin=htmlspecialchars($_POST["padmin"]); if (array_key_exists("done", $_POST)) $RSDB_TEMP_done=htmlspecialchars($_POST["done"]); - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Home.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Home.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Home.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -26,158 +26,30 @@ protected function body( ) { - global $RSDB_intern_index_php; global $RSDB_intern_link_db_sec; global $RSDB_intern_user_id; global $RSDB_intern_loginsystem_fullpath; global $RSDB_intern_link_item_comp; + // get number of entries + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1'"); + $stmt->execute(); + echo ' - <script type="text/JavaScript"> -  - </script> - <style type="text/css"> -  - </style> - <body onLoad="'."MM_preloadImages('media/icons/buttons/button_comp_search_m.jpg', 'media/icons/buttons/button_comp_category_m.jpg', 'media/icons/buttons/button_comp_name_m.jpg', 'media/icons/buttons/button_comp_vendor_m.jpg', 'media/icons/buttons/button_comp_rank_m.jpg', 'media/icons/buttons/button_comp_submit_m.jpg');".'"> <h1>Compatibility Database - Overview</h1> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="100%" valign="top"> - <p style="font-size:2;">The ReactOS Compatibility Database (CompDB) has stored a lot of information about application and driver compatibility with ReactOS.</p> - <div id="StartList" style="display: none;text-align:center;"> - <a href="'.$RSDB_intern_link_db_sec.'category&cat=0&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompCategory', '', 'media/icons/buttons/button_comp_category_m.jpg', 1);".'"> - <img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'name&letter=all&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompName', '', 'media/icons/buttons/button_comp_name_m.jpg', 1);".'"> - <img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompVendor', '', 'media/icons/buttons/button_comp_vendor_m.jpg', 1);".'"> - <img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'rank&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompRank', '', 'media/icons/buttons/button_comp_rank_m.jpg', 1);".'"> - <img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'submit&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('SubApp', '', 'media/icons/buttons/button_comp_submit_m.jpg', 1)".'"> - <img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0" /> - </a> - <br /> - <table width="231" height="49" border="0" cellpadding="0" cellspacing="0" style="margin: 0px auto;"> - <tr> - <td width="231" height="49" align="right" valign="middle" nowrap background="media/icons/buttons/button_comp_search.jpg"> - <table width="100%" border="0"> - <tr> - <td width="110"> </td> - <td> - <input name="searchinput" type="text" id="searchinput" tabindex="0" onBlur="'."loadItemList(this.value, 'table', 'comp', 'ajaxload', 'sresult');".'" onKeyUp="'."loadItemList(this.value, 'table', 'comp', 'ajaxload', 'sresult');".'" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /> - <img id="ajaxload" src="images/ajax_loading.gif" style="display: none" /> - <script language="JavaScript" type="text/JavaScript"> -  - </script> - </td> - </tr> - </table> - </td> - </tr> - </table> - </div> - <div style="text-align:center;"> - <noscript> - <a href="'.$RSDB_intern_link_db_sec.'category&cat=0&ajax=false"> - <img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'name&letter=all&ajax=false"> - <img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all&ajax=false"> - <img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'rank&ajax=false"> - <img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'submit&ajax=false"> - <img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0" /> - </a> - <br /> - <a href="'.$RSDB_intern_link_db_sec.'search&ajax=false"> - <img src="media/icons/buttons/button_comp_search_noscript.jpg" alt="Search by Query" name="CompSearch" width="232" height="50" border="0" /> - </a> - <br /> - </noscript> - </div> - </td> - <td style="text-align:right;vertical-align:top;"> - <img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" height="300" width="400" /> - </td> - </tr> - </table> - <div id="sresult" style="display: none"></div> - <h3>Features</h3> - <p>Some of the <strong>features of the Compatibility Database</strong> are:</p> - <ul> - <li>Browse through the database in several different ways (by <a href="'.$RSDB_intern_link_db_sec.'category&cat=0">category</a>, <a href="'.$RSDB_intern_link_db_sec.'name&letter=all">name</a>, <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all">vendor</a>, <a href="'.$RSDB_intern_link_db_sec.'rank">ranks</a>, <a href="'.$RSDB_intern_link_db_sec.'search">search</a>).</li> - <li>Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. </li> - <li>Ability to vote on test reports, forum messages, screenshots, etc.</li> - <li>Ability to customize the layout, several settings (like personal threshold, etc.) and behaviour of the Support Database.</li> - <li>Ability to sign up to be an application maintainer.<br /></li> - </ul> - <h3>Recent submissions</h3>'; - - // get number of entries - $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_comp = '1'"); - $stmt->execute(); - echo ' - <p>There are <a href="'.$RSDB_intern_link_db_sec.'stats"><strong>'.$stmt->fetchColumn().' applications and drivers</strong></a> currently in the database.</p> - <div style="margin:0; margin-top:10px; width:520px; margin-right:10px; border:1px solid #dfdfdf; padding:0em 1em 1em 1em; background-color:#EAF0F8;"> - <br /> - <table width="500" border="0" cellpadding="1" cellspacing="1"> - <tr bgcolor="#5984C3"> - <td width="15%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> - <td width="50%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Application</strong></font></div></td> - <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Function</strong></font></div></td> - </tr>'; + <img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" style="float: right;"/> + <p>The ReactOS Compatibility Database contains information about compatible software. Below the latest reports are listed</p> + <p>There are <strong>'.$stmt->fetchColumn().'</strong> applications and drivers currently in the database.</p> + + <h2>Recent submissions</h2> + <div style="margin:10px 10px 0 0; width:500px; border:1px solid #dfdfdf; padding:1em; background-color:#EAF0F8;"> + <table style="width:100%; border: none;" cellpadding="1" cellspacing="1"> + <tr style="background-color:#5984C3;color:white;"> + <th>Application</th> + <th style="width:50px;">Works?</th> + <th style="width:150px;text-align:center;">Last update</th> + </tr>'; //@MOVEME to css $cellcolor1='#E2E2E2'; @@ -185,42 +57,28 @@ $cellcolorcounter=0; // show latest tests - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_testresults WHERE test_visible = '1' ORDER BY test_id DESC LIMIT 5"); + $stmt=CDBConnection::getInstance()->prepare("SELECT t.test_user_submit_timestamp, i.comp_id, i.comp_name FROM rsdb_item_comp_testresults t JOIN rsdb_item_comp i ON t.test_comp_id=i.comp_id WHERE t.test_visible = '1' ORDER BY t.test_id DESC LIMIT 10"); $stmt->execute(); while ($entry = $stmt->fetch(PDO::FETCH_ASSOC)) { + ++$cellcolorcounter; - // get programm name to the test - $stmt_comp=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_id = :comp_id LIMIT 1"); - $stmt_comp->bindParam('comp_id',$entry['test_comp_id'],PDO::PARAM_STR); - $stmt_comp->execute(); - $comp = $stmt_comp->fetchOnce(PDO::FETCH_ASSOC); - - $cellcolorcounter++; echo ' <tr style="background-color:'.($cellcolorcounter%2 ? $cellcolor1 : $cellcolor2).';"> - <td style="text-align: center;font-size:1;">'.$entry['test_user_submit_timestamp'].'</td> - <td style="font-size:2;"> <strong><a href="'.$RSDB_intern_link_item_comp.$comp['comp_id'].'&item2=tests">'.$comp['comp_name'].'</a></strong></td> - <td style="font-size:2;"> '.Star::drawSmall($entry['test_result_function'], 1, 5, '').'</td> + <td><a href="'.$RSDB_intern_link_item_comp.$entry['comp_id'].'&item2=tests">'.$entry['comp_name'].'</a></td> + <td>TBI</td> + <td style="text-align: center;">'.$entry['test_user_submit_timestamp'].'</td> </tr>'; } echo ' - </table> - </div>'; + </table> + </div> + <p>You can also <a href="'.$RSDB_intern_link_db_sec.'submit">Submit new Entries</a></p>'; // print some login blah to guest users if ($RSDB_intern_user_id <= 0) { echo '<p style="font-size:2;">Some of the features of the ReactOS Compatibility Database require that you have a <a href="'.$RSDB_intern_loginsystem_fullpath.'?page=register">myReactOS account</a> and are <a href="'.$RSDB_intern_loginsystem_fullpath.'?page=login">logged in</a>.</p>'; } - - echo ' - <script type="text/JavaScript"> -  - </script>'; } // end of member function body Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Details.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Details.class.p… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Details.class.p… [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -19,11 +19,14 @@ */ -class Item_Tips extends HTML_Item +class Item_Details extends HTML_Item { protected function body() { + global $RSDB_intern_link_item; + global $RSDB_intern_link_vendor_sec; + global $RSDB_intern_user_id; $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_visible = '1' AND comp_id = :comp_id ORDER BY comp_name ASC"); @@ -194,7 +197,7 @@ </table> <?php - if (usrfunc_IsModerator($RSDB_intern_user_id)) { + if (CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_visible = '1' AND comp_id = :comp_id LIMIT 1"); $stmt->bindParam('comp_id',@$_GET['item'],PDO::PARAM_STR); $stmt->execute(); @@ -239,7 +242,7 @@ // Edit application group data: - if ($RSDB_TEMP_pmod == "ok" && @$_GET['item'] != "" && $RSDB_TEMP_appn != "" && $RSDB_TEMP_apppr != "" && $RSDB_TEMP_appit != "" && $RSDB_TEMP_version != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && @$_GET['item'] != "" && $RSDB_TEMP_appn != "" && $RSDB_TEMP_apppr != "" && $RSDB_TEMP_appit != "" && $RSDB_TEMP_version != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id AND grpentr_comp = '1' LIMIT 1"); $stmt->bindParam('group_id',$RSDB_TEMP_appn,PDO::PARAM_STR); @@ -266,7 +269,7 @@ } // Special request: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtreq1 != "" && $RSDB_TEMP_txtreq2 != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("INSERT INTO rsdb_logs ( log_id , log_date , log_usrid , log_usrip , log_level , log_action , log_title , log_description , log_category , log_badusr , log_referrer , log_browseragent , log_read , log_taskdone_usr ) VALUES ('', NOW( ) , :user_id, :ip, 'low', 'request', :title, :description, 'user_moderator', '0', :referrer, :user_agend, ';', '0')"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('ip',$RSDB_ipaddr,PDO::PARAM_STR); @@ -277,7 +280,7 @@ $stmt->execute(); } // Report spam: - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_txtspam != "" && CUser::isModerator($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_comp SET comp_visible = '3' WHERE comp_id = :comp_id"); $stmt->bindParam('comp_id',@$_GET['item'],PDO::PARAM_STR); $stmt->execute(); @@ -292,7 +295,7 @@ $temp_verified = "yes"; } if ($result_maintainer_item['comp_checked'] == "1" || $result_maintainer_item['comp_checked'] == "no") { - if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && usrfunc_IsModerator($RSDB_intern_user_id)) { + if ($RSDB_TEMP_pmod == "ok" && $RSDB_TEMP_verified == "done" && CUser::isModerator($RSDB_intern_user_id)) { echo "!"; $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_comp SET comp_checked = :checked WHERE comp_id = :comp_id "); $stmt->bindParam('checked',$temp_verified,PDO::PARAM_STR); @@ -529,7 +532,7 @@ <br /> <?php - if (usrfunc_IsAdmin($RSDB_intern_user_id)) { + if (CUser::isAdmin($RSDB_intern_user_id)) { $RSDB_TEMP_padmin = ""; $RSDB_TEMP_done = ""; @@ -539,13 +542,13 @@ if (array_key_exists("medal", $_POST)) $RSDB_TEMP_medal=htmlspecialchars($_POST["medal"]); - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_done != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_logs SET log_taskdone_usr = :user_id WHERE log_id = :log_id"); $stmt->bindParam('user_id',$RSDB_intern_user_id,PDO::PARAM_STR); $stmt->bindParam('log_id',$RSDB_TEMP_done,PDO::PARAM_STR); $stmt->execute(); } - if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_medal != "" && isset($_GET['item']) && $_GET['item'] != "" && usrfunc_IsAdmin($RSDB_intern_user_id)) { + if ($RSDB_TEMP_padmin == "ok" && $RSDB_TEMP_medal != "" && isset($_GET['item']) && $_GET['item'] != "" && CUser::isAdmin($RSDB_intern_user_id)) { $stmt=CDBConnection::getInstance()->prepare("UPDATE rsdb_item_comp SET comp_award = :award WHERE comp_id = :comp_id"); $stmt->bindParam('award',$RSDB_TEMP_medal,PDO::PARAM_STR); $stmt->bindParam('comp_id',$_GET['item'],PDO::PARAM_STR); Modified: branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Tests.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Tests.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/lib/view/Item_Tests.class.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -101,10 +101,10 @@ <tr> <td width="80" rowspan="2" align="center" valign="middle"><div align="left"><strong><?php - if (usrfunc_IsAdmin($result_testreports['test_user_id'])) { + if (CUser::isAdmin($result_testreports['test_user_id'])) { echo '<font size="3" face="Arial, Helvetica, sans-serif" color="#5984C3"> Admin'; } - else if (usrfunc_IsModerator($result_testreports['test_user_id'])) { + else if (CUser::isModerator($result_testreports['test_user_id'])) { echo '<font size="2" face="Arial, Helvetica, sans-serif" color="#5984C3"> Maintainer'; } else { Modified: branches/danny-web/www/www.reactos.org/compat/notools/plugins.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/c… ============================================================================== --- branches/danny-web/www/www.reactos.org/compat/notools/plugins.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/compat/notools/plugins.php [iso-8859-1] Sat Apr 18 00:51:44 2009 @@ -37,7 +37,7 @@ // Exif reader v 1.2 // By Richard James Kendall - require_once("inc/tools/plugins/exif.php"); + require_once("notools/plugins/exif.php"); function read_exif($RSDB_TEMP_filename, $spacechar) { global $exif_data;

1 0

[cwittich] 40563: fix last setupapi stringtable winetest
by cwittich＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: cwittich Date: Sat Apr 18 00:50:04 2009 New Revision: 40563 URL: http://svn.reactos.org/svn/reactos?rev=40563&view=rev Log: fix last setupapi stringtable winetest Modified: trunk/reactos/dll/win32/setupapi/stringtable.c trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Sat Apr 18 00:50:04 2009 @@ -602,13 +602,13 @@ LPWSTR lpString, DWORD dwFlags, LPVOID lpExtraData, - LPDWORD lpReserved) + DWORD dwReserved) { PSTRING_TABLE pStringTable; DWORD i; TRACE("%p %s %x %p, %x\n", hStringTable, debugstr_w(lpString), dwFlags, - lpExtraData, lpReserved); + lpExtraData, dwReserved); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) @@ -627,11 +627,7 @@ if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { if (lpExtraData) - { - memcpy(lpExtraData, - pStringTable->pSlots[i].pData, - pStringTable->pSlots[i].dwSize); - } + memcpy(lpExtraData, pStringTable->pSlots[i].pData, dwReserved); return i + 1; } } @@ -640,18 +636,13 @@ if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { if (lpExtraData) - { - memcpy(lpExtraData, - pStringTable->pSlots[i].pData, - pStringTable->pSlots[i].dwSize); - } + memcpy(lpExtraData, pStringTable->pSlots[i].pData, dwReserved); return i + 1; } } } } - - return (DWORD)-1; + return ~0u; } Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sat Apr 18 00:50:04 2009 @@ -1434,7 +1434,7 @@ WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitialize(VOID); WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitializeEx(DWORD, DWORD); WINSETUPAPI DWORD WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD); -WINSETUPAPI DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, LPDWORD); +WINSETUPAPI DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); WINSETUPAPI BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); WINSETUPAPI LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD); WINSETUPAPI BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD);

1 0

[jimtabor] 40562: - Ref bug 4074: Need to test it again to see if it crashes further down the line.
by jimtabor＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: jimtabor Date: Sat Apr 18 00:34:09 2009 New Revision: 40562 URL: http://svn.reactos.org/svn/reactos?rev=40562&view=rev Log: - Ref bug 4074: Need to test it again to see if it crashes further down the line. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Apr 18 00:34:09 2009 @@ -2397,9 +2397,11 @@ BOOLEAN isChild; PWINDOW Wnd; - ASSERT_REFS_CO(Window); //fixme: temp hack? + ASSERT_REFS_CO(Window); // FIXME: temp hack? Wnd = Window->Wnd; + + if (!Wnd) return TRUE; // FIXME: Need to finish object rewrite or lock the thread when killing the window! /* Check for owner thread */ if ((Window->OwnerThread != PsGetCurrentThread()))

1 0

[cwittich] 40561: don't crash on setupapi stringtable winetest
by cwittich＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: cwittich Date: Fri Apr 17 23:37:13 2009 New Revision: 40561 URL: http://svn.reactos.org/svn/reactos?rev=40561&view=rev Log: don't crash on setupapi stringtable winetest Modified: trunk/reactos/dll/win32/setupapi/stringtable.c Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Fri Apr 17 23:37:13 2009 @@ -607,13 +607,14 @@ PSTRING_TABLE pStringTable; DWORD i; - TRACE("%p %s %lx\n", (PVOID)hStringTable, debugstr_w(lpString), dwFlags); + TRACE("%p %s %x %p, %x\n", hStringTable, debugstr_w(lpString), dwFlags, + lpExtraData, lpReserved); pStringTable = (PSTRING_TABLE)hStringTable; if (pStringTable == NULL) { ERR("Invalid hStringTable!\n"); - return (DWORD)-1; + return ~0u; } /* Search for existing string in the string table */ @@ -625,10 +626,12 @@ { if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { - memcpy(lpExtraData, - pStringTable->pSlots[i].pData, - pStringTable->pSlots[i].dwSize); - *lpReserved = 0; + if (lpExtraData) + { + memcpy(lpExtraData, + pStringTable->pSlots[i].pData, + pStringTable->pSlots[i].dwSize); + } return i + 1; } } @@ -636,10 +639,12 @@ { if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { - memcpy(lpExtraData, - pStringTable->pSlots[i].pData, - pStringTable->pSlots[i].dwSize); - *lpReserved = 0; + if (lpExtraData) + { + memcpy(lpExtraData, + pStringTable->pSlots[i].pData, + pStringTable->pSlots[i].dwSize); + } return i + 1; } }

1 0

[cfinck] 40560: Remove the underscores in front of the variable names again after speaking with Daniel. RosBE-Unix and -Windows now use the same names for them again.
by cfinck＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: cfinck Date: Fri Apr 17 21:17:45 2009 New Revision: 40560 URL: http://svn.reactos.org/svn/reactos?rev=40560&view=rev Log: Remove the underscores in front of the variable names again after speaking with Daniel. RosBE-Unix and -Windows now use the same names for them again. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Fri Apr 17 21:17:45 2009 @@ -86,18 +86,18 @@ if ($_ROSBE_MODE -eq "MinGW") { $ENV:C_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" - $ENV:_ROSBE_HOST_CFLAGS = $null - $ENV:_ROSBE_HOST_CXXFLAGS = $null - $ENV:_ROSBE_TARGET_CFLAGS = $null - $ENV:_ROSBE_TARGET_CXXFLAGS = $null + $ENV:ROSBE_HOST_CFLAGS = $null + $ENV:ROSBE_HOST_CXXFLAGS = $null + $ENV:ROSBE_TARGET_CFLAGS = $null + $ENV:ROSBE_TARGET_CXXFLAGS = $null } else { $ENV:C_INCLUDE_PATH = $null $ENV:CPLUS_INCLUDE_PATH = $null - $ENV:_ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" - $ENV:_ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" - $ENV:_ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" - $ENV:_ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" + $ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" + $ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" + $ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" + $ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" } if ($_ROSBE_HOST_GCCVERSION -eq "3.4.5") { $ENV:PATH = "$_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH" @@ -106,8 +106,8 @@ $ENV:C_INCLUDE_PATH = "$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include" $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include" $ENV:LIBRARY_PATH = "$_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5" - $ENV:_ROSBE_HOST_CFLAGS = $null - $ENV:_ROSBE_HOST_CXXFLAGS = $null - $ENV:_ROSBE_TARGET_CFLAGS = $null - $ENV:_ROSBE_TARGET_CXXFLAGS = $null + $ENV:ROSBE_HOST_CFLAGS = $null + $ENV:ROSBE_HOST_CXXFLAGS = $null + $ENV:ROSBE_TARGET_CFLAGS = $null + $ENV:ROSBE_TARGET_CXXFLAGS = $null } Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Fri Apr 17 21:17:45 2009 @@ -99,18 +99,18 @@ if "%_ROSBE_MODE%" == "MinGW" ( set C_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include set CPLUS_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set _ROSBE_HOST_CFLAGS= - set _ROSBE_HOST_CXXFLAGS= - set _ROSBE_TARGET_CFLAGS= - set _ROSBE_TARGET_CXXFLAGS= + set ROSBE_HOST_CFLAGS= + set ROSBE_HOST_CXXFLAGS= + set ROSBE_TARGET_CFLAGS= + set ROSBE_TARGET_CXXFLAGS= ) else ( set C_INCLUDE_PATH= set CPLUS_INCLUDE_PATH= - set _ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" - set _ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" - set _ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" - set _ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" + set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" + set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" ) if "%_ROSBE_HOST_GCCVERSION%" == "3.4.5" ( set PATH=%_ROSBE_BASEDIR%\3.4.5\bin;%_ROSBE_BASEDIR%\3.4.5\libexec\gcc\mingw32\3.4.5;%PATH% @@ -119,8 +119,8 @@ set C_INCLUDE_PATH=%_ROSBE_BASEDIR%\3.4.5\include;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5\include set CPLUS_INCLUDE_PATH=%_ROSBE_BASEDIR%\3.4.5\include;%_ROSBE_BASEDIR%\3.4.5\include\c++\3.4.5;%_ROSBE_BASEDIR%\3.4.5\include\c++\3.4.5\mingw32;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5\include set LIBRARY_PATH=%_ROSBE_BASEDIR%\3.4.5\lib;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5 - set _ROSBE_HOST_CFLAGS= - set _ROSBE_HOST_CXXFLAGS= - set _ROSBE_TARGET_CFLAGS= - set _ROSBE_TARGET_CXXFLAGS= + set ROSBE_HOST_CFLAGS= + set ROSBE_HOST_CXXFLAGS= + set ROSBE_TARGET_CFLAGS= + set ROSBE_TARGET_CXXFLAGS= )

1 0

[cfinck] 377: - Remove "Tests marked as TODO", that's a Wine-specific thing we don't need to know about - Change the layout, so that everything fits into one line (idea by Christoph) - Don't compare differences for a specific result in case the test crashed
by cfinck＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: cfinck Date: Fri Apr 17 21:13:01 2009 New Revision: 377 URL: http://svn.reactos.org/svn/reactos?rev=377&view=rev Log: - Remove "Tests marked as TODO", that's a Wine-specific thing we don't need to know about - Change the layout, so that everything fits into one line (idea by Christoph) - Don't compare differences for a specific result in case the test crashed Modified: branches/danny-web/resources/testman/testman.sql branches/danny-web/www/www.reactos.org/testman/compare.php branches/danny-web/www/www.reactos.org/testman/css/compare.css branches/danny-web/www/www.reactos.org/testman/detail.php branches/danny-web/www/www.reactos.org/testman/js/compare.js.php branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… Modified: branches/danny-web/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/resources/testman/tes… ============================================================================== --- branches/danny-web/resources/testman/testman.sql [iso-8859-1] (original) +++ branches/danny-web/resources/testman/testman.sql [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -16,7 +16,6 @@ `test_id` int(10) unsigned NOT NULL, `suite_id` int(10) unsigned NOT NULL, `count` int(10) NOT NULL COMMENT 'Number of all executed tests', - `todo` int(10) unsigned NOT NULL COMMENT 'Tests marked as TODO', `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', `skipped` int(10) unsigned NOT NULL COMMENT 'Number of skipped tests', PRIMARY KEY (`id`), Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -17,22 +17,22 @@ GetLanguage(); require_once("lang/$lang.inc.php"); - - function GetValueForResult($result) - { - // If a test crashed, return a numeric value of 0, so that the comparison is accurate - if($result == -1) - return 0; - - return $result; - } function GetDifference(&$current_result_row, &$prev_result_row, $subject) { - if(!$prev_result_row["id"] || $current_result_row[$subject] == $prev_result_row[$subject]) + // Return   ("" is not possible because of IE...) if + // - we have nothing to compare + // - both values are identical + // - a crash occured in one of the results + if(!$prev_result_row["id"] || + $current_result_row[$subject] == $prev_result_row[$subject] || + $current_result_row[$subject] == -1 || + $prev_result_row[$subject] == -1) + { return " "; - - $diff = GetValueForResult($current_result_row[$subject]) - GetValueForResult($prev_result_row[$subject]); + } + + $diff = $current_result_row[$subject] - $prev_result_row[$subject]; if($diff > 0) return "(+$diff)"; @@ -104,9 +104,6 @@ <div class="real_failedtests" style="border: solid 1px black; border-left: none; width: 7px;"></div> <div class="desc"><?php echo $testman_langres["failedtests"]; ?></div> - <div class="box todotests"></div> - <div class="desc"><?php echo $testman_langres["todotests"]; ?></div> - <div class="box skippedtests"></div> <div class="desc"><?php echo $testman_langres["skippedtests"]; ?></div> @@ -142,7 +139,7 @@ for($i = 0; $i < count($id_array); $i++) { $result_stmt[$i] = $dbh->prepare( - "SELECT e.id, e.count, e.todo, e.failures, e.skipped " . + "SELECT e.id, e.count, e.failures, e.skipped " . "FROM " . DB_TESTMAN . ".winetest_suites s " . "LEFT JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id AND e.test_id = :testid " . "WHERE s.id IN (" . $suite_idlist . ")" . @@ -198,7 +195,6 @@ $prev_result_row = null; $temp_totaltests = -2; $temp_failedtests = -2; - $temp_todotests = -2; $temp_skippedtests = -2; for($i = 0; $i < count($result_stmt); $i++) @@ -215,19 +211,13 @@ // Check whether there are any changes within the test results of several runs CheckIfChanged($changed, $temp_totaltests, $result_row["count"]); CheckIfChanged($changed, $temp_failedtests, $result_row["failures"]); - CheckIfChanged($changed, $temp_todotests, $result_row["todo"]); CheckIfChanged($changed, $temp_skippedtests, $result_row["skipped"]); if($result_row["id"]) { - echo '<table class="celltable">'; - echo '<tr>'; - printf('<td colspan="3" title="%s" class="totaltests">%s <span class="diff">%s</span></td>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); - echo '</tr><tr>'; - printf('<td title="%s" class="%s_failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["count"] == -1) ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); - printf('<td title="%s" class="todotests">%d <span class="diff">%s</span></td>', $testman_langres["todotests"], $result_row["todo"], GetDifference($result_row, $prev_result_row, "todo")); - printf('<td title="%s" class="skippedtests">%d <span class="diff">%s</span></td>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); - echo '</tr></table>'; + printf('<div title="%s" class="box totaltests">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); + printf('<div title="%s" class="box %s_failedtests">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["count"] == -1) ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); + printf('<div title="%s" class="box skippedtests">%d <span class="diff">%s</span></div>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); } else { Modified: branches/danny-web/www/www.reactos.org/testman/css/compare.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -45,10 +45,6 @@ background-color: #FF6666 !important; } -.todotests { - background-color: #9999FF !important; -} - .skippedtests { background-color: #CCCCCC !important; } @@ -65,6 +61,8 @@ background: #5984C3; color: white; font-weight: bold; + position: absolute; + width: 325px; } #comparetable { @@ -82,7 +80,7 @@ width: 200px; } -#comparetable td { +#comparetable td, #comparetable td div.box { border-right: solid 1px #BBBBBB; border-bottom: solid 1px #BBBBBB; padding: 3px; @@ -92,14 +90,16 @@ cursor: pointer; } -.celltable { - width: 215px; -} - -.celltable td { +#comparetable td div { text-align: center; } -.celltable td.totaltests { +#comparetable td div.box { + float: left; + width: 95px; +} + +#comparetable td div.totaltests { font-weight: bold; + width: 120px; } Modified: branches/danny-web/www/www.reactos.org/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -52,7 +52,7 @@ // Get information about this result $stmt = $dbh->prepare( - "SELECT l.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . + "SELECT l.log, e.count, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . "FROM " . DB_TESTMAN . ".winetest_results e " . "JOIN " . DB_TESTMAN . ".winetest_logs l ON e.id = l.id " . "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . @@ -81,10 +81,6 @@ <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["failedtests"]; ?>:</td> <td><?php echo $row["failures"]; ?></td> - </tr> - <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> - <td class="info"><?php echo $testman_langres["todotests"]; ?>:</td> - <td><?php echo $row["todo"]; ?></td> </tr> <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["skippedtests"]; ?>:</td> Modified: branches/danny-web/www/www.reactos.org/testman/js/compare.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/compare.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/compare.js.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -76,12 +76,12 @@ // Remove all difference data in this case as there is no previous element for(var i = 0; i < trs.length; i++) { - var tds = trs[i].childNodes[Index].getElementsByTagName("td"); - - for(var j = 0; j < tds.length; j++) + var divs = trs[i].childNodes[Index].getElementsByTagName("div"); + + for(var j = 0; j < divs.length; j++) { // \u00A0 =   - tds[j].getElementsByTagName("span")[0].firstChild.data = "\u00A0"; + divs[j].getElementsByTagName("span")[0].firstChild.data = "\u00A0"; } } @@ -91,28 +91,35 @@ // No, then add the difference data accordingly for(var i = 0; i < trs.length; i++) { - // We can only add difference data if the current table and the previous one contain tables with result data - if(trs[i].childNodes[Index].firstChild.nodeName != "TABLE" || trs[i].childNodes[Index - 1].firstChild.nodeName != "TABLE") + // We can only add difference data if the current table and the previous one contain result data + if(trs[i].childNodes[Index].firstChild.nodeName != "DIV" || trs[i].childNodes[Index - 1].firstChild.nodeName != "DIV") continue; - var tds = trs[i].childNodes[Index].getElementsByTagName("td"); - - for(var j = 0; j < tds.length; j++) + var divs = trs[i].childNodes[Index].childNodes; + + for(var j = 0; j < divs.length; j++) { - var CurrentValue = GetValueForResult(tds[j]); - var PreviousValue = GetValueForResult(trs[i].childNodes[Index - 1].getElementsByTagName("td")[j]); - - // Calculate the difference - var Diff = CurrentValue - PreviousValue; - - if(Diff > 0) - var DiffString = String("(+" + Diff + ")"); - else if(Diff < 0) - var DiffString = String("(" + Diff + ")"); + var CurrentValue = divs[j].firstChild.data; + var PreviousValue = trs[i].childNodes[Index - 1].childNodes[j].firstChild.data; + + if(CurrentValue == PreviousValue || CurrentValue == -1 || PreviousValue == -1) + { + var DiffString = "\u00A0"; + } else - var DiffString = "\u00A0"; - - tds[j].getElementsByTagName("span")[0].firstChild.data = DiffString; + { + // Calculate the difference + var Diff = CurrentValue - PreviousValue; + + if(Diff > 0) + var DiffString = String("(+" + Diff + ")"); + else if(Diff < 0) + var DiffString = String("(" + Diff + ")"); + else + var DiffString = "\u00A0"; + } + + divs[j].getElementsByTagName("span")[0].firstChild.data = DiffString; } } } @@ -188,7 +195,6 @@ TempBlock.appendChild(DragColumn.childNodes[i].cloneNode(true)); TempBlock.id = "TempBlock"; - TempBlock.style.position = "absolute"; TempBlock.style.top = GetAbsoluteOffsetTop(DragColumn) + "px"; document.body.insertBefore(TempBlock, document.getElementById("comparetable")); Modified: branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/de.inc.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -44,7 +44,6 @@ "legend" => "Legende", "totaltests" => "Alle Tests", "failedtests" => "Fehlgeschlagene Tests", - "todotests" => "Als TODO markierte Tests", "skippedtests" => "Ãbersprungene Tests", "difference" => "Unterschied zum vorherigen Ergebnis", Modified: branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/en.inc.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -44,7 +44,6 @@ "legend" => "Legend", "totaltests" => "Total Tests", "failedtests" => "Failed Tests", - "todotests" => "Tests marked as TODO", "skippedtests" => "Skipped tests", "difference" => "Difference to the previous result", Modified: branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/lang/pl.inc.php [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -45,7 +45,6 @@ "legend" => "Legenda", "totaltests" => "Wszystkie testy", "failedtests" => "Nieudane", - "todotests" => "Oznaczone jako TODO", "skippedtests" => "PominiÄte", "difference" => "RÃ³Å¼nica wzglÄdem poprzedniego wyniku", Modified: branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] Fri Apr 17 21:13:01 2009 @@ -78,17 +78,15 @@ // We found no summary line, so the test probably crashed // Indicate this by setting count to -1 and set the rest to zero. $count = -1; - $todo = 0; $failures = 0; $skipped = 0; } // Add the information into the DB - $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, count, todo, failures, skipped) VALUES (:testid, :suiteid, :count, :todo, :failures, :skipped)"); + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, count, failures, skipped) VALUES (:testid, :suiteid, :count, :failures, :skipped)"); $stmt->bindValue(":testid", (int)$test_id); $stmt->bindValue(":suiteid", (int)$suite_id); $stmt->bindParam(":count", $count); - $stmt->bindParam(":todo", $todo); $stmt->bindParam(":failures", $failures); $stmt->bindParam(":skipped", $skipped); $stmt->execute() or die("Submit(): SQL failed #2");

1 0

[cfinck] 376: Sort the results to compare by ID instead of clicking order
by cfinck＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: cfinck Date: Fri Apr 17 20:48:09 2009 New Revision: 376 URL: http://svn.reactos.org/svn/reactos?rev=376&view=rev Log: Sort the results to compare by ID instead of clicking order Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] Fri Apr 17 20:48:09 2009 @@ -14,7 +14,7 @@ var inputbox_endrev; var PageCount; var ResultCount; -var SelectedResults = new Array(); +var SelectedResults = new Object(); var SelectedResultCount = 0; var REQUESTTYPE_FULLLOAD = 1; @@ -422,28 +422,38 @@ PageSwitch(info[0], info[1]); } +function NumericComparison(a, b) +{ + return a - b; +} + function CompareButton_OnClick() { - var first = true; var parameters = "ids="; - + var IDArray = new Array(); + + // Sort the selected IDs for(id in SelectedResults) - { - if(first) - { - parameters += id; + IDArray.push(parseInt(id)); + + if(!IDArray.length) + { + alert("<?php echo addslashes($testman_langres["noselection"]); ?>"); + return; + } + + IDArray.sort(NumericComparison); + + for(i = 0; i < IDArray.length; i++) + { + if(!i) + { + parameters += IDArray[i]; first = false; continue; } - parameters += "," + id; - } - - // If first is still true, no results were selected at all - if(first) - { - alert("<?php echo addslashes($testman_langres["noselection"]); ?>"); - return; + parameters += "," + IDArray[i]; } window.open("compare.php?" + parameters);

1 0

[cwittich] 40559: revert 40488 as it breaks regsvr32
by cwittich＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: cwittich Date: Fri Apr 17 20:40:31 2009 New Revision: 40559 URL: http://svn.reactos.org/svn/reactos?rev=40559&view=rev Log: revert 40488 as it breaks regsvr32 Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Fri Apr 17 20:40:31 2009 @@ -213,30 +213,29 @@ for ( ; section; section = section->next) { - int len = 4; - - if (section->name[0]) len += wcslen(section->name); + int len = 0; + + if (section->name[0]) len += wcslen(section->name) + 4; for (key = section->key; key; key = key->next) { - len += wcslen(key->name); - if (key->value && key->value[0]) len += wcslen(key->value); - len += 3; /* '=' and "\r\n" */ + len += wcslen(key->name) + 2; + if (key->value) len += wcslen(key->value) + 1; } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!buffer) return; p = buffer; - *p++ = '['; if (section->name[0]) { + *p++ = '['; wcscpy( p, section->name ); p += wcslen(p); - } - *p++ = ']'; - *p++ = '\r'; - *p++ = '\n'; + *p++ = ']'; + *p++ = '\r'; + *p++ = '\n'; + } for (key = section->key; key; key = key->next) {

1 0

[cfinck] 375: Also make the failed tests cell red in case a test crashed
by cfinck＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: cfinck Date: Fri Apr 17 18:11:58 2009 New Revision: 375 URL: http://svn.reactos.org/svn/reactos?rev=375&view=rev Log: Also make the failed tests cell red in case a test crashed Modified: branches/danny-web/www/www.reactos.org/testman/compare.php Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Fri Apr 17 18:11:58 2009 @@ -224,7 +224,7 @@ echo '<tr>'; printf('<td colspan="3" title="%s" class="totaltests">%s <span class="diff">%s</span></td>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); echo '</tr><tr>'; - printf('<td title="%s" class="%s_failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], ($result_row["failures"] > 0 ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); + printf('<td title="%s" class="%s_failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["count"] == -1) ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); printf('<td title="%s" class="todotests">%d <span class="diff">%s</span></td>', $testman_langres["todotests"], $result_row["todo"], GetDifference($result_row, $prev_result_row, "todo")); printf('<td title="%s" class="skippedtests">%d <span class="diff">%s</span></td>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); echo '</tr></table>';

1 0

[mjmartin] 40558: - OutputDebugStringA: Handle freeing memory in case of an exception.
by mjmartin＠svn.reactos.org 17 Apr '09

17 Apr '09

Author: mjmartin Date: Fri Apr 17 15:09:22 2009 New Revision: 40558 URL: http://svn.reactos.org/svn/reactos?rev=40558&view=rev Log: - OutputDebugStringA: Handle freeing memory in case of an exception. Modified: trunk/reactos/dll/win32/kernel32/debug/output.c Modified: trunk/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Fri Apr 17 15:09:22 2009 @@ -246,6 +246,8 @@ _SEH2_TRY { + volatile PCHAR a_cBuffer = NULL; + /* opening the mutex failed */ if(hDBMonMutex == NULL) { @@ -339,8 +341,13 @@ else { /* output in blocks of 512 characters */ - volatile PCHAR a_cBuffer; a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); + + if (!a_cBuffer) + { + DbgPrint("OutputDebugStringA: Failed\n"); + break; + } /* write a maximum of 511 bytes */ if(nOutputStringLen > 510) @@ -357,7 +364,11 @@ /* send the current block to the kernel debugger */ DbgPrint("%s", a_cBuffer); - HeapFree(GetProcessHeap(), 0, a_cBuffer); + if (a_cBuffer) + { + HeapFree(GetProcessHeap(), 0, a_cBuffer); + a_cBuffer = NULL; + } } /* move to the next block */ @@ -370,6 +381,9 @@ /* ignore access violations and let other exceptions fall through */ _SEH2_EXCEPT((_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { + if (a_cBuffer) + HeapFree(GetProcessHeap(), 0, a_cBuffer); + /* string copied verbatim from Microsoft's kernel32.dll */ DbgPrint("\nOutputDebugString faulted during output\n"); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs