Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 24586: - avoid using _tprintf - use EnvironmentVariable as a singleton
by janderwald＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: janderwald Date: Sat Oct 21 00:09:29 2006 New Revision: 24586 URL: http://svn.reactos.org/svn/reactos?rev=24586&view=rev Log: - avoid using _tprintf - use EnvironmentVariable as a singleton Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/conf_parser.h trunk/reactos/tools/sysreg/env_var.cpp trunk/reactos/tools/sysreg/env_var.h trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sysreg.cpp Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Sat Oct 21 00:09:29 2006 @@ -14,9 +14,20 @@ namespace Sysreg_ { - using std::cout; +#ifdef UNICODE + + using std::wcerr; + using std::endl; + +#define cerr wcerr + +#else + using std::cerr; using std::endl; + +#endif + using std::ifstream; //--------------------------------------------------------------------------------------- ConfigParser::ConfigParser() @@ -84,9 +95,7 @@ ConfigMap::iterator it = m_Map.find (ConfVariable); if (it == m_Map.end ()) { -#ifdef NDEBUG cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; -#endif return false; } Modified: trunk/reactos/tools/sysreg/conf_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.h… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.h (original) +++ trunk/reactos/tools/sysreg/conf_parser.h Sat Oct 21 00:09:29 2006 @@ -18,6 +18,7 @@ namespace Sysreg_ { using std::map; + using std::wstring; //--------------------------------------------------------------------------------------- /// /// class ConfigParser @@ -34,6 +35,7 @@ class ConfigParser { public: + typedef std::basic_string<TCHAR> string; typedef std::basic_istringstream<TCHAR> istringstream; typedef map<string, string> ConfigMap; Modified: trunk/reactos/tools/sysreg/env_var.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.cpp?r… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.cpp (original) +++ trunk/reactos/tools/sysreg/env_var.cpp Sat Oct 21 00:09:29 2006 @@ -13,9 +13,22 @@ namespace System_ { - using std::cout; +#ifdef UNICODE + + using std::wcerr; using std::endl; + +#define cerr wcerr + +#else + using std::cerr; + using std::endl; + +#endif + + + EnvironmentVariable::EnvironmentMap EnvironmentVariable::m_Map; //--------------------------------------------------------------------------------------- EnvironmentVariable::EnvironmentVariable() @@ -44,17 +57,13 @@ if (!value) { -#ifdef NDEBUG cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; -#endif return false; } if (!_tcslen(value)) { -#ifdef NDEBUG cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; -#endif return false; } Modified: trunk/reactos/tools/sysreg/env_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.h?rev… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.h (original) +++ trunk/reactos/tools/sysreg/env_var.h Sat Oct 21 00:09:29 2006 @@ -28,16 +28,8 @@ class EnvironmentVariable { - typedef map<string, string> EnvironmentMap; public: -//--------------------------------------------------------------------------------------- -/// -/// EnvironmentVariable -/// -/// Description: constructor of class EnvironmentVariable - - EnvironmentVariable(); - + typedef map<string, string> EnvironmentMap; //--------------------------------------------------------------------------------------- /// /// ~EnvironmentVariable @@ -58,11 +50,20 @@ /// @param EnvValue value of the environment variable /// @return bool - bool getValue(const string & EnvName, string & EnvValue); + static bool getValue(const string & EnvName, string & EnvValue); protected: - EnvironmentMap m_Map; + +//--------------------------------------------------------------------------------------- +/// +/// EnvironmentVariable +/// +/// Description: constructor of class EnvironmentVariable + + EnvironmentVariable(); + + static EnvironmentMap m_Map; }; // end of class EnvironmentVariable Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Sat Oct 21 00:09:29 2006 @@ -14,9 +14,19 @@ namespace System_ { - using std::cout; +#ifdef UNICODE + + using std::wcerr; using std::endl; + +#define cerr wcerr + +#else + using std::cerr; + using std::endl; + +#endif //--------------------------------------------------------------------------------------- PipeReader::PipeReader() : m_File(NULL) @@ -36,24 +46,18 @@ { if (m_File != NULL) { -#ifdef NDEBUG cerr << "PipeReader::openPipe> pipe already open" << endl; -#endif return false; } // m_File = _tpopen(PipeCmd.c_str(), AccessMode.c_str()); if (m_File) { -#ifdef NDEBUG cerr << "PipeReader::openPipe> successfully opened pipe" << endl; -#endif return true; } -#ifdef NDEBUG cerr << "PipeReader::openPipe> failed to open pipe " << PipeCmd << endl; -#endif return false; } @@ -63,9 +67,7 @@ { if (!m_File) { -#ifdef NDEBUG cerr << "PipeReader::closePipe> pipe is not open" << endl; -#endif return false; } @@ -73,9 +75,7 @@ if (res == UINT_MAX) { -#ifdef NDEBUG cerr << "Error: _pclose failed " <<endl; -#endif return false; } @@ -105,16 +105,9 @@ TCHAR * res = _fgetts(buf, size, m_File); if (!res) { -#ifdef NDEBUG cerr << "Error: PipeReader::readPipe failed" << endl; -#endif return 0; } - -#ifdef NDEBUG - cerr << "PipeReader::readPipe> res: " << Buffer << endl; -#endif - return _tcslen(buf); } Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Oct 21 00:09:29 2006 @@ -16,9 +16,20 @@ namespace Sysreg_ { - using std::cout; +#ifdef UNICODE + + using std::wcerr; using std::endl; + +#define cerr wcerr + +#else + using std::cerr; + using std::endl; + +#endif + using System_::PipeReader; @@ -72,7 +83,8 @@ } else { - _tprintf(_T("Error: unknown debug port %s Currently only file|pipe is supported\n"), debug_port); + cerr <<"Error: unknown debug port " << debug_port <<endl + <<" Currently only file|pipe is supported" <<endl; return false; } @@ -90,7 +102,7 @@ /// TBD the information needs to be written into an provided log object /// which writes the info into HTML/log / sends etc .... - _tprintf(debug_data.c_str ()); + cerr << debug_data << endl; return true; } @@ -102,7 +114,7 @@ if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { - _tprintf(_T("Error: failed to open pipe with cmd: %s\n"), boot_cmd.c_str ()); + cerr << "Error: failed to open pipe with cmd: " << boot_cmd <<endl; return false; } string Buffer; @@ -130,13 +142,13 @@ if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { - _tprintf(_T("Error: failed to open pipe with cmd: %s\n"), boot_cmd.c_str ()); + cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; return false; } FILE * file = _tfopen(debug_log.c_str (), _T("rt")); if (!file) { - _tprintf(_T("Error: failed to open debug log %s\n", debug_log.c_str ())); + cerr << "Error: failed to open debug log " << debug_log << endl; pipe_reader.closePipe (); return false; } @@ -156,6 +168,7 @@ }while(!pipe_reader.isEof ()); pipe_reader.closePipe (); + return true; } } // end of namespace Sysreg_ Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Sat Oct 21 00:09:29 2006 @@ -25,9 +25,22 @@ namespace System_ { - using std::cout; + +#ifdef UNICODE + + using std::wcerr; using std::endl; + +#define cerr wcerr + +#else + using std::cerr; + using std::endl; + +#endif + + using std::vector; string SymbolFile::VAR_ROS_OUTPUT = _T("ROS_OUTPUT"); @@ -52,13 +65,12 @@ bool SymbolFile::initialize(ConfigParser & conf_parser, const System_::string &Path) { vector<string> vect; - EnvironmentVariable envvar; string current_dir; if (Path == _T("")) { current_dir = _T("output-i386"); - envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, current_dir); + EnvironmentVariable::getValue(SymbolFile::VAR_ROS_OUTPUT, current_dir); } else { @@ -101,6 +113,8 @@ string path = current_dir; path.insert (path.length () -1, _T("\\")); path.insert (path.length () -1, filename); + + cerr << "Module Name " << modulename << endl << "File Name " << filename << endl; m_Map.insert(std::make_pair<string, string>(modulename, path)); @@ -168,7 +182,7 @@ if (!pipe_reader.openPipe (pipe_cmd)) { - _tprintf(_T("SymbolFile::resolveAddress> failed to open pipe %s"), pipe_cmd); + cerr << "SymbolFile::resolveAddress> failed to open pipe" <<pipe_cmd <<endl; return false; } @@ -189,7 +203,7 @@ if (it == m_Map.end ()) { - _tprintf(_T("SymbolFile::resolveAddress> no symbol file found for module %s"), ModuleName.c_str()); + cerr << "SymbolFile::resolveAddress> no symbol file found for module " << ModuleName << endl; return false; } Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Sat Oct 21 00:09:29 2006 @@ -11,12 +11,24 @@ #include "sysreg.h" +#ifdef UNICODE + + using std::wcerr; + using std::endl; + using std::wcout; + +#define cerr wcerr +#define cout wcout + +#else + + using std::cerr; + using std::endl; + +#endif + typedef std::basic_string<TCHAR> string; - -using std::cout; -using std::endl; -using std::cerr; using System_::EnvironmentVariable; @@ -63,7 +75,7 @@ RegressionTest * regtest = comp_factory.createComponent (argv[2]); if (!regtest) { - _tprintf(_T("Error: the requested regression test does not exist")); + cerr << "Error: the requested regression test does not exist" << endl; return -1; } @@ -75,11 +87,11 @@ if (regtest->execute (config)) { - _tprintf(_T("The regression test %s completed successfully\n"), regtest->getName ().c_str ()); + cout << "The regression test " << regtest->getName () << " completed successfully" << endl; } else { - _tprintf(_T("The regression test %s failed\n"), regtest->getName ().c_str ()); + cout << "The regression test " << regtest->getName () << "failed" << endl; } return 0;

