Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[cfinck] 40186: - Start customizing some subsystems for RosCMS 4 and our new Backend server --> Bugzilla: Customized to the new config file path --> Shared: Fully customized --> Testman: Fully customized, ready for a test installation now :-) --> Wiki: Customized to the new config file path - Upgrade the MediaWiki config file to our used MediaWiki version - Remove the old ReactOS logo shown in case of a Wiki error, add a refreshed one - Add config file examples to the directories, which are also

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Mar 23 20:09:41 2009 New Revision: 40186 URL: http://svn.reactos.org/svn/reactos?rev=40186&view=rev Log: - Start customizing some subsystems for RosCMS 4 and our new Backend server --> Bugzilla: Customized to the new config file path --> Shared: Fully customized --> Testman: Fully customized, ready for a test installation now :-) --> Wiki: Customized to the new config file path - Upgrade the MediaWiki config file to our used MediaWiki version - Remove the old ReactOS logo shown in case of a Wiki error, add a refreshed one - Add config file examples to the directories, which are also used by the server, to make local testing easier Added: branches/danny-web/reactos.org/htdocs/testman/connect.db.php (with props) branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php (with props) branches/danny-web/reactos.org/www.reactos.org_config/ (with props) branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config (with props) branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php (with props) branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php (with props) Removed: branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/reactos.png branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php Modified: branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php branches/danny-web/reactos.org/htdocs/testman/ajax-search.php branches/danny-web/reactos.org/htdocs/testman/compare.php branches/danny-web/reactos.org/htdocs/testman/config.inc.php branches/danny-web/reactos.org/htdocs/testman/detail.php branches/danny-web/reactos.org/htdocs/testman/index.php branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… branches/danny-web/reactos.org/htdocs/testman/webservice/index.php branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php branches/danny-web/reactos.org/htdocs/wiki/config/index.php branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/wiki.png Modified: branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/bu… ============================================================================== --- branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -417,7 +417,7 @@ } # The "localconfig" file has another path on the ReactOS Web Server - $localconfig = "../../config/bugzilla-config"; + $localconfig = "../../www.reactos.org_config/bugzilla-config"; # We have to return absolute paths for mod_perl. # That means that if you modify these paths, they must be absolute paths. Modified: branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/sh… ============================================================================== --- branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -6,7 +6,7 @@ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ - require_once(ROOT_PATH . "roscms/inc/utils.php"); + require_once(ROSCMS_PATH . "inc/utils.php"); function GetLanguage() { Modified: branches/danny-web/reactos.org/htdocs/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -13,6 +13,7 @@ require_once("config.inc.php"); + require_once("connect.db.php"); require_once("utils.inc.php"); try @@ -40,15 +41,15 @@ $where .= "AND r.id >= " . (int)$_GET["startid"] . " "; if($_GET["user"]) - $where .= "AND u.user_name LIKE " . $dbh->quote($_GET["user"] . "%") . " "; + $where .= "AND a.name LIKE " . $dbh->quote($_GET["user"] . "%") . " "; if($_GET["platform"]) $where .= "AND r.platform LIKE " . $dbh->quote($_GET["platform"] . "%") . " "; } // Prepare some clauses - $tables = "FROM " . DB_TESTMAN . ".winetest_runs r JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id "; - $order = "ORDER BY revision ASC, id ASC "; + $tables = "FROM " . DB_TESTMAN . ".winetest_runs r JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id "; + $order = "ORDER BY revision ASC, r.id ASC "; echo "<results>"; @@ -81,7 +82,7 @@ if($_GET["resultlist"]) { $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform, r.comment " . + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . $tables . $where . $order . "LIMIT " . RESULTS_PER_PAGE ) or die("<error>Query failed #2</error>"); @@ -100,7 +101,7 @@ echo "<result>"; printf("<id>%d</id>", $row["id"]); printf("<date>%s</date>", GetDateString($row["timestamp"])); - printf("<user>%s</user>", htmlspecialchars($row["user_name"])); + printf("<user>%s</user>", htmlspecialchars($row["name"])); printf("<revision>%d</revision>", $row["revision"]); printf("<platform>%s</platform>", GetPlatformString($row["platform"])); printf("<comment>%s</comment>", htmlspecialchars($row["comment"])); Modified: branches/danny-web/reactos.org/htdocs/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/compare.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -8,12 +8,11 @@ charset=utf-8 without BOM */ - define("ROOT_PATH", "../"); - require_once("config.inc.php"); + require_once("connect.db.php"); require_once("utils.inc.php"); require_once("languages.inc.php"); - require_once(ROOT_PATH . "shared/subsys_layout.php"); + require_once(SHARED_PATH . "subsys_layout.php"); GetLanguage(); require_once("lang/$lang.inc.php"); @@ -166,10 +165,10 @@ printf('<th class="TestSuite">%s</th>', $testman_langres["testsuite"]); $stmt = $dbh->prepare( - "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform " . + "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform " . "FROM " . DB_TESTMAN . ".winetest_runs r " . - "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . - "WHERE r.id = :id" + "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . + "WHERE r.id = :id" ); foreach($id_array as $id) @@ -179,7 +178,7 @@ $row = $stmt->fetch(PDO::FETCH_ASSOC); echo '<th onmousedown="ResultHead_OnMouseDown(this)">'; - printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["user_name"], GetPlatformString($row["platform"])); + printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["name"], GetPlatformString($row["platform"])); echo '</th>'; } Modified: branches/danny-web/reactos.org/htdocs/testman/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/config.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -2,20 +2,13 @@ /* PROJECT: ReactOS Web Test Manager LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - PURPOSE: Configuration settings + PURPOSE: Configuration settings for the Web Interface COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ - - // DB Settings - // The user entered here must have: - // * SELECT, INSERT, UPDATE and DELETE privileges to $DB_TESTMAN - // * SELECT privileges to $DB_ROSCMS - define("DB_HOST", "localhost"); - define("DB_USER", "root"); - define("DB_PASS", ""); - - define("DB_ROSCMS", "roscms"); - define("DB_TESTMAN", "testman"); + + define("ROSCMS_PATH", "../roscms/"); + define("SHARED_PATH", "../shared/"); + define("TESTMAN_PATH", ""); define("RESULTS_PER_PAGE", 100); define("MAX_COMPARE_RESULTS", 5); Added: branches/danny-web/reactos.org/htdocs/testman/connect.db.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/connect.db.php (added) +++ branches/danny-web/reactos.org/htdocs/testman/connect.db.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,10 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Database Configuration Settings + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + require_once(TESTMAN_PATH . "../../www.reactos.org_config/testman-connect.php"); +?> Propchange: branches/danny-web/reactos.org/htdocs/testman/connect.db.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/danny-web/reactos.org/htdocs/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/detail.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -7,13 +7,12 @@ charset=utf-8 without BOM */ - - define("ROOT_PATH", "../"); require_once("config.inc.php"); + require_once("connect.db.php"); require_once("utils.inc.php"); require_once("languages.inc.php"); - require_once(ROOT_PATH . "shared/subsys_layout.php"); + require_once(SHARED_PATH . "subsys_layout.php"); GetLanguage(); require_once("lang/$lang.inc.php"); @@ -53,11 +52,11 @@ // Get information about this result $stmt = $dbh->prepare( - "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, u.user_name, r.comment " . + "SELECT e.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 " . "FROM " . DB_TESTMAN . ".winetest_results e " . "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . "JOIN " . DB_TESTMAN . ".winetest_runs r ON e.test_id = r.id " . - "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . + "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . "WHERE e.id = :id" ); $stmt->bindParam(":id", $_GET["id"]); @@ -111,7 +110,7 @@ </tr> <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["user"]; ?>:</td> - <td><?php echo $row["user_name"]; ?></td> + <td><?php echo $row["name"]; ?></td> </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["platform"]; ?>:</td> Modified: branches/danny-web/reactos.org/htdocs/testman/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -7,17 +7,16 @@ charset=utf-8 without BOM */ - - define("ROOT_PATH", "../"); require_once("config.inc.php"); + require_once("connect.db.php"); require_once("utils.inc.php"); require_once("languages.inc.php"); - require_once(ROOT_PATH . "shared/subsys_layout.php"); - require_once(ROOT_PATH . "shared/svn.php"); + require_once(SHARED_PATH . "subsys_layout.php"); + require_once(SHARED_PATH . "svn.php"); GetLanguage(); - require_once(ROOT_PATH . "shared/lang/$lang.inc.php"); + require_once(SHARED_PATH . "lang/$lang.inc.php"); require_once("lang/$lang.inc.php"); $rev = GetLatestRevision(); @@ -113,10 +112,10 @@ } $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform, r.comment " . + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . "FROM " . DB_TESTMAN . ".winetest_runs r " . - "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . - "ORDER BY revision DESC, id DESC " . + "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . + "ORDER BY revision DESC, r.id DESC " . "LIMIT 10" ) or die("Query failed #1"); @@ -131,7 +130,7 @@ printf('<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_%s" /></td>', $row["id"]); printf('<td onclick="Result_OnCellClick(this)">%s</td>', $row["revision"]); printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetDateString($row["timestamp"])); - printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["user_name"])); + printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["name"])); printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetPlatformString($row["platform"])); printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["comment"])); echo "</tr>"; Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -5,8 +5,9 @@ PURPOSE: Aggregator for the Debug Log of ReactOS BuildBot Buildslaves COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> */ - - require_once("../config.inc.php"); + + require_once("config.inc.php"); + require_once(TESTMAN_PATH . "connect.db.php"); require_once("utils.inc.php"); if(!isset($_GET["username"]) || !isset($_GET["password"]) || !isset($_GET["slavename"]) || !is_numeric($_GET["platform"]) || !is_numeric($_GET["build"])) Added: branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php (added) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,10 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Configuration settings for the Web Service + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + define("TESTMAN_PATH", "../"); +?> Propchange: branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -6,7 +6,8 @@ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ - require_once("../config.inc.php"); + require_once("config.inc.php"); + require_once(TESTMAN_PATH . "connect.db.php"); require_once("utils.inc.php"); if(!isset($_POST["username"]) || !isset($_POST["password"]) || !isset($_POST["testtype"])) Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -26,7 +26,7 @@ global $dbh; // Check the login credentials - $stmt = $dbh->prepare("SELECT user_id FROM " . DB_ROSCMS . ".users WHERE user_name = :username AND user_roscms_password = MD5(:password) AND user_account_enabled = 'yes'"); + $stmt = $dbh->prepare("SELECT id FROM " . DB_ROSCMS . ".roscms_accounts WHERE name = :username AND password = MD5(:password) AND disabled = 0"); $stmt->bindParam(":username", $username); $stmt->bindParam(":password", $password); $stmt->execute() or die("SQL failed #1"); Modified: branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== --- branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -7,6 +7,9 @@ # See includes/DefaultSettings.php for all configurable settings # and their default values, but don't forget to make changes in _this_ # file, not there. +# +# Further documentation for configuration settings may be found at: +# http://www.mediawiki.org/wiki/Manual:Configuration_settings # If you customize your file layout, set $IP to the directory that contains # the other MediaWiki files. It will be used as a base to locate files. @@ -19,7 +22,7 @@ $path = array( $IP, "$IP/includes", "$IP/languages" ); set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() ); -require_once( "includes/DefaultSettings.php" ); +require_once( "$IP/includes/DefaultSettings.php" ); # If PHP's memory limit is very low, some operations may fail. # ini_set( 'memory_limit', '20M' ); @@ -28,65 +31,59 @@ if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) { die( "This script must be run from the command line\n" ); } -} elseif ( empty( $wgNoOutputBuffer ) ) { - ## Compress output if the browser supports it - if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' ); } +## Uncomment this to disable output compression +# $wgDisableOutputCompression = true; $wgSitename = "ReactOS"; -$wgScriptPath = "/wiki"; -$wgScript = "$wgScriptPath/index.php"; -$wgRedirectScript = "$wgScriptPath/redirect.php"; +## The URL base path to the directory containing the wiki; +## defaults for all runtime URL paths are based off of this. +## For more information on customizing the URLs please see: +## http://www.mediawiki.org/wiki/Manual:Short_URL +$wgScriptPath = "/wiki"; +$wgScriptExtension = ".php"; -## For more information on customizing the URLs please see: -## http://meta.wikimedia.org/wiki/Eliminating_index.php_from_the_url -## If using PHP as a CGI module, the ?title= style usually must be used. -$wgArticlePath = "$wgScript/$1"; -# $wgArticlePath = "$wgScript?title=$1"; +$wgArticlePath = "$wgScriptPath/$1"; +$wgStylePath = "$wgScriptPath/skins"; -$wgStylePath = "$wgScriptPath/skins"; -$wgStyleDirectory = "$IP/skins"; -$wgLogo = "$wgStylePath/common/images/reactos.png"; +## UPO means: this is also a user preference option -$wgUploadPath = "$wgScriptPath/images"; -$wgUploadDirectory = "$IP/images"; - -$wgEnableEmail = true; -$wgEnableUserEmail = true; +$wgEnableEmail = true; +$wgEnableUserEmail = true; # UPO $wgEmergencyContact = "ros-web(a)reactos.org"; -$wgPasswordSender = "ros-web(a)reactos.org"; +$wgPasswordSender = "ros-web(a)reactos.org"; -## For a detailed description of the following switches see -## http://meta.wikimedia.org/Enotif and http://meta.wikimedia.org/Eauthent -## There are many more options for fine tuning available see -## /includes/DefaultSettings.php -## UPO means: this is also a user preference option $wgEnotifUserTalk = true; # UPO $wgEnotifWatchlist = true; # UPO $wgEmailAuthentication = false; -# Uncomment one of the following lines based on whether the Wiki runs on the ReactOS Server or locally -require_once("/web/reactos.org/config/wiki-connect.php"); -//require_once("$IP/wiki-connect.php"); +require_once("$IP/../../www.reactos.org_config/wiki-connect.php"); -# Use the hash preprocessor for our server -$wgParserConf["preprocessorClass"] = "Preprocessor_Hash"; +# MySQL specific settings +$wgDBprefix = ""; + +# MySQL table options to use during installation or update +$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary"; # Experimental charset support for MySQL 4.1/5.0. -$wgDBmysql5 = false; +$wgDBmysql5 = true; ## Shared memory settings $wgMainCacheType = CACHE_NONE; $wgMemCachedServers = array(); ## To enable image uploads, make sure the 'images' directory -## is writable, then uncomment this: -$wgEnableUploads = true; -$wgUseImageResize = true; +## is writable, then set this to true: +$wgEnableUploads = true; $wgUseImageMagick = true; $wgImageMagickConvertCommand = "/usr/bin/convert"; + +## If you use ImageMagick (or any other shell command) on a +## Linux server, this will need to be set to the name of an +## available UTF-8 locale +$wgShellLocale = "en_US.UTF-8"; ## If you want to use image uploads under safe mode, ## create the directories images/archive, images/thumb and @@ -96,10 +93,7 @@ ## If you have the appropriate support software installed ## you can enable inline LaTeX equations: -# $wgUseTeX = true; -$wgMathPath = "{$wgUploadPath}/math"; -$wgMathDirectory = "{$wgUploadDirectory}/math"; -$wgTmpDirectory = "{$wgUploadDirectory}/tmp"; +$wgUseTeX = false; $wgLocalInterwiki = $wgSitename; @@ -114,7 +108,7 @@ ## For attaching licensing metadata to pages, and displaying an ## appropriate copyright notice / icon. GNU Free Documentation ## License and Creative Commons licenses are supported so far. -$wgEnableCreativeCommonsRdf = true; +# $wgEnableCreativeCommonsRdf = true; $wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright $wgRightsUrl = "http://www.gnu.org/copyleft/fdl.html"; $wgRightsText = "GNU Free Documentation License 1.2"; @@ -125,8 +119,7 @@ # When you make changes to this configuration file, this will make # sure that cached pages are cleared. -$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) ); -$wgCacheEpoch = max( $wgCacheEpoch, $configdate ); +$wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) ); # Entirely disable Anonymous Edits $wgGroupPermissions['*']['edit'] = false; @@ -142,9 +135,6 @@ $wgGroupPermissions['supermod']['undelete'] = true; $wgGroupPermissions['supermod']['rollback'] = true; -# deactivate DB SQL queries -$wgAllowSysopQueries = false; - # Enable external image embedding $wgAllowExternalImages = true; @@ -153,5 +143,3 @@ # RosCMS-specific settings define("ROSCMS_PATH", "$IP/../roscms/"); - -?> Modified: branches/danny-web/reactos.org/htdocs/wiki/config/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== --- branches/danny-web/reactos.org/htdocs/wiki/config/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/wiki/config/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -22,6 +22,8 @@ error_reporting( E_ALL ); header( "Content-type: text/html; charset=utf-8" ); @ini_set( "display_errors", true ); + +define("ROSCMS_PATH", "../../roscms/"); # In case of errors, let output be clean. $wgRequestTime = microtime( true ); Removed: branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/reactos.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== Binary file - no diff available. Modified: branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/wiki.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== Binary files - no diff available. Removed: branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== --- branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php (removed) @@ -1,10 +1,0 @@ -<?php - // Settings for a local MediaWiki installation - $wgDBserver = "localhost"; - $wgDBname = "wiki"; - $wgDBuser = "rosuser"; - $wgDBpassword = "roscms"; - $wgDBprefix = ""; - $wgDBtype = "mysql"; - $wgDBport = "5432"; -?> Propchange: branches/danny-web/reactos.org/www.reactos.org_config/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Mar 23 20:09:41 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/danny-web/reactos.org/www.reactos.org_config/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/danny-web/reactos.org/www.reactos.org_config/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.react… ============================================================================== --- branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config (added) +++ branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,90 @@ + +# If you are using Apache as your web server, Bugzilla can create .htaccess +# files for you that will instruct Apache not to serve files that shouldn't +# be accessed from the web (like your local configuration data and non-cgi +# executable files). For this to work, the directory your Bugzilla +# installation is in must be within the jurisdiction of a <Directory> block +# in the httpd.conf file that has 'AllowOverride Limit' in it. If it has +# 'AllowOverride All' or other options with Limit, that's fine. +# (Older Apache installations may use an access.conf file to store these +# <Directory> blocks.) +# If this is set to 1, Bugzilla will create these files if they don't exist. +# If this is set to 0, Bugzilla will not create these files. +$create_htaccess = 1; + +# This is the group your web server runs as. +# If you have a Windows box, ignore this setting. +# If you do not have access to the group your web server runs under, +# set this to "". If you do set this to "", then your Bugzilla installation +# will be _VERY_ insecure, because some files will be world readable/writable, +# and so anyone who can get local access to your machine can do whatever they +# want. You should only have this set to "" if this is a testing installation +# and you cannot set this up any other way. YOU HAVE BEEN WARNED! +# If you set this to anything other than "", you will need to run checksetup.pl +# asAdministrator, or as a user who is a member of the specified group. +$webservergroup = ''; + +# What SQL database to use. Default is mysql. List of supported databases +# can be obtained by listing Bugzilla/DB directory - every module corresponds +# to one supported database and the name corresponds to a driver name. +$db_driver = 'mysql'; + +# The DNS name of the host that the database server runs on. +$db_host = 'localhost'; + +# The name of the database +$db_name = 'bugs'; + +# Who we connect to the database as. +$db_user = 'root'; + +# Enter your database password here. It's normally advisable to specify +# a password for your bugzilla database user. +# If you use apostrophe (') or a backslash (\) in your password, you'll +# need to escape it by preceding it with a '\' character. (\') or (\) +# (Far simpler just not to use those characters.) +$db_pass = ''; + +# Sometimes the database server is running on a non-standard port. If that's +# the case for your database server, set this to the port number that your +# database server is running on. Setting this to 0 means "use the default +# port for my database server." +$db_port = 0; + +# MySQL Only: Enter a path to the unix socket for MySQL. If this is +# blank, then MySQL's compiled-in default will be used. You probably +# want that. +$db_sock = ''; + +# Should checksetup.pl try to verify that your database setup is correct? +# (with some combinations of database servers/Perl modules/moonphase this +# doesn't work) +$db_check = 1; + +# With the introduction of a configurable index page using the +# template toolkit, Bugzilla's main index page is now index.cgi. +# Most web servers will allow you to use index.cgi as a directory +# index, and many come preconfigured that way, but if yours doesn't +# then you'll need an index.html file that provides redirection +# to index.cgi. Setting $index_html to 1 below will allow +# checksetup.pl to create one for you if it doesn't exist. +# NOTE: checksetup.pl will not replace an existing file, so if you +# wish to have checksetup.pl create one for you, you must +# make sure that index.html doesn't already exist +$index_html = 0; + +# For some optional functions of Bugzilla (such as the pretty-print patch +# viewer), we need the cvs binary to access files and revisions. +# Because it's possible that this program is not in your path, you can specify +# its location here. Please specify the full path to the executable. +$cvsbin = ''; + +# For some optional functions of Bugzilla (such as the pretty-print patch +# viewer), we need the interdiff binary to make diffs between two patches. +# Because it's possible that this program is not in your path, you can specify +# its location here. Please specify the full path to the executable. +$interdiffbin = ''; + +# The interdiff feature needs diff, so we have to have that path. +# Please specify the directory name only; do not use trailing slash. +$diffpath = ''; Propchange: branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.react… ============================================================================== --- branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php (added) +++ branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,12 @@ +<?php + // DB Settings + // The user entered here must have: + // * SELECT, INSERT, UPDATE and DELETE privileges to $DB_TESTMAN + // * SELECT privileges to $DB_ROSCMS + define("DB_HOST", "localhost"); + define("DB_USER", "root"); + define("DB_PASS", ""); + + define("DB_ROSCMS", "roscms"); + define("DB_TESTMAN", "testman"); +?> Propchange: branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.react… ============================================================================== --- branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php (added) +++ branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,7 @@ +<?php + // Settings for a local MediaWiki installation + $wgDBserver = "localhost"; + $wgDBname = "wiki"; + $wgDBuser = "root"; + $wgDBpassword = ""; +?> Propchange: branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 9 months

