Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 40255: comment out audio drivers for now
by tkreuzer＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: tkreuzer Date: Thu Mar 26 15:24:46 2009 New Revision: 40255 URL: http://svn.reactos.org/svn/reactos?rev=40255&view=rev Log: comment out audio drivers for now Modified: branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/directory.rbuild [iso-8859-1] Thu Mar 26 15:24:46 2009 @@ -13,7 +13,7 @@ <directory name="chew"> <xi:include href="chew/chew.rbuild" /> </directory> - <directory name="sound"> +  </group>

1 0

[dgoette] 40254: start to convert database calls to PDO, also removing dependency from roscms function cookie_domain()
by dgoette＠svn.reactos.org 26 Mar '09

26 Mar '09

1 0

[dgoette] 40253: Rename Subsystem class for subsystems with own user tables to SubsystemExternal, and use Subsystem for our own subsystems
by dgoette＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: dgoette Date: Thu Mar 26 15:14:54 2009 New Revision: 40253 URL: http://svn.reactos.org/svn/reactos?rev=40253&view=rev Log: Rename Subsystem class for subsystems with own user tables to SubsystemExternal, and use Subsystem for our own subsystems Added: branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/SubsystemExternal.class.php - copied, changed from r40223, branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.… branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c… Added: branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php (added) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php [iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -1,0 +1,50 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Gtte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +/** + * class Subsystem + * + * @package subsystems + */ +class Subsystem extends Login +{ + + + + /** + * returns the roscms username + * + * @param int id user_id + * @return string + * @access public + */ + public static function getUserName( $user_id ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_USERS." WHERE id = :user_id"); + $stmt->bindParam('user_id',$user_id,PDO::PARAM_STR); + $stmt->execute(); + return $stmt->fetchColumn(); + } // end of member function getUserName + + + +} // end of Subsystem +?> Copied: branches/danny-web/reactos.org/htdocs/roscms/lib/SubsystemExternal.class.php (from r40223, branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/SubsystemExternal.class.php [iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -24,7 +24,7 @@ * * @package subsystems */ -abstract class Subsystem extends Login +abstract class SubsystemExternal extends Subsystem { protected $name = ''; // name of subsystem @@ -247,5 +247,5 @@ -} // end of Subsystem +} // end of SubsystemExternal ?> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Bugzil… [iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -23,7 +23,7 @@ * class Subsystem_Bugzilla * */ -class Subsystem_Bugzilla extends Subsystem +class Subsystem_Bugzilla extends SubsystemExternal { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_PHPBB.… [iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -23,7 +23,7 @@ * class Subsystem_PHPBB * */ -class Subsystem_PHPBB extends Subsystem +class Subsystem_PHPBB extends SubsystemExternal { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/subsystem/Subsystem_Wiki.c… [iso-8859-1] Thu Mar 26 15:14:54 2009 @@ -23,7 +23,7 @@ * class Subsystem_Wiki * */ -class Subsystem_Wiki extends Subsystem +class Subsystem_Wiki extends SubsystemExternal {

1 0