1 0

[janderwald] 24585: - fix compilation - implement scanning of symbol directories
by janderwald＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: janderwald Date: Fri Oct 20 23:40:33 2006 New Revision: 24585 URL: http://svn.reactos.org/svn/reactos?rev=24585&view=rev Log: - fix compilation - implement scanning of symbol directories Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sym_file.h trunk/reactos/tools/sysreg/sysreg.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Oct 20 23:40:33 2006 @@ -117,7 +117,7 @@ { break; } - if (hasTimeout(&ts, 60000) + //if (hasTimeout(&ts, 60000) } pipe_reader.closePipe (); Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Fri Oct 20 23:40:33 2006 @@ -12,10 +12,13 @@ #include "sym_file.h" #include "env_var.h" #include "pipe_reader.h" +#include "conf_parser.h" #include <iostream> +#include <vector> #include <stdio.h> #include <stdlib.h> +#define _FINDDATA_T_DEFINED #include <io.h> #include <time.h> @@ -25,8 +28,14 @@ using std::cout; using std::endl; using std::cerr; + using std::vector; string SymbolFile::VAR_ROS_OUTPUT = _T("ROS_OUTPUT"); + string SymbolFile::ROS_ADDR2LINE = _T("ROS_ADDR2LINE"); + string SymbolFile::m_SymbolPath= _T(""); + string SymbolFile::m_SymResolver= _T(""); + SymbolFile::SymbolMap SymbolFile::m_Map; + //--------------------------------------------------------------------------------------- SymbolFile::SymbolFile() { @@ -40,19 +49,35 @@ } //--------------------------------------------------------------------------------------- - bool SymbolFile::initialize(const System_::string &Path) - { - char szBuffer[260]; -// vector<string> vect; + bool SymbolFile::initialize(ConfigParser & conf_parser, const System_::string &Path) + { + vector<string> vect; EnvironmentVariable envvar; - - string val = _T("output-i386"); - - envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, val); - - struct _finddata_t c_file; - strcpy(szBuffer, "D:\\reactos\\output-i386\\*"); - intptr_t hFile = _findfirst(szBuffer, &c_file); + string current_dir; + + if (Path == _T("")) + { + current_dir = _T("output-i386"); + envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, current_dir); + } + else + { + current_dir = Path; + } + + m_SymbolPath = current_dir; + + if (!conf_parser.getStringValue (ROS_ADDR2LINE, m_SymResolver)) + { + cerr << "Warning: ROS_ADDR2LINE is not set in configuration file -> symbol lookup will fail" <<endl; + return false; + } + + string val = current_dir; + val.insert (val.length()-1, _T("\\*")); + + struct _tfinddata64i32_t c_file; + intptr_t hFile = _tfindfirst64i32(val.c_str(), &c_file); if (hFile == -1L) { @@ -62,49 +87,78 @@ do { - if (strstr(c_file.name, ".nostrip.")) + + do { - cerr << c_file.name << endl; + TCHAR * pos; + if ((pos = _tcsstr(c_file.name, _T(".nostrip.")))) + { + size_t len = _tcslen(pos); + string modulename = c_file.name; + string filename = modulename; + modulename.erase(modulename.length() - len, len); + + string path = current_dir; + path.insert (path.length () -1, _T("\\")); + path.insert (path.length () -1, filename); + + m_Map.insert(std::make_pair<string, string>(modulename, path)); + + } + if (c_file.attrib & _A_SUBDIR) + { + if (c_file.name[0] != _T('.')) + { + string path = current_dir; + path.insert (path.length ()-1, _T("\\")); + path.insert (path.length ()-1, c_file.name); + vect.push_back (path); + } + } + + }while(_tfindnext(hFile, &c_file) == 0); + + _findclose(hFile); + hFile = -1L; + + while(!vect.empty ()) + { + current_dir = vect.front (); + vect.erase (vect.begin()); + val = current_dir; + val.insert (val.length() -1, _T("\\*")); + hFile = _tfindfirst64i32(val.c_str(), &c_file); + if (hFile != -1L) + { + break; + } } - }while(_findnext(hFile, &c_file) == 0); - - - - - return false; + if (hFile == -1L) + { + break; + } + + }while(1); + + + return !m_Map.empty(); } //--------------------------------------------------------------------------------------- bool SymbolFile::resolveAddress(const string &module_name, const string &module_address, string &Buffer) { SymbolMap::const_iterator it = m_Map.find (module_name); -/* - if (it == m_Map.end ()) - { -#ifdef NDEBUG - cerr << "SymbolFile::resolveAddress> no symbol file found for module " << module_name << endl; -#endif - return false; - } -*/ - /// - /// fetch environment path - /// - EnvironmentVariable envvar; -#if 1 - string pipe_cmd = _T("");//D:\\reactos\\output-i386"); -#else - string path = _T("output-i386"); - envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, path); -#endif - pipe_cmd += _T("addr2line.exe "); //FIXXME file extension + + if (it == m_Map.end () || m_SymResolver == _T("")) + { + cerr << "SymbolFile::resolveAddress> no symbol file or ROS_ADDR2LINE not set" << endl; + return false; + } + + string pipe_cmd = m_SymResolver; pipe_cmd += _T("--exe="); -#if 1 - pipe_cmd += _T("D:\\reactos\\output-i386\\dll\\win32\\kernel32\\kernel32.nostrip.dll"); -#else - path += it->second; -#endif + pipe_cmd += it->second; pipe_cmd += _T(" "); pipe_cmd += module_address; @@ -114,9 +168,7 @@ if (!pipe_reader.openPipe (pipe_cmd)) { -#ifdef NDEBUG _tprintf(_T("SymbolFile::resolveAddress> failed to open pipe %s"), pipe_cmd); -#endif return false; } @@ -125,20 +177,24 @@ Buffer.reserve (500); } - return pipe_reader.readPipe (Buffer); + bool ret = pipe_reader.readPipe (Buffer); + pipe_reader.closePipe (); + return ret; } //--------------------------------------------------------------------------------------- bool SymbolFile::getSymbolFilePath(const System_::string &ModuleName, System_::string &FilePath) { - cerr << "SymbolFile::getSymbolFilePath is not yet implemented" <<endl; - return false; - - } - - - - - + SymbolMap::const_iterator it = m_Map.find (ModuleName); + + if (it == m_Map.end ()) + { + _tprintf(_T("SymbolFile::resolveAddress> no symbol file found for module %s"), ModuleName.c_str()); + return false; + } + + FilePath = it->second; + return true; + } } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/sym_file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.h?re… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.h (original) +++ trunk/reactos/tools/sysreg/sym_file.h Fri Oct 20 23:40:33 2006 @@ -11,6 +11,8 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */ +#include "conf_parser.h" + #include <string> #include <tchar.h> #include <map> @@ -19,6 +21,7 @@ { typedef std::basic_string<TCHAR> string; + using Sysreg_::ConfigParser; //--------------------------------------------------------------------------------------- /// @@ -33,17 +36,10 @@ class SymbolFile { - typedef std::map<string, string> SymbolMap; public: static string VAR_ROS_OUTPUT; -//--------------------------------------------------------------------------------------- -/// -/// SymbolFile -/// -/// Description: constructor of class SymbolFile - - SymbolFile(); - + static string ROS_ADDR2LINE; + typedef std::map<string, string> SymbolMap; //--------------------------------------------------------------------------------------- /// /// ~SymbolFile @@ -70,7 +66,7 @@ /// @param Path path to ROS_OUTPUT containing symbol files /// @return bool - bool initialize(const string & Path = _T("output-i386")); + static bool initialize(ConfigParser & conf_parser, const string & Path); //--------------------------------------------------------------------------------------- /// @@ -85,7 +81,7 @@ /// @param buffer receives information about the resolved location /// @return bool - bool resolveAddress(const string & module_name, const string & module_address, string & Buffer); + static bool resolveAddress(const string & module_name, const string & module_address, string & Buffer); //--------------------------------------------------------------------------------------- /// @@ -97,11 +93,21 @@ /// @param ModuleName name of the module to lookup /// @param FilePath buffer receiving the address of symbol file - bool getSymbolFilePath(const string & ModuleName, string & FilePath); + static bool getSymbolFilePath(const string & ModuleName, string & FilePath); protected: - SymbolMap m_Map; +//--------------------------------------------------------------------------------------- +/// +/// SymbolFile +/// +/// Description: constructor of class SymbolFile + + SymbolFile(); + + static SymbolMap m_Map; + static string m_SymbolPath; + static string m_SymResolver; }; } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Fri Oct 20 23:40:33 2006 @@ -28,8 +28,6 @@ using Sysreg_::RegressionTest; using Sysreg_::RosBootTest; - -//test include using System_::SymbolFile; typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory; @@ -69,6 +67,12 @@ return -1; } + string envvar; + string ros = _T("ROS_OUTPUT"); + config.getStringValue (ros, envvar); + + SymbolFile::initialize (config, envvar); + if (regtest->execute (config)) { _tprintf(_T("The regression test %s completed successfully\n"), regtest->getName ().c_str ());