[jmorlan] 40185: - In cmd's PUSHD and POPD commands, change directory using _tchdir.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Mon Mar 23 17:48:04 2009 New Revision: 40185 URL: http://svn.reactos.org/svn/reactos?rev=40185&view=rev Log: - In cmd's PUSHD and POPD commands, change directory using _tchdir. Modified: trunk/reactos/base/shell/cmd/dirstack.c Modified: trunk/reactos/base/shell/cmd/dirstack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dirstack.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/dirstack.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dirstack.c [iso-8859-1] Mon Mar 23 17:48:04 2009 @@ -165,7 +165,7 @@ return 0; if (bChangePath) - SetCurrentDirectory (newPath); + _tchdir(newPath); return 0; } @@ -192,7 +192,7 @@ GetDirectoryStackTop (szPath); PopDirectory (); - SetCurrentDirectory (szPath); + _tchdir(szPath); return 0; }

15 years, 9 months

[jmorlan] 40184: - Moved the code for updating the drive-specific current-directory environment variable out of RTL and into the CRT. Testing on Windows shows that neither RtlSetCurrentDirectory_U or SetCurrentDirectory update these variables, but _tchdir does.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Mon Mar 23 17:47:46 2009 New Revision: 40184 URL: http://svn.reactos.org/svn/reactos?rev=40184&view=rev Log: - Moved the code for updating the drive-specific current-directory environment variable out of RTL and into the CRT. Testing on Windows shows that neither RtlSetCurrentDirectory_U or SetCurrentDirectory update these variables, but _tchdir does. Modified: trunk/reactos/lib/rtl/path.c trunk/reactos/lib/sdk/crt/direct/chdir.c trunk/reactos/lib/sdk/crt/direct/wchdir.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=40184&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Mar 23 17:47:46 2009 @@ -207,7 +207,6 @@ RtlSetCurrentDirectory_U(PUNICODE_STRING dir) { UNICODE_STRING full; - UNICODE_STRING envvar; FILE_FS_DEVICE_INFORMATION device_info; OBJECT_ATTRIBUTES Attr; IO_STATUS_BLOCK iosb; @@ -215,7 +214,6 @@ NTSTATUS Status; ULONG size; HANDLE handle = NULL; - WCHAR var[4]; PWSTR ptr; DPRINT("RtlSetCurrentDirectory %wZ\n", dir); @@ -281,19 +279,6 @@ memcpy( cd->DosPath.Buffer, ptr, size * sizeof(WCHAR)); cd->DosPath.Buffer[size] = 0; cd->DosPath.Length = size * sizeof(WCHAR); - - - /* FIXME: whats this all about??? Wine doesnt have this. -Gunnar */ - if (cd->DosPath.Buffer[1]==':') - { - envvar.Length = 2 * swprintf (var, L"=%c:", cd->DosPath.Buffer[0]); - envvar.MaximumLength = 8; - envvar.Buffer = var; - - RtlSetEnvironmentVariable(NULL, - &envvar, - &cd->DosPath); - } RtlFreeUnicodeString( &full); RtlReleasePebLock(); Modified: trunk/reactos/lib/sdk/crt/direct/chdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/direct/chdir.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/direct/chdir.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/direct/chdir.c [iso-8859-1] Mon Mar 23 17:47:46 2009 @@ -8,9 +8,20 @@ */ int _tchdir(const _TCHAR* _path) { - if (!SetCurrentDirectory(_path)) { - _dosmaperr(_path?GetLastError():0); - return -1; - } + WCHAR newdir[MAX_PATH]; + + if (!SetCurrentDirectory(_path)) + { + _dosmaperr(_path ? GetLastError() : 0); + return -1; + } + + /* Update the drive-specific current directory variable */ + if (GetCurrentDirectoryW(MAX_PATH, newdir) && newdir[1] == L':') + { + WCHAR envvar[4] = { L'=', towupper(newdir[0]), L':', L'\0' }; + SetEnvironmentVariableW(envvar, newdir); + } + return 0; } Modified: trunk/reactos/lib/sdk/crt/direct/wchdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/direct/wchdir.… ============================================================================== --- trunk/reactos/lib/sdk/crt/direct/wchdir.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/direct/wchdir.c [iso-8859-1] Mon Mar 23 17:47:46 2009 @@ -2,4 +2,3 @@ #define _UNICODE #include "chdir.c" -