[dgoette] 40252: create new folder structure and move files to their new folders, update header
by dgoette＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: dgoette Date: Thu Mar 26 14:08:27 2009 New Revision: 40252 URL: http://svn.reactos.org/svn/reactos?rev=40252&view=rev Log: create new folder structure and move files to their new folders, update header Added: branches/danny-web/reactos.org/htdocs/compat/css/ branches/danny-web/reactos.org/htdocs/compat/css/style.css (contents, props changed) - copied, changed from r40251, branches/danny-web/reactos.org/htdocs/compat/style.css branches/danny-web/reactos.org/htdocs/compat/js/ branches/danny-web/reactos.org/htdocs/compat/js/search.js (contents, props changed) - copied, changed from r40251, branches/danny-web/reactos.org/htdocs/compat/search.js branches/danny-web/reactos.org/htdocs/compat/js/smoothscroll.js (props changed) - copied unchanged from r40251, branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js branches/danny-web/reactos.org/htdocs/compat/lib/ Removed: branches/danny-web/reactos.org/htdocs/compat/search.js branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js branches/danny-web/reactos.org/htdocs/compat/style.css Copied: branches/danny-web/reactos.org/htdocs/compat/css/style.css (from r40251, branches/danny-web/reactos.org/htdocs/compat/style.css) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/style.css [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/css/style.css [iso-8859-1] Thu Mar 26 14:08:27 2009 @@ -1,383 +1,383 @@ -body { - font-family: Verdana; - font-size: 12px; - margin: 0 0 1em 0; - padding: 0; /* Only affects Opera */ - background: #FFFFFF url('http://localhost/reactos.org/images/topbar.jpg') repeat-x scroll top left; -} - -hr { - margin: 5px 0 5px 0; - color: #8D8D8D; -} - -address { - font-size: 9px; -} - -address p { - margin: 0; -} -address a { - font-size: 9px; - text-decoration:none; -} -address a:hover { - font-size: 9px; - text-decoration:underline; -} - - - -h1, .contentSmallTitle { - display: block; - line-height: normal; - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - padding: 0px 0px 1px 10px; - margin-top: 0; -} -h1 a { - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - text-decoration:none; -} -h1 a:hover { - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - text-decoration:underline; -} - -h2 { - font-size: 22px; - color: #5984C3; - font-weight: bold; - margin-top: 15px; -} - -h3 { - font-size: 18px; - color: #5984C3; - font-weight: bold; - margin-top: 10px; -} - -h4 { - font-size: 16px; - color: #5984C3; - font-weight: bold; - margin-top: 5px; -} - -h5 { - font-size: 14px; - color: #5984C3; - font-weight: bold; - margin-top: 5px; -} - -h6 { - font-size: 12px; - color: #5984C3; - font-weight: bold; -} - -a { - font-size: 12px; - color: #006090; -} - -a:hover { - background-color: #DDEEFF; - color: #000000; -} - -/* set by the generator */ -a.extern { - background: url('http://localhost/reactos.org/wiki/stylesheets/monobook/external.png') no-repeat center right; - padding-right: 14px; -} - -#content, .contentSmall { - padding-right: 3px; - font-size: 12px; - text-align: justify; -} - -#content li { - list-style-image: url('http://localhost/reactos.org/images/bullet.png') -} - -#top { - margin: 0; - background: url('http://localhost/reactos.org/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0; - padding: 103px 0 26px 0; - color: #FFFFFF; - text-align: right; -} - -#top a { - font-size: 13px; - color: #FFFFFF; - text-decoration: none; - padding: 1px 5px 1px 5px; -} - -#top a:hover { - color: #000000; - background-color: #FFCC33; -} - -#topMenu { - font-size: 13px; - margin-left: 300px; - background-color: #5984C3; -} - -#topMenu p { - text-align: left; - margin: 0; -} - -#leftNav { - padding: 0px 10px 10px 7px; -} - -#rightNav { - padding: 0px 3px 0px 5px; - width: 270px; - line-height: 150%; -} - -#rightNav img { - border: 1px solid #000000; - height: 200px; - width: 266px; -} - -#leftNav ol { - margin: 0; - padding: 0; - list-style-type: none; - background-color: #EEEEEE; - border-top: #3F3849 0px solid; - border-right: #3F3849 1px solid; - border-left: #3F3849 1px solid; -} - -#leftNav ol li { - font-size: 13px; - font-weight: bold; - border-bottom: #3f3849 1px solid; -} - -#leftNav ol li a { - display: block; - width: 145px; - padding: 2px 4px 2px 4px; - - color: #3F3849; - text-decoration: none; - background-color: #EEEEEE; -} - -#leftNav ol li a:hover { - color: #000000; - background-color: #FFCC33; -} - -#leftNav ol li a.extern { - background: none; - padding-right: 0px; -} - -#leftNav .navTitle { - padding-left: 12px; - border-top: #3F3849 1px solid; - border-right: #3F3849 1px solid; - border-bottom: #3F3849 1px solid; - border-left: #3F3849 1px solid; - - font-weight: bold; - font-size: 14px; - color: #FFFFFF; - background-color: #5984c3; -} - -#leftNav .navBox { - text-align: center; - padding: 2px; - background-color: #EEEEEE; - border-right: 1px solid #3F3849; - border-bottom: 1px solid #3F3849; - border-left: 1px solid #3F3849; - font-size: 13px; -} - - -#bugzillaContent { - font-size: 12px; -} - -#bugzillaContent table { - font-size: 12px; -} - - - -#sectionMenu { - margin: 0; - font-size: 13px; - background-color: #5984C3; -} -#sectionMenu a { - font-size: 13px; - color: #FFFFFF; - text-decoration: none; - padding: 1px 5px 1px 5px; -} -#sectionMenu a:hover { - color: #000000; - background-color: #FFCC33; -} - - -/* Maintainer Bar */ - -table.maintainer { - background-color: #ddddee; - padding:4px 8px; - border:1px solid #ccccdd; - text-align: Center; -} - -table.maintainer td { - background-color: #ddddee; - font-family: Verdana; - font-size: 15px; -} - -table.maintainer a { - font-size: 15px; -} - -table.maintainer a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -/* Admin Bar */ - -table.admin { - background-color: #FEE3CB; - padding:4px 8px; - border:1px solid #FBBB95; - text-align: Center; -} - -table.admin td { - background-color: #FEE3CB; - font-family: Verdana; - font-size: 15px; -} - -table.admin a { - font-size: 15px; -} - -table.admin a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - -/* Message Bar */ - -table.message { - background-color: #FFCC00; - padding:4px 8px; - border: 1px solid #FF6600; - text-align: Center; -} - -table.message td { - background-color: #FFCC00; - font-family: Verdana; - font-size: 15px; -} - -table.message a { - font-size: 15px; -} - -table.message a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -/* Forum Bar */ - -table.forumbar { - background-color: #99CCCC; - padding:4px 8px; - border: 1px solid #5984C3; - text-align: Center; -} - -table.forumbar td { - background-color: #DDEEFF; - font-family: Verdana; - font-size: 15px; -} - -table.forumbar a { - font-size: 15px; -} - -table.forumbar a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -.button -{ - background-color: #5984C3; color: white; - font-family: "verdana bitstream vera sans", verdana, sans-serif; font-size: 13px; - border-width:1px; border-style:solid; border-color: #C0C0C0; - font-weight: bold; padding: 0; -} - - - -UL.simple { - PADDING-RIGHT: 0px; - PADDING-LEFT: 20px; - PADDING-BOTTOM: 0px; - PADDING-TOP: 0px; - MARGIN: 0px 0px 1em; - LIST-STYLE-TYPE: none; - FONT-SIZE: 12px; -} -SPAN.simple { - font-size: 15px; - font-weight: bold; -} - - - +body { + font-family: Verdana; + font-size: 12px; + margin: 0 0 1em 0; + padding: 0; /* Only affects Opera */ + background: #FFFFFF url('http://localhost/reactos.org/images/topbar.jpg') repeat-x scroll top left; +} + +hr { + margin: 5px 0 5px 0; + color: #8D8D8D; +} + +address { + font-size: 9px; +} + +address p { + margin: 0; +} +address a { + font-size: 9px; + text-decoration:none; +} +address a:hover { + font-size: 9px; + text-decoration:underline; +} + + + +h1, .contentSmallTitle { + display: block; + line-height: normal; + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + padding: 0px 0px 1px 10px; + margin-top: 0; +} +h1 a { + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + text-decoration:none; +} +h1 a:hover { + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + background-color: #5984C3; + text-decoration:underline; +} + +h2 { + font-size: 22px; + color: #5984C3; + font-weight: bold; + margin-top: 15px; +} + +h3 { + font-size: 18px; + color: #5984C3; + font-weight: bold; + margin-top: 10px; +} + +h4 { + font-size: 16px; + color: #5984C3; + font-weight: bold; + margin-top: 5px; +} + +h5 { + font-size: 14px; + color: #5984C3; + font-weight: bold; + margin-top: 5px; +} + +h6 { + font-size: 12px; + color: #5984C3; + font-weight: bold; +} + +a { + font-size: 12px; + color: #006090; +} + +a:hover { + background-color: #DDEEFF; + color: #000000; +} + +/* set by the generator */ +a.extern { + background: url('http://localhost/reactos.org/wiki/stylesheets/monobook/external.png') no-repeat center right; + padding-right: 14px; +} + +#content, .contentSmall { + padding-right: 3px; + font-size: 12px; + text-align: justify; +} + +#content li { + list-style-image: url('http://localhost/reactos.org/images/bullet.png') +} + +#top { + margin: 0; + background: url('http://localhost/reactos.org/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0; + padding: 103px 0 26px 0; + color: #FFFFFF; + text-align: right; +} + +#top a { + font-size: 13px; + color: #FFFFFF; + text-decoration: none; + padding: 1px 5px 1px 5px; +} + +#top a:hover { + color: #000000; + background-color: #FFCC33; +} + +#topMenu { + font-size: 13px; + margin-left: 300px; + background-color: #5984C3; +} + +#topMenu p { + text-align: left; + margin: 0; +} + +#leftNav { + padding: 0px 10px 10px 7px; +} + +#rightNav { + padding: 0px 3px 0px 5px; + width: 270px; + line-height: 150%; +} + +#rightNav img { + border: 1px solid #000000; + height: 200px; + width: 266px; +} + +#leftNav ol { + margin: 0; + padding: 0; + list-style-type: none; + background-color: #EEEEEE; + border-top: #3F3849 0px solid; + border-right: #3F3849 1px solid; + border-left: #3F3849 1px solid; +} + +#leftNav ol li { + font-size: 13px; + font-weight: bold; + border-bottom: #3f3849 1px solid; +} + +#leftNav ol li a { + display: block; + width: 145px; + padding: 2px 4px 2px 4px; + + color: #3F3849; + text-decoration: none; + background-color: #EEEEEE; +} + +#leftNav ol li a:hover { + color: #000000; + background-color: #FFCC33; +} + +#leftNav ol li a.extern { + background: none; + padding-right: 0px; +} + +#leftNav .navTitle { + padding-left: 12px; + border-top: #3F3849 1px solid; + border-right: #3F3849 1px solid; + border-bottom: #3F3849 1px solid; + border-left: #3F3849 1px solid; + + font-weight: bold; + font-size: 14px; + color: #FFFFFF; + background-color: #5984c3; +} + +#leftNav .navBox { + text-align: center; + padding: 2px; + background-color: #EEEEEE; + border-right: 1px solid #3F3849; + border-bottom: 1px solid #3F3849; + border-left: 1px solid #3F3849; + font-size: 13px; +} + + +#bugzillaContent { + font-size: 12px; +} + +#bugzillaContent table { + font-size: 12px; +} + + + +#sectionMenu { + margin: 0; + font-size: 13px; + background-color: #5984C3; +} +#sectionMenu a { + font-size: 13px; + color: #FFFFFF; + text-decoration: none; + padding: 1px 5px 1px 5px; +} +#sectionMenu a:hover { + color: #000000; + background-color: #FFCC33; +} + + +/* Maintainer Bar */ + +table.maintainer { + background-color: #ddddee; + padding:4px 8px; + border:1px solid #ccccdd; + text-align: Center; +} + +table.maintainer td { + background-color: #ddddee; + font-family: Verdana; + font-size: 15px; +} + +table.maintainer a { + font-size: 15px; +} + +table.maintainer a:hover { + background:#eeeeff; + color: #000000; + font-family: Verdana; + font-size: 15px; +} + + +/* Admin Bar */ + +table.admin { + background-color: #FEE3CB; + padding:4px 8px; + border:1px solid #FBBB95; + text-align: Center; +} + +table.admin td { + background-color: #FEE3CB; + font-family: Verdana; + font-size: 15px; +} + +table.admin a { + font-size: 15px; +} + +table.admin a:hover { + background:#eeeeff; + color: #000000; + font-family: Verdana; + font-size: 15px; +} + +/* Message Bar */ + +table.message { + background-color: #FFCC00; + padding:4px 8px; + border: 1px solid #FF6600; + text-align: Center; +} + +table.message td { + background-color: #FFCC00; + font-family: Verdana; + font-size: 15px; +} + +table.message a { + font-size: 15px; +} + +table.message a:hover { + background:#eeeeff; + color: #000000; + font-family: Verdana; + font-size: 15px; +} + + +/* Forum Bar */ + +table.forumbar { + background-color: #99CCCC; + padding:4px 8px; + border: 1px solid #5984C3; + text-align: Center; +} + +table.forumbar td { + background-color: #DDEEFF; + font-family: Verdana; + font-size: 15px; +} + +table.forumbar a { + font-size: 15px; +} + +table.forumbar a:hover { + background:#eeeeff; + color: #000000; + font-family: Verdana; + font-size: 15px; +} + + +.button +{ + background-color: #5984C3; color: white; + font-family: "verdana bitstream vera sans", verdana, sans-serif; font-size: 13px; + border-width:1px; border-style:solid; border-color: #C0C0C0; + font-weight: bold; padding: 0; +} + + + +UL.simple { + PADDING-RIGHT: 0px; + PADDING-LEFT: 20px; + PADDING-BOTTOM: 0px; + PADDING-TOP: 0px; + MARGIN: 0px 0px 1em; + LIST-STYLE-TYPE: none; + FONT-SIZE: 12px; +} +SPAN.simple { + font-size: 15px; + font-weight: bold; +} + + + Propchange: branches/danny-web/reactos.org/htdocs/compat/css/style.css ------------------------------------------------------------------------------ svn:eol-style = native Copied: branches/danny-web/reactos.org/htdocs/compat/js/search.js (from r40251, branches/danny-web/reactos.org/htdocs/compat/search.js) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/search.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/js/search.js [iso-8859-1] Thu Mar 26 14:08:27 2009 @@ -1,353 +1,353 @@ - Propchange: branches/danny-web/reactos.org/htdocs/compat/js/search.js ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/danny-web/reactos.org/htdocs/compat/js/smoothscroll.js ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/danny-web/reactos.org/htdocs/compat/search.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/search.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/search.js (removed) @@ -1,353 +1,0 @@ - Removed: branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/smoothscroll.js (removed) @@ -1,144 +1,0 @@ -/* Smooth scrolling - Changes links that link to other parts of this page to scroll - smoothly to those links rather than jump to them directly, which - can be a little disorienting. - - sil, http://www.kryogenix.org/ - - v1.0 2003-11-11 - v1.1 2005-06-16 wrap it up in an object -*/ - -var ss = { - fixAllLinks: function() { - // Get a list of all links in the page - var allLinks = document.getElementsByTagName('a'); - // Walk through the list - for (var i=0;i<allLinks.length;i++) { - var lnk = allLinks[i]; - if ((lnk.href && lnk.href.indexOf('#') != -1) && - ( (lnk.pathname == location.pathname) || - ('/'+lnk.pathname == location.pathname) ) && - (lnk.search == location.search)) { - // If the link is internal to the page (begins in #) - // then attach the smoothScroll function as an onclick - // event handler - ss.addEvent(lnk,'click',ss.smoothScroll); - } - } - }, - - smoothScroll: function(e) { - // This is an event handler; get the clicked on element, - // in a cross-browser fashion - if (window.event) { - target = window.event.srcElement; - } else if (e) { - target = e.target; - } else return; - - // Make sure that the target is an element, not a text node - // within an element - if (target.nodeName.toLowerCase() != 'a') { - target = target.parentNode; - } - - // Paranoia; check this is an A tag - if (target.nodeName.toLowerCase() != 'a') return; - - // Find the <a name> tag corresponding to this href - // First strip off the hash (first character) - anchor = target.hash.substr(1); - // Now loop all A tags until we find one with that name - var allLinks = document.getElementsByTagName('a'); - var destinationLink = null; - for (var i=0;i<allLinks.length;i++) { - var lnk = allLinks[i]; - if (lnk.name && (lnk.name == anchor)) { - destinationLink = lnk; - break; - } - } - - // If we didn't find a destination, give up and let the browser do - // its thing - if (!destinationLink) return true; - - // Find the destination's position - var destx = destinationLink.offsetLeft; - var desty = destinationLink.offsetTop; - var thisNode = destinationLink; - while (thisNode.offsetParent && - (thisNode.offsetParent != document.body)) { - thisNode = thisNode.offsetParent; - destx += thisNode.offsetLeft; - desty += thisNode.offsetTop; - } - - // Stop any current scrolling - clearInterval(ss.INTERVAL); - - cypos = ss.getCurrentYPos(); - - ss_stepsize = parseInt((desty-cypos)/ss.STEPS); - ss.INTERVAL = -setInterval('ss.scrollWindow('+ss_stepsize+','+desty+',"'+anchor+'")',10); - - // And stop the actual click happening - if (window.event) { - window.event.cancelBubble = true; - window.event.returnValue = false; - } - if (e && e.preventDefault && e.stopPropagation) { - e.preventDefault(); - e.stopPropagation(); - } - }, - - scrollWindow: function(scramount,dest,anchor) { - wascypos = ss.getCurrentYPos(); - isAbove = (wascypos < dest); - window.scrollTo(0,wascypos + scramount); - iscypos = ss.getCurrentYPos(); - isAboveNow = (iscypos < dest); - if ((isAbove != isAboveNow) || (wascypos == iscypos)) { - // if we've just scrolled past the destination, or - // we haven't moved from the last scroll (i.e., we're at the - // bottom of the page) then scroll exactly to the link - window.scrollTo(0,dest); - // cancel the repeating timer - clearInterval(ss.INTERVAL); - // and jump to the link directly so the URL's right - location.hash = anchor; - } - }, - - getCurrentYPos: function() { - if (document.body && document.body.scrollTop) - return document.body.scrollTop; - if (document.documentElement && document.documentElement.scrollTop) - return document.documentElement.scrollTop; - if (window.pageYOffset) - return window.pageYOffset; - return 0; - }, - - addEvent: function(elm, evType, fn, useCapture) { - // addEvent and removeEvent - // cross-browser event handling for IE5+, NS6 and Mozilla - // By Scott Andrew - if (elm.addEventListener){ - elm.addEventListener(evType, fn, useCapture); - return true; - } else if (elm.attachEvent){ - var r = elm.attachEvent("on"+evType, fn); - return r; - } else { - alert("Handler could not be removed"); - } - } -} - -ss.STEPS = 25; - -ss.addEvent(window,"load",ss.fixAllLinks); Removed: branches/danny-web/reactos.org/htdocs/compat/style.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/style.css [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/style.css (removed) @@ -1,383 +1,0 @@ -body { - font-family: Verdana; - font-size: 12px; - margin: 0 0 1em 0; - padding: 0; /* Only affects Opera */ - background: #FFFFFF url('http://localhost/reactos.org/images/topbar.jpg') repeat-x scroll top left; -} - -hr { - margin: 5px 0 5px 0; - color: #8D8D8D; -} - -address { - font-size: 9px; -} - -address p { - margin: 0; -} -address a { - font-size: 9px; - text-decoration:none; -} -address a:hover { - font-size: 9px; - text-decoration:underline; -} - - - -h1, .contentSmallTitle { - display: block; - line-height: normal; - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - padding: 0px 0px 1px 10px; - margin-top: 0; -} -h1 a { - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - text-decoration:none; -} -h1 a:hover { - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - background-color: #5984C3; - text-decoration:underline; -} - -h2 { - font-size: 22px; - color: #5984C3; - font-weight: bold; - margin-top: 15px; -} - -h3 { - font-size: 18px; - color: #5984C3; - font-weight: bold; - margin-top: 10px; -} - -h4 { - font-size: 16px; - color: #5984C3; - font-weight: bold; - margin-top: 5px; -} - -h5 { - font-size: 14px; - color: #5984C3; - font-weight: bold; - margin-top: 5px; -} - -h6 { - font-size: 12px; - color: #5984C3; - font-weight: bold; -} - -a { - font-size: 12px; - color: #006090; -} - -a:hover { - background-color: #DDEEFF; - color: #000000; -} - -/* set by the generator */ -a.extern { - background: url('http://localhost/reactos.org/wiki/stylesheets/monobook/external.png') no-repeat center right; - padding-right: 14px; -} - -#content, .contentSmall { - padding-right: 3px; - font-size: 12px; - text-align: justify; -} - -#content li { - list-style-image: url('http://localhost/reactos.org/images/bullet.png') -} - -#top { - margin: 0; - background: url('http://localhost/reactos.org/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0; - padding: 103px 0 26px 0; - color: #FFFFFF; - text-align: right; -} - -#top a { - font-size: 13px; - color: #FFFFFF; - text-decoration: none; - padding: 1px 5px 1px 5px; -} - -#top a:hover { - color: #000000; - background-color: #FFCC33; -} - -#topMenu { - font-size: 13px; - margin-left: 300px; - background-color: #5984C3; -} - -#topMenu p { - text-align: left; - margin: 0; -} - -#leftNav { - padding: 0px 10px 10px 7px; -} - -#rightNav { - padding: 0px 3px 0px 5px; - width: 270px; - line-height: 150%; -} - -#rightNav img { - border: 1px solid #000000; - height: 200px; - width: 266px; -} - -#leftNav ol { - margin: 0; - padding: 0; - list-style-type: none; - background-color: #EEEEEE; - border-top: #3F3849 0px solid; - border-right: #3F3849 1px solid; - border-left: #3F3849 1px solid; -} - -#leftNav ol li { - font-size: 13px; - font-weight: bold; - border-bottom: #3f3849 1px solid; -} - -#leftNav ol li a { - display: block; - width: 145px; - padding: 2px 4px 2px 4px; - - color: #3F3849; - text-decoration: none; - background-color: #EEEEEE; -} - -#leftNav ol li a:hover { - color: #000000; - background-color: #FFCC33; -} - -#leftNav ol li a.extern { - background: none; - padding-right: 0px; -} - -#leftNav .navTitle { - padding-left: 12px; - border-top: #3F3849 1px solid; - border-right: #3F3849 1px solid; - border-bottom: #3F3849 1px solid; - border-left: #3F3849 1px solid; - - font-weight: bold; - font-size: 14px; - color: #FFFFFF; - background-color: #5984c3; -} - -#leftNav .navBox { - text-align: center; - padding: 2px; - background-color: #EEEEEE; - border-right: 1px solid #3F3849; - border-bottom: 1px solid #3F3849; - border-left: 1px solid #3F3849; - font-size: 13px; -} - - -#bugzillaContent { - font-size: 12px; -} - -#bugzillaContent table { - font-size: 12px; -} - - - -#sectionMenu { - margin: 0; - font-size: 13px; - background-color: #5984C3; -} -#sectionMenu a { - font-size: 13px; - color: #FFFFFF; - text-decoration: none; - padding: 1px 5px 1px 5px; -} -#sectionMenu a:hover { - color: #000000; - background-color: #FFCC33; -} - - -/* Maintainer Bar */ - -table.maintainer { - background-color: #ddddee; - padding:4px 8px; - border:1px solid #ccccdd; - text-align: Center; -} - -table.maintainer td { - background-color: #ddddee; - font-family: Verdana; - font-size: 15px; -} - -table.maintainer a { - font-size: 15px; -} - -table.maintainer a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -/* Admin Bar */ - -table.admin { - background-color: #FEE3CB; - padding:4px 8px; - border:1px solid #FBBB95; - text-align: Center; -} - -table.admin td { - background-color: #FEE3CB; - font-family: Verdana; - font-size: 15px; -} - -table.admin a { - font-size: 15px; -} - -table.admin a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - -/* Message Bar */ - -table.message { - background-color: #FFCC00; - padding:4px 8px; - border: 1px solid #FF6600; - text-align: Center; -} - -table.message td { - background-color: #FFCC00; - font-family: Verdana; - font-size: 15px; -} - -table.message a { - font-size: 15px; -} - -table.message a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -/* Forum Bar */ - -table.forumbar { - background-color: #99CCCC; - padding:4px 8px; - border: 1px solid #5984C3; - text-align: Center; -} - -table.forumbar td { - background-color: #DDEEFF; - font-family: Verdana; - font-size: 15px; -} - -table.forumbar a { - font-size: 15px; -} - -table.forumbar a:hover { - background:#eeeeff; - color: #000000; - font-family: Verdana; - font-size: 15px; -} - - -.button -{ - background-color: #5984C3; color: white; - font-family: "verdana bitstream vera sans", verdana, sans-serif; font-size: 13px; - border-width:1px; border-style:solid; border-color: #C0C0C0; - font-weight: bold; padding: 0; -} - - - -UL.simple { - PADDING-RIGHT: 0px; - PADDING-LEFT: 20px; - PADDING-BOTTOM: 0px; - PADDING-TOP: 0px; - MARGIN: 0px 0px 1em; - LIST-STYLE-TYPE: none; - FONT-SIZE: 12px; -} -SPAN.simple { - font-size: 15px; - font-weight: bold; -} - - -