1 0

[janderwald] 24584: * beginning of a system regression tools
by janderwald＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: janderwald Date: Fri Oct 20 19:49:46 2006 New Revision: 24584 URL: http://svn.reactos.org/svn/reactos?rev=24584&view=rev Log: * beginning of a system regression tools Added: trunk/reactos/tools/sysreg/ (with props) trunk/reactos/tools/sysreg/comp_factory.h (with props) trunk/reactos/tools/sysreg/conf_parser.cpp (with props) trunk/reactos/tools/sysreg/conf_parser.h (with props) trunk/reactos/tools/sysreg/env_var.cpp (with props) trunk/reactos/tools/sysreg/env_var.h (with props) trunk/reactos/tools/sysreg/pipe_reader.cpp (with props) trunk/reactos/tools/sysreg/pipe_reader.h (with props) trunk/reactos/tools/sysreg/reg_test.h (with props) trunk/reactos/tools/sysreg/rosboot_test.cpp (with props) trunk/reactos/tools/sysreg/rosboot_test.h (with props) trunk/reactos/tools/sysreg/sym_file.cpp (with props) trunk/reactos/tools/sysreg/sym_file.h (with props) trunk/reactos/tools/sysreg/sysreg.cpp (with props) trunk/reactos/tools/sysreg/sysreg.h (with props) Propchange: trunk/reactos/tools/sysreg/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Oct 20 19:49:46 2006 @@ -1,0 +1,8 @@ +*.coff +*.exe +*.d +*.a +*.o +*.sym +*.map +*.tmp Added: trunk/reactos/tools/sysreg/comp_factory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/comp_factory.… ============================================================================== --- trunk/reactos/tools/sysreg/comp_factory.h (added) +++ trunk/reactos/tools/sysreg/comp_factory.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,204 @@ +#ifndef COMPONENT_FACTORY_TEMPLATE_H_ //comp_factory.h +#define COMPONENT_FACTORY_TEMPLATE_H_ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/comp_factory.h + * PURPOSE: component management + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include <map> +#include <vector> + +namespace System_ +{ + using std::map; + using std::vector; + using std::endl; +//---------------------------------------------------------- +/// +/// ComponentFactoryTemplate +/// +/// This class servess as a factory class for components. In general +/// can be used for any possible class which has base class +/// and a derrived class +/// + +//-------------------------------------------------------------------- +/// +/// create +/// +/// Description: this template function creates a function which returns +/// objects of type ElementType but in real are objects of DerrivedType +/// + + template<class ElementType, class DerrivedType> + static ElementType * create () + { + return new DerrivedType(); + } + +//-------------------------------------------------------------------- + + template<typename ElementType, typename ElementId> + class ComponentFactoryTemplate + { + typedef ElementType * (*creation_function)(); + typedef map<ElementId, creation_function> ElementMap; + typedef vector<ElementId> ElementIdVector; + public: + +//-------------------------------------------------------------------- +/// +/// ComponentFactoryTemplate +/// +/// Description: default destructor of class ComponentFactoryTemplate +/// + + ComponentFactoryTemplate() + { + + } + +//-------------------------------------------------------------------- +/// +/// ~ComponentFactoryTemplate +/// +/// Description: default destructor of class ComponentFactoryTemplate +/// + + virtual ~ComponentFactoryTemplate() + { + + } +//-------------------------------------------------------------------- +/// +/// listComponent +/// +/// Description: lists all registererd components ids + + void listComponentIds() + { + for(unsigned i = 0; i < ids_.size (); i++) + cout<<ids_[i]<<endl; + } +//-------------------------------------------------------------------- +/// +/// isComponentRegistered +/// +/// Description: this function just checks if a component with a given +/// id has been registered or not. If it is it returns true else false +/// +/// @return bool +/// @param element id of the component + + bool isComponentRegistered(ElementId const & id) + { + typename ElementMap::const_iterator iter = elements_.find(id); + if(iter != elements_.end()) + return true; + else + return false; + } + +//-------------------------------------------------------------------- +/// +/// getNumOfComponents +/// +/// Description: returns how many components have been registered + + const unsigned getNumOfComponents() + { + return ids_.size (); + } + +//-------------------------------------------------------------------- +/// +/// registerComponent +/// +/// Description: this function is template function in a class template. +/// The purpose is that at compiletime for each of the derriving classes of +/// ElementType a registerComponent function is generated and then all classes +/// of that type are added at runtime to factory. +/// returns zero on success, nonzero on failure +/// +/// @return bool +/// @param id the element id of the content type + template<typename ContentType> + bool registerComponent(ElementId const & id) + { + typename ElementMap::const_iterator iter = elements_.find(id); + if(iter != elements_.end()) + return false; + ids_.insert(ids_.begin(),id); + elements_.insert(std::make_pair<ElementId, creation_function >(id, &create<ElementType, ContentType>)); + return true; + + } + + //-------------------------------------------------------------------- +/// +/// deregisterComponent +/// +/// Description: unregisters a given component indentified by param id +/// After unregistration, the specified component can no longer be +/// created +/// @return bool +/// @param id the element id of the ContentType + + template<typename ContentType> + const bool deregisterComponent(ElementId const & id) + { + typename ElementMap::const_iterator iterator = elements_.find(id); + if(iterator != elements_.end()) + { + elements_.erase(iterator); + return true; + } + else + return false; + } + + +//-------------------------------------------------------------------- +/// +/// createComponent +/// +/// Description: creates a component according to the specified information +/// returns the component encapsulated in an std::auto_ptr +/// @param id specifies the key id, to look for +/// @return std::auto_ptr<ElementType> + ElementType * createComponent(ElementId const & id) const + { + typename ElementMap::const_iterator first_it = elements_.find(id); + if(first_it != elements_.end()) + return (first_it->second)(); + else + return 0; + } + +//-------------------------------------------------------------------- +/// +/// deleteComponent +/// +/// Description: deletes a component +/// @param element the element to be deleted + + void deleteComponent(ElementType * element) + { + delete element; + } + protected: + ElementMap elements_; + ElementIdVector ids_; + }; + + +} //end of namespace Sysreg_ + +#endif + Propchange: trunk/reactos/tools/sysreg/comp_factory.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/comp_factory.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (added) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,98 @@ +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: configuration parser + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include "conf_parser.h" +#include <iostream> +#include <sstream> +#include <fstream> + +namespace Sysreg_ +{ + using std::cout; + using std::cerr; + using std::endl; + using std::ifstream; +//--------------------------------------------------------------------------------------- + ConfigParser::ConfigParser() + { + + } + +//--------------------------------------------------------------------------------------- + ConfigParser::~ConfigParser() + { + m_Map.clear (); + } + +//--------------------------------------------------------------------------------------- + bool ConfigParser::parseFile(TCHAR * FileName) + { + FILE * file; +#ifdef UNICODE + file = _tfopen(FileName, _T("rt,ccs=UNICODE")); +#else + file = _tfopen(FileName, _T("rt")); +#endif + if (!file) + { + cerr << " Error: ConfigParser::parseFile failed to open configuration file " <<endl; + return false; + } + + bool ret = false; + while (!feof(file)) + { + TCHAR buffer[500]; + TCHAR * buf; + + buf = _fgetts(buffer, sizeof(buffer) / sizeof(TCHAR), file); + if (buf) + { + if (buffer[0] != ';') + { + string s_buffer = string(buffer); + string::size_type ws_pos = s_buffer.find_first_of (_T("=")); + + if (ws_pos != string::npos && ws_pos > 0 && ws_pos < s_buffer.size()) + { + string name = s_buffer.substr (0, ws_pos); + string value = s_buffer.substr (ws_pos + 1); + if (value[value.length () -1] == 0xA) + { + // remove newline char + value[value.length ()-1] = _T('\0'); + } + m_Map[name] = value; + ret = true; + } + } + } + } + return ret; + + } + +//--------------------------------------------------------------------------------------- + bool ConfigParser::getStringValue(string &ConfVariable, string &ConfValue) + { + ConfigMap::iterator it = m_Map.find (ConfVariable); + if (it == m_Map.end ()) + { +#ifdef NDEBUG + cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; +#endif + return false; + } + + ConfValue = it->second; + return true; + } + + +} // end of namespace Sysreg_ Propchange: trunk/reactos/tools/sysreg/conf_parser.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/conf_parser.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/conf_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.h… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.h (added) +++ trunk/reactos/tools/sysreg/conf_parser.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,92 @@ +#ifndef CONF_PARSER_H__ +#define CONF_PARSER_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: configuration parser + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include <string> +#include <map> +#include <tchar.h> + +namespace Sysreg_ +{ + using std::map; +//--------------------------------------------------------------------------------------- +/// +/// class ConfigParser +/// +/// Description: this class reads configuration entries from a configuration file +/// Each entry must have the form of VALUE=XXX. The entries are stored +/// in a map which can be queried after parsing the configuration file +/// +/// Note: lines beginning with an ; are ignored +/// +/// Usage: First, call parseFile with param to file. Finally, call getValue with the +/// appropiate type + + class ConfigParser + { + public: + typedef std::basic_string<TCHAR> string; + typedef std::basic_istringstream<TCHAR> istringstream; + typedef map<string, string> ConfigMap; +//--------------------------------------------------------------------------------------- +/// +/// ConfigParser +/// +/// Description: constructor of class ConfigParser + + ConfigParser(); + +//--------------------------------------------------------------------------------------- +/// +/// ~ConfigParser +/// +/// Description: destructor of class ConfigParser + + virtual ~ConfigParser(); + +//--------------------------------------------------------------------------------------- +/// +/// parseFile +/// +/// Description: this function takes as param a path to file. it attempts to parse this specific +/// file with the given syntax. On success it returns true. +/// +/// Note: Everytime parseFile is called, the previous stored values are cleared +/// +/// @param FileName path to configuration file +/// @return bool + + bool parseFile(TCHAR * FileName); + +//-------------------------------------------------------------------------------------- +/// +/// getStringValue +/// +/// Description: attempts to read a config variable from the configuration file +/// If the variable name is not found, it returns false and the param +/// ConfValue remains untouched. On success it returns the true. +/// +/// @param ConfVariable name of the configuration variable to retrieve +/// @param ConfValue type of value to retrieve + + bool getStringValue(string & ConfVariable, string & ConfValue); + + protected: + ConfigMap m_Map; + + }; // end of class ConfigParser + + +} // end of namspace Sysreg_ + + +#endif /* end of CONF_PARSER_H__ */ Propchange: trunk/reactos/tools/sysreg/conf_parser.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/conf_parser.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/env_var.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.cpp?r… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.cpp (added) +++ trunk/reactos/tools/sysreg/env_var.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,67 @@ +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: environment variable lookup + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "env_var.h" +#include <iostream> + +namespace System_ +{ + using std::cout; + using std::endl; + using std::cerr; + +//--------------------------------------------------------------------------------------- + EnvironmentVariable::EnvironmentVariable() + { + + } + +//--------------------------------------------------------------------------------------- + EnvironmentVariable::~EnvironmentVariable() + { + m_Map.clear (); + } + +//--------------------------------------------------------------------------------------- + + bool EnvironmentVariable::getValue(const System_::string &EnvName, System_::string &EnvValue) + { + EnvironmentMap::const_iterator it = m_Map.find (EnvName); + if (it != m_Map.end()) + { + EnvValue = it->second; + return true; + } + + TCHAR * value = _tgetenv(EnvName.c_str ()); + + if (!value) + { +#ifdef NDEBUG + cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; +#endif + return false; + } + + if (!_tcslen(value)) + { +#ifdef NDEBUG + cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; +#endif + return false; + } + + EnvValue = value; + m_Map[EnvName] = EnvValue; + return true; + } + + +} // end of namespace System_ Propchange: trunk/reactos/tools/sysreg/env_var.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/env_var.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/env_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.h?rev… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.h (added) +++ trunk/reactos/tools/sysreg/env_var.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,71 @@ +#ifndef ENV_VAR_H__ +#define ENV_VAR_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: environment variable lookup + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include <string> +#include <map> +#include <tchar.h> + +namespace System_ +{ + + using std::map; + typedef std::basic_string<TCHAR> string; +//--------------------------------------------------------------------------------------- +/// +/// class EnvironmentVariable +/// +/// Description: this class performs looking up environment variable from the system +/// The result is also stored in its internal map to cache results + + class EnvironmentVariable + { + typedef map<string, string> EnvironmentMap; + public: +//--------------------------------------------------------------------------------------- +/// +/// EnvironmentVariable +/// +/// Description: constructor of class EnvironmentVariable + + EnvironmentVariable(); + +//--------------------------------------------------------------------------------------- +/// +/// ~EnvironmentVariable +/// +/// Description: destructor of class EnvironmentVariable + + virtual ~EnvironmentVariable(); + +//--------------------------------------------------------------------------------------- +/// +/// getValue +/// +/// Description: this function returns the value of an associated environment variable. if +/// the variable is set it returns true and the value in the parameter EnvValue. On error +/// it returns false and the param EnvValue remains untouched +/// +/// @param EnvName name of environment variable to retrieve +/// @param EnvValue value of the environment variable +/// @return bool + + bool getValue(const string & EnvName, string & EnvValue); + + + protected: + EnvironmentMap m_Map; + + }; // end of class EnvironmentVariable + +} // end of namespace System_ + +#endif /* end of ENV_VAR_H__ */ Propchange: trunk/reactos/tools/sysreg/env_var.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/env_var.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (added) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,132 @@ +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: pipe reader support + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include "pipe_reader.h" + +#include <iostream> +#include <assert.h> + +namespace System_ +{ + using std::cout; + using std::endl; + using std::cerr; + +//--------------------------------------------------------------------------------------- + PipeReader::PipeReader() : m_File(NULL) + { + + } + +//--------------------------------------------------------------------------------------- + PipeReader::~PipeReader() + { + + } + +//--------------------------------------------------------------------------------------- + + bool PipeReader::openPipe(const System_::string &PipeCmd, System_::string AccessMode) + { + if (m_File != NULL) + { +#ifdef NDEBUG + cerr << "PipeReader::openPipe> pipe already open" << endl; +#endif + return false; + } + // + m_File = _tpopen(PipeCmd.c_str(), AccessMode.c_str()); + if (m_File) + { +#ifdef NDEBUG + cerr << "PipeReader::openPipe> successfully opened pipe" << endl; +#endif + return true; + } + +#ifdef NDEBUG + cerr << "PipeReader::openPipe> failed to open pipe " << PipeCmd << endl; +#endif + return false; + } + +//--------------------------------------------------------------------------------------- + + bool PipeReader::closePipe() + { + if (!m_File) + { +#ifdef NDEBUG + cerr << "PipeReader::closePipe> pipe is not open" << endl; +#endif + return false; + } + + int res = _pclose(m_File); + + if (res == UINT_MAX) + { +#ifdef NDEBUG + cerr << "Error: _pclose failed " <<endl; +#endif + return false; + } + + m_File = NULL; + return true; + } + +//--------------------------------------------------------------------------------------- + + bool PipeReader::isEof() const + { + return feof(m_File); + } + +//--------------------------------------------------------------------------------------- + + string::size_type PipeReader::readPipe(System_::string &Buffer) + { + + TCHAR * buf = (TCHAR *)Buffer.c_str(); + System_::string::size_type size = Buffer.capacity(); + +//#ifdef NDEBUG + memset(buf, 0x0, sizeof(TCHAR) * size); +//#endif + + TCHAR * res = _fgetts(buf, size, m_File); + if (!res) + { +#ifdef NDEBUG + cerr << "Error: PipeReader::readPipe failed" << endl; +#endif + return 0; + } + +#ifdef NDEBUG + cerr << "PipeReader::readPipe> res: " << Buffer << endl; +#endif + + return _tcslen(buf); + } + +//--------------------------------------------------------------------------------------- + + bool PipeReader::writePipe(const string & Buffer) + { + //TODO + // implement me + cerr << "PipeReader::writePipe is not yet implemented" << endl; + + return false; + } + +} // end of namespace System_ Propchange: trunk/reactos/tools/sysreg/pipe_reader.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/pipe_reader.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.h (added) +++ trunk/reactos/tools/sysreg/pipe_reader.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,117 @@ +#ifndef PIPE_READER_H__ +#define PIPE_READER_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: pipe reader support + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + + +#include <string> +#include <tchar.h> +#include <stdio.h> +#include <stdlib.h> + +namespace System_ +{ + typedef std::basic_string<TCHAR> string; +//--------------------------------------------------------------------------------------- +/// +/// class PipeReader +/// +/// Description: this class implements a pipe reader. It uses _popen to perform opening of +/// pipe / _pclose + + class PipeReader + { + public: + +//--------------------------------------------------------------------------------------- +/// +/// PipeReader +/// +/// Description: constructor of class PipeReader + + PipeReader(); + +//--------------------------------------------------------------------------------------- +/// +/// virtual ~PipeReader +/// +/// Description: destructor of class PipeReader + + virtual ~PipeReader(); + +//--------------------------------------------------------------------------------------- +/// +/// openPipe +/// +/// Description: this function attempts to open a pipe. If an pipe is already open or +/// it fails to open a pipe, the function returns false +/// +/// @param PipeCmd command of the pipe to open +/// @param AccessMode on how to open the pipe +/// accepted modes are t ... text mode - not compatible with b +/// b ... binary mode - not compatible with t +/// r ... allows reading from the pipe +/// w ... allows writing to the pipe +/// @return bool + + bool openPipe(const string & PipeCmd, string AccessMode = _T("rt")); + +//--------------------------------------------------------------------------------------- +/// +/// closePipe +/// +/// Description: closes a pipe. Returns true on success +/// +/// @return bool + + bool closePipe(); + +//--------------------------------------------------------------------------------------- +/// +/// readPipe +/// +/// Description: attempts to read from the pipe. Returns true on success. If it returns +/// false, call PipeReader::isEoF() to determine if the pipe should be closed +/// +/// @param Buffer to be written to +/// @return string::size_type + + string::size_type readPipe(string & Buffer); + +//--------------------------------------------------------------------------------------- +/// +/// writePipe +/// +/// Description: attempts to write to the pipe. Returns true on success. +/// +/// @param Buffer containing information which is written to the pipe + + bool writePipe(const string & Buffer); + +//--------------------------------------------------------------------------------------- +/// +/// isEof +/// +/// Description: returns true if the pipe has reached end of file. The caller should call +/// closePipe if this function returns true + + bool isEof() const; + +protected: + FILE * m_File; + + }; // end of class PipeReader + +} // end of namespace System_ + + + +#endif /* end of PIPE_READER_H__ */ Propchange: trunk/reactos/tools/sysreg/pipe_reader.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/pipe_reader.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/reg_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/reg_test.h?re… ============================================================================== --- trunk/reactos/tools/sysreg/reg_test.h (added) +++ trunk/reactos/tools/sysreg/reg_test.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,87 @@ +#ifndef REG_TEST_H__ +#define REG_TEST_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: regression test abstract class + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include "conf_parser.h" + +#include <string> +#include <tchar.h> + +namespace Sysreg_ +{ + using Sysreg_::ConfigParser; + + typedef std::basic_string<TCHAR> string; +//------------------------------------------------------------------- +/// +/// class RegressionTest +/// +/// Description: The class RegressionTest is an abstract base class. Every +/// regression test class derives from this class. + + + class RegressionTest + { + public: + +//--------------------------------------------------------------------------------------- +/// +/// RegressionTest +/// +/// Description: constructor of class RegressionTest +/// +/// @param RegName name of derriving subclass + + RegressionTest(const string RegName) : m_Name(RegName) + {} + +//--------------------------------------------------------------------------------------- +/// +/// ~RegressionTest +/// +/// Description: destructor of class RegressionTest + + virtual ~RegressionTest() + {} + +//--------------------------------------------------------------------------------------- +/// +/// getName +/// +/// Description: returns the value of the member m_Name + + const string & getName() const + { return m_Name; } + +//--------------------------------------------------------------------------------------- +/// +/// execute +/// +/// Description: the execute function passes an System_::ConfigParser object to the +/// derriving RegresssionTest class. The class can then read required options from the +/// configuration file. The RegressionTest shall then perform its specific regression test. +/// @see System_::PipeReader +/// @see System_::SymbolFile +/// +/// Note : if an error happens or the option cannot be found, this function +/// should return false. + + virtual bool execute(ConfigParser & conf_parser) = 0; + + protected: + string m_Name; + + }; // end of class RegressionTest + + +} // end of namespace Sysreg_ + +#endif Propchange: trunk/reactos/tools/sysreg/reg_test.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/reg_test.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (added) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,161 @@ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: ReactOS boot test + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "rosboot_test.h" +#include "pipe_reader.h" + +#include <iostream> + +namespace Sysreg_ +{ + using std::cout; + using std::endl; + using std::cerr; + + using System_::PipeReader; + + string RosBootTest::VARIABLE_NAME = _T("ROSBOOT_CMD"); + string RosBootTest::CLASS_NAME = _T("rosboot"); + string RosBootTest::DEBUG_PORT = _T("ROSBOOT_DEBUG_PORT"); + string RosBootTest::DEBUG_FILE = _T("ROSBOOT_DEBUG_FILE"); +//--------------------------------------------------------------------------------------- + RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME) + { + + } + +//--------------------------------------------------------------------------------------- + RosBootTest::~RosBootTest() + { + + } + +//--------------------------------------------------------------------------------------- + bool RosBootTest::execute(ConfigParser &conf_parser) + { + string boot_cmd; + string debug_port; + bool ret; + + if (!conf_parser.getStringValue (RosBootTest::DEBUG_PORT, debug_port)) + { + cerr << "Error: ROSBOOT_DEBUG_TYPE is not set in configuration file" << endl; + return false; + } + if (!conf_parser.getStringValue(RosBootTest::VARIABLE_NAME, boot_cmd)) + { + cerr << "Error: ROSBOOT_CMD is not set in configuration file" << endl; + return false; + } + + if (!_tcscmp(debug_port.c_str(), _T("pipe"))) + { + ret = fetchDebugByPipe(boot_cmd); + } + else if (!_tcscmp(debug_port.c_str(), _T("file"))) + { + string debug_file; + if (!conf_parser.getStringValue (RosBootTest::DEBUG_FILE, debug_file)) + { + cerr << "Error: ROSBOOT_DEBUG_FILE is not set in configuration file" << endl; + return false; + } + ret = fetchDebugByFile(boot_cmd, debug_file); + } + else + { + _tprintf(_T("Error: unknown debug port %s Currently only file|pipe is supported\n"), debug_port); + return false; + } + + + return ret; + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::checkDebugData(string debug_data) + { + /// + /// FIXME + /// + /// parse debug_data and output STOP errors, UM exception + /// as well as important stages i.e. ntoskrnl loaded + /// TBD the information needs to be written into an provided log object + /// which writes the info into HTML/log / sends etc .... + + _tprintf(debug_data.c_str ()); + return true; + + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::fetchDebugByPipe(string boot_cmd) + { + struct timeval ts; + PipeReader pipe_reader; + + if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) + { + _tprintf(_T("Error: failed to open pipe with cmd: %s\n"), boot_cmd.c_str ()); + return false; + } + string Buffer; + Buffer.reserve (10000); + +// gettimeofday(&ts, NULL); + + while(!pipe_reader.isEof ()) + { + pipe_reader.readPipe (Buffer); + if (!checkDebugData(Buffer)) + { + break; + } + if (hasTimeout(&ts, 60000) + + } + pipe_reader.closePipe (); + return true; + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::fetchDebugByFile(Sysreg_::string boot_cmd, Sysreg_::string debug_log) + { + PipeReader pipe_reader; + + if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) + { + _tprintf(_T("Error: failed to open pipe with cmd: %s\n"), boot_cmd.c_str ()); + return false; + } + FILE * file = _tfopen(debug_log.c_str (), _T("rt")); + if (!file) + { + _tprintf(_T("Error: failed to open debug log %s\n", debug_log.c_str ())); + pipe_reader.closePipe (); + return false; + } + + TCHAR szBuffer[500]; + + do + { + if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) + { + string buffer = szBuffer; + if (!checkDebugData(buffer)) + { + break; + } + } + }while(!pipe_reader.isEof ()); + + pipe_reader.closePipe (); + } + +} // end of namespace Sysreg_ Propchange: trunk/reactos/tools/sysreg/rosboot_test.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/rosboot_test.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (added) +++ trunk/reactos/tools/sysreg/rosboot_test.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,116 @@ +#ifndef ROSBOOT_TEST_H__ +#define ROSBOOT_TEST_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: ReactOS boot test + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "reg_test.h" +#include <winsock2.h> + +namespace Sysreg_ +{ +//--------------------------------------------------------------------------------------- +/// +/// class RosBootTest +/// +/// Description: this class attempts to boot ReactOS in an emulator with console logging enabled. +/// It + + class RosBootTest : public RegressionTest + { + public: + static string VARIABLE_NAME; + static string CLASS_NAME; + static string DEBUG_PORT; + static string DEBUG_FILE; + +//--------------------------------------------------------------------------------------- +/// +/// RosBootTest +/// +/// Description: constructor of class RosBootTest +/// + + RosBootTest(); + +//--------------------------------------------------------------------------------------- +/// +/// ~RosBootTest +/// +/// Description: destructor of class RosBootTest +/// + + virtual ~RosBootTest(); + +//--------------------------------------------------------------------------------------- +/// +/// execute +/// +/// Description: this function performs a ReactOS boot test. It reads the variable +/// ROSBOOT_CMD and executes this specific command. This command shall contain the path +/// to an emulator (i.e. qemu) and the required arguments (-serial switch, hdd img etc) to be able +/// to read from console. If an error is detected, it attempts to resolve the faulting +/// module and address. + + virtual bool execute(ConfigParser & conf_parser); + + protected: +//--------------------------------------------------------------------------------------- +/// +/// fetchDebugByPipe +/// +/// Description: this functions debugs ReactOS by PipeReader class +/// +/// Note: if an error occurs, this function returns false +/// +/// @param BootCmd the command which is passed to PipeReader class +/// @return bool + + bool fetchDebugByPipe(string BootCmd); + +//--------------------------------------------------------------------------------------- +/// +/// fetchDebugByFile +/// +/// Description: this functions fetches debug info by reading a debug log +/// +/// Note: if an error occurs, this function returns false +/// +/// @param BootCmd the command which is passed to PipeReader class +/// @param debug_log path pointing to debug log +/// @return bool + + bool fetchDebugByFile(string BootCmd, string debug_log); + +//--------------------------------------------------------------------------------------- +/// +/// checkDebugData +/// +/// Description: this function parses the given debug data for BSOD, UM exception etc +/// If it detects an fatal error, it should return false +/// +/// Note: the received debug information should be written to an internal log object +/// to facilate post-processing of the results + + bool checkDebugData(string debug_data); + + }; // end of class RosBootTest + +//--------------------------------------------------------------------------------------- +/// +/// checkTimeOut +/// +/// Description: this function checks if the the application has already hung + + bool checkTimeOut(struct timeval * ts, unsigned max_timeout); + +} // end of namespace Sysreg_ + +#endif /* end of ROSBOOT_H__ */ Propchange: trunk/reactos/tools/sysreg/rosboot_test.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/rosboot_test.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (added) +++ trunk/reactos/tools/sysreg/sym_file.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,144 @@ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: source symbol lookup + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "sym_file.h" +#include "env_var.h" +#include "pipe_reader.h" + +#include <iostream> +#include <stdio.h> +#include <stdlib.h> +#include <io.h> +#include <time.h> + + +namespace System_ +{ + using std::cout; + using std::endl; + using std::cerr; + + string SymbolFile::VAR_ROS_OUTPUT = _T("ROS_OUTPUT"); +//--------------------------------------------------------------------------------------- + SymbolFile::SymbolFile() + { + + } + +//--------------------------------------------------------------------------------------- + SymbolFile::~SymbolFile() + { + + } + +//--------------------------------------------------------------------------------------- + bool SymbolFile::initialize(const System_::string &Path) + { + char szBuffer[260]; +// vector<string> vect; + EnvironmentVariable envvar; + + string val = _T("output-i386"); + + envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, val); + + struct _finddata_t c_file; + strcpy(szBuffer, "D:\\reactos\\output-i386\\*"); + intptr_t hFile = _findfirst(szBuffer, &c_file); + + if (hFile == -1L) + { + cerr << "SymbolFile::initialize> failed" <<endl; + return false; + } + + do + { + if (strstr(c_file.name, ".nostrip.")) + { + cerr << c_file.name << endl; + } + + }while(_findnext(hFile, &c_file) == 0); + + + + + return false; + } + +//--------------------------------------------------------------------------------------- + bool SymbolFile::resolveAddress(const string &module_name, const string &module_address, string &Buffer) + { + SymbolMap::const_iterator it = m_Map.find (module_name); +/* + if (it == m_Map.end ()) + { +#ifdef NDEBUG + cerr << "SymbolFile::resolveAddress> no symbol file found for module " << module_name << endl; +#endif + return false; + } +*/ + /// + /// fetch environment path + /// + EnvironmentVariable envvar; +#if 1 + string pipe_cmd = _T("");//D:\\reactos\\output-i386"); +#else + string path = _T("output-i386"); + envvar.getValue(SymbolFile::VAR_ROS_OUTPUT, path); +#endif + pipe_cmd += _T("addr2line.exe "); //FIXXME file extension + pipe_cmd += _T("--exe="); +#if 1 + pipe_cmd += _T("D:\\reactos\\output-i386\\dll\\win32\\kernel32\\kernel32.nostrip.dll"); +#else + path += it->second; +#endif + + pipe_cmd += _T(" "); + pipe_cmd += module_address; + + + PipeReader pipe_reader; + + if (!pipe_reader.openPipe (pipe_cmd)) + { +#ifdef NDEBUG + _tprintf(_T("SymbolFile::resolveAddress> failed to open pipe %s"), pipe_cmd); +#endif + return false; + } + + if (Buffer.capacity () < 100) + { + Buffer.reserve (500); + } + + return pipe_reader.readPipe (Buffer); + } + +//--------------------------------------------------------------------------------------- + bool SymbolFile::getSymbolFilePath(const System_::string &ModuleName, System_::string &FilePath) + { + cerr << "SymbolFile::getSymbolFilePath is not yet implemented" <<endl; + return false; + + } + + + + + + +} // end of namespace System_ Propchange: trunk/reactos/tools/sysreg/sym_file.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/sym_file.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/sym_file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.h?re… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.h (added) +++ trunk/reactos/tools/sysreg/sym_file.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,110 @@ +#ifndef SYM_FILE_H__ +#define SYM_FILE_H__ + + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: source symbol lookup + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include <string> +#include <tchar.h> +#include <map> + +namespace System_ +{ + + typedef std::basic_string<TCHAR> string; + +//--------------------------------------------------------------------------------------- +/// +/// class SymbolFile +/// +/// Description: this class performs 2 tasks: First, it locates all available module names +/// and their associated symbol files. Secondly, it performs resolving address to source addresses +/// via the function resolveAddress +/// +/// Usage: call initialize(). Then call resolveAddress(); +/// i.e. resolveAddress("comctl32.dll", 0xBLABLABLA, result); + + class SymbolFile + { + typedef std::map<string, string> SymbolMap; + public: + static string VAR_ROS_OUTPUT; +//--------------------------------------------------------------------------------------- +/// +/// SymbolFile +/// +/// Description: constructor of class SymbolFile + + SymbolFile(); + +//--------------------------------------------------------------------------------------- +/// +/// ~SymbolFile +/// +/// Description: destructor of class SymbolFile + + virtual ~SymbolFile(); + +//--------------------------------------------------------------------------------------- +/// +/// initialize +/// +/// Description: this function initialize the class. It searches the subdirs +/// of ROS_OUTPUT and adds all files with name *.nostrip.* to a map with module +/// name as the key. +/// +/// Note: if the param Path is not empty, it adds all found modules to the internal +/// map +/// +/// Note: if the path does not exist or the no symbol files were added then false is returned +/// +/// Note: if a module with same module name is already in the map, then the new module is not added +/// +/// @param Path path to ROS_OUTPUT containing symbol files +/// @return bool + + bool initialize(const string & Path = _T("output-i386")); + +//--------------------------------------------------------------------------------------- +/// +/// resolveAddress +/// +/// Description: this function attempts to resolve an address using a given symbol file +/// +/// Note: the lookup is performed with raddr2line +/// +/// @param module_name name of the module to examine +/// @param module_address address of the module to resolve +/// @param buffer receives information about the resolved location +/// @return bool + + bool resolveAddress(const string & module_name, const string & module_address, string & Buffer); + +//--------------------------------------------------------------------------------------- +/// +/// getSymbolFilePath +/// +/// Description: this function returns the associated FilePath to a given module name. If +/// the module name is not known, it returns false and the param FilePath remains untouched +/// +/// @param ModuleName name of the module to lookup +/// @param FilePath buffer receiving the address of symbol file + + bool getSymbolFilePath(const string & ModuleName, string & FilePath); + + protected: + SymbolMap m_Map; + + }; +} // end of namespace System_ + + + +#endif /* end of SYM_FILE_H__ */ Propchange: trunk/reactos/tools/sysreg/sym_file.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/sym_file.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (added) +++ trunk/reactos/tools/sysreg/sysreg.cpp Fri Oct 20 19:49:46 2006 @@ -1,0 +1,82 @@ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: app initialization + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + + +#include "sysreg.h" + + +typedef std::basic_string<TCHAR> string; + +using std::cout; +using std::endl; +using std::cerr; + + +using System_::EnvironmentVariable; +using System_::ComponentFactoryTemplate; + +using Sysreg_::ConfigParser; + +//regression test classes +using Sysreg_::RegressionTest; +using Sysreg_::RosBootTest; + + +//test include +using System_::SymbolFile; + +typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory; + +static const TCHAR USAGE[] = +_T("sysreg.exe <conf_file> <testname>\n\nconf_file ... path to a configuration file\ntest_name ... name of test to execute\n"); + + + + +int _tmain(int argc, TCHAR * argv[]) +{ + ConfigParser config; + ComponentFactory comp_factory; + + if (argc != 3) + { + cerr << USAGE << endl; + return -1; + } +//--------------------------------------------------------------------------------------- + /// regression tests should be registered here + comp_factory.registerComponent<RosBootTest>(RosBootTest::CLASS_NAME); + +//--------------------------------------------------------------------------------------- + + if (!config.parseFile (argv[1])) + { + cerr << USAGE << endl; + return -1; + } + + RegressionTest * regtest = comp_factory.createComponent (argv[2]); + if (!regtest) + { + _tprintf(_T("Error: the requested regression test does not exist")); + return -1; + } + + if (regtest->execute (config)) + { + _tprintf(_T("The regression test %s completed successfully\n"), regtest->getName ().c_str ()); + } + else + { + _tprintf(_T("The regression test %s failed\n"), regtest->getName ().c_str ()); + } + + return 0; +} Propchange: trunk/reactos/tools/sysreg/sysreg.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/sysreg.cpp ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/tools/sysreg/sysreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.h?rev=… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.h (added) +++ trunk/reactos/tools/sysreg/sysreg.h Fri Oct 20 19:49:46 2006 @@ -1,0 +1,34 @@ +#ifndef SYSREG_H__ +#define SYSREG_H__ + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: app initialization + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include <tchar.h> +#include <string> +#include <iostream> + + + +#include "env_var.h" +#include "pipe_reader.h" +#include "comp_factory.h" +#include "conf_parser.h" + +// regression test classes +#include "rosboot_test.h" + +//test include +#include "sym_file.h" + + + + + +#endif /* end of SYSREG_H__ */ Propchange: trunk/reactos/tools/sysreg/sysreg.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/sysreg.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[weiden] 24583: Minor simplification
by weiden＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: weiden Date: Fri Oct 20 18:26:41 2006 New Revision: 24583 URL: http://svn.reactos.org/svn/reactos?rev=24583&view=rev Log: Minor simplification Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=24583… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c (original) +++ trunk/reactos/ntoskrnl/se/sd.c Fri Oct 20 18:26:41 2006 @@ -411,9 +411,8 @@ { /* first only probe and copy until the control field of the descriptor to determine whether it's a self-relative descriptor */ - DescriptorSize = (ULONG)((ULONG_PTR)&OriginalSecurityDescriptor->Control - - (ULONG_PTR)OriginalSecurityDescriptor) + - sizeof(OriginalSecurityDescriptor->Control); + DescriptorSize = FIELD_OFFSET(SECURITY_DESCRIPTOR, + Owner); ProbeForRead(OriginalSecurityDescriptor, DescriptorSize, sizeof(ULONG));