15 years, 9 months

[cgutman] 40183: - This should fix a rare afd crash - It was a race condition caused by another thread clearing our IRP while we were still using it

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Mar 23 08:05:57 2009 New Revision: 40183 URL: http://svn.reactos.org/svn/reactos?rev=40183&view=rev Log: - This should fix a rare afd crash - It was a race condition caused by another thread clearing our IRP while we were still using it Modified: trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Mar 23 08:05:57 2009 @@ -323,14 +323,3 @@ &Irp->Tail.Overlay.ListEntry ); return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0, NULL ); } - -VOID SocketCalloutEnter( PAFD_FCB FCB ) { - ASSERT(FCB->Locked); - FCB->Critical = TRUE; - SocketStateUnlock( FCB ); -} - -VOID SocketCalloutLeave( PAFD_FCB FCB ) { - FCB->Critical = FALSE; - SocketAcquireStateLock( FCB ); -} Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Mar 23 08:05:57 2009 @@ -104,8 +104,6 @@ if( !FCB->ReceiveIrp.InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); - SocketCalloutEnter( FCB ); - Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, FCB->Connection.Object, TDI_RECEIVE_NORMAL, @@ -114,8 +112,6 @@ &FCB->ReceiveIrp.Iosb, ReceiveComplete, FCB ); - - SocketCalloutLeave( FCB ); if( Status == STATUS_SUCCESS ) FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; @@ -559,9 +555,8 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); if( NT_SUCCESS(Irp->IoStatus.Status) ) { + /* Now relaunch the datagram request */ - SocketCalloutEnter( FCB ); - Status = TdiReceiveDatagram ( &FCB->ReceiveIrp.InFlightRequest, FCB->AddressFile.Object, @@ -572,8 +567,6 @@ &FCB->ReceiveIrp.Iosb, PacketSocketRecvComplete, FCB ); - - SocketCalloutLeave( FCB ); } SocketStateUnlock( FCB ); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Mon Mar 23 08:05:57 2009 @@ -134,8 +134,6 @@ if( FCB->Send.BytesUsed ) { FCB->PollState &= ~AFD_EVENT_SEND; - SocketCalloutEnter( FCB ); - Status = TdiSend( &FCB->SendIrp.InFlightRequest, FCB->Connection.Object, 0, @@ -144,8 +142,6 @@ &FCB->SendIrp.Iosb, SendComplete, FCB ); - - SocketCalloutLeave( FCB ); } else { FCB->PollState |= AFD_EVENT_SEND; } @@ -260,8 +256,6 @@ TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); if( TargetAddress ) { - SocketCalloutEnter( FCB ); - Status = TdiSendDatagram ( &FCB->SendIrp.InFlightRequest, FCB->AddressFile.Object, @@ -272,8 +266,6 @@ PacketSocketSendComplete, FCB ); - SocketCalloutLeave( FCB ); - ExFreePool( TargetAddress ); } else Status = STATUS_NO_MEMORY; @@ -358,10 +350,6 @@ if( TotalBytesCopied > 0 ) { UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - FCB->SendIrp.InFlightRequest = (PVOID)1; /* Placeholder */ - - SocketCalloutEnter( FCB ); - Status = TdiSend( &FCB->SendIrp.InFlightRequest, FCB->Connection.Object, 0, @@ -371,8 +359,6 @@ SendComplete, FCB ); - SocketCalloutLeave( FCB ); - if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; @@ -434,8 +420,6 @@ /* Check the size of the Address given ... */ if( TargetAddress ) { - SocketCalloutEnter( FCB ); - Status = TdiSendDatagram ( &FCB->SendIrp.InFlightRequest, FCB->AddressFile.Object, @@ -446,8 +430,6 @@ PacketSocketSendComplete, FCB ); - SocketCalloutLeave( FCB ); - ExFreePool( TargetAddress ); } else Status = STATUS_NO_MEMORY; Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon Mar 23 08:05:57 2009 @@ -271,8 +271,6 @@ VOID UnlockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); -VOID SocketCalloutEnter( PAFD_FCB FCB ); -VOID SocketCalloutLeave( PAFD_FCB FCB ); /* main.c */