1 0

[dgoette] 40251: branch compatability database for overhaul
by dgoette＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: dgoette Date: Thu Mar 26 13:58:15 2009 New Revision: 40251 URL: http://svn.reactos.org/svn/reactos?rev=40251&view=rev Log: branch compatability database for overhaul Added: branches/danny-web/reactos.org/htdocs/compat/ - copied from r40250, branches/danny-web/reactos.org/htdocs/support/

1 0

[janderwald] 40250: - Remove dead code - Silence a few debug prints - Implement Dispatch_FastRead, Dispatch_fnFastDeviceIoControl - Change _InterlockedXXX to InterlockedXXX - Store IPortPinWaveCyclic pins in an array and close pin on a new create request (fixes a memory leak) - Complete the close irp when the stream has really been closed
by janderwald＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: janderwald Date: Thu Mar 26 12:59:45 2009 New Revision: 40250 URL: http://svn.reactos.org/svn/reactos?rev=40250&view=rev Log: - Remove dead code - Silence a few debug prints - Implement Dispatch_FastRead, Dispatch_fnFastDeviceIoControl - Change _InterlockedXXX to InterlockedXXX - Store IPortPinWaveCyclic pins in an array and close pin on a new create request (fixes a memory leak) - Complete the close irp when the stream has really been closed Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -50,15 +50,6 @@ DPRINT1("PcInitializeAdapterDriver\n"); -#if 0 - /* Set default stub - is this a good idea? */ - DPRINT1("Setting IRP stub\n"); - for ( i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i ++ ) - { - DriverObject->MajorFunction[i] = IrpStub; - } -#endif - /* Our IRP handlers */ DPRINT1("Setting IRP handlers\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = PcDispatchIrp; @@ -195,8 +186,6 @@ return STATUS_UNSUCCESSFUL; } - - return status; } @@ -241,6 +230,17 @@ /* the provided port driver doesnt support ISubdevice */ return STATUS_INVALID_PARAMETER; } + + /* get the subdevice descriptor */ + Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &SubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get subdevice descriptor %x\n", Status); + SubDevice->lpVtbl->Release(SubDevice); + return STATUS_UNSUCCESSFUL; + } + + /* add an create item to the device header */ Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PcCreateItemDispatch, (PVOID)SubDevice, Name, NULL); if (!NT_SUCCESS(Status)) { @@ -249,17 +249,16 @@ DPRINT1("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); return Status; } + + /* increment reference count */ SubDevice->lpVtbl->AddRef(SubDevice); - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &SubDeviceDescriptor); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get subdevice descriptor %x\n", Status); - SubDevice->lpVtbl->Release(SubDevice); - } - for(Index = 0; Index < SubDeviceDescriptor->InterfaceCount; Index++) { + //FIXME + // Use a reference string such as Wave0001 / Topology0001 + // + Status = IoRegisterDeviceInterface(DeviceExt->PhysicalDeviceObject, &SubDeviceDescriptor->Interfaces[Index], NULL, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -49,7 +49,7 @@ Status = IoInitializeTimer(pDeviceObject, pTimerRoutine, pContext); if (!NT_SUCCESS(Status)) { - DPRINT("IoInitializeTimer failed with %x\n", Status); + DPRINT1("IoInitializeTimer failed with %x\n", Status); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -94,8 +94,6 @@ return Status; } - - /* * @implemented */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -6,20 +6,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - //DPRINT1("Dispatch_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->DeviceIoControl(IrpTarget, DeviceObject, Irp); } @@ -29,20 +23,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnRead called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Read(IrpTarget, DeviceObject, Irp); } @@ -52,20 +40,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnWrite called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Write(IrpTarget, DeviceObject, Irp); } @@ -75,20 +57,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnFlush called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Flush(IrpTarget, DeviceObject, Irp); } @@ -98,24 +74,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnClose called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - ASSERT(CreateItem != NULL); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack != NULL); - ASSERT(IoStack->FileObject != NULL); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - - //DPRINT1("IrpTarget %p\n", IrpTarget); - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Close(IrpTarget, DeviceObject, Irp); } @@ -125,20 +91,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->QuerySecurity(IrpTarget, DeviceObject, Irp); } @@ -148,20 +108,14 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - DPRINT1("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); - - IrpTarget = (IIrpTarget*)CreateItem->Context; - + IIrpTarget * IrpTarget; + PKSOBJECT_CREATE_ITEM CreateItem; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->SetSecurity(IrpTarget, DeviceObject, Irp); } @@ -178,10 +132,13 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); - - - return FALSE; + IIrpTarget * IrpTarget; + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)FileObject->FsContext2; + + /* let IrpTarget handle request */ + return IrpTarget->lpVtbl->FastDeviceIoControl(IrpTarget, FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, IoStatus, DeviceObject); } @@ -197,10 +154,13 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); - - return FALSE; - + IIrpTarget * IrpTarget; + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)FileObject->FsContext2; + + /* let IrpTarget handle request */ + return IrpTarget->lpVtbl->FastRead(IrpTarget, FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); } BOOLEAN @@ -216,10 +176,10 @@ PDEVICE_OBJECT DeviceObject) { IIrpTarget * IrpTarget; - //DPRINT1("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); - + + /* access IrpTarget */ IrpTarget = (IIrpTarget *)FileObject->FsContext2; - + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->FastWrite(IrpTarget, FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -112,9 +112,6 @@ DPRINT1("IDmaChannelSlave_AllocateBuffer free common buffer first \n"); return STATUS_UNSUCCESSFUL; } - - //FIXME - // retry with different size on failure This->Buffer = This->pAdapter->DmaOperations->AllocateCommonBuffer(This->pAdapter, BufferSize, &This->Address, FALSE); if (!This->Buffer) @@ -400,7 +397,7 @@ This->DmaStarted = FALSE; - return 0; + return STATUS_SUCCESS; } NTSTATUS @@ -493,7 +490,7 @@ IDmaChannelSlaveImpl * This; - DPRINT1("OutDmaChannel %p OuterUnknown %p PoolType %p DeviceDescription %p DeviceObject %p\n", + DPRINT("OutDmaChannel %p OuterUnknown %p PoolType %p DeviceDescription %p DeviceObject %p\n", OutDmaChannel, OuterUnknown, PoolType, DeviceDescription, DeviceObject); This = AllocateItem(PoolType, sizeof(IDmaChannelSlaveImpl), TAG_PORTCLASS); @@ -509,8 +506,6 @@ { DeviceDescription->InterfaceType = BusType; } - - DPRINT1("Calling IoGetDmaAdapter\n"); Adapter = IoGetDmaAdapter(DeviceExt->PhysicalDeviceObject, DeviceDescription, &MapRegisters); if (!Adapter) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -15,7 +15,7 @@ DPRINT("IDrmPort2_AddRef: This %p\n", This); - return _InterlockedIncrement(&This->ref); + return InterlockedIncrement(&This->ref); } ULONG @@ -25,7 +25,7 @@ { IDrmPort2Impl * This = (IDrmPort2Impl*)iface; - _InterlockedDecrement(&This->ref); + InterlockedDecrement(&This->ref); if (This->ref == 0) { @@ -51,13 +51,12 @@ IsEqualGUIDAligned(refiid, &IID_IUnknown)) { *Output = (PVOID)&This->lpVtbl; - _InterlockedIncrement(&This->ref); + InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } StringFromCLSID(refiid, Buffer); DPRINT1("IDrmPort2_QueryInterface no interface!!! iface %S\n", Buffer); - KeBugCheckEx(0, 0, 0, 0, 0); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -7,7 +7,8 @@ LONG ref; IPortWaveCyclic* Port; - IPortPinWaveCyclic * Pin; + IPortPinWaveCyclic ** Pins; + SUBDEVICE_DESCRIPTOR * Descriptor; }IPortFilterWaveCyclicImpl; @@ -69,7 +70,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -83,55 +84,58 @@ IN PIRP Irp, IN KSOBJECT_CREATE *CreateObject) { - ISubdevice * ISubDevice; NTSTATUS Status; IPortPinWaveCyclic * Pin; - SUBDEVICE_DESCRIPTOR * Descriptor; PKSPIN_CONNECT ConnectDetails; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; ASSERT(This->Port); + ASSERT(This->Descriptor); + ASSERT(This->Pins); DPRINT("IPortFilterWaveCyclic_fnNewIrpTarget entered\n"); - Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + /* let's verify the connection request */ + Status = PcValidateConnectRequest(Irp, &This->Descriptor->Factory, &ConnectDetails); if (!NT_SUCCESS(Status)) + { return STATUS_UNSUCCESSFUL; - - Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); - if (!NT_SUCCESS(Status)) - return STATUS_UNSUCCESSFUL; - - Status = PcValidateConnectRequest(Irp, &Descriptor->Factory, &ConnectDetails); - if (!NT_SUCCESS(Status)) - { - ISubDevice->lpVtbl->Release(ISubDevice); - return STATUS_UNSUCCESSFUL; - } - - ISubDevice->lpVtbl->Release(ISubDevice); - + } + + if (This->Pins[ConnectDetails->PinId] && This->Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount) + { + /* release existing instance */ + This->Pins[ConnectDetails->PinId]->lpVtbl->Close(This->Pins[ConnectDetails->PinId], DeviceObject, NULL); + } + + /* now create the pin */ Status = NewPortPinWaveCyclic(&Pin); if (!NT_SUCCESS(Status)) { return Status; } - Status = Pin->lpVtbl->Init(Pin, This->Port, iface, ConnectDetails, &Descriptor->Factory.KsPinDescriptor[ConnectDetails->PinId]); + /* initialize the pin */ + Status = Pin->lpVtbl->Init(Pin, This->Port, iface, ConnectDetails, &This->Descriptor->Factory.KsPinDescriptor[ConnectDetails->PinId]); if (!NT_SUCCESS(Status)) { Pin->lpVtbl->Release(Pin); return Status; } - /* store pin handle */ - This->Pin = Pin; + /* release existing pin */ + if (This->Pins[ConnectDetails->PinId]) + { + This->Pins[ConnectDetails->PinId]->lpVtbl->Release(This->Pins[ConnectDetails->PinId]); + } + /* store pin */ + This->Pins[ConnectDetails->PinId] = Pin; /* store result */ *OutTarget = (IIrpTarget*)Pin; /* increment current instance count */ - Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount++; + This->Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount++; return Status; } @@ -207,7 +211,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -216,10 +220,18 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("IPortFilterWaveCyclic_fnClose entered\n"); - - //FIXME - //close all pin instances + ULONG Index; + IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; + + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + if (This->Pins[Index]) + { + This->Pins[Index]->lpVtbl->Close(This->Pins[Index], DeviceObject, NULL); + } + + } + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -271,7 +283,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - + UNIMPLEMENTED return STATUS_SUCCESS; } @@ -291,6 +303,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { + UNIMPLEMENTED return STATUS_SUCCESS; } @@ -310,6 +323,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { + UNIMPLEMENTED return STATUS_SUCCESS; } @@ -323,12 +337,38 @@ IN IPortFilterWaveCyclic* iface, IN IPortWaveCyclic* Port) { + ISubdevice * ISubDevice; + SUBDEVICE_DESCRIPTOR * Descriptor; + NTSTATUS Status; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl*)iface; This->Port = Port; + /* get our private interface */ + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + /* get the subdevice descriptor */ + Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); + + /* release subdevice interface */ + ISubDevice->lpVtbl->Release(ISubDevice); + + if (!NT_SUCCESS(Status)) + return STATUS_UNSUCCESSFUL; + + /* save descriptor */ + This->Descriptor = Descriptor; + + /* allocate pin array */ + This->Pins = AllocateItem(NonPagedPool, Descriptor->Factory.PinDescriptorCount * sizeof(IPortPinWaveCyclic*), TAG_PORTCLASS); + + if (!This->Pins) + return STATUS_UNSUCCESSFUL; + /* increment reference count */ - iface->lpVtbl->AddRef(iface); + Port->lpVtbl->AddRef(Port); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -178,8 +178,6 @@ ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); (void)InterlockedIncrement((volatile long*)&This->NumMappings); - - if (Irp) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -30,6 +30,7 @@ ULONG DelayedRequestInProgress; ULONG FrameSize; BOOL Capture; + PIRP CloseIrp; }IPortPinWaveCyclicImpl; @@ -242,7 +243,7 @@ Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); - DPRINT1("Position %u Buffer %p BufferSize %u ActiveIrpOffset %u\n", Position, Buffer, This->CommonBufferSize, BufferSize); + DPRINT("Position %u Buffer %p BufferSize %u ActiveIrpOffset %u\n", Position, Buffer, This->CommonBufferSize, BufferSize); if (Position < This->CommonBufferOffset) { @@ -616,29 +617,25 @@ IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { - PMINIPORTWAVECYCLICSTREAM Stream = (PMINIPORTWAVECYCLICSTREAM)Context; - - DPRINT("CloseStreamRoutine %p\n", Stream); - Stream->lpVtbl->Release(Stream); -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -IPortPinWaveCyclic_fnClose( - IN IPortPinWaveCyclic* iface, - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ + PMINIPORTWAVECYCLICSTREAM Stream; + NTSTATUS Status; ISubdevice *ISubDevice; - NTSTATUS Status; - SUBDEVICE_DESCRIPTOR * Descriptor; - PIO_WORKITEM WorkItem; - - IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; - DPRINT1("IPortPinWaveCyclic_fnClose\n"); + PSUBDEVICE_DESCRIPTOR Descriptor; + + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)Context; + + if (This->Stream) + { + if (This->State != KSSTATE_STOP) + { + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); + KeStallExecutionProcessor(10); + } + } + + This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); + This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); + This->DmaChannel->lpVtbl->Release(This->DmaChannel); Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); if (NT_SUCCESS(Status)) @@ -648,39 +645,73 @@ { ISubDevice->lpVtbl->Release(ISubDevice); Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; - DPRINT1("InstanceCount %u\n", Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount); } } + if (This->Format) + { + ExFreePool(This->Format); + This->Format = NULL; + } + + if (This->IrpQueue) + { + This->IrpQueue->lpVtbl->Release(This->IrpQueue); + } if (This->Stream) { - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); - } - - This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); - This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); - This->DmaChannel->lpVtbl->Release(This->DmaChannel); - - if (This->Format) - ExFreePool(This->Format); - - This->IrpQueue->lpVtbl->Release(This->IrpQueue); - + Stream = This->Stream; + This->Stream = NULL; + + if (This->CloseIrp) + { + This->CloseIrp->IoStatus.Information = 0; + This->CloseIrp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(This->CloseIrp, IO_NO_INCREMENT); + } + Stream->lpVtbl->Release(Stream); + /* this line is never reached */ + } +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWaveCyclic_fnClose( + IN IPortPinWaveCyclic* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_WORKITEM WorkItem; + + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; if (This->Stream) { WorkItem = IoAllocateWorkItem(DeviceObject); if (WorkItem) { - IoQueueWorkItem(WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This->Stream); + if (Irp) + { + This->CloseIrp = Irp; + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + } + IoQueueWorkItem(WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This); + return STATUS_PENDING; } } - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - + if (Irp) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Thu Mar 26 12:59:45 2009 @@ -598,7 +598,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSUFFICIENT_RESOURCES; } - DPRINT1("Queueing IRP %p\n", Irp); + DPRINT1("Queueing IRP %p Irql %u\n", Irp, KeGetCurrentIrql()); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_PENDING; IoMarkIrpPending(Irp);