1 0

[weiden] 24582: Prefer inline probing macros for base types
by weiden＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: weiden Date: Fri Oct 20 18:20:27 2006 New Revision: 24582 URL: http://svn.reactos.org/svn/reactos?rev=24582&view=rev Log: Prefer inline probing macros for base types Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=24582… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c (original) +++ trunk/reactos/ntoskrnl/se/sd.c Fri Oct 20 18:20:27 2006 @@ -541,10 +541,7 @@ /* securely access the buffers! */ \ _SEH_TRY \ { \ - ProbeForRead(&SidType->SubAuthorityCount, \ - sizeof(SidType->SubAuthorityCount), \ - 1); \ - SidType##SAC = SidType->SubAuthorityCount; \ + SidType##SAC = ProbeForReadUchar(&SidType->SubAuthorityCount); \ SidType##Size = RtlLengthRequiredSid(SidType##SAC); \ DescriptorSize += ROUND_UP(SidType##Size, sizeof(ULONG)); \ ProbeForRead(SidType, \ @@ -574,6 +571,8 @@ DetermineSIDSize(Owner); DetermineSIDSize(Group); +#undef DetermineSIDSize + /* determine the size of the ACLs */ #define DetermineACLSize(AclType, AclFlag) \ do { \ @@ -587,10 +586,7 @@ /* securely access the buffers! */ \ _SEH_TRY \ { \ - ProbeForRead(&AclType->AclSize, \ - sizeof(AclType->AclSize), \ - 1); \ - AclType##Size = AclType->AclSize; \ + AclType##Size = ProbeForReadUshort(&AclType->AclSize); \ DescriptorSize += ROUND_UP(AclType##Size, sizeof(ULONG)); \ ProbeForRead(AclType, \ AclType##Size, \ @@ -622,6 +618,8 @@ DetermineACLSize(Sacl, SACL); DetermineACLSize(Dacl, DACL); +#undef DetermineACLSize + /* allocate enough memory to store a complete copy of a self-relative security descriptor */ NewDescriptor = ExAllocatePool(PoolType, @@ -663,6 +661,8 @@ CopySID(Owner); CopySID(Group); +#undef CopySID + #define CopyACL(Type) \ do { \ if(DescriptorCopy.Type != NULL) \ @@ -683,6 +683,8 @@ CopyACL(Sacl); CopyACL(Dacl); + +#undef CopyACL } _SEH_HANDLE {