15 years, 9 months

[tkreuzer] 40182: In the beginning somebody created dc.c. And he saw that it was empty. So he quickly added some functions to it. And as there were so many nice dc functions, the dc.c quickly got populated with a lot of code. But dc.c must have still felt lonely, so that people added more and more code, even completely unrelated code. Finally dc.c became a fat wastedump for all the code a developer didn't know where to put. Clean up this mess by splitting the 3600 line monster file into 5 files

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 23 06:43:11 2009 New Revision: 40182 URL: http://svn.reactos.org/svn/reactos?rev=40182&view=rev Log: In the beginning somebody created dc.c. And he saw that it was empty. So he quickly added some functions to it. And as there were so many nice dc functions, the dc.c quickly got populated with a lot of code. But dc.c must have still felt lonely, so that people added more and more code, even completely unrelated code. Finally dc.c became a fat wastedump for all the code a developer didn't know where to put. Clean up this mess by splitting the 3600 line monster file into 5 files and moving some stuff into other files. Added: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c - copied, changed from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c - copied, changed from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c - copied, changed from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcstate.c - copied, changed from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/device.c - copied, changed from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c Removed: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Removed: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Copied: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c (from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Copied: trunk/reactos/subsystems/win32/win32k/objects/dclife.c (from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Copied: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c (from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Copied: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c (from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Copied: trunk/reactos/subsystems/win32/win32k/objects/device.c (from r40179, trunk/reactos/subsystems/win32/win32k/objects/dc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

15 years, 9 months

[dgorbachev] 40181: Add "REACTOS Mm Hack of Doom" again (removed in r39723). Bug #4296.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Mar 23 03:56:01 2009 New Revision: 40181 URL: http://svn.reactos.org/svn/reactos?rev=40181&view=rev Log: Add "REACTOS Mm Hack of Doom" again (removed in r39723). Bug #4296. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Mon Mar 23 03:56:01 2009 @@ -389,9 +389,6 @@ /* Checking NPX, disable interrupts now */ mov eax, [esi+KTHREAD_INITIAL_STACK] - - /* HACK */ - mov ecx, [eax - 4] cli /* Get the NPX State */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Mon Mar 23 03:56:01 2009 @@ -1924,10 +1924,14 @@ NoFixUp: mov edi, cr2 + /* REACTOS Mm Hack of Doom */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK + je HandlePf + /* Enable interrupts and check if we got here with interrupts disabled */ sti - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK - jz IllegalState + /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK + jz IllegalState */ HandlePf: /* Send trap frame and check if this is kernel-mode or usermode */

15 years, 9 months

[tkreuzer] 40180: Initialize flattrs in EBRUSHOBJ_vInit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 23 03:51:22 2009 New Revision: 40180 URL: http://svn.reactos.org/svn/reactos?rev=40180&view=rev Log: Initialize flattrs in EBRUSHOBJ_vInit Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Mon Mar 23 03:51:22 2009 @@ -64,6 +64,7 @@ pebo->BrushObject.pvRbrush = pbrush->ulRealization; pebo->BrushObject.flColorType = 0; pebo->pbrush = pbrush; + pebo->flattrs = pbrush->flAttrs; pebo->XlateObject = pxlo; }

15 years, 9 months