1 0

[jmorlan] 40249: - Add another heap freelist for small blocks, making mingw32-make about 100 times faster at loading makefile.auto
by jmorlan＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: jmorlan Date: Thu Mar 26 09:32:14 2009 New Revision: 40249 URL: http://svn.reactos.org/svn/reactos?rev=40249&view=rev Log: - Add another heap freelist for small blocks, making mingw32-make about 100 times faster at loading makefile.auto Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=40249&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Thu Mar 26 09:32:14 2009 @@ -105,12 +105,12 @@ /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) -#define HEAP_NB_FREE_LISTS 4 /* Number of free lists */ +#define HEAP_NB_FREE_LISTS 5 /* Number of free lists */ /* Max size of the blocks on the free lists */ static const DWORD HEAP_freeListSizes[HEAP_NB_FREE_LISTS] = { - 0x20, 0x80, 0x200, ~0UL + 0x10, 0x20, 0x80, 0x200, ~0UL }; typedef struct

1 0

[jmorlan] 40248: - Fix a buffer overflow in cmd - Make "CMD /C" clean up before exiting to get rid of spurious "memory leak" debug messages
by jmorlan＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: jmorlan Date: Thu Mar 26 09:31:46 2009 New Revision: 40248 URL: http://svn.reactos.org/svn/reactos?rev=40248&view=rev Log: - Fix a buffer overflow in cmd - Make "CMD /C" clean up before exiting to get rid of spurious "memory leak" debug messages Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Mar 26 09:31:46 2009 @@ -335,7 +335,7 @@ need rewrite some code to use cmd_realloc when it need instead of add 512bytes extra */ - first = cmd_alloc ( (_tcslen(First) + 512) * sizeof(TCHAR)); + first = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (first == NULL) { error_out_of_memory(); @@ -343,7 +343,7 @@ return FALSE; } - rest = cmd_alloc ( (_tcslen(Rest) + 512) * sizeof(TCHAR)); + rest = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); if (rest == NULL) { cmd_free (first); @@ -1540,7 +1540,7 @@ { PARSED_COMMAND *Cmd; - do + while (!bCanExit || !bExit) { Cmd = ParseCommand(NULL); if (!Cmd) @@ -1549,7 +1549,6 @@ ExecuteCommand(Cmd); FreeCommand(Cmd); } - while (!bCanExit || !bExit); return nErrorLevel; } @@ -1891,7 +1890,7 @@ GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); ParseCommandLine(commandline); if (option != _T('K')) - cmd_exit(nErrorLevel); + bExit = TRUE; } }