1 0

[weiden] 24581: Fix integer overflow vulnerability in NtPrivilegeCheck
by weiden＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: weiden Date: Fri Oct 20 18:10:53 2006 New Revision: 24581 URL: http://svn.reactos.org/svn/reactos?rev=24581&view=rev Log: Fix integer overflow vulnerability in NtPrivilegeCheck Modified: trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=245… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c (original) +++ trunk/reactos/ntoskrnl/se/priv.c Fri Oct 20 18:10:53 2006 @@ -292,7 +292,7 @@ NTSTATUS STDCALL NtPrivilegeCheck (IN HANDLE ClientToken, IN PPRIVILEGE_SET RequiredPrivileges, - IN PBOOLEAN Result) + OUT PBOOLEAN Result) { PLUID_AND_ATTRIBUTES Privileges; PTOKEN Token; @@ -313,16 +313,26 @@ _SEH_TRY { ProbeForWrite(RequiredPrivileges, - sizeof(PRIVILEGE_SET), + FIELD_OFFSET(PRIVILEGE_SET, + Privilege), sizeof(ULONG)); PrivilegeCount = RequiredPrivileges->PrivilegeCount; PrivilegeControl = RequiredPrivileges->Control; + /* Check PrivilegeCount to avoid an integer overflow! */ + if (FIELD_OFFSET(PRIVILEGE_SET, + Privilege[PrivilegeCount]) / + sizeof(RequiredPrivileges->Privilege[0]) != PrivilegeCount) + { + Status = STATUS_INVALID_PARAMETER; + _SEH_LEAVE; + } + /* probe all of the array */ ProbeForWrite(RequiredPrivileges, - sizeof(FIELD_OFFSET(PRIVILEGE_SET, - Privilege[PrivilegeCount])), + FIELD_OFFSET(PRIVILEGE_SET, + Privilege[PrivilegeCount]), sizeof(ULONG)); ProbeForWriteBoolean(Result);