[tkreuzer] 40179: Brush rewrite part 1/x - Make the EBRUSHOBJ structure somewhat like XPs. - Make the eboXxx members of the DC real EBRUSHOBJs and initialize them on DC creation. Except for IntArc they are not yet used and there still with the old way of doing it. - Implement DC_vUpdateXxxBrush functions that update the DCs EBRUSHOBJs after changes to the dcattr. - Implement EBRUSHOBJ_bRealizeBrush that realizes the brush by either calling the DrvRealizeBrush or EngRealizeBrush, which is current

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 23 03:38:59 2009 New Revision: 40179 URL: http://svn.reactos.org/svn/reactos?rev=40179&view=rev Log: Brush rewrite part 1/x - Make the EBRUSHOBJ structure somewhat like XPs. - Make the eboXxx members of the DC real EBRUSHOBJs and initialize them on DC creation. Except for IntArc they are not yet used and there still with the old way of doing it. - Implement DC_vUpdateXxxBrush functions that update the DCs EBRUSHOBJs after changes to the dcattr. - Implement EBRUSHOBJ_bRealizeBrush that realizes the brush by either calling the DrvRealizeBrush or EngRealizeBrush, which is currently only stubbed and this functionality is not plugged in due to other broken features. - EBRUSHOBJ_vInit: Store the RGB color and return it in BRUSHOBJ_ulGetBrushColor. - Implement EBRUSHOBJ_vSetSolidBrushColor, EBRUSHOBJ_vUpdate and EBRUSHOBJ_vUnrealizeBrush - Rename PENOBJ_bla to PEN_bla. - Make GDIOBJ_ShareUnlockObjByPtr an inline function - Implement GDIOBJ_IncrementShareCount as inline function. - NtGdiSelectBitmap: keep a shared reference on the selected bitmap. - EngAssociateSurface: don't ASSERT, but fail if locking the surface handle failed. - EngModifySurface: use an exclusive lock and handle everything inside this function. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/lineto.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -92,7 +92,7 @@ BYTE *tMask, *lMask; static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; /* Pattern brushes */ - PEBRUSHOBJ GdiBrush = NULL; + PEBRUSHOBJ pebo = NULL; SURFOBJ *psoPattern = NULL; PSURFACE psurfPattern; ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0; @@ -107,12 +107,12 @@ if (pbo && pbo->iSolidColor == 0xFFFFFFFF) { - GdiBrush = CONTAINING_RECORD( + pebo = CONTAINING_RECORD( pbo, EBRUSHOBJ, BrushObject); - psurfPattern = SURFACE_LockSurface(GdiBrush->GdiBrushObject->hbmPattern); + psurfPattern = SURFACE_LockSurface(pebo->pbrush->hbmPattern); if (psurfPattern != NULL) { psoPattern = &psurfPattern->SurfObj; @@ -145,7 +145,7 @@ { DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( Dest, DestRect->left + i, DestRect->top + j, - DIB_GetSource(psoPattern, (DestRect->left + i) % PatternWidth, PatternY, GdiBrush ? GdiBrush->XlateObject : NULL)); + DIB_GetSource(psoPattern, (DestRect->left + i) % PatternWidth, PatternY, pebo ? pebo->XlateObject : NULL)); } } c8++; @@ -220,7 +220,7 @@ if (ROP4_USES_PATTERN(Rop4) && pbo && pbo->iSolidColor == 0xFFFFFFFF) { GdiBrush = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - if ((psurfPattern = SURFACE_LockSurface(GdiBrush->GdiBrushObject->hbmPattern))) + if ((psurfPattern = SURFACE_LockSurface(GdiBrush->pbrush->hbmPattern))) { BltInfo.PatternSurface = &psurfPattern->SurfObj; } @@ -763,7 +763,7 @@ if (ROP4_USES_PATTERN(Rop4) && pbo && pbo->iSolidColor == 0xFFFFFFFF) { GdiBrush = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); - psurfPattern = SURFACE_LockSurface(GdiBrush->GdiBrushObject->hbmPattern); + psurfPattern = SURFACE_LockSurface(GdiBrush->pbrush->hbmPattern); if (psurfPattern) { PatternSurface = &psurfPattern->SurfObj; Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -4,8 +4,7 @@ * PURPOSE: GDI Driver Brush Functions * FILE: subsystem/win32/win32k/eng/engbrush.c * PROGRAMER: Jason Filby - * REVISION HISTORY: - * 3/7/1999: Created + * Timo Kreuzer */ #include <w32k.h> @@ -15,9 +14,29 @@ /** Internal functions ********************************************************/ -VOID FASTCALL +/** + * This function is not exported, because it makes no sense for + * The driver to punt back to this function */ +BOOL +APIENTRY +EngRealizeBrush( + BRUSHOBJ *pbo, + SURFOBJ *psoDst, + SURFOBJ *psoPattern, + SURFOBJ *psoMask, + XLATEOBJ *pxlo, + ULONG iHatch) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +FASTCALL EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, XLATEOBJ *pxlo) { + ULONG iSolidColor; + ASSERT(pebo); ASSERT(pbrush); @@ -27,19 +46,108 @@ } else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) { - pebo->BrushObject.iSolidColor = XLATEOBJ_iXlate(pxlo, pbrush->BrushAttr.lbColor); + /* Set the RGB color */ + pebo->crRealize = pbrush->BrushAttr.lbColor; + pebo->ulRGBColor = pbrush->BrushAttr.lbColor; + + /* Translate the brush color to the target format */ + iSolidColor = XLATEOBJ_iXlate(pxlo, pbrush->BrushAttr.lbColor); + pebo->BrushObject.iSolidColor = iSolidColor; } else { + /* This is a pattern brush that needs realization */ pebo->BrushObject.iSolidColor = 0xFFFFFFFF; - // FIXME: What about calling DrvRealizeBrush? +// EBRUSHOBJ_bRealizeBrush(pebo); } pebo->BrushObject.pvRbrush = pbrush->ulRealization; pebo->BrushObject.flColorType = 0; - pebo->GdiBrushObject = pbrush; + pebo->pbrush = pbrush; pebo->XlateObject = pxlo; } + +VOID +FASTCALL +EBRUSHOBJ_vSetSolidBrushColor(EBRUSHOBJ *pebo, ULONG iSolidColor) +{ + /* Never use with non-solid brushes */ + ASSERT(pebo->flattrs & GDIBRUSH_IS_SOLID); + + pebo->BrushObject.iSolidColor = iSolidColor; +} + +BOOL +FASTCALL +EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo) +{ + BOOL bResult; + PFN_DrvRealizeBrush pfnRealzizeBrush; + PSURFACE psurfTrg, psurfPattern, psurfMask; + PPDEVOBJ ppdev; + XLATEOBJ *pxlo; + + psurfTrg = pebo->psurfTrg; // FIXME: all EBRUSHOBJs need a surface + ppdev = (PPDEVOBJ)psurfTrg->SurfObj.hdev; // FIXME: all SURFACEs need a PDEV + + pfnRealzizeBrush = ppdev->DriverFunctions.RealizeBrush; + if (!pfnRealzizeBrush) + { + pfnRealzizeBrush = EngRealizeBrush; + } + + psurfPattern = SURFACE_LockSurface(pebo->pbrush->hbmPattern); + + /* FIXME: implement mask */ + psurfMask = NULL; + + // FIXME + pxlo = NULL; + + bResult = pfnRealzizeBrush(&pebo->BrushObject, + &pebo->psurfTrg->SurfObj, + psurfPattern ? &psurfPattern->SurfObj : NULL, + psurfMask ? &psurfMask->SurfObj : NULL, + pxlo, + -1); // FIXME: what about hatch brushes? + + if (psurfPattern) + SURFACE_UnlockSurface(psurfPattern); + + if (psurfMask) + SURFACE_UnlockSurface(psurfMask); + + return bResult; +} + +VOID +FASTCALL +EBRUSHOBJ_vUnrealizeBrush(EBRUSHOBJ *pebo) +{ + /* Check if it's a GDI realisation */ + if (pebo->pengbrush) + { + + } + else if (pebo->BrushObject.pvRbrush) + { + /* Free allocated driver memory */ + EngFreeMem(pebo->BrushObject.pvRbrush); + } +} + + + +VOID +FASTCALL +EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, XLATEOBJ *pxlo) +{ + /* Unrealize the brush */ + EBRUSHOBJ_vUnrealizeBrush(pebo); + + EBRUSHOBJ_vInit(pebo, pbrush, pxlo); +} + /** Exported DDI functions ****************************************************/ @@ -48,30 +156,34 @@ * @implemented */ PVOID APIENTRY -BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj, - IN ULONG ObjSize) +BRUSHOBJ_pvAllocRbrush( + IN BRUSHOBJ *pbo, + IN ULONG cj) { - BrushObj->pvRbrush=EngAllocMem(0, ObjSize, 0); - return(BrushObj->pvRbrush); + pbo->pvRbrush = EngAllocMem(0, cj, 'rbdG'); + return pbo->pvRbrush; } /* * @implemented */ PVOID APIENTRY -BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj) +BRUSHOBJ_pvGetRbrush( + IN BRUSHOBJ *pbo) { // FIXME: this is wrong! Read msdn. - return(BrushObj->pvRbrush); + return pbo->pvRbrush; } /* * @implemented */ ULONG APIENTRY -BRUSHOBJ_ulGetBrushColor(IN BRUSHOBJ *BrushObj) +BRUSHOBJ_ulGetBrushColor( + IN BRUSHOBJ *pbo) { - return BrushObj->iSolidColor; + EBRUSHOBJ *pebo = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); + return pebo->ulRGBColor; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/lineto.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/lineto.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -530,9 +530,9 @@ EBRUSHOBJ, BrushObject); ASSERT(GdiBrush); - ASSERT(GdiBrush->GdiBrushObject); - - if (GdiBrush->GdiBrushObject->flAttrs & GDIBRUSH_IS_NULL) + ASSERT(GdiBrush->pbrush); + + if (GdiBrush->pbrush->flAttrs & GDIBRUSH_IS_NULL) return TRUE; /* No success yet */ Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -506,27 +506,33 @@ /* * @implemented */ -BOOL APIENTRY -EngAssociateSurface(IN HSURF hsurf, - IN HDEV hdev, - IN ULONG Hooks) +BOOL +APIENTRY +EngAssociateSurface( + IN HSURF hsurf, + IN HDEV hdev, + IN FLONG flHooks) { SURFOBJ *pso; PSURFACE psurf; - PDEVOBJ* Device; - - Device = (PDEVOBJ*)hdev; - + PDEVOBJ* ppdev; + + ppdev = (PDEVOBJ*)hdev; + + /* Lock the surface */ psurf = SURFACE_LockSurface(hsurf); - ASSERT(psurf); + if (!psurf) + { + return FALSE; + } pso = &psurf->SurfObj; /* Associate the hdev */ pso->hdev = hdev; - pso->dhpdev = Device->hPDev; + pso->dhpdev = ppdev->hPDev; /* Hook up specified functions */ - psurf->flHooks = Hooks; + psurf->flHooks = flHooks; SURFACE_UnlockSurface(psurf); @@ -548,25 +554,29 @@ IN VOID *pvReserved) { SURFOBJ *pso; - - pso = EngLockSurface(hsurf); - if (pso == NULL) + PSURFACE psurf; + PDEVOBJ* ppdev; + + psurf = SURFACE_LockSurface(hsurf); + if (psurf == NULL) { return FALSE; } - if (!EngAssociateSurface(hsurf, hdev, flHooks)) - { - EngUnlockSurface(pso); - - return FALSE; - } - + ppdev = (PDEVOBJ*)hdev; + pso = &psurf->SurfObj; pso->dhsurf = dhsurf; pso->lDelta = lDelta; pso->pvScan0 = pvScan0; - EngUnlockSurface(pso); + /* Associate the hdev */ + pso->hdev = hdev; + pso->dhpdev = ppdev->hPDev; + + /* Hook up specified functions */ + psurf->flHooks = flHooks; + + SURFACE_UnlockSurface(psurf); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -15,7 +15,7 @@ * A MAILING LIST FIRST. */ -typedef struct +typedef struct _BRUSH { /* Header for all gdi objects in the handle table. Do not (re)move this. */ @@ -44,11 +44,33 @@ ULONG Unknown6C; } BRUSH, *PBRUSH; -typedef struct +typedef struct _EBRUSHOBJ { - BRUSHOBJ BrushObject; - PBRUSH GdiBrushObject; - XLATEOBJ *XlateObject; + BRUSHOBJ BrushObject; + + COLORREF crRealize; + ULONG ulRGBColor; + DWORD pengbrush; + ULONG ulSurfPalTime; + ULONG ulDCPalTime; + COLORREF crCurrentText; + COLORREF crCurrentBack; + COLORADJUSTMENT *pca; +// DWORD dwUnknown2c; +// DWORD dwUnknown30; + SURFACE * psurfTrg; +// PALETTE * ppalSurf; +// PALETTE * ppalDC; +// PALETTE * ppal3; +// DWORD dwUnknown44; + BRUSH * pbrush; + FLONG flattrs; + DWORD ulUnique; +// DWORD dwUnknown54; +// DWORD dwUnknown58; + + /* Ros specific */ + XLATEOBJ *XlateObject; } EBRUSHOBJ, *PEBRUSHOBJ; /* GDI Brush Attributes */ @@ -78,10 +100,25 @@ #define BRUSH_LockBrush(hBrush) ((PBRUSH)GDIOBJ_LockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) #define BRUSH_UnlockBrush(pBrush) GDIOBJ_UnlockObjByPtr((POBJ)pBrush) +#define BRUSH_ShareLockBrush(hBrush) ((PBRUSH)GDIOBJ_ShareLockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) +#define BRUSH_ShareUnlockBrush(pBrush) GDIOBJ_ShareUnlockObjByPtr((POBJ)pBrush) + INT FASTCALL BRUSH_GetObject (PBRUSH GdiObject, INT Count, LPLOGBRUSH Buffer); BOOL INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody); VOID FASTCALL EBRUSHOBJ_vInit(EBRUSHOBJ *BrushInst, PBRUSH BrushObj, XLATEOBJ *XlateObj); +VOID +FASTCALL +EBRUSHOBJ_vSetSolidBrushColor(EBRUSHOBJ *pebo, ULONG iSolidColor); + +VOID +FASTCALL +EBRUSHOBJ_vUpdate(EBRUSHOBJ *pebo, PBRUSH pbrush, XLATEOBJ *pxlo); + +BOOL +FASTCALL +EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo); + #endif Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -190,10 +190,10 @@ PVOID prgnVis; PVOID prgnRao; POINTL ptlFillOrigin; - unsigned eboFill_[23]; /* EBRUSHOBJ */ - unsigned eboLine_[23]; - unsigned eboText_[23]; - unsigned eboBackground_[23]; + EBRUSHOBJ eboFill; + EBRUSHOBJ eboLine; + EBRUSHOBJ eboText; + EBRUSHOBJ eboBackground; HFONT hlfntCur; FLONG flSimulationFlags; LONG lEscapement; Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -61,7 +61,7 @@ BOOL INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner); BOOL INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo); BOOL INTERNAL_CALL GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj); -VOID INTERNAL_CALL GDIOBJ_ShareUnlockObjByPtr(POBJ Object); +//VOID INTERNAL_CALL GDIOBJ_ShareUnlockObjByPtr(POBJ Object); BOOL INTERNAL_CALL GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType); POBJ INTERNAL_CALL GDIOBJ_AllocObj(UCHAR ObjectType); POBJ INTERNAL_CALL GDIOBJ_AllocObjWithHandle(ULONG ObjectType); @@ -99,4 +99,22 @@ return cLocks; } +ULONG +FORCEINLINE +GDIOBJ_ShareUnlockObjByPtr(POBJ Object) +{ + INT cLocks = InterlockedDecrement((PLONG)&Object->ulShareCount); + ASSERT(cLocks >= 0); + return cLocks; +} + +ULONG +FORCEINLINE +GDIOBJ_IncrementShareCount(POBJ Object) +{ + INT cLocks = InterlockedIncrement((PLONG)&Object->ulShareCount); + ASSERT(cLocks >= 1); + return cLocks; +} + #endif Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -6,26 +6,30 @@ /* Internal interface */ -#define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) -#define PENOBJ_AllocPenWithHandle() ((PBRUSH)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PEN)) +#define PEN_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) +#define PEN_AllocPenWithHandle() ((PBRUSH)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) -#define PENOBJ_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN) +#define PEN_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) +#define PEN_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN) -//#define PENOBJ_LockPen(hBMObj) ((PBRUSH)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) +//#define PEN_LockPen(hBMObj) ((PBRUSH)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_AllocExtPen() ((PBRUSH)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) -#define PENOBJ_AllocExtPenWithHandle() ((PBRUSH)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_EXTPEN)) +#define PEN_AllocExtPen() ((PBRUSH)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) +#define PEN_AllocExtPenWithHandle() ((PBRUSH)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_EXTPEN)) -#define PENOBJ_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) -#define PENOBJ_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN) +#define PEN_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObjType_BRUSH_TYPE) +#define PEN_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN) -//#define PENOBJ_LockExtPen(hBMObj) ((PBRUSH)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN)) +//#define PEN_LockExtPen(hBMObj) ((PBRUSH)GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_EXTPEN)) -#define PENOBJ_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr((POBJ)pPenObj) +#define PEN_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr((POBJ)pPenObj) + +#define PEN_ShareUnlockPen(ppen) GDIOBJ_ShareUnlockObjByPtr((POBJ)ppen) -PBRUSH FASTCALL PENOBJ_LockPen(HGDIOBJ); +PBRUSH FASTCALL PEN_LockPen(HGDIOBJ); +PBRUSH FASTCALL PEN_ShareLockPen(HGDIOBJ); + INT APIENTRY PEN_GetObject(PBRUSH pPen, INT Count, PLOGPEN Buffer); #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -45,7 +45,6 @@ PDC_ATTR pdcattr; RECTL RectBounds, RectSEpts; PBRUSH pbrushPen; - EBRUSHOBJ eboPen; SURFACE *psurf; BOOL ret = TRUE; LONG PenWidth, PenOrigWidth; @@ -70,7 +69,7 @@ pdcattr = dc->pdcattr; - pbrushPen = PENOBJ_LockPen(pdcattr->hpen); + pbrushPen = PEN_LockPen(pdcattr->hpen); if (!pbrushPen) { DPRINT1("Arc Fail 1\n"); @@ -161,24 +160,24 @@ if (NULL == psurf) { DPRINT1("Arc Fail 2\n"); - PENOBJ_UnlockPen(pbrushPen); + PEN_UnlockPen(pbrushPen); SetLastWin32Error(ERROR_INTERNAL_ERROR); return FALSE; } - EBRUSHOBJ_vInit(&eboPen, pbrushPen, dc->rosdc.XlatePen); + EBRUSHOBJ_vInit(&dc->eboLine, pbrushPen, dc->rosdc.XlatePen); if (arctype == GdiTypePie) { - PUTLINE(CenterX, CenterY, SfCx + CenterX, SfCy + CenterY, eboPen); - PUTLINE(EfCx + CenterX, EfCy + CenterY, CenterX, CenterY, eboPen); + PUTLINE(CenterX, CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); + PUTLINE(EfCx + CenterX, EfCy + CenterY, CenterX, CenterY, dc->eboLine); } if (arctype == GdiTypeChord) - PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, eboPen); + PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); pbrushPen->ptPenWidth.x = PenOrigWidth; SURFACE_UnlockSurface(psurf); - PENOBJ_UnlockPen(pbrushPen); + PEN_UnlockPen(pbrushPen); DPRINT("IntArc Exit.\n"); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -960,11 +960,15 @@ DC_UnlockDc(pDC); return NULL; } + hOrgBmp = pDC->rosdc.hBitmap; - /* Release the old bitmap, lock the new one and convert it to a SURF */ pDC->rosdc.hBitmap = hBmp; + /* Release the old bitmap */ + if (pDC->dclevel.pSurface) + SURFACE_ShareUnlockSurface(pDC->dclevel.pSurface); + // If Info DC this is zero and pSurface is moved to DC->pSurfInfo. pDC->dclevel.pSurface = psurfBmp; psurfBmp->hDC = hDC; @@ -985,6 +989,9 @@ 0, psurfBmp->SurfObj.sizlBitmap.cx, psurfBmp->SurfObj.sizlBitmap.cy); + + /* Keep a shared reference on the bitmap */ + GDIOBJ_IncrementShareCount((POBJ)psurfBmp); SURFACE_UnlockSurface(psurfBmp); /* Regenerate the XLATEOBJs. */ @@ -999,7 +1006,7 @@ BRUSH_UnlockBrush(pbrush); } - pbrush = PENOBJ_LockPen(pdcattr->hpen); + pbrush = PEN_LockPen(pdcattr->hpen); if (pbrush) { if (pDC->rosdc.XlatePen) @@ -1007,7 +1014,7 @@ EngDeleteXlate(pDC->rosdc.XlatePen); } pDC->rosdc.XlatePen = IntGdiCreateBrushXlate(pDC, pbrush, &bFailed); - PENOBJ_UnlockPen(pbrush); + PEN_UnlockPen(pbrush); } DC_UnlockDc(pDC); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -2422,8 +2422,6 @@ } pdcattr = NewDC->pdcattr; - NewDC->BaseObject.hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. - xformTemplate.eM11 = 1.0f; xformTemplate.eM12 = 0.0f; xformTemplate.eM21 = 0.0f; @@ -2461,9 +2459,18 @@ pdcattr->crBrushClr = RGB( 255, 255, 255 ); //// This fixes the default brush and pen settings. See DC_InitDC. + + /* Create the default fill brush */ pdcattr->hbrush = NtGdiGetStockObject( WHITE_BRUSH ); + NewDC->dclevel.pbrFill = BRUSH_ShareLockBrush(pdcattr->hbrush); + EBRUSHOBJ_vInit(&NewDC->eboFill, NewDC->dclevel.pbrFill, NULL); + + /* Create the default pen / line brush */ pdcattr->hpen = NtGdiGetStockObject( BLACK_PEN ); -//// + NewDC->dclevel.pbrLine = PEN_ShareLockPen(pdcattr->hpen); + EBRUSHOBJ_vInit(&NewDC->eboLine, NewDC->dclevel.pbrFill, NULL); + + pdcattr->hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); TextIntRealizeFont(pdcattr->hlfntNew,NULL); @@ -2743,7 +2750,7 @@ { return FALSE; } - return SurfObj->hsurf == PrimarySurface.pSurface; + return SurfObj->hsurf == PrimarySurface.pSurface; // <- FIXME: WTF? } // @@ -3466,4 +3473,157 @@ return FALSE; } +VOID +FASTCALL +DC_vUpdateFillBrush(PDC pdc) +{ + PDC_ATTR pdcattr = pdc->pdcattr; + PBRUSH pbrFill; + XLATEOBJ *pxlo; + ULONG iSolidColor; + + /* Check if update of eboFill is needed */ + if (pdcattr->ulDirty_ & DIRTY_FILL) + { + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlatePen; + + /* Check if the brush handle has changed */ + if (pdcattr->hbrush != pdc->dclevel.pbrFill->BaseObject.hHmgr) + { + /* Try to lock the new brush */ + pbrFill = BRUSH_ShareLockBrush(pdcattr->hbrush); + if (pbrFill) + { + /* Unlock old brush, set new brush */ + BRUSH_ShareUnlockBrush(pdc->dclevel.pbrFill); + pdc->dclevel.pbrFill = pbrFill; + + /* Update eboFill, realizing it, if needed */ + EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pxlo); + } + else + { + /* Invalid brush handle, restore old one */ + pdcattr->hbrush = pdc->dclevel.pbrFill->BaseObject.hHmgr; + } + } + + /* Check for DC brush */ + if (pdcattr->hbrush == StockObjects[DC_BRUSH]) + { + /* Translate the color to the target format */ + iSolidColor = XLATEOBJ_iXlate(pxlo, pdcattr->crPenClr); + + /* Update the eboFill's solid color */ + EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboFill, iSolidColor); + } + + /* Clear flag */ + pdcattr->ulDirty_ &= ~DIRTY_FILL; + } +} + +VOID +FASTCALL +DC_vUpdateLineBrush(PDC pdc) +{ + PDC_ATTR pdcattr = pdc->pdcattr; + PBRUSH pbrLine; + XLATEOBJ *pxlo; + ULONG iSolidColor; + + /* Check if update of eboLine is needed */ + if (pdcattr->ulDirty_ & DIRTY_LINE) + { + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlatePen; + + /* Check if the pen handle has changed */ + if (pdcattr->hpen != pdc->dclevel.pbrLine->BaseObject.hHmgr) + { + /* Try to lock the new pen */ + pbrLine = BRUSH_ShareLockBrush(pdcattr->hpen); + if (pbrLine) + { + /* Unlock old brush, set new brush */ + BRUSH_ShareUnlockBrush(pdc->dclevel.pbrLine); + pdc->dclevel.pbrLine = pbrLine; + + /* Update eboLine, realizing it, if needed */ + EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pxlo); + } + else + { + /* Invalid pen handle, restore old one */ + pdcattr->hpen = pdc->dclevel.pbrLine->BaseObject.hHmgr; + } + } + + /* Check for DC pen */ + if (pdcattr->hpen == StockObjects[DC_PEN]) + { + /* Translate the color to the target format */ + iSolidColor = XLATEOBJ_iXlate(pxlo, pdcattr->crPenClr); + + /* Update the eboLine's solid color */ + EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboLine, iSolidColor); + } + + /* Clear flag */ + pdcattr->ulDirty_ &= ~DIRTY_LINE; + } +} + +VOID +FASTCALL +DC_vUpdateTextBrush(PDC pdc) +{ + PDC_ATTR pdcattr = pdc->pdcattr; + XLATEOBJ *pxlo; + ULONG iSolidColor; + + /* Check if update of eboText is needed */ + if (pdcattr->ulDirty_ & DIRTY_TEXT) + { + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlatePen; + + /* Translate the color to the target format */ + iSolidColor = XLATEOBJ_iXlate(pxlo, pdcattr->crForegroundClr); + + /* Update the eboText's solid color */ + EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboText, iSolidColor); + + /* Clear flag */ + pdcattr->ulDirty_ &= ~DIRTY_TEXT; + } +} + +VOID +FASTCALL +DC_vUpdateBackgroundBrush(PDC pdc) +{ + PDC_ATTR pdcattr = pdc->pdcattr; + XLATEOBJ *pxlo; + ULONG iSolidColor; + + /* Check if update of eboBackground is needed */ + if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) + { + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlatePen; + + /* Translate the color to the target format */ + iSolidColor = XLATEOBJ_iXlate(pxlo, pdcattr->crBackgroundClr); + + /* Update the eboBackground's solid color */ + EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboBackground, iSolidColor); + + /* Clear flag */ + pdcattr->ulDirty_ &= ~DIRTY_BACKGROUND; + } +} + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -96,7 +96,7 @@ /* Special locking order to avoid lock-ups */ pbrushFill = BRUSH_LockBrush(pdcattr->hbrush); - pbrushLine = PENOBJ_LockPen(pdcattr->hpen); + pbrushLine = PEN_LockPen(pdcattr->hpen); psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); /* FIXME - psurf can be NULL!!!! don't assert but handle this case gracefully! */ ASSERT(psurf); @@ -154,7 +154,7 @@ } } if (pbrushLine) - PENOBJ_UnlockPen(pbrushLine); + PEN_UnlockPen(pbrushLine); } SURFACE_UnlockSurface(psurf); @@ -252,7 +252,7 @@ if (pdcattr->ulDirty_ & DC_PEN_DIRTY) IntGdiSelectPen(dc,pdcattr->hpen); - pbrush = PENOBJ_LockPen(pdcattr->hpen); + pbrush = PEN_LockPen(pdcattr->hpen); if (!pbrush) { DPRINT1("Ellipse Fail 1\n"); @@ -333,7 +333,7 @@ pbrush); pbrush->ptPenWidth.x = PenOrigWidth; - PENOBJ_UnlockPen(pbrush); + PEN_UnlockPen(pbrush); DC_UnlockDc(dc); DPRINT("Ellipse Exit.\n"); return ret; @@ -580,7 +580,7 @@ /* Special locking order to avoid lock-ups! */ pbrushFill = BRUSH_LockBrush(pdcattr->hbrush); - pbrushLine = PENOBJ_LockPen(pdcattr->hpen); + pbrushLine = PEN_LockPen(pdcattr->hpen); if (!pbrushLine) { ret = FALSE; @@ -658,7 +658,7 @@ BRUSH_UnlockBrush(pbrushFill); if (pbrushLine) - PENOBJ_UnlockPen(pbrushLine); + PEN_UnlockPen(pbrushLine); if (psurf) SURFACE_UnlockSurface(psurf); @@ -746,7 +746,7 @@ if (pdcattr->ulDirty_ & DC_PEN_DIRTY) IntGdiSelectPen(dc,pdcattr->hpen); - pbrushLine = PENOBJ_LockPen(pdcattr->hpen); + pbrushLine = PEN_LockPen(pdcattr->hpen); if (!pbrushLine) { /* Nothing to do, as we don't have a bitmap */ @@ -816,7 +816,7 @@ pbrushLine); pbrushLine->ptPenWidth.x = PenOrigWidth; - PENOBJ_UnlockPen(pbrushLine); + PEN_UnlockPen(pbrushLine); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -1013,16 +1013,6 @@ return Object; } - -VOID INTERNAL_CALL -GDIOBJ_ShareUnlockObjByPtr(POBJ Object) -{ - if (InterlockedDecrement((PLONG)&Object->ulShareCount) < 0) - { - DPRINT1("Trying to unlock non-existant object\n"); - } -} - BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle) { Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -144,11 +144,11 @@ Bounds.bottom = max(Points[0].y, Points[1].y); /* get BRUSH from current pen. */ - pbrushLine = PENOBJ_LockPen( pdcattr->hpen ); + pbrushLine = PEN_LockPen( pdcattr->hpen ); if (!pbrushLine) { /* default to BLACK_PEN */ - pbrushLine = PENOBJ_LockPen(NtGdiGetStockObject(BLACK_PEN)); + pbrushLine = PEN_LockPen(NtGdiGetStockObject(BLACK_PEN)); ASSERT(pbrushLine); } @@ -165,7 +165,7 @@ } SURFACE_UnlockSurface(psurf); - PENOBJ_UnlockPen( pbrushLine ); + PEN_UnlockPen( pbrushLine ); } if (Ret) @@ -268,7 +268,7 @@ IntGdiSelectPen(dc,pdcattr->hpen); /* Get BRUSHOBJ from current pen. */ - pbrushLine = PENOBJ_LockPen(pdcattr->hpen); + pbrushLine = PEN_LockPen(pdcattr->hpen); /* FIXME - pbrushLine can be NULL! Don't assert here! */ ASSERT(pbrushLine); @@ -309,7 +309,7 @@ } } - PENOBJ_UnlockPen(pbrushLine); + PEN_UnlockPen(pbrushLine); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -29,12 +29,22 @@ PBRUSH FASTCALL -PENOBJ_LockPen(HGDIOBJ hBMObj) +PEN_LockPen(HGDIOBJ hBMObj) { if (GDI_HANDLE_GET_TYPE(hBMObj) == GDI_OBJECT_TYPE_EXTPEN) return GDIOBJ_LockObj( hBMObj, GDI_OBJECT_TYPE_EXTPEN); else return GDIOBJ_LockObj( hBMObj, GDI_OBJECT_TYPE_PEN); +} + +PBRUSH +FASTCALL +PEN_ShareLockPen(HGDIOBJ hBMObj) +{ + if (GDI_HANDLE_GET_TYPE(hBMObj) == GDI_OBJECT_TYPE_EXTPEN) + return GDIOBJ_ShareLockObj( hBMObj, GDI_OBJECT_TYPE_EXTPEN); + else + return GDIOBJ_ShareLockObj( hBMObj, GDI_OBJECT_TYPE_PEN); } HPEN APIENTRY @@ -68,11 +78,11 @@ if (bOldStylePen) { - pbrushPen = PENOBJ_AllocPenWithHandle(); + pbrushPen = PEN_AllocPenWithHandle(); } else { - pbrushPen = PENOBJ_AllocExtPenWithHandle(); + pbrushPen = PEN_AllocExtPenWithHandle(); } if (!pbrushPen) @@ -173,17 +183,17 @@ default: DPRINT1("IntGdiExtCreatePen unknown penstyle %x\n", dwPenStyle); } - PENOBJ_UnlockPen(pbrushPen); + PEN_UnlockPen(pbrushPen); return hPen; ExitCleanup: SetLastWin32Error(ERROR_INVALID_PARAMETER); pbrushPen->pStyle = NULL; - PENOBJ_UnlockPen(pbrushPen); + PEN_UnlockPen(pbrushPen); if (bOldStylePen) - PENOBJ_FreePenByHandle(hPen); + PEN_FreePenByHandle(hPen); else - PENOBJ_FreeExtPenByHandle(hPen); + PEN_FreeExtPenByHandle(hPen); return NULL; } @@ -192,14 +202,14 @@ { PBRUSH pbrushPen; - pbrushPen = PENOBJ_LockPen(hPen); + pbrushPen = PEN_LockPen(hPen); if (pbrushPen) { if (pbrushPen->flAttrs & GDIBRUSH_IS_SOLID) { pbrushPen->BrushAttr.lbColor = Color & 0xFFFFFF; } - PENOBJ_UnlockPen(pbrushPen); + PEN_UnlockPen(pbrushPen); } } @@ -282,14 +292,14 @@ pdcattr = pDC->pdcattr; - pbrushPen = PENOBJ_LockPen(hPen); + pbrushPen = PEN_LockPen(hPen); if (pbrushPen == NULL) { return NULL; } XlateObj = IntGdiCreateBrushXlate(pDC, pbrushPen, &bFailed); - PENOBJ_UnlockPen(pbrushPen); + PEN_UnlockPen(pbrushPen); if (bFailed) { SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Mon Mar 23 03:38:59 2009 @@ -118,7 +118,7 @@ ULONG ulColor) { HPEN hPen; - PBRUSH pbrushPen = PENOBJ_AllocPenWithHandle(); + PBRUSH pbrushPen = PEN_AllocPenWithHandle(); if ((dwPenStyle & PS_STYLE_MASK) == PS_NULL) dwWidth = 1; @@ -143,7 +143,7 @@ break; } hPen = pbrushPen->BaseObject.hHmgr; - PENOBJ_UnlockPen(pbrushPen); + PEN_UnlockPen(pbrushPen); return hPen; }