1 0

[tkreuzer] 40247: Fix compilation of freeldr. (a number of ULONG / ULONG_PTR issues, remove LoadReactOSSetup2 for non-x86 builds
by tkreuzer＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: tkreuzer Date: Thu Mar 26 07:57:19 2009 New Revision: 40247 URL: http://svn.reactos.org/svn/reactos?rev=40247&view=rev Log: Fix compilation of freeldr. (a number of ULONG / ULONG_PTR issues, remove LoadReactOSSetup2 for non-x86 builds Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Thu Mar 26 07:57:19 2009 @@ -124,8 +124,10 @@ } else if (_stricmp(SettingValue, "ReactOSSetup2") == 0) { +#ifdef __i386__ // WinLdr-style boot LoadReactOSSetup2(); +#endif } #endif #ifdef __i386__ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Thu Mar 26 07:57:19 2009 @@ -18,6 +18,8 @@ <file>setupldr.c</file> </directory> <directory name="windows"> - <file>setupldr2.c</file> + <if property="ARCH" value="i386"> + <file>setupldr2.c</file> + </if> </directory> </module> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Thu Mar 26 07:57:19 2009 @@ -406,7 +406,7 @@ if (SizeOfRawData < VirtualSize) { DPRINTM(DPRINT_PELOADER, "WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize); - RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); + RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG_PTR)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); } SectionHeader++; @@ -421,7 +421,7 @@ /* Relocate the image, if it needs it */ - if (NtHeaders->OptionalHeader.ImageBase != (ULONG)VirtualBase) + if (NtHeaders->OptionalHeader.ImageBase != (ULONG_PTR)VirtualBase) { DPRINTM(DPRINT_PELOADER, "Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); @@ -528,7 +528,7 @@ /* AddressOfData in thunk entry will become a virtual address (from relative) */ //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData); ThunkData->u1.AddressOfData = - (ULONG)RVA(ImageBase, ThunkData->u1.AddressOfData); + (ULONG_PTR)RVA(ImageBase, ThunkData->u1.AddressOfData); //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); } @@ -630,11 +630,11 @@ FunctionTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfFunctions)); /* Save a pointer to the function */ - ThunkData->u1.Function = (ULONG)RVA(DllBase, FunctionTable[Ordinal]); + ThunkData->u1.Function = (ULONG_PTR)RVA(DllBase, FunctionTable[Ordinal]); /* Is it a forwarder? (function pointer isn't within the export directory) */ - if (((ULONG)VaToPa((PVOID)ThunkData->u1.Function) > (ULONG)ExportDirectory) && - ((ULONG)VaToPa((PVOID)ThunkData->u1.Function) < ((ULONG)ExportDirectory + ExportSize))) + if (((ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function) > (ULONG_PTR)ExportDirectory) && + ((ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function) < ((ULONG_PTR)ExportDirectory + ExportSize))) { PLDR_DATA_TABLE_ENTRY DataTableEntry; CHAR ForwardDllName[255]; @@ -685,7 +685,7 @@ ImportByName->Hint = 0; /* And finally point ThunkData's AddressOfData to that structure */ - RefThunkData.u1.AddressOfData = (ULONG)ImportByName; + RefThunkData.u1.AddressOfData = (ULONG_PTR)ImportByName; /* And recursively call ourselves */ Status = WinLdrpBindImportName( Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Thu Mar 26 07:57:19 2009 @@ -432,7 +432,7 @@ CHAR BootOptions[256]; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; - ULONG SectionId; + ULONG_PTR SectionId; ULONG BootDevice; PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; KERNEL_ENTRY_POINT KiSystemStartup;

1 0

[tkreuzer] 40246: Hack cleanup: IntGdiBrushXlate is a dirty ros hack, it is needed due to the fact that we handle brushes totally wrong. Replace it with a static function IntUpdateBrushXlate and move it to dcobjs.c.
by tkreuzer＠svn.reactos.org 26 Mar '09

26 Mar '09

Author: tkreuzer Date: Thu Mar 26 06:41:57 2009 New Revision: 40246 URL: http://svn.reactos.org/svn/reactos?rev=40246&view=rev Log: Hack cleanup: IntGdiBrushXlate is a dirty ros hack, it is needed due to the fact that we handle brushes totally wrong. Replace it with a static function IntUpdateBrushXlate and move it to dcobjs.c. Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Thu Mar 26 06:41:57 2009 @@ -7,9 +7,6 @@ extern HDC hSystemBM; extern HSEMAPHORE hsemDriverMgmt; - -XLATEOBJ* FASTCALL -IntGdiCreateBrushXlate(PDC Dc, BRUSH *BrushObj, BOOLEAN *Failed); XLATEOBJ* FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Thu Mar 26 06:41:57 2009 @@ -112,58 +112,6 @@ /* FIXME */ return sizeof(LOGBRUSH); -} - - -XLATEOBJ* FASTCALL -IntGdiCreateBrushXlate(PDC Dc, BRUSH *pbrush, BOOLEAN *Failed) -{ - XLATEOBJ *Result = NULL; - SURFACE * psurf; - HPALETTE hPalette = NULL; - - psurf = SURFACE_LockSurface(Dc->rosdc.hBitmap); - if (psurf) - { - hPalette = psurf->hDIBPalette; - SURFACE_UnlockSurface(psurf); - } - if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault; - - if (pbrush->flAttrs & GDIBRUSH_IS_NULL) - { - Result = NULL; - *Failed = FALSE; - } - else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) - { - Result = IntEngCreateXlate(0, PAL_RGB, hPalette, NULL); - *Failed = FALSE; - } - else - { - SURFACE *Pattern = SURFACE_LockSurface(pbrush->hbmPattern); - if (Pattern == NULL) - return NULL; - - /* Special case: 1bpp pattern */ - if (Pattern->SurfObj.iBitmapFormat == BMF_1BPP) - { - PDC_ATTR pdcattr = Dc->pdcattr; - - if (Dc->rosdc.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(hPalette, pdcattr->crBackgroundClr, pbrush->BrushAttr.lbColor); - } - else if (pbrush->flAttrs & GDIBRUSH_IS_DIB) - { - Result = IntEngCreateXlate(0, 0, hPalette, Pattern->hDIBPalette); - } - - SURFACE_UnlockSurface(Pattern); - *Failed = FALSE; - } - - return Result; } /** Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Thu Mar 26 06:41:57 2009 @@ -10,6 +10,60 @@ #define NDEBUG #include <debug.h> + +// HACK! +static +BOOLEAN +IntUpdateBrushXlate(PDC pdc, XLATEOBJ **ppxlo, BRUSH *pbrush) +{ + SURFACE * psurf; + XLATEOBJ *pxlo = NULL; + HPALETTE hPalette = NULL; + + psurf = SURFACE_LockSurface(pdc->rosdc.hBitmap); + if (psurf) + { + hPalette = psurf->hDIBPalette; + SURFACE_UnlockSurface(psurf); + } + if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault; + + if (pbrush->flAttrs & GDIBRUSH_IS_NULL) + { + pxlo = NULL; + } + else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) + { + pxlo = IntEngCreateXlate(0, PAL_RGB, hPalette, NULL); + } + else + { + SURFACE *psurfPattern = SURFACE_LockSurface(pbrush->hbmPattern); + if (psurfPattern == NULL) + return FALSE; + + /* Special case: 1bpp pattern */ + if (psurfPattern->SurfObj.iBitmapFormat == BMF_1BPP) + { + if (pdc->rosdc.bitsPerPixel != 1) + pxlo = IntEngCreateSrcMonoXlate(hPalette, + pdc->pdcattr->crBackgroundClr, + pbrush->BrushAttr.lbColor); + } + else if (pbrush->flAttrs & GDIBRUSH_IS_DIB) + { + pxlo = IntEngCreateXlate(0, 0, hPalette, psurfPattern->hDIBPalette); + } + + SURFACE_UnlockSurface(psurfPattern); + } + + if (*ppxlo != NULL) + EngDeleteXlate(*ppxlo); + + *ppxlo = pxlo; + return TRUE; +} VOID @@ -102,8 +156,8 @@ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboLine, iSolidColor); } - /* Clear flag */ - pdcattr->ulDirty_ &= ~DIRTY_LINE; + /* Clear flags */ + pdcattr->ulDirty_ &= ~(DIRTY_LINE | DC_PEN_DIRTY); } VOID @@ -202,8 +256,7 @@ PDC_ATTR pdcattr; HBRUSH hOrgBrush; PBRUSH pbrush; - XLATEOBJ *XlateObj; - BOOLEAN bFailed; + BOOLEAN bSuccess; if (pDC == NULL || hBrush == NULL) return NULL; @@ -216,23 +269,17 @@ return NULL; } - DC_vSelectFillBrush(pDC, pbrush); - - XlateObj = IntGdiCreateBrushXlate(pDC, pbrush, &bFailed); - BRUSH_UnlockBrush(pbrush); - if(bFailed) - { - return NULL; - } - hOrgBrush = pdcattr->hbrush; pdcattr->hbrush = hBrush; - if (pDC->rosdc.XlateBrush != NULL) - { - EngDeleteXlate(pDC->rosdc.XlateBrush); - } - pDC->rosdc.XlateBrush = XlateObj; + DC_vSelectFillBrush(pDC, pbrush); + + bSuccess = IntUpdateBrushXlate(pDC, &pDC->rosdc.XlateBrush, pbrush); + BRUSH_UnlockBrush(pbrush); + if(!bSuccess) + { + return NULL; + } pdcattr->ulDirty_ &= ~DC_BRUSH_DIRTY; @@ -248,8 +295,7 @@ PDC_ATTR pdcattr; HPEN hOrgPen = NULL; PBRUSH pbrushPen; - XLATEOBJ *XlateObj; - BOOLEAN bFailed; + BOOLEAN bSuccess; if (pDC == NULL || hPen == NULL) return NULL; @@ -261,26 +307,20 @@ return NULL; } - DC_vSelectLineBrush(pDC, pbrushPen); - - XlateObj = IntGdiCreateBrushXlate(pDC, pbrushPen, &bFailed); - PEN_UnlockPen(pbrushPen); - if (bFailed) - { - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return NULL; - } - hOrgPen = pdcattr->hpen; pdcattr->hpen = hPen; - if (pDC->rosdc.XlatePen != NULL) - { - EngDeleteXlate(pDC->rosdc.XlatePen); - } + DC_vSelectLineBrush(pDC, pbrushPen); + + bSuccess = IntUpdateBrushXlate(pDC, &pDC->rosdc.XlatePen, pbrushPen); + PEN_UnlockPen(pbrushPen); + if (!bSuccess) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return NULL; + } + pdcattr->ulDirty_ &= ~DC_PEN_DIRTY; - - pDC->rosdc.XlatePen = XlateObj; return hOrgPen; } @@ -354,7 +394,6 @@ HBITMAP hOrgBmp; PSURFACE psurfBmp, psurfOld; HRGN hVisRgn; - BOOLEAN bFailed; PBRUSH pbrush; if (hDC == NULL || hBmp == NULL) return NULL; @@ -420,22 +459,14 @@ pbrush = BRUSH_LockBrush(pdcattr->hbrush); if (pbrush) { - if (pDC->rosdc.XlateBrush) - { - EngDeleteXlate(pDC->rosdc.XlateBrush); - } - pDC->rosdc.XlateBrush = IntGdiCreateBrushXlate(pDC, pbrush, &bFailed); + IntUpdateBrushXlate(pDC, &pDC->rosdc.XlateBrush, pbrush); BRUSH_UnlockBrush(pbrush); } pbrush = PEN_LockPen(pdcattr->hpen); if (pbrush) { - if (pDC->rosdc.XlatePen) - { - EngDeleteXlate(pDC->rosdc.XlatePen); - } - pDC->rosdc.XlatePen = IntGdiCreateBrushXlate(pDC, pbrush, &bFailed); + IntUpdateBrushXlate(pDC, &pDC->rosdc.XlatePen, pbrush); PEN_UnlockPen(pbrush); }

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