1 0

[weiden] 24580: Fix returning the context of the current thread in NtGetContextThread
by weiden＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: weiden Date: Fri Oct 20 17:45:52 2006 New Revision: 24580 URL: http://svn.reactos.org/svn/reactos?rev=24580&view=rev Log: Fix returning the context of the current thread in NtGetContextThread Modified: trunk/reactos/ntoskrnl/ps/debug.c Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c (original) +++ trunk/reactos/ntoskrnl/ps/debug.c Fri Oct 20 17:45:52 2006 @@ -174,8 +174,7 @@ Size = sizeof(CONTEXT); /* Read the flags */ - ProbeForReadUlong(&ThreadContext->ContextFlags); - Flags = ThreadContext->ContextFlags; + Flags = ProbeForReadUlong(&ThreadContext->ContextFlags); /* Check if the caller wanted extended registers */ if ((Flags & CONTEXT_EXTENDED_REGISTERS) != @@ -256,10 +255,18 @@ FALSE, NULL); } - + } + + _SEH_TRY + { /* Copy the context */ - RtlMoveMemory(ThreadContext, &GetSetContext.Context, Size); - } + RtlCopyMemory(ThreadContext, &GetSetContext.Context, Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; /* Return status */ return Status; @@ -285,8 +292,7 @@ Size = sizeof(CONTEXT); /* Read the flags */ - ProbeForReadUlong(&ThreadContext->ContextFlags); - Flags = ThreadContext->ContextFlags; + Flags = ProbeForReadUlong(&ThreadContext->ContextFlags); /* Check if the caller wanted extended registers */ if ((Flags & CONTEXT_EXTENDED_REGISTERS) != @@ -304,7 +310,7 @@ } /* Copy the context */ - RtlMoveMemory(&GetSetContext.Context, ThreadContext, Size); + RtlCopyMemory(&GetSetContext.Context, ThreadContext, Size); } _SEH_HANDLE {