15 years, 9 months

[cgutman] 40178: - Implement NdisFreeDmaChannel

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Mar 23 02:49:24 2009 New Revision: 40178 URL: http://svn.reactos.org/svn/reactos?rev=40178&view=rev Log: - Implement NdisFreeDmaChannel Modified: trunk/reactos/drivers/network/ndis/ndis/40stubs.c trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/40stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] Mon Mar 23 02:49:24 2009 @@ -78,24 +78,6 @@ NdisDeregisterMac( OUT PNDIS_STATUS Status, IN NDIS_HANDLE NdisMacHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisFreeDmaChannel( - IN PNDIS_HANDLE NdisDmaHandle) /* * FUNCTION: * ARGUMENTS: Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Mon Mar 23 02:49:24 2009 @@ -974,5 +974,24 @@ } +/* + * @implemented + */ +VOID +EXPORT +NdisFreeDmaChannel( + IN PNDIS_HANDLE NdisDmaHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 4.0 + */ +{ + NdisMDeregisterDmaChannel(NdisDmaHandle); +} + + + /* EOF */

15 years, 9 months

[cgutman] 40177: - Fix a memory leak

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Mar 23 02:39:57 2009 New Revision: 40177 URL: http://svn.reactos.org/svn/reactos?rev=40177&view=rev Log: - Fix a memory leak Modified: trunk/reactos/drivers/network/ndis/include/efilter.h trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/include/efilter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/efilter.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/efilter.h [iso-8859-1] Mon Mar 23 02:39:57 2009 @@ -56,6 +56,11 @@ VOID NTAPI +EthDeleteFilter( + IN PETH_FILTER Filter); + +VOID +NTAPI EthFilterDprIndicateReceive( IN PETH_FILTER Filter, IN NDIS_HANDLE MacReceiveContext, Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Mar 23 02:39:57 2009 @@ -1898,6 +1898,12 @@ Adapter->NdisMiniportBlock.AllocatedResourcesTranslated = NULL; } + if (Adapter->NdisMiniportBlock.EthDB) + { + EthDeleteFilter(Adapter->NdisMiniportBlock.EthDB); + Adapter->NdisMiniportBlock.EthDB = NULL; + } + Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStopped;

15 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009