1 0

[weiden] 24579: Use inline probing macro for handle variables
by weiden＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: weiden Date: Fri Oct 20 17:33:24 2006 New Revision: 24579 URL: http://svn.reactos.org/svn/reactos?rev=24579&view=rev Log: Use inline probing macro for handle variables Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Fri Oct 20 17:33:24 2006 @@ -708,7 +708,7 @@ _SEH_TRY { /* Probe the handle */ - ProbeForWrite(DebugHandle, sizeof(HANDLE), sizeof(ULONG)); + ProbeForWriteHandle(DebugHandle); } _SEH_HANDLE {

1 0

[weiden] 24578: - Some minor Nt stub fixes - Fix compilation with GCC4
by weiden＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: weiden Date: Fri Oct 20 17:19:13 2006 New Revision: 24578 URL: http://svn.reactos.org/svn/reactos?rev=24578&view=rev Log: - Some minor Nt stub fixes - Fix compilation with GCC4 Modified: trunk/reactos/include/ndk/rtltypes.h trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h (original) +++ trunk/reactos/include/ndk/rtltypes.h Fri Oct 20 17:19:13 2006 @@ -471,6 +471,7 @@ // // Routines and callbacks for the RTL AVL/Generic Table package // +#if defined(NTOS_MODE_USER) || (!defined(NTOS_MODE_USER) && !defined(_NTIFS_)) typedef NTSTATUS (NTAPI *PRTL_AVL_MATCH_FUNCTION)( struct _RTL_AVL_TABLE *Table, @@ -515,6 +516,7 @@ struct _RTL_AVL_TABLE *Table, PVOID Buffer ); +#endif // // RTL Query Registry callback Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Fri Oct 20 17:19:13 2006 @@ -793,6 +793,7 @@ /* Probe the handle */ ProbeForRead(AppClientId, sizeof(CLIENT_ID), sizeof(ULONG)); ClientId = *AppClientId; + AppClientId = &ClientId; } _SEH_HANDLE { @@ -838,7 +839,7 @@ /* Compare process ID */ if (DebugEvent->ClientId.UniqueProcess == - ClientId.UniqueProcess) + AppClientId->UniqueProcess) { /* Check if we already found a match */ if (NeedsWake) @@ -853,7 +854,7 @@ /* Compare thread ID and flag */ if ((DebugEvent->ClientId.UniqueThread == - ClientId.UniqueThread) && (DebugEvent->Flags & 1)) + AppClientId->UniqueThread) && (DebugEvent->Flags & 1)) { /* Remove the event from the list */ RemoveEntryList(NextEntry); @@ -1034,7 +1035,19 @@ PreviousMode); /* Return required length to user-mode */ - if (ReturnLength) *ReturnLength = sizeof(*DebugInfo); + if (ReturnLength) + { + _SEH_TRY + { + ProbeForWriteUlong(ReturnLength); + *ReturnLength = sizeof(*DebugInfo); + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } if (!NT_SUCCESS(Status)) return Status; /* Open the Object */ @@ -1096,13 +1109,18 @@ RtlZeroMemory(&WaitStateChange, sizeof(WaitStateChange)); /* Check if we came with a timeout from user mode */ - if ((Timeout) && (PreviousMode != KernelMode)) + if (PreviousMode != KernelMode) { _SEH_TRY { - /* Make a copy on the stack */ - SafeTimeOut = ProbeForReadLargeInteger(Timeout); - Timeout = &SafeTimeOut; + if (Timeout) + { + /* Make a copy on the stack */ + SafeTimeOut = ProbeForReadLargeInteger(Timeout); + Timeout = &SafeTimeOut; + } + + ProbeForWrite(StateChange, sizeof(*StateChange), sizeof(ULONG)); } _SEH_HANDLE { @@ -1114,12 +1132,6 @@ /* Query the current time */ KeQuerySystemTime(&StartTime); - } - - /* Check if the call is from user mode */ - if (PreviousMode == UserMode) - { - /* FIXME: Probe the state change structure */ } /* Get the debug object */ @@ -1268,9 +1280,18 @@ ObDereferenceObject(DebugObject); /* Return our wait state change structure */ - RtlMoveMemory(StateChange, - &WaitStateChange, - sizeof(DBGUI_WAIT_STATE_CHANGE)); + _SEH_TRY + { + RtlCopyMemory(StateChange, + &WaitStateChange, + sizeof(DBGUI_WAIT_STATE_CHANGE)); + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + return Status; } Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Fri Oct 20 17:19:13 2006 @@ -147,7 +147,7 @@ ObpDeleteNameCheck(ObjectBody); /* Decrease the total number of handles for this type */ - InterlockedDecrement(&ObjectType->TotalNumberOfHandles); + InterlockedDecrement((PLONG)&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Decremented count for: %p. HC LC %lx %lx\n", __FUNCTION__, @@ -388,7 +388,7 @@ } /* Increase total number of handles */ - InterlockedIncrement(&ObjectType->TotalNumberOfHandles); + InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", __FUNCTION__, @@ -494,7 +494,7 @@ } /* Increase total number of handles */ - InterlockedIncrement(&ObjectType->TotalNumberOfHandles); + InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfHandles); OBTRACE(OB_HANDLE_DEBUG, "%s - Incremented count for: %p. UNNAMED HC LC %lx %lx\n", __FUNCTION__, Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Fri Oct 20 17:19:13 2006 @@ -71,7 +71,7 @@ } /* Decrease the total */ - InterlockedDecrement(&ObjectType->TotalNumberOfObjects); + InterlockedDecrement((PLONG)&ObjectType->TotalNumberOfObjects); /* Check if we have create info */ if (Header->Flags & OB_FLAG_CREATE_INFO) Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Fri Oct 20 17:19:13 2006 @@ -724,7 +724,7 @@ { if (data->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { - RGBQUAD *rgb = data->bmiColors; + const RGBQUAD *rgb = data->bmiColors; DWORD col = RGB( rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue ); // Check if the first color of the colormap is black

1 0

[ion] 24577: - Implement DbgkpConvertKernelToUserStateChange. I just remembered that there's actually 3 debug subsystems in NT: Win32, Native and Kernel, so this structure will still need to be heavily parsed at the Win32 level (in kernel32) before user-mode debuggers can work (so I'll have to write a small native-mode debugger test app to test this implementation first). - Implement DbgkpMarkProcessPeb.
by ion＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: ion Date: Fri Oct 20 10:12:54 2006 New Revision: 24577 URL: http://svn.reactos.org/svn/reactos?rev=24577&view=rev Log: - Implement DbgkpConvertKernelToUserStateChange. I just remembered that there's actually 3 debug subsystems in NT: Win32, Native and Kernel, so this structure will still need to be heavily parsed at the Win32 level (in kernel32) before user-mode debuggers can work (so I'll have to write a small native-mode debugger test app to test this implementation first). - Implement DbgkpMarkProcessPeb. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Fri Oct 20 10:12:54 2006 @@ -1,13 +1,12 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/dbgk/dbgkutil.c * PURPOSE: User-Mode Debugging Support, Internal Debug Functions. - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG @@ -19,39 +18,7 @@ NTAPI DbgkCreateThread(PVOID StartAddress) { -#if 0 - LPC_DBG_MESSAGE Message; - LPC_DBG_MESSAGE Reply; - NTSTATUS Status; - - if (PsGetCurrentThread()->ThreadsProcess->DebugPort == NULL) - { - return; - } - - Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); - Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - - sizeof(LPC_MESSAGE); - Message.Type = DBG_EVENT_CREATE_THREAD; - Message.Status = STATUS_SUCCESS; - Message.Data.CreateThread.Reserved = 0; - Message.Data.CreateThread.StartAddress = StartAddress; - - /* FIXME: Freeze all threads in process */ - - /* Send the message to the process's debug port and wait for a reply */ - Status = - LpcSendDebugMessagePort(PsGetCurrentThread()->ThreadsProcess->DebugPort, - &Message, - &Reply); - if (!NT_SUCCESS(Status)) - { - return; - } - - /* FIXME: Examine reply */ - return; -#endif + /* FIXME */ } VOID Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Fri Oct 20 10:12:54 2006 @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/dbgk/debug.c + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/dbgk/dbgkobj.c * PURPOSE: User-Mode Debugging Support, Debug Object Management. - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -318,16 +317,144 @@ DbgkpConvertKernelToUserStateChange(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, IN PDEBUG_EVENT DebugEvent) { - /* FIXME: TODO */ - return; + /* Start by copying the client ID */ + WaitStateChange->AppClientId = DebugEvent->ClientId; + + /* Now check which kind of event this was */ + switch (DebugEvent->ApiMsg.ApiNumber) + { + /* New process */ + case DbgKmCreateProcessApi: + + /* Set the right native code */ + WaitStateChange->NewState = DbgCreateProcessStateChange; + + /* Copy the information */ + WaitStateChange->StateInfo.CreateProcessInfo.NewProcess = + DebugEvent->ApiMsg.CreateProcess; + + /* Clear the file handle for us */ + DebugEvent->ApiMsg.CreateProcess.FileHandle = NULL; + break; + + /* New thread */ + case DbgKmCreateThreadApi: + + /* Set the right native code */ + WaitStateChange->NewState = DbgCreateThreadStateChange; + + /* Copy information */ + WaitStateChange->StateInfo.CreateThread.NewThread.StartAddress = + DebugEvent->ApiMsg.CreateThread.StartAddress; + WaitStateChange->StateInfo.CreateThread.NewThread.SubSystemKey = + DebugEvent->ApiMsg.CreateThread.SubSystemKey; + break; + + /* Exception (or breakpoint/step) */ + case DbgKmExceptionApi: + + /* Look at the exception code */ + if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == + STATUS_BREAKPOINT) + { + /* Update this as a breakpoint exception */ + WaitStateChange->NewState = DbgBreakpointStateChange; + } + else if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == + STATUS_SINGLE_STEP) + { + /* Update this as a single step exception */ + WaitStateChange->NewState = DbgSingleStepStateChange; + } + else + { + /* Otherwise, set default exception */ + WaitStateChange->NewState = DbgExceptionStateChange; + } + + /* Copy the exception record */ + WaitStateChange->StateInfo.Exception.ExceptionRecord = + DebugEvent->ApiMsg.Exception.ExceptionRecord; + break; + + /* Process exited */ + case DbgKmExitProcessApi: + + /* Set the right native code and copy the exit code */ + WaitStateChange->NewState = DbgExitProcessStateChange; + WaitStateChange->StateInfo.ExitProcess.ExitStatus = + DebugEvent->ApiMsg.ExitProcess.ExitStatus; + break; + + /* Thread exited */ + case DbgKmExitThreadApi: + + /* Set the right native code */ + WaitStateChange->NewState = DbgExitThreadStateChange; + WaitStateChange->StateInfo.ExitThread.ExitStatus = + DebugEvent->ApiMsg.ExitThread.ExitStatus; + break; + + /* DLL Load */ + case DbgKmLoadDllApi: + + /* Set the native code */ + WaitStateChange->NewState = DbgLoadDllStateChange; + + /* Copy the data */ + WaitStateChange->StateInfo.LoadDll = DebugEvent->ApiMsg.LoadDll; + + /* Clear the file handle for us */ + DebugEvent->ApiMsg.LoadDll.FileHandle = NULL; + break; + + /* DLL Unload */ + case DbgKmUnloadDllApi: + + /* Set the native code and copy the address */ + WaitStateChange->NewState = DbgUnloadDllStateChange; + WaitStateChange->StateInfo.UnloadDll.BaseAddress = + DebugEvent->ApiMsg.UnloadDll.BaseAddress; + break; + + default: + + /* Shouldn't happen */ + ASSERT(FALSE); + } } VOID NTAPI DbgkpMarkProcessPeb(IN PEPROCESS Process) { - /* FIXME: TODO */ - return; + KAPC_STATE ApcState; + PAGED_CODE(); + + /* Acquire process rundown */ + if (!ExAcquireRundownProtection(&Process->RundownProtect)) return; + + /* Make sure we have a PEB */ + if (Process->Peb) + { + /* Attach to the process */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + + /* Acquire the debug port mutex */ + ExAcquireFastMutex(&DbgkpProcessDebugPortMutex); + + /* Set the IsBeingDebugged member of the PEB */ + Process->Peb->BeingDebugged = (Process->DebugPort) ? TRUE: FALSE; + + /* Release lock */ + ExReleaseFastMutex(&DbgkpProcessDebugPortMutex); + + /* Detach from the process */ + KeUnstackDetachProcess(&ApcState); + } + + /* Release rundown protection */ + ExReleaseRundownProtection(&Process->RundownProtect); } VOID

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