Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 19676: Add more debug info and better error control, from Elrond.
by gedmurphy＠svn.reactos.com 27 Nov '05

27 Nov '05

Add more debug info and better error control, from Elrond. A few minor changes by me. Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-11-27 06:48:34 UTC (rev 19675) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-11-27 11:29:07 UTC (rev 19676) @@ -40,7 +40,7 @@ #include "ifenum.h" #include <assert.h> -#define NDEBUG +#define DEBUG #include "debug.h" /* Globals */ @@ -95,7 +95,9 @@ /* String does not need to be freed: it points to the constant * string we provided */ - TRACE("returning %08x\n", (int)status); + if (!NT_SUCCESS(status)) { + DPRINT1("openTcpFile for <%wZ> failed: 0x%lx\n", &fileName, status); + } return status; } @@ -356,9 +358,13 @@ BOOL interfaceInfoComplete; int curInterf = 0, i; - if( NT_SUCCESS(status) ) - infoSetInt = HeapAlloc( GetProcessHeap(), 0, - sizeof(IFInfo) * numEntities ); + if (!NT_SUCCESS(status)) { + DPRINT1("getInterfaceInfoSet: tdiGetEntityIDSet() failed: 0x%lx\n", status); + return status; + } + + infoSetInt = HeapAlloc( GetProcessHeap(), 0, + sizeof(IFInfo) * numEntities ); if( infoSetInt ) { for( i = 0; i < numEntities; i++ ) { @@ -643,6 +649,11 @@ name ? getInterfaceInfoByName( tcpFile, name, ifInfo ) : getInterfaceInfoByIndex( tcpFile, index, ifInfo ); + + if (!NT_SUCCESS(status)) { + DPRINT1("getIPAddrEntryForIf returning %lx\n", status); + } + return status; } @@ -848,10 +859,14 @@ *NteInstance = Data.NewAddress; } + if (!NT_SUCCESS(status)) { + DPRINT1("addIPAddress for if %d returning 0x%lx\n", IfIndex, status); + } + switch( status ) { - case STATUS_SUCCESS: return ERROR_SUCCESS; - case STATUS_DEVICE_DOES_NOT_EXIST: return ERROR_DEV_NOT_EXIST; - default: return status; + case STATUS_SUCCESS: return ERROR_SUCCESS; + case STATUS_DEVICE_DOES_NOT_EXIST: return ERROR_DEV_NOT_EXIST; + default: return status; } } @@ -878,6 +893,13 @@ closeTcpFile( tcpFile ); - if( NT_SUCCESS(status) ) return ERROR_SUCCESS; - else return ERROR_GEN_FAILURE; + if (!NT_SUCCESS(status)) { + DPRINT1("deleteIpAddress(%lu) returning 0x%lx\n", NteContext, status); + } + + + if( NT_SUCCESS(status) ) + return ERROR_SUCCESS; + else + return ERROR_GEN_FAILURE; } _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c --- trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-11-27 06:48:34 UTC (rev 19675) +++ trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-11-27 11:29:07 UTC (rev 19676) @@ -37,7 +37,7 @@ # include <resolv.h> #endif - +#define DEBUG #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -84,7 +84,7 @@ */ DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG NteContext, PULONG NteInstance) { - return addIPAddress( Address, Netmask, IfIndex, NteContext, NteInstance ); + return RtlNtStatusToDosError(addIPAddress(Address, Netmask, IfIndex, NteContext, NteInstance)); } @@ -402,7 +402,7 @@ DWORD WINAPI DeleteIPAddress(ULONG NTEContext) { TRACE("NTEContext %ld\n", NTEContext); - return deleteIpAddress( NTEContext ); + return RtlNtStatusToDosError(deleteIpAddress(NTEContext)); } @@ -613,7 +613,7 @@ winsEnabled = TRUE; RegCloseKey(hKey); } - + TRACE("num of index is %lu\n", table->numIndexes); for (ndx = 0; ndx < table->numIndexes; ndx++) { PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx]; DWORD addrLen = sizeof(ptr->Address), type;

1 0

[sedwards] 19675: XML.cpp -> xml.cpp, XML.h -> xml.h. Sorry Windows users, if you make sure your stuff is in the correct case the first time then you wont have problems when doing a svn update.
by sedwards＠svn.reactos.com 27 Nov '05

27 Nov '05

XML.cpp -> xml.cpp, XML.h -> xml.h. Sorry Windows users, if you make sure your stuff is in the correct case the first time then you wont have problems when doing a svn update. Deleted: trunk/reactos/tools/buildno/XML.cpp Deleted: trunk/reactos/tools/buildno/XML.h Modified: trunk/reactos/tools/buildno/buildno.cpp Modified: trunk/reactos/tools/buildno/buildno.mak Added: trunk/reactos/tools/buildno/xml.cpp Added: trunk/reactos/tools/buildno/xml.h Deleted: trunk/reactos/tools/rbuild/XML.cpp Deleted: trunk/reactos/tools/rbuild/XML.h Modified: trunk/reactos/tools/rbuild/exception.h Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.mak Added: trunk/reactos/tools/rbuild/xml.cpp Added: trunk/reactos/tools/rbuild/xml.h _____ Deleted: trunk/reactos/tools/buildno/XML.cpp --- trunk/reactos/tools/buildno/XML.cpp 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/XML.cpp 2005-11-27 06:48:34 UTC (rev 19675) @@ -1,733 +0,0 @@ -// XML.cpp - -#include "pch.h" - -#ifdef _MSC_VER -#define MAX_PATH _MAX_PATH -#endif - -#ifdef WIN32 -# include <direct.h> -# include <io.h> -#else -# include <sys/stat.h> -# define MAX_PATH PATH_MAX -#endif -#include <assert.h> - -#include "XML.h" -#include "exception.h" -#include "ssprintf.h" - -using std::string; -using std::vector; - -#ifdef WIN32 -#define getcwd _getcwd -#endif//WIN32 - -static const char* WS = " \t\r\n"; -static const char* WSEQ = " =\t\r\n"; - -string working_directory; - -class XMLInclude -{ -public: - XMLElement *e; - Path path; - - XMLInclude ( XMLElement* e_, const Path& path_ ) - : e(e_), path(path_) - { - } -}; - -class XMLIncludes : public vector<XMLInclude*> -{ -public: - ~XMLIncludes() - { - for ( size_t i = 0; i < this->size(); i++ ) - delete (*this)[i]; - } -}; - -void -InitWorkingDirectory() -{ - // store the current directory for path calculations - working_directory.resize ( _MAX_PATH ); - working_directory[0] = 0; - getcwd ( &working_directory[0], working_directory.size() ); - working_directory.resize ( strlen ( working_directory.c_str() ) ); -} - -#ifdef _MSC_VER -unsigned __int64 -#else -unsigned long long -#endif -filelen ( FILE* f ) -{ -#ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); -#else -# ifdef __FreeBSD__ - struct stat file_stat; - if ( fstat(fileno(f), &file_stat) != 0 ) -# else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) -# endif // __FreeBSD__ - return 0; - return file_stat.st_size; - -#endif // WIN32 -} - -Path::Path() -{ - if ( !working_directory.size() ) - InitWorkingDirectory(); - string s ( working_directory ); - const char* p = strtok ( &s[0], "/\\" ); - while ( p ) - { - if ( *p ) - path.push_back ( p ); - p = strtok ( NULL, "/\\" ); - } -} - -Path::Path ( const Path& cwd, const string& file ) -{ - string s ( cwd.Fixup ( file, false ) ); - const char* p = strtok ( &s[0], "/\\" ); - while ( p ) - { - if ( *p ) - path.push_back ( p ); - p = strtok ( NULL, "/\\" ); - } -} - -string -Path::Fixup ( const string& file, bool include_filename ) const -{ - if ( strchr ( "/\\", file[0] ) -#ifdef WIN32 - // this squirreliness is b/c win32 has drive letters and *nix doesn't... - || file[1] == ':' -#endif//WIN32 - ) - { - return file; - } - vector<string> pathtmp ( path ); - string tmp ( file ); - const char* prev = strtok ( &tmp[0], "/\\" ); - const char* p = strtok ( NULL, "/\\" ); - while ( p ) - { - if ( !strcmp ( prev, "." ) ) - ; // do nothing - else if ( !strcmp ( prev, ".." ) ) - { - // this squirreliness is b/c win32 has drive letters and *nix doesn't... -#ifdef WIN32 - if ( pathtmp.size() > 1 ) -#else - if ( pathtmp.size() ) -#endif - pathtmp.resize ( pathtmp.size() - 1 ); - } - else - pathtmp.push_back ( prev ); - prev = p; - p = strtok ( NULL, "/\\" ); - } - if ( include_filename ) - pathtmp.push_back ( prev ); - - // reuse tmp variable to return recombined path - tmp.resize(0); - for ( size_t i = 0; i < pathtmp.size(); i++ ) - { - // this squirreliness is b/c win32 has drive letters and *nix doesn't... -#ifdef WIN32 - if ( i ) tmp += "/"; -#else - tmp += "/"; -#endif - tmp += pathtmp[i]; - } - return tmp; -} - -/*static*/ string -Path::RelativeFromWorkingDirectory ( const string& path ) -{ - vector<string> vwork, vpath, vout; - Path::Split ( vwork, working_directory, true ); - Path::Split ( vpath, path, true ); -#ifdef WIN32 - // this squirreliness is b/c win32 has drive letters and *nix doesn't... - // not possible to do relative across different drive letters - if ( vwork[0] != vpath[0] ) - return path; -#endif - size_t i = 0; - while ( i < vwork.size() && i < vpath.size() && vwork[i] == vpath[i] ) - ++i; - if ( i < vwork.size() ) - { - // path goes above our working directory, we will need some ..'s - for ( size_t j = 0; j < i; j++ ) - vout.push_back ( ".." ); - } - while ( i < vpath.size() ) - vout.push_back ( vpath[i++] ); - - // now merge vout into a string again - string out = "."; - for ( i = 0; i < vout.size(); i++ ) - { - out += "/" + vout[i]; - } - return out; -} - -/*static*/ void -Path::Split ( vector<string>& out, - const string& path, - bool include_last ) -{ - string s ( path ); - const char* prev = strtok ( &s[0], "/\\" ); - const char* p = strtok ( NULL, "/\\" ); - out.resize ( 0 ); - while ( p ) - { - out.push_back ( prev ); - prev = p; - p = strtok ( NULL, "/\\" ); - } - if ( include_last ) - out.push_back ( prev ); -} - -XMLFile::XMLFile() -{ -} - -void -XMLFile::close() -{ - _buf.resize(0); - _p = _end = NULL; -} - -bool -XMLFile::open(const string& filename_) -{ - close(); - FILE* f = fopen ( filename_.c_str(), "rb" ); - if ( !f ) - return false; - unsigned long len = (unsigned long)filelen(f); - _buf.resize ( len ); - fread ( &_buf[0], 1, len, f ); - fclose ( f ); - _p = _buf.c_str(); - _end = _p + len; - _filename = filename_; - next_token(); - return true; -} - -// next_token() moves the pointer to next token, which may be -// an xml element or a text element, basically it's a glorified -// skipspace, normally the user of this class won't need to call -// this function -void -XMLFile::next_token() -{ - _p += strspn ( _p, WS ); -} - -bool -XMLFile::next_is_text() -{ - return *_p != '<'; -} - -bool -XMLFile::more_tokens() -{ - return _p != _end; -} - -// get_token() is used to return a token, and move the pointer -// past the token -bool -XMLFile::get_token(string& token) -{ - const char* tokend; - if ( !strncmp ( _p, "" ); - if ( !tokend ) - tokend = _end; - else - tokend += 3; - } - else if ( !strncmp ( _p, "<?", 2 ) ) - { - tokend = strstr ( _p, "?>" ); - if ( !tokend ) - tokend = _end; - else - tokend += 2; - } - else if ( *_p == '<' ) - { - tokend = strchr ( _p, '>' ); - if ( !tokend ) - tokend = _end; - else - ++tokend; - } - else - { - tokend = strchr ( _p, '<' ); - if ( !tokend ) - tokend = _end; - while ( tokend > _p && isspace(tokend[-1]) ) - --tokend; - } - if ( tokend == _p ) - return false; - token = string ( _p, tokend-_p ); - _p = tokend; - next_token(); - return true; -} - -string -XMLFile::Location() const -{ - int line = 1; - const char* p = strchr ( _buf.c_str(), '\n' ); - while ( p && p < _p ) - { - ++line; - p = strchr ( p+1, '\n' ); - } - return ssprintf ( "%s(%i)",_filename.c_str(), line ); -} - -XMLAttribute::XMLAttribute() -{ -} - -XMLAttribute::XMLAttribute(const string& name_, - const string& value_) - : name(name_), value(value_) -{ -} - -XMLAttribute::XMLAttribute ( const XMLAttribute& src ) - : name(src.name), value(src.value) -{ - -} - -XMLAttribute& XMLAttribute::operator = ( const XMLAttribute& src ) -{ - name = src.name; - value = src.value; - return *this; -} - -XMLElement::XMLElement ( const string& location_ ) - : location(location_), - parentElement(NULL) -{ -} - -XMLElement::~XMLElement() -{ - size_t i; - for ( i = 0; i < attributes.size(); i++ ) - delete attributes[i]; - for ( i = 0; i < subElements.size(); i++ ) - delete subElements[i]; -} - -void -XMLElement::AddSubElement ( XMLElement* e ) -{ - subElements.push_back ( e ); - e->parentElement = this; -} - -// Parse() -// This function takes a single xml tag ( i.e. beginning with '<' and -// ending with '>', and parses out it's tag name and constituent -// attributes. -// Return Value: returns true if you need to look for a </tag> for -// the one it just parsed... -bool -XMLElement::Parse(const string& token, - bool& end_tag) -{ - const char* p = token.c_str(); - assert ( *p == '<' ); - ++p; - p += strspn ( p, WS ); - - // check if this is a comment - if ( !strncmp ( p, "!--", 3 ) ) - { - name = "!--"; - end_tag = false; - return false; // never look for end tag to a comment - } - - end_tag = ( *p == '/' ); - if ( end_tag ) - { - ++p; - p += strspn ( p, WS ); - } - const char* end = strpbrk ( p, WS ); - if ( !end ) - { - end = strpbrk ( p, "/>" ); - assert ( end ); - } - name = string ( p, end-p ); - p = end; - p += strspn ( p, WS ); - while ( *p != '>' && *p != '/' ) - { - end = strpbrk ( p, WSEQ ); - if ( !end ) - { - end = strpbrk ( p, "/>" ); - assert ( end ); - } - string attribute ( p, end-p ), value; - p = end; - p += strspn ( p, WS ); - if ( *p == '=' ) - { - ++p; - p += strspn ( p, WS ); - char quote = 0; - if ( strchr ( "\"'", *p ) ) - { - quote = *p++; - end = strchr ( p, quote ); - } - else - { - end = strpbrk ( p, WS ); - } - if ( !end ) - { - end = strchr ( p, '>' ); - assert(end); - if ( end[-1] == '/' ) - end--; - } - value = string ( p, end-p ); - p = end; - if ( quote && *p == quote ) - p++; - p += strspn ( p, WS ); - } - else if ( name[0] != '!' ) - { - throw XMLSyntaxErrorException ( location, - "attributes must have values" ); - } - attributes.push_back ( new XMLAttribute ( attribute, value ) ); - } - return !( *p == '/' ) && !end_tag; -} - -XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) -{ - // this would be faster with a tree-based container, but our attribute - // lists are likely to stay so short as to not be an issue. - for ( size_t i = 0; i < attributes.size(); i++ ) - { - if ( attribute == attributes[i]->name ) - return attributes[i]; - } - if ( required ) - { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); - } - return NULL; -} - -const XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) const -{ - // this would be faster with a tree-based container, but our attribute - // lists are likely to stay so short as to not be an issue. - for ( size_t i = 0; i < attributes.size(); i++ ) - { - if ( attribute == attributes[i]->name ) - return attributes[i]; - } - if ( required ) - { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); - } - return NULL; -} - -// XMLParse() -// This function reads a "token" from the file loaded in XMLFile -// if it finds a tag that is non-singular, it parses sub-elements and/or -// inner text into the XMLElement that it is building to return. -// Return Value: an XMLElement allocated via the new operator that contains -// it's parsed data. Keep calling this function until it returns NULL -// (no more data) -XMLElement* -XMLParse(XMLFile& f, - XMLIncludes* includes, - const Path& path, - bool* pend_tag = NULL ) -{ - string token; - if ( !f.get_token(token) ) - return NULL; - bool end_tag, is_include = false; - - while ( token[0] != '<' - || !strncmp ( token.c_str(), "<!--", 4 ) - || !strncmp ( token.c_str(), "<?", 2 ) ) - { - if ( token[0] != '<' ) - throw XMLSyntaxErrorException ( f.Location(), - "expecting xml tag, not '%s'", - token.c_str() ); - if ( !f.get_token(token) ) - return NULL; - } - - XMLElement* e = new XMLElement ( f.Location() ); - bool bNeedEnd = e->Parse ( token, end_tag ); - - if ( e->name == "xi:include" && includes ) - { - includes->push_back ( new XMLInclude ( e, path ) ); - is_include = true; - } - - if ( !bNeedEnd ) - { - if ( pend_tag ) - *pend_tag = end_tag; - else if ( end_tag ) - { - delete e; - throw XMLSyntaxErrorException ( f.Location(), - "end tag '%s' not expected", - token.c_str() ); - return NULL; - } - return e; - } - bool bThisMixingErrorReported = false; - while ( f.more_tokens() ) - { - if ( f.next_is_text() ) - { - if ( !f.get_token ( token ) || !token.size() ) - { - throw InvalidBuildFileException ( - f.Location(), - "internal tool error - get_token() failed when more_tokens() returned true" ); - break; - } - if ( e->subElements.size() && !bThisMixingErrorReported ) - { - throw XMLSyntaxErrorException ( f.Location(), - "mixing of inner text with sub elements" ); - bThisMixingErrorReported = true; - } - if ( strchr ( token.c_str(), '>' ) ) - { - throw XMLSyntaxErrorException ( f.Location(), - "invalid symbol '>'" ); - } - if ( e->value.size() ) - { - throw XMLSyntaxErrorException ( f.Location(), - "multiple instances of inner text" ); - e->value += " " + token; - } - else - e->value = token; - } - else - { - XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); - if ( !e2 ) - { - throw InvalidBuildFileException ( - e->location, - "end of file found looking for end tag" ); - break; - } - if ( end_tag ) - { - if ( e->name != e2->name ) - { - delete e2; - throw XMLSyntaxErrorException ( f.Location(), - "end tag name mismatch" ); - break; - } - delete e2; - break; - } - if ( e->value.size() && !bThisMixingErrorReported ) - { - throw XMLSyntaxErrorException ( f.Location(), - "mixing of inner text with sub elements" ); - bThisMixingErrorReported = true; - } - e->AddSubElement ( e2 ); - } - } - return e; -} - -void -XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path ) -{ - for ( ;; ) - { - XMLElement* e = XMLParse ( f, &includes, path ); - if ( !e ) - return; - head.AddSubElement ( e ); - } -} - -XMLElement* -XMLLoadInclude ( XMLElement* e, const Path& path, XMLIncludes& includes ) -{ - XMLAttribute* att; - att = e->GetAttribute("href",true); - assert(att); - - string file ( path.Fixup(att->value,true) ); - string top_file ( Path::RelativeFromWorkingDirectory ( file ) ); - e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) ); - XMLFile fInc; - if ( !fInc.open ( file ) ) - { - // look for xi:fallback element - for ( size_t i = 0; i < e->subElements.size(); i++ ) - { - XMLElement* e2 = e->subElements[i]; - if ( e2->name == "xi:fallback" ) - { - // now look for xi:include below... - for ( i = 0; i < e2->subElements.size(); i++ ) - { - XMLElement* e3 = e2->subElements[i]; - if ( e3->name == "xi:include" ) - { - return XMLLoadInclude ( e3, path, includes ); - } - } - throw InvalidBuildFileException ( - e2->location, - "<xi:fallback> must have a <xi:include> sub-element" ); - return NULL; - } - } - return NULL; - } - else - { - XMLElement* new_e = new XMLElement ( e->location ); - new_e->name = "xi:included"; - Path path2 ( path, att->value ); - XMLReadFile ( fInc, *new_e, includes, path2 ); - return new_e; - } -} - -XMLElement* -XMLLoadFile ( const string& filename, const Path& path ) -{ - XMLIncludes includes; - XMLFile f; - - if ( !f.open ( filename ) ) - throw FileNotFoundException ( filename ); - - XMLElement* head = new XMLElement("(virtual)"); - - XMLReadFile ( f, *head, includes, path ); - - for ( size_t i = 0; i < includes.size(); i++ ) - { - XMLElement* e = includes[i]->e; - XMLElement* e2 = XMLLoadInclude ( includes[i]->e, includes[i]->path, includes ); - if ( !e2 ) - { - throw FileNotFoundException ( - ssprintf("%s (referenced from %s)", - e->GetAttribute("top_href",true)->value.c_str(), - f.Location().c_str() ) ); - } - XMLElement* parent = e->parentElement; - XMLElement** parent_container = NULL; - if ( !parent ) - { - delete e; - throw Exception ( "internal tool error: xi:include doesn't have a parent" ); - return NULL; - } - for ( size_t j = 0; j < parent->subElements.size(); j++ ) - { - if ( parent->subElements[j] == e ) - { - parent_container = &parent->subElements[j]; - break; - } - } - if ( !parent_container ) - { - delete e; - throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" ); - return NULL; - } - // replace inclusion tree with the imported tree - e2->parentElement = e->parentElement; - e2->name = e->name; - e2->attributes = e->attributes; - *parent_container = e2; - e->attributes.resize(0); - delete e; - } - return head; -} _____ Deleted: trunk/reactos/tools/buildno/XML.h --- trunk/reactos/tools/buildno/XML.h 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/XML.h 2005-11-27 06:48:34 UTC (rev 19675) @@ -1,96 +0,0 @@ -// XML.h - -#ifndef XML_H -#define XML_H - -#include "pch.h" - -void -InitWorkingDirectory(); - -#ifdef _MSC_VER -unsigned __int64 -#else -unsigned long long -#endif -filelen ( FILE* f ); - -class Path -{ - std::vector<std::string> path; -public: - Path(); // initializes path to getcwd(); - Path ( const Path& cwd, const std::string& filename ); - std::string Fixup ( const std::string& filename, bool include_filename ) const; - - static std::string RelativeFromWorkingDirectory ( const std::string& path ); - - static void Split ( std::vector<std::string>& out, - const std::string& path, - bool include_last ); -}; - -class XMLFile -{ - friend class XMLElement; -public: - XMLFile(); - void close(); - bool open(const std::string& filename); - void next_token(); - bool next_is_text(); - bool more_tokens(); - bool get_token(std::string& token); - const std::string& filename() { return _filename; } - std::string Location() const; - -private: - std::string _buf, _filename; - - const char *_p, *_end; -}; - - -class XMLAttribute -{ -public: - std::string name; - std::string value; - - XMLAttribute(); - XMLAttribute ( const std::string& name_, const std::string& value_ ); - XMLAttribute ( const XMLAttribute& ); - XMLAttribute& operator = ( const XMLAttribute& ); -}; - - -class XMLElement -{ -public: - std::string location; - std::string name; - std::vector<XMLAttribute*> attributes; - XMLElement* parentElement; - std::vector<XMLElement*> subElements; - std::string value; - - XMLElement ( const std::string& location_ ); - ~XMLElement(); - bool Parse(const std::string& token, - bool& end_tag); - void AddSubElement ( XMLElement* e ); - XMLAttribute* GetAttribute ( const std::string& attribute, - bool required); - const XMLAttribute* GetAttribute ( const std::string& attribute, - bool required) const; -}; - -XMLElement* -XMLLoadFile ( const std::string& filename, const Path& path ); - -/*XMLElement* -XMLParse(XMLFile& f, - const Path& path, - bool* pend_tag = NULL);*/ - -#endif//XML_H _____ Modified: trunk/reactos/tools/buildno/buildno.cpp --- trunk/reactos/tools/buildno/buildno.cpp 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/buildno.cpp 2005-11-27 06:48:34 UTC (rev 19675) @@ -28,7 +28,7 @@ #include <time.h> #include <string.h> #include "version.h" -#include "XML.h" +#include "xml.h" #include "exception.h" #define FALSE 0 _____ Modified: trunk/reactos/tools/buildno/buildno.mak --- trunk/reactos/tools/buildno/buildno.mak 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/buildno.mak 2005-11-27 06:48:34 UTC (rev 19675) @@ -22,7 +22,7 @@ buildno.cpp \ exception.cpp \ ssprintf.cpp \ - XML.cpp \ + xml.cpp \ ) BUILDNO_OBJECTS = \ @@ -48,7 +48,7 @@ $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ -$(BUILDNO_INT_)XML.o: $(BUILDNO_BASE_)XML.cpp | $(BUILDNO_INT) +$(BUILDNO_INT_)xml.o: $(BUILDNO_BASE_)xml.cpp | $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ _____ Copied: trunk/reactos/tools/buildno/xml.cpp (from rev 19674, trunk/reactos/tools/buildno/XML.cpp) --- trunk/reactos/tools/buildno/XML.cpp 2005-11-27 06:34:50 UTC (rev 19674) +++ trunk/reactos/tools/buildno/xml.cpp 2005-11-27 06:48:34 UTC (rev 19675) @@ -0,0 +1,733 @@ +// xml.cpp + +#include "pch.h" + +#ifdef _MSC_VER +#define MAX_PATH _MAX_PATH +#endif + +#ifdef WIN32 +# include <direct.h> +# include <io.h> +#else +# include <sys/stat.h> +# define MAX_PATH PATH_MAX +#endif +#include <assert.h> + +#include "xml.h" +#include "exception.h" +#include "ssprintf.h" + +using std::string; +using std::vector; + +#ifdef WIN32 +#define getcwd _getcwd +#endif//WIN32 + +static const char* WS = " \t\r\n"; +static const char* WSEQ = " =\t\r\n"; + +string working_directory; + +class XMLInclude +{ +public: + XMLElement *e; + Path path; + + XMLInclude ( XMLElement* e_, const Path& path_ ) + : e(e_), path(path_) + { + } +}; + +class XMLIncludes : public vector<XMLInclude*> +{ +public: + ~XMLIncludes() + { + for ( size_t i = 0; i < this->size(); i++ ) + delete (*this)[i]; + } +}; + +void +InitWorkingDirectory() +{ + // store the current directory for path calculations + working_directory.resize ( _MAX_PATH ); + working_directory[0] = 0; + getcwd ( &working_directory[0], working_directory.size() ); + working_directory.resize ( strlen ( working_directory.c_str() ) ); +} + +#ifdef _MSC_VER +unsigned __int64 +#else +unsigned long long +#endif +filelen ( FILE* f ) +{ +#ifdef WIN32 + return _filelengthi64 ( _fileno(f) ); +#else +# ifdef __FreeBSD__ + struct stat file_stat; + if ( fstat(fileno(f), &file_stat) != 0 ) +# else + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) +# endif // __FreeBSD__ + return 0; + return file_stat.st_size; + +#endif // WIN32 +} + +Path::Path() +{ + if ( !working_directory.size() ) + InitWorkingDirectory(); + string s ( working_directory ); + const char* p = strtok ( &s[0], "/\\" ); + while ( p ) + { + if ( *p ) + path.push_back ( p ); + p = strtok ( NULL, "/\\" ); + } +} + +Path::Path ( const Path& cwd, const string& file ) +{ + string s ( cwd.Fixup ( file, false ) ); + const char* p = strtok ( &s[0], "/\\" ); + while ( p ) + { + if ( *p ) + path.push_back ( p ); + p = strtok ( NULL, "/\\" ); + } +} + +string +Path::Fixup ( const string& file, bool include_filename ) const +{ + if ( strchr ( "/\\", file[0] ) +#ifdef WIN32 + // this squirreliness is b/c win32 has drive letters and *nix doesn't... + || file[1] == ':' [truncated at 1000 lines; 2744 more skipped]

1 0

[royce] 19674: remove xml.h/cpp's dependancy on exception.h/cpp - in preparation to move xml.h/cpp and ssprintf.h/ccp out of rbuild directory since buildno uses them too
by royce＠svn.reactos.com 27 Nov '05

27 Nov '05

remove xml.h/cpp's dependancy on exception.h/cpp - in preparation to move xml.h/cpp and ssprintf.h/ccp out of rbuild directory since buildno uses them too Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/XML.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/bootstrap.cpp Modified: trunk/reactos/tools/rbuild/compilerflag.cpp Modified: trunk/reactos/tools/rbuild/exception.cpp Modified: trunk/reactos/tools/rbuild/exception.h Modified: trunk/reactos/tools/rbuild/include.cpp Modified: trunk/reactos/tools/rbuild/linkerflag.cpp Modified: trunk/reactos/tools/rbuild/linkerscript.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.dsp Modified: trunk/reactos/tools/rbuild/stubbedcomponent.cpp Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -15,11 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "pch.h" -#ifndef MAX_PATH -#define MAX_PATH _MAX_PATH -#endif +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER #ifdef WIN32 # include <direct.h> @@ -31,9 +30,12 @@ #include <assert.h> #include "XML.h" -#include "exception.h" #include "ssprintf.h" +#ifndef MAX_PATH +#define MAX_PATH _MAX_PATH +#endif + using std::string; using std::vector; @@ -46,6 +48,29 @@ string working_directory; +XMLException::XMLException ( + const std::string& location, + const char* format, ... ) +{ + va_list args; + va_start ( args, format ); + SetExceptionV ( location, format, args ); + va_end ( args ); +} + +void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) +{ + _e = location + ": " + ssvprintf(format,args); +} + +void XMLException::SetException ( const std::string& location, const char* format, ... ) +{ + va_list args; + va_start ( args, format ); + SetExceptionV ( location, format, args ); + va_end ( args ); +} + XMLIncludes::~XMLIncludes() { for ( size_t i = 0; i < this->size(); i++ ) @@ -56,7 +81,7 @@ InitWorkingDirectory() { // store the current directory for path calculations - working_directory.resize ( _MAX_PATH ); + working_directory.resize ( MAX_PATH ); working_directory[0] = 0; getcwd ( &working_directory[0], working_directory.size() ); working_directory.resize ( strlen ( working_directory.c_str() ) ); @@ -70,18 +95,17 @@ filelen ( FILE* f ) { #ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); + return _filelengthi64 ( _fileno(f) ); #else # ifdef __FreeBSD__ - struct stat file_stat; - if ( fstat(fileno(f), &file_stat) != 0 ) + struct stat file_stat; + if ( fstat(fileno(f), &file_stat) != 0 ) # else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) # endif // __FreeBSD__ - return 0; - return file_stat.st_size; - + return 0; + return file_stat.st_size; #endif // WIN32 } @@ -227,9 +251,10 @@ } void -Path::Split ( vector<string>& out, - const string& path, - bool include_last ) +Path::Split ( + vector<string>& out, + const string& path, + bool include_last ) { string s ( path ); const char* prev = strtok ( &s[0], "/\\" ); @@ -263,7 +288,7 @@ } bool -XMLFile::open(const string& filename_) +XMLFile::open ( const string& filename_ ) { close(); FILE* f = fopen ( filename_.c_str(), "rb" ); @@ -297,7 +322,7 @@ } bool -XMLFile::more_tokens() +XMLFile::more_tokens () { return _p != _end; } @@ -305,7 +330,7 @@ // get_token() is used to return a token, and move the pointer // past the token bool -XMLFile::get_token(string& token) +XMLFile::get_token ( string& token ) { const char* tokend; if ( !strncmp ( _p, "<!--", 4 ) ) @@ -372,8 +397,9 @@ { } -XMLAttribute::XMLAttribute(const string& name_, - const string& value_) +XMLAttribute::XMLAttribute( + const string& name_, + const string& value_ ) : name(name_), value(value_) { } @@ -391,8 +417,9 @@ return *this; } -XMLElement::XMLElement ( XMLFile* xmlFile, - const string& location ) +XMLElement::XMLElement ( + XMLFile* xmlFile, + const string& location ) : xmlFile ( xmlFile ), location ( location ), parentElement ( NULL ) @@ -422,8 +449,9 @@ // Return Value: returns true if you need to look for a </tag> for // the one it just parsed... bool -XMLElement::Parse(const string& token, - bool& end_tag) +XMLElement::Parse ( + const string& token, + bool& end_tag ) { const char* p = token.c_str(); assert ( *p == '<' ); @@ -493,8 +521,9 @@ } else if ( name[0] != '!' ) { - throw XMLSyntaxErrorException ( location, - "attributes must have values" ); + throw XMLSyntaxErrorException ( + location, + "attributes must have values" ); } attributes.push_back ( new XMLAttribute ( attribute, value ) ); } @@ -502,8 +531,9 @@ } XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) +XMLElement::GetAttribute ( + const string& attribute, + bool required ) { // this would be faster with a tree-based container, but our attribute // lists are likely to stay so short as to not be an issue. @@ -514,16 +544,18 @@ } if ( required ) { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); + throw XMLRequiredAttributeNotFoundException ( + location, + attribute, + name ); } return NULL; } const XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) const +XMLElement::GetAttribute ( + const string& attribute, + bool required ) const { // this would be faster with a tree-based container, but our attribute // lists are likely to stay so short as to not be an issue. @@ -534,13 +566,57 @@ } if ( required ) { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); + throw XMLRequiredAttributeNotFoundException ( + location, + attribute, + name ); } return NULL; } +int +XMLElement::FindElement ( const std::string& type, int prev ) const +{ + int done = subElements.size(); + while ( ++prev < done ) + { + XMLElement* e = subElements[prev]; + if ( e->name == type ) + return prev; + } + return -1; +} + +int +XMLElement::GetElements ( + const std::string& type, + std::vector<XMLElement*>& v ) +{ + int find = FindElement ( type ); + v.resize ( 0 ); + while ( find != -1 ) + { + v.push_back ( subElements[find] ); + find = FindElement ( type, find ); + } + return v.size(); +} + +int +XMLElement::GetElements ( + const std::string& type, + std::vector<const XMLElement*>& v ) const +{ + int find = FindElement ( type ); + v.resize ( 0 ); + while ( find != -1 ) + { + v.push_back ( subElements[find] ); + find = FindElement ( type, find ); + } + return v.size(); +} + // XMLParse() // This function reads a "token" from the file loaded in XMLFile // if it finds a tag that is non-singular, it parses sub-elements and/or @@ -549,30 +625,38 @@ // it's parsed data. Keep calling this function until it returns NULL // (no more data) XMLElement* -XMLParse ( XMLFile& f, - XMLIncludes* includes, - const Path& path, - bool* pend_tag = NULL ) +XMLParse ( + XMLFile& f, + XMLIncludes* includes, + const Path& path, + bool* pend_tag = NULL ) { string token, location; if ( !f.get_token(token,location) ) return NULL; bool end_tag, is_include = false; - while ( token[0] != '<' - || !strncmp ( token.c_str (), "<!--", 4 ) - || !strncmp ( token.c_str (), "<?", 2 ) ) + while + ( + token[0] != '<' + || !strncmp ( token.c_str (), "<!--", 4 ) + || !strncmp ( token.c_str (), "<?", 2 ) + ) { if ( token[0] != '<' ) - throw XMLSyntaxErrorException ( location, - "expecting xml tag, not '%s'", - token.c_str () ); - if ( !f.get_token(token,location) ) + { + throw XMLSyntaxErrorException ( + location, + "expecting xml tag, not '%s'", + token.c_str () ); + } + if ( !f.get_token ( token, location ) ) return NULL; } - XMLElement* e = new XMLElement ( &f, - location ); + XMLElement* e = new XMLElement ( + &f, + location ); bool bNeedEnd = e->Parse ( token, end_tag ); if ( e->name == "xi:include" && includes ) @@ -581,8 +665,10 @@ att = e->GetAttribute ( "href", true ); assert ( att ); string includeFile ( path.Fixup ( att->value, true ) ); - string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) ); - includes->push_back ( new XMLInclude ( e, path, topIncludeFile ) ); + string topIncludeFile ( + Path::RelativeFromWorkingDirectory ( includeFile ) ); + includes->push_back ( + new XMLInclude ( e, path, topIncludeFile ) ); is_include = true; } @@ -593,9 +679,10 @@ else if ( end_tag ) { delete e; - throw XMLSyntaxErrorException ( location, - "end tag '%s' not expected", - token.c_str() ); + throw XMLSyntaxErrorException ( + location, + "end tag '%s' not expected", + token.c_str() ); return NULL; } return e; @@ -607,26 +694,29 @@ { if ( !f.get_token ( token, location ) || token.size () == 0 ) { - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( location, "internal tool error - get_token() failed when more_tokens() returned true" ); break; } if ( e->subElements.size() && !bThisMixingErrorReported ) { - throw XMLSyntaxErrorException ( location, - "mixing of inner text with sub elements" ); + throw XMLSyntaxErrorException ( + location, + "mixing of inner text with sub elements" ); bThisMixingErrorReported = true; } if ( strchr ( token.c_str (), '>' ) ) { - throw XMLSyntaxErrorException ( location, - "invalid symbol '>'" ); + throw XMLSyntaxErrorException ( + location, + "invalid symbol '>'" ); } if ( e->value.size() > 0 ) { - throw XMLSyntaxErrorException ( location, - "multiple instances of inner text" ); + throw XMLSyntaxErrorException ( + location, + "multiple instances of inner text" ); e->value += " " + token; } else @@ -634,13 +724,14 @@ } else { - XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); + XMLElement* e2 = XMLParse ( + f, is_include ? NULL : includes, path, &end_tag ); if ( !e2 ) { string e_location = e->location; string e_name = e->name; delete e; - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( e_location, "end of file found looking for end tag: </%s>", e_name.c_str() ); @@ -669,8 +760,9 @@ { string e_location = e->location; delete e; - throw XMLSyntaxErrorException ( e_location, - "mixing of inner text with sub elements" ); + throw XMLSyntaxErrorException ( + e_location, + "mixing of inner text with sub elements" ); bThisMixingErrorReported = true; } e->AddSubElement ( e2 ); @@ -680,7 +772,11 @@ } void -XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path ) +XMLReadFile ( + XMLFile& f, + XMLElement& head, + XMLIncludes& includes, + const Path& path ) { for ( ;; ) { @@ -692,8 +788,9 @@ } XMLElement* -XMLLoadInclude ( XMLInclude& include, - XMLIncludes& includes ) +XMLLoadInclude ( + XMLInclude& include, + XMLIncludes& includes ) { XMLAttribute* att; att = include.e->GetAttribute("href", true); @@ -720,13 +817,17 @@ { att = e3->GetAttribute ( "href", true ); assert ( att ); - string includeFile ( include.path.Fixup ( att->value, true ) ); - string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) ); - XMLInclude* fallbackInclude = new XMLInclude ( e3, include.path, topIncludeFile ); - return XMLLoadInclude ( *fallbackInclude, includes ); + string includeFile ( + include.path.Fixup ( att->value, true ) ); + string topIncludeFile ( + Path::RelativeFromWorkingDirectory ( includeFile ) ); + XMLInclude* fallbackInclude = + new XMLInclude ( e3, include.path, topIncludeFile ); + return XMLLoadInclude ( + *fallbackInclude, includes ); } } - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( e2->location, "<xi:fallback> must have a <xi:include> sub-element" ); return NULL; @@ -737,8 +838,9 @@ else { include.fileExists = true; - XMLElement* new_e = new XMLElement ( fInc, - include.e->location ); + XMLElement* new_e = new XMLElement ( + fInc, + include.e->location ); new_e->name = "xi:included"; Path path2 ( include.path, att->value ); XMLReadFile ( *fInc, *new_e, includes, path2 ); @@ -754,10 +856,12 @@ XMLFile* f = new XMLFile(); if ( !f->open ( filename ) ) - throw FileNotFoundException ( filename ); + { + throw XMLFileNotFoundException ( "(virtual)", filename ); + return NULL; + } - XMLElement* head = new XMLElement ( f, - "(virtual)" ); + XMLElement* head = new XMLElement ( f, "(virtual)" ); XMLReadFile ( *f, *head, includes, path ); @@ -767,17 +871,17 @@ XMLElement* e2 = XMLLoadInclude ( *includes[i], includes ); if ( !e2 ) { - throw FileNotFoundException ( - ssprintf ( "%s (referenced from %s)", - e->GetAttribute ( "top_href", true )->value.c_str (), - f->Location ().c_str () ) ); + throw XMLFileNotFoundException ( + f->Location(), + e->GetAttribute ( "top_href", true )->value ); } XMLElement* parent = e->parentElement; XMLElement** parent_container = NULL; if ( !parent ) { + string location = e->location; delete e; - throw Exception ( "internal tool error: xi:include doesn't have a parent" ); + throw XMLException ( location, "internal tool error: xi:include doesn't have a parent" ); return NULL; } for ( size_t j = 0; j < parent->subElements.size (); j++ ) @@ -790,8 +894,9 @@ } if ( !parent_container ) { + string location = e->location; delete e; - throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" ); + throw XMLException ( location, "internal tool error: couldn't find xi:include in parent's sub-elements" ); return NULL; } // replace inclusion tree with the imported tree _____ Modified: trunk/reactos/tools/rbuild/XML.h --- trunk/reactos/tools/rbuild/XML.h 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/XML.h 2005-11-27 06:34:50 UTC (rev 19674) @@ -18,7 +18,9 @@ #ifndef XML_H #define XML_H -#include "pch.h" +#include <string> +#include <vector> +#include <stdarg.h> class XMLElement; @@ -34,6 +36,75 @@ #endif filelen ( FILE* f ); +class XMLException +{ +public: + XMLException ( const std::string& location, const char* format, ... ); + const std::string& operator *() { return _e; } + +protected: + XMLException() {} + void SetExceptionV ( const std::string& location, const char* format, va_list args ); + void SetException ( const std::string& location, const char* format, ... ); + +private: + std::string _e; +}; + +class XMLSyntaxErrorException : public XMLException +{ +public: + XMLSyntaxErrorException ( + const std::string& location, + const char* format, ... ) + { + va_list args; + va_start ( args, format ); + SetExceptionV ( location, format, args ); + va_end ( args ); + } +}; + +class XMLRequiredAttributeNotFoundException : public XMLException +{ +public: + XMLRequiredAttributeNotFoundException ( + const std::string& location, + const std::string& attributeName, + const std::string& elementName ) + { + SetException ( location, "Required attribute '%s' not found in element '%s'", + attributeName.c_str(), + elementName.c_str() ); + } +}; + +class XMLInvalidBuildFileException : public XMLException +{ +public: + XMLInvalidBuildFileException ( + const std::string& location, + const char* format, + ... ) + { + va_list args; + va_start ( args, format ); + SetExceptionV ( location, format, args ); + va_end ( args ); + } +}; + +class XMLFileNotFoundException : public XMLException +{ +public: + XMLFileNotFoundException ( + const std::string& location, + const std::string& filename ) + { + SetException ( location, "Can't open file '%s'", filename.c_str() ); + } +}; + class Path { std::vector<std::string> path; @@ -46,9 +117,10 @@ static std::string RelativeFromWorkingDirectory ( const std::string& path ); static std::string RelativeFromDirectory ( const std::string& path, const std::string& base_directory); - static void Split ( std::vector<std::string>& out, - const std::string& path, - bool include_last ); + static void Split ( + std::vector<std::string>& out, + const std::string& path, + bool include_last ); }; class XMLInclude @@ -59,8 +131,13 @@ std::string topIncludeFilename; bool fileExists; - XMLInclude ( XMLElement* e_, const Path& path_, const std::string topIncludeFilename_ ) - : e ( e_ ), path ( path_ ), topIncludeFilename ( topIncludeFilename_ ) + XMLInclude ( + XMLElement* e_, + const Path& path_, + const std::string topIncludeFilename_ ) + : e ( e_ ), + path ( path_ ), + topIncludeFilename ( topIncludeFilename_ ) { } }; @@ -117,21 +194,43 @@ std::vector<XMLElement*> subElements; std::string value; - XMLElement ( XMLFile* xmlFile, - const std::string& location ); + XMLElement ( + XMLFile* xmlFile, + const std::string& location ); + ~XMLElement(); - bool Parse(const std::string& token, - bool& end_tag); + + bool Parse ( + const std::string& token, + bool& end_tag); + void AddSubElement ( XMLElement* e ); - XMLAttribute* GetAttribute ( const std::string& attribute, - bool required); - const XMLAttribute* GetAttribute ( const std::string& attribute, - bool required) const; + + XMLAttribute* GetAttribute ( + const std::string& attribute, + bool required); + + const XMLAttribute* GetAttribute ( + const std::string& attribute, + bool required ) const; + + int FindElement ( + const std::string& type, + int prev = -1 ) const; + + int GetElements ( + const std::string& type, + std::vector<XMLElement*>& v ); + + int GetElements ( + const std::string& type, + std::vector<const XMLElement*>& v ) const; }; XMLElement* -XMLLoadFile ( const std::string& filename, - const Path& path, - XMLIncludes& includes ); +XMLLoadFile ( + const std::string& filename, + const Path& path, + XMLIncludes& includes ); #endif // XML_H _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -1944,8 +1944,9 @@ if ( invoke.invokeModule->type != BuildTool ) { - throw InvalidBuildFileException ( module.node.location, - "Only modules of type buildtool can be invoked." ); + throw XMLInvalidBuildFileException ( + module.node.location, + "Only modules of type buildtool can be invoked." ); } string invokeTarget = module.GetInvocationTarget ( i ); _____ Modified: trunk/reactos/tools/rbuild/bootstrap.cpp --- trunk/reactos/tools/rbuild/bootstrap.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/bootstrap.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -72,7 +72,7 @@ { if ( !IsSupportedModuleType ( module->type ) ) { - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( node.location, "<bootstrap> is not applicable for this module type." ); } _____ Modified: trunk/reactos/tools/rbuild/compilerflag.cpp --- trunk/reactos/tools/rbuild/compilerflag.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/compilerflag.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -51,7 +51,7 @@ { if (node.value.size () == 0) { - throw InvalidBuildFileException ( + throw XMLInvalidBuildFileException ( node.location, "<compilerflag> is empty." ); } _____ Modified: trunk/reactos/tools/rbuild/exception.cpp --- trunk/reactos/tools/rbuild/exception.cpp 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/exception.cpp 2005-11-27 06:34:50 UTC (rev 19674) @@ -26,58 +26,60 @@ Exception::Exception ( const string& message ) { - Message = message; + _e = message; } -Exception::Exception ( const char* format, - ...) +Exception::Exception ( const char* format, ...) { va_list args; - va_start ( args, - format); - Message = ssvprintf ( format, - args); + va_start ( args, format); + _e = ssvprintf ( format, args); va_end ( args ); } -void Exception::SetMessage ( const char* message, - va_list args) +void Exception::SetMessage ( const char* format, ...) { - Message = ssvprintf ( message, - args); + va_list args; + va_start ( args, format); + _e = ssvprintf ( format, args); + va_end ( args ); } +void Exception::SetMessageV ( const char* message, va_list args ) +{ + _e = ssvprintf ( message, args); +} + OutOfMemoryException::OutOfMemoryException () : Exception ( "Out of memory" ) { } -InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber ) +InvalidOperationException::InvalidOperationException ( + const char* filename, + const int linenumber ) + : Exception ( "%s:%d", filename, linenumber ) { - Message = ssprintf ( "%s:%d", - filename, - linenumber ); } -InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber, - const char* message, - ... ) +InvalidOperationException::InvalidOperationException ( + const char* filename, + const int linenumber, + const char* message, + ... ) { string errorMessage; va_list args; - va_start ( args, - message ); - errorMessage = ssvprintf ( message, - args ); + va_start ( args, message ); + errorMessage = ssvprintf ( message, args ); va_end ( args ); - Message = ssprintf ( "%s:%d %s", - filename, - linenumber, - errorMessage.c_str () ); + SetMessage ( + "%s:%d %s", + filename, + linenumber, + errorMessage.c_str () ); } @@ -97,49 +99,15 @@ } -InvalidBuildFileException::InvalidBuildFileException ( const string& location, - const char* message, - ...) -{ - va_list args; - va_start ( args, - message ); - SetLocationMessage ( location, message, args ); - va_end ( args ); -} - -InvalidBuildFileException::InvalidBuildFileException () -{ -} - -void -InvalidBuildFileException::SetLocationMessage ( const std::string& location, - const char* message, - va_list args ) -{ - Message = location + ": " + ssvprintf ( message, args ); -} - -XMLSyntaxErrorException::XMLSyntaxErrorException ( const string& location, - const char* message, - ... ) -{ - va_list args; - va_start ( args, - message ); - SetLocationMessage ( location, message, args ); - va_end ( args ); -} - - RequiredAttributeNotFoundException::RequiredAttributeNotFoundException ( const string& location, const string& attributeName, const string& elementName ) - : InvalidBuildFileException ( location, - "Required attribute '%s' not found on '%s'.", - attributeName.c_str (), - elementName.c_str ()) + : XMLInvalidBuildFileException ( + location, + "Required attribute '%s' not found on '%s'.", + attributeName.c_str (), + elementName.c_str ()) { } @@ -147,10 +115,11 @@ const string& location, const string& name, const string& value ) - : InvalidBuildFileException ( location, - "Attribute '%s' has an invalid value '%s'.", - name.c_str (), - value.c_str () ) + : XMLInvalidBuildFileException ( + location, + "Attribute '%s' has an invalid value '%s'.", + name.c_str (), + value.c_str () ) { } @@ -171,9 +140,10 @@ UnknownModuleTypeException::UnknownModuleTypeException ( const string& location, int moduletype ) - : InvalidBuildFileException ( location, - "module type requested: %i", - moduletype ) + : XMLInvalidBuildFileException ( + location, + "module type requested: %i", + moduletype ) { } _____ Modified: trunk/reactos/tools/rbuild/exception.h --- trunk/reactos/tools/rbuild/exception.h 2005-11-27 06:20:33 UTC (rev 19673) +++ trunk/reactos/tools/rbuild/exception.h 2005-11-27 06:34:50 UTC (rev 19674) @@ -19,6 +19,7 @@ #define __EXCEPTION_H #include "pch.h" +#include "XML.h" class Exception { @@ -26,11 +27,15 @@ Exception ( const std::string& message ); Exception ( const char* format, ...); - std::string Message; + const std::string& operator *() { return _e; } + protected: Exception (); - void SetMessage ( const char* message, - va_list args ); + void SetMessage ( const char* message, ... ); + void SetMessageV ( const char* message, va_list args ); + +private: + std::string _e; }; @@ -68,39 +73,17 @@ std::string Filename; }; -class InvalidBuildFileException : public Exception -{ -public: - InvalidBuildFileException ( const std::string& location, - const char* message, - ...); - void SetLocationMessage ( const std::string& location, - const char* message, - va_list args ); -protected: - InvalidBuildFileException (); -}; - -class XMLSyntaxErrorException : public InvalidBuildFileException +class RequiredAttributeNotFoundException : public XMLInvalidBuildFileException { public: - XMLSyntaxErrorException ( const std::string& location, - const char* message, - ... ); -}; - - -class RequiredAttributeNotFoundException : public InvalidBuildFileException -{ -public: RequiredAttributeNotFoundException ( const std::string& location, const std::string& attributeName, const std::string& elementName ); [truncated at 1000 lines; 679 more skipped]

1 0

[sedwards] 19673: more crt, crtdll and msvcrt cleanup
by sedwards＠svn.reactos.com 27 Nov '05

27 Nov '05

more crt, crtdll and msvcrt cleanup Modified: trunk/reactos/lib/crt/conio/cgets.c Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/cputs.c Modified: trunk/reactos/lib/crt/conio/getch.c Modified: trunk/reactos/lib/crt/conio/getche.c Modified: trunk/reactos/lib/crt/conio/kbhit.c Modified: trunk/reactos/lib/crt/conio/putch.c Modified: trunk/reactos/lib/crt/conio/ungetch.c Modified: trunk/reactos/lib/crt/direct/getcwd.c Modified: trunk/reactos/lib/crt/direct/getdcwd.c Modified: trunk/reactos/lib/crt/float/isnan.c Modified: trunk/reactos/lib/crt/include/float.h Modified: trunk/reactos/lib/crt/include/internal/atexit.h Modified: trunk/reactos/lib/crt/include/internal/console.h Modified: trunk/reactos/lib/crt/include/internal/file.h Modified: trunk/reactos/lib/crt/include/internal/math.h Modified: trunk/reactos/lib/crt/include/internal/tls.h Modified: trunk/reactos/lib/crt/io/access.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/math/hypot.c Modified: trunk/reactos/lib/crt/math/modf.c Modified: trunk/reactos/lib/crt/mbstring/mbscat.c Modified: trunk/reactos/lib/crt/mbstring/mbscpy.c Modified: trunk/reactos/lib/crt/mbstring/mbsdup.c Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/process/_system.c Modified: trunk/reactos/lib/crt/signal/signal.c Modified: trunk/reactos/lib/crt/stdio/fgetchar.c Modified: trunk/reactos/lib/crt/stdio/gets.c Modified: trunk/reactos/lib/crt/stdio/perror.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c Modified: trunk/reactos/lib/crt/stdlib/atexit.c Modified: trunk/reactos/lib/crt/stdlib/errno.c Modified: trunk/reactos/lib/crt/stdlib/makepath.c Modified: trunk/reactos/lib/crt/stdlib/splitp.c Modified: trunk/reactos/lib/crt/stdlib/wsplitp.c Modified: trunk/reactos/lib/crt/wine/heap.c Modified: trunk/reactos/lib/crt/wine/scanf.c Modified: trunk/reactos/lib/crtdll/dllmain.c Modified: trunk/reactos/lib/crtdll/precomp.h Modified: trunk/reactos/lib/msvcrt/dllmain.c Modified: trunk/reactos/lib/msvcrt/precomp.h Modified: trunk/reactos/lib/rtl/math.c _____ Modified: trunk/reactos/lib/crt/conio/cgets.c --- trunk/reactos/lib/crt/conio/cgets.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cgets.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -6,8 +6,7 @@ * PROGRAMMER: Eric Kohl (Imported from DJGPP) */ -#include <conio.h> -#include <stdlib.h> +#include "precomp.h" /* * @implemented _____ Modified: trunk/reactos/lib/crt/conio/cprintf.c --- trunk/reactos/lib/crt/conio/cprintf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cprintf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -8,8 +8,6 @@ #include "precomp.h" -#include <conio.h> - /* * @unimplemented */ _____ Modified: trunk/reactos/lib/crt/conio/cputs.c --- trunk/reactos/lib/crt/conio/cputs.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/cputs.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,7 +9,6 @@ */ #include "precomp.h" -#include <conio.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/conio/getch.c --- trunk/reactos/lib/crt/conio/getch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/getch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,10 +9,7 @@ */ #include "precomp.h" -#include <conio.h> -#include <internal/console.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/conio/getche.c --- trunk/reactos/lib/crt/conio/getche.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/getche.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -10,10 +10,8 @@ * 28/12/98: Created */ -#include <conio.h> -#include <internal/console.h> +#include "precomp.h" - int _getche(void) { if (char_avail) _____ Modified: trunk/reactos/lib/crt/conio/kbhit.c --- trunk/reactos/lib/crt/conio/kbhit.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/kbhit.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,10 +9,7 @@ */ #include "precomp.h" -#include <conio.h> -#include <internal/console.h> - /* * FIXME PeekConsoleInput returns more than keyboard hits * _____ Modified: trunk/reactos/lib/crt/conio/putch.c --- trunk/reactos/lib/crt/conio/putch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/putch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,7 +9,6 @@ */ #include "precomp.h" -#include <conio.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/conio/ungetch.c --- trunk/reactos/lib/crt/conio/ungetch.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/conio/ungetch.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -12,11 +12,6 @@ #include "precomp.h" -#include <conio.h> -#include <internal/console.h> - - - int char_avail = 0; int ungot_char = 0; _____ Modified: trunk/reactos/lib/crt/direct/getcwd.c --- trunk/reactos/lib/crt/direct/getcwd.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/direct/getcwd.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,7 +1,6 @@ #include "precomp.h" #include <direct.h> #include <stdlib.h> -#include <errno.h> #include <tchar.h> /* _____ Modified: trunk/reactos/lib/crt/direct/getdcwd.c --- trunk/reactos/lib/crt/direct/getdcwd.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/direct/getdcwd.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,7 +2,6 @@ #include <direct.h> #include <internal/debug.h> #include <tchar.h> -#include <errno.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/float/isnan.c --- trunk/reactos/lib/crt/float/isnan.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/float/isnan.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -16,9 +16,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <math.h> -#include <float.h> -#include <internal/ieee.h> +#include "precomp.h" /* _____ Modified: trunk/reactos/lib/crt/include/float.h --- trunk/reactos/lib/crt/include/float.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/float.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -91,9 +91,13 @@ #define _FPE_STACKUNDERFLOW 0x8b #define _FPE_EXPLICITGEN 0x8c /* raise( SIGFPE ); */ -#ifndef __GNUC__ -#define DBL_MAX_10_EXP 308 +#ifndef DBL_MAX_10_EXP +#define DBL_MAX_10_EXP 308 +#endif +#ifndef S_IFIFO #define S_IFIFO -1 +#endif +#ifndef UINT64_MAX #define UINT64_MAX 0xffffffffffffffff #endif _____ Modified: trunk/reactos/lib/crt/include/internal/atexit.h --- trunk/reactos/lib/crt/include/internal/atexit.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/atexit.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,6 +2,9 @@ #ifndef __CRT_INTERNAL_ATEXIT_H #define __CRT_INTERNAL_ATEXIT_H +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif struct __atexit { struct __atexit* __next; _____ Modified: trunk/reactos/lib/crt/include/internal/console.h --- trunk/reactos/lib/crt/include/internal/console.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/console.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -3,6 +3,10 @@ #ifndef __CRT_INTERNAL_CONSOLE_H #define __CRT_INTERNAL_CONSOLE_H +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif + extern int char_avail; extern int ungot_char; _____ Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -136,13 +136,11 @@ #define MB_CUR_MAX __mb_cur_max -int _isnanl(double x); -int _isinfl(double x); +int _isnanl(long double x); +int _isinfl(long double x); int _isnan(double x); int _isinf(double x); - - /* Flags for the iobuf structure (for reference) */ #if 0 #define _IOREAD 1 /* currently reading */ @@ -150,24 +148,22 @@ #define _IORW 0x0080 /* opened as "r+w" */ #endif +#ifndef W_OK +#define W_OK 2 /* Check for write permission */ +#endif + /* internal FILE->_flag flags */ #define _IOMYBUF 0x0008 /* stdio malloc()'d buffer */ #define _IOEOF 0x0010 /* EOF reached on read */ #define _IOERR 0x0020 /* I/O error from system */ #define _IOSTRG 0x0040 /* Strange or no file descriptor */ - #define _IOBINARY 0x040000 #define _IOTEXT 0x000000 - #define _IOCOMMIT 0x100000 - #define _IODIRTY 0x010000 #define _IOAHEAD 0x020000 - - - /* * The three possible buffering mode (nMode) values for setvbuf. * NOTE: _IOFBF works, but _IOLBF seems to work like unbuffered... @@ -176,12 +172,10 @@ #define _IOFBF 0x0000 /* full buffered */ #define _IOLBF 0x0040 /* line buffered */ #define _IONBF 0x0004 /* not buffered */ - #define _IO_LBF 0x80000 /* this value is used insteat of _IOLBF within the structure FILE as value for _flags, because _IOLBF has the same value as _IOSTRG */ - wint_t _filwbuf(FILE *f); #if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 2 @@ -189,6 +183,5 @@ int __cdecl _flsbuf (int, FILE*); #endif - #endif /* __dj_include_libc_file_h__ */ _____ Modified: trunk/reactos/lib/crt/include/internal/math.h --- trunk/reactos/lib/crt/include/internal/math.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/math.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,7 +1,9 @@ - #ifndef __CRT_INTERNAL_MATH_H #define __CRT_INTERNAL_MATH_H +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif int _isinf (double); /* not exported */ int _isnanl (long double); /* not exported */ _____ Modified: trunk/reactos/lib/crt/include/internal/tls.h --- trunk/reactos/lib/crt/include/internal/tls.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/include/internal/tls.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -3,6 +3,10 @@ #ifndef __CRT_INTERNAL_TLS_H #define __CRT_INTERNAL_TLS_H +#ifndef _CRT_PRECOMP_H +#error DO NOT INCLUDE THIS HEADER DIRECTLY +#endif + #include <stdarg.h> #include <windef.h> _____ Modified: trunk/reactos/lib/crt/io/access.c --- trunk/reactos/lib/crt/io/access.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/io/access.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,5 +1,4 @@ #include "precomp.h" -#include <errno.h> #include <tchar.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crt/io/open.c --- trunk/reactos/lib/crt/io/open.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/io/open.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -42,7 +42,6 @@ #include <stdarg.h> #endif -#include <fcntl.h> #include <sys/stat.h> #include <string.h> #include <share.h> _____ Modified: trunk/reactos/lib/crt/math/hypot.c --- trunk/reactos/lib/crt/math/hypot.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/math/hypot.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -17,10 +17,6 @@ */ #include "precomp.h" -#include <float.h> -#include <math.h> -#include <errno.h> - /* Approximate square roots of DBL_MAX and DBL_MIN. Numbers between these two shouldn't neither overflow nor underflow when squared. */ _____ Modified: trunk/reactos/lib/crt/math/modf.c --- trunk/reactos/lib/crt/math/modf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/math/modf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -10,12 +10,8 @@ * ==================================================== */ -#include <float.h> -#include <math.h> -#include <internal/ieee.h> -#include <internal/math.h> +#include "precomp.h" - //static const double one = 1.0; double modf(double __x, double *__i) _____ Modified: trunk/reactos/lib/crt/mbstring/mbscat.c --- trunk/reactos/lib/crt/mbstring/mbscat.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbscat.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,3 +1,4 @@ +#include "precomp.h" #include <string.h> /* _____ Modified: trunk/reactos/lib/crt/mbstring/mbscpy.c --- trunk/reactos/lib/crt/mbstring/mbscpy.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbscpy.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,3 +1,4 @@ +#include "precomp.h" #include <mbstring.h> #include <string.h> _____ Modified: trunk/reactos/lib/crt/mbstring/mbsdup.c --- trunk/reactos/lib/crt/mbstring/mbsdup.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/mbstring/mbsdup.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -9,6 +9,7 @@ * 12/04/99: Created */ +#include "precomp.h" #include <mbstring.h> #include <stdlib.h> _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,13 +2,18 @@ #define _CRT_PRECOMP_H /* Some global constants to hack around the msvc build */ +/* These will go away or be moved soon enough */ +#define _CRT_NON_CONFORMING_SWPRINTFS #define _CRT_SECURE_NO_DEPRECATE #define _INC_WTIME_INL #define _INC_UTIME_INL #define _INC_TIME_INL /* Headers to be compiled */ +#include <stdlib.h> #include <stdio.h> +#include <string.h> +#include <conio.h> #include <errno.h> #include <fcntl.h> #include <float.h> @@ -16,6 +21,9 @@ #include <math.h> #include <limits.h> +#include <sys/stat.h> +#include <share.h> + /* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include <windows.h> @@ -27,7 +35,10 @@ #endif /* CRT Internal data */ +#include <internal/atexit.h> +#include <internal/console.h> #include <internal/file.h> #include <internal/ieee.h> +#include <internal/tls.h> #endif /* _CRT_PRECOMP_H */ _____ Modified: trunk/reactos/lib/crt/process/_system.c --- trunk/reactos/lib/crt/process/_system.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/process/_system.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -13,7 +13,6 @@ #include <stdlib.h> #include <string.h> #include <process.h> -#include <errno.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/signal/signal.c --- trunk/reactos/lib/crt/signal/signal.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/signal/signal.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,7 +2,6 @@ #include <signal.h> #include <stdlib.h> -#include <errno.h> #include <string.h> void _default_handler(int signal); _____ Modified: trunk/reactos/lib/crt/stdio/fgetchar.c --- trunk/reactos/lib/crt/stdio/fgetchar.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/fgetchar.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -22,7 +22,6 @@ */ #include "precomp.h" -#include <conio.h> int _fgetchar(void) { _____ Modified: trunk/reactos/lib/crt/stdio/gets.c --- trunk/reactos/lib/crt/stdio/gets.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/gets.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -83,9 +83,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <stdio.h> -#include <errno.h> -#include <string.h> +#include "precomp.h" link_warning (gets, "the `gets' function is dangerous and should not be used.") _____ Modified: trunk/reactos/lib/crt/stdio/perror.c --- trunk/reactos/lib/crt/stdio/perror.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/perror.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,9 +1,6 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include "precomp.h" -#include <errno.h> - - #ifdef perror #undef perror void perror(const char *s); _____ Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,12 +2,6 @@ #include "precomp.h" -int _isnanl(double x); -int _isinfl(double x); -int _isnan(double x); -int _isinf(double x); - - int __vfwprintf(FILE *fp, const wchar_t *fmt0, va_list argp); _____ Modified: trunk/reactos/lib/crt/stdlib/atexit.c --- trunk/reactos/lib/crt/stdlib/atexit.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/atexit.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,6 +1,5 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <stdlib.h> -#include <internal/atexit.h> +#include "precomp.h" void _atexit_cleanup(void) { _____ Modified: trunk/reactos/lib/crt/stdlib/errno.c --- trunk/reactos/lib/crt/stdlib/errno.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/errno.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,8 +2,6 @@ * */ #include "precomp.h" -#include <internal/tls.h> - #include "doserrmap.h" /* _____ Modified: trunk/reactos/lib/crt/stdlib/makepath.c --- trunk/reactos/lib/crt/stdlib/makepath.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/makepath.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,5 +1,6 @@ /* $Id$ */ +#include "precomp.h" #include <stdlib.h> #include <string.h> _____ Modified: trunk/reactos/lib/crt/stdlib/splitp.c --- trunk/reactos/lib/crt/stdlib/splitp.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/splitp.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -1,8 +1,5 @@ -#include <stdlib.h> -#include <string.h> -#include <tchar.h> +#include "precomp.h" - /* * @implemented */ _____ Modified: trunk/reactos/lib/crt/stdlib/wsplitp.c --- trunk/reactos/lib/crt/stdlib/wsplitp.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/stdlib/wsplitp.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -2,4 +2,6 @@ #define _UNICODE #define UNICODE +#include <tchar.h> + #include "splitp.c" _____ Modified: trunk/reactos/lib/crt/wine/heap.c --- trunk/reactos/lib/crt/wine/heap.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/wine/heap.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -23,7 +23,6 @@ #include "precomp.h" -#include <errno.h> #include <malloc.h> #include <stdlib.h> #include <internal/mtdll.h> _____ Modified: trunk/reactos/lib/crt/wine/scanf.c --- trunk/reactos/lib/crt/wine/scanf.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crt/wine/scanf.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -26,7 +26,6 @@ #include "precomp.h" #include <wchar.h> -#include <conio.h> #include <ctype.h> #define NDEBUG _____ Modified: trunk/reactos/lib/crtdll/dllmain.c --- trunk/reactos/lib/crtdll/dllmain.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crtdll/dllmain.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -21,9 +21,6 @@ */ #include <precomp.h> -#include <stdio.h> -#include <internal/tls.h> -#include <stdlib.h> #include <internal/wine/msvcrt.h> #include <sys/stat.h> _____ Modified: trunk/reactos/lib/crtdll/precomp.h --- trunk/reactos/lib/crtdll/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/crtdll/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1 +1,9 @@ +#ifndef _CRT_PRECOMP_H +#define _CRT_PRECOMP_H + +#include <stdio.h> #include <windows.h> +#include <internal/tls.h> +#include <stdlib.h> + +#endif /* _CRT_PRECOMP_H */ _____ Modified: trunk/reactos/lib/msvcrt/dllmain.c --- trunk/reactos/lib/msvcrt/dllmain.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/msvcrt/dllmain.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -21,9 +21,6 @@ */ #include <precomp.h> -#include <stdio.h> -#include <internal/tls.h> -#include <stdlib.h> #include <internal/wine/msvcrt.h> #define NDEBUG _____ Modified: trunk/reactos/lib/msvcrt/precomp.h --- trunk/reactos/lib/msvcrt/precomp.h 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/msvcrt/precomp.h 2005-11-27 06:20:33 UTC (rev 19673) @@ -1 +1,9 @@ +#ifndef _CRT_PRECOMP_H +#define _CRT_PRECOMP_H + +#include <stdio.h> +#include <internal/tls.h> +#include <stdlib.h> #include <windows.h> + +#endif /* _CRT_PRECOMP_H */ _____ Modified: trunk/reactos/lib/rtl/math.c --- trunk/reactos/lib/rtl/math.c 2005-11-27 05:54:05 UTC (rev 19672) +++ trunk/reactos/lib/rtl/math.c 2005-11-27 06:20:33 UTC (rev 19673) @@ -31,13 +31,13 @@ double atan (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fld1\n\t" "fpatan" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -45,16 +45,16 @@ */ double ceil (double __x) { - register double __value; + register double __val; __volatile unsigned short int __cw, __cwtmp; __asm __volatile ("fnstcw %0" : "=m" (__cw)); __cwtmp = (__cw & 0xf3ff) | 0x0800; /* rounding up */ __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); + __asm __volatile ("frndint" : "=t" (__val) : "0" (__x)); __asm __volatile ("fldcw %0" : : "m" (__cw)); - return __value; + return __val; } /* @@ -62,12 +62,12 @@ */ double cos (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fcos" - : "=t" (__value): "0" (__x)); + : "=t" (__val): "0" (__x)); - return __value; + return __val; } /* @@ -75,12 +75,12 @@ */ double fabs (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fabs" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -88,16 +88,16 @@ */ double floor (double __x) { - register double __value; + register double __val; __volatile unsigned short int __cw, __cwtmp; __asm __volatile ("fnstcw %0" : "=m" (__cw)); __cwtmp = (__cw & 0xf3ff) | 0x0400; /* rounding down */ __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); - __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); + __asm __volatile ("frndint" : "=t" (__val) : "0" (__x)); __asm __volatile ("fldcw %0" : : "m" (__cw)); - return __value; + return __val; } /* @@ -105,26 +105,26 @@ */ double log (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fldln2\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } double __log2 (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fld1\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -132,7 +132,7 @@ */ double pow (double __x, double __y) { - register double __value, __exponent; + register double __val, __exponent; long __p = (long) __y; if (__x == 0.0 && __y > 0.0) @@ -165,13 +165,13 @@ "fxch\n\t" "fsub %%st(1) # fract(y * log2(x))\n\t" "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); - __value += 1.0; + : "=t" (__val), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); + __val += 1.0; __asm __volatile__ ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); + : "=t" (__val) : "0" (__val), "u" (__exponent)); - return __value; + return __val; } /* @@ -179,12 +179,12 @@ */ double sin (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fsin" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -192,12 +192,12 @@ */ double sqrt (double __x) { - register double __value; + register double __val; __asm __volatile__ ("fsqrt" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); - return __value; + return __val; } /* @@ -205,11 +205,11 @@ */ double tan (double __x) { - register double __value; - register double __value2 __attribute__ ((unused)); + register double __val; + register double __val2 __attribute__ ((unused)); __asm __volatile__ ("fptan" - : "=t" (__value2), "=u" (__value) : "0" (__x)); + : "=t" (__val2), "=u" (__val) : "0" (__x)); - return __value; + return __val; }

1 0

[royce] 19672: msvc compatibility
by royce＠svn.reactos.com 27 Nov '05

27 Nov '05

msvc compatibility Modified: trunk/reactos/lib/inflib/builddep.h _____ Modified: trunk/reactos/lib/inflib/builddep.h --- trunk/reactos/lib/inflib/builddep.h 2005-11-27 05:53:01 UTC (rev 19671) +++ trunk/reactos/lib/inflib/builddep.h 2005-11-27 05:54:05 UTC (rev 19672) @@ -44,6 +44,10 @@ #define _tcstol strtol #define STRFMT "%s" +#ifdef _MSC_VER +#define strcasecmp stricmp +#endif + extern unsigned long DbgPrint(char *Fmt, ...); #else /* ! defined(INFLIB_HOST) */

1 0

[royce] 19671: msvc compatibility
by royce＠svn.reactos.com 27 Nov '05

27 Nov '05

msvc compatibility Modified: trunk/reactos/include/reactos/debug.h _____ Modified: trunk/reactos/include/reactos/debug.h --- trunk/reactos/include/reactos/debug.h 2005-11-27 05:50:19 UTC (rev 19670) +++ trunk/reactos/include/reactos/debug.h 2005-11-27 05:53:01 UTC (rev 19671) @@ -94,8 +94,17 @@ #else /* On non-debug builds, we never show these */ +#ifdef _MSC_VER +static __inline void DPRINT1 ( const char* fmt, ... ) +{ +} +static __inline void DPRINT ( const char* fmt, ... ) +{ +} +#else #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) +#endif #define CHECKPOINT1 #define CHECKPOINT #define UNIMPLEMENTED

1 0

[sedwards] 19670: inline -> __inline
by sedwards＠svn.reactos.com 27 Nov '05

27 Nov '05

inline -> __inline Modified: trunk/reactos/lib/inflib/infcore.c _____ Modified: trunk/reactos/lib/inflib/infcore.c --- trunk/reactos/lib/inflib/infcore.c 2005-11-27 04:16:53 UTC (rev 19669) +++ trunk/reactos/lib/inflib/infcore.c 2005-11-27 05:50:19 UTC (rev 19670) @@ -336,7 +336,7 @@ /* push the current state on the parser stack */ -inline static void push_state( struct parser *parser, enum parser_state state ) +__inline static void push_state( struct parser *parser, enum parser_state state ) { // assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); parser->stack[parser->stack_pos++] = state; @@ -344,7 +344,7 @@ /* pop the current state */ -inline static void pop_state( struct parser *parser ) +__inline static void pop_state( struct parser *parser ) { // assert( parser->stack_pos ); parser->state = parser->stack[--parser->stack_pos]; @@ -352,7 +352,7 @@ /* set the parser state and return the previous one */ -inline static enum parser_state set_state( struct parser *parser, enum parser_state state ) +__inline static enum parser_state set_state( struct parser *parser, enum parser_state state ) { enum parser_state ret = parser->state; parser->state = state; @@ -361,14 +361,14 @@ /* check if the pointer points to an end of file */ -inline static int is_eof( struct parser *parser, const CHAR *ptr ) +__inline static int is_eof( struct parser *parser, const CHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z); } /* check if the pointer points to an end of line */ -inline static int is_eol( struct parser *parser, const CHAR *ptr ) +__inline static int is_eol( struct parser *parser, const CHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z ||

1 0

[turner] 19669: Don't hardcode user to .DEFAULT when reading registry
by turner＠svn.reactos.com 27 Nov '05

27 Nov '05

Don't hardcode user to .DEFAULT when reading registry Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-27 03:08:35 UTC (rev 19668) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-27 04:16:53 UTC (rev 19669) @@ -928,11 +928,14 @@ the current wallpaper bitmap */ HBITMAP hOldBitmap, hNewBitmap; ASSERT(pvParam); - UNICODE_STRING Key = RTL_CONSTANT_STRING(L"\\Registry\\User\\.Default\\Control Panel\\Desktop"); + UNICODE_STRING Key = RTL_CONSTANT_STRING(L"Control Panel\\Desktop"); UNICODE_STRING Tile = RTL_CONSTANT_STRING(L"TileWallpaper"); UNICODE_STRING Style = RTL_CONSTANT_STRING(L"WallpaperStyle"); + UNICODE_STRING KeyPath; OBJECT_ATTRIBUTES KeyAttributes; + OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; + HANDLE CurrentUserKey = NULL; HANDLE KeyHandle = NULL; PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; ULONG Length = 0; @@ -970,14 +973,24 @@ /*default value is center */ WinStaObject->WallpaperMode = wmCenter; - /* find the tile value in the registry */ + + + /* Get a handle to the current users settings */ + RtlFormatCurrentUserKeyPath(&KeyPath); + InitializeObjectAttributes(&ObjectAttributes,&KeyPath,OBJ_CASE_INSENSITI VE,NULL,NULL); + ZwOpenKey(&CurrentUserKey, KEY_READ, &ObjectAttributes); + RtlFreeUnicodeString(&KeyPath); + + /* open up the settings to read the values */ InitializeObjectAttributes(&KeyAttributes, &Key, OBJ_CASE_INSENSITIVE, - NULL, NULL); + CurrentUserKey, NULL); ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); - + NtClose(CurrentUserKey); + + /* read the tile value in the registry */ Status = ZwQueryValueKey(KeyHandle, &Tile, KeyValuePartialInformation, 0, 0, &ResLength); - + ResLength += sizeof(KEY_VALUE_PARTIAL_INFORMATION); KeyValuePartialInfo = ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); Length = ResLength;

1 0

[ion] 19668: - Update selector names to official names and define/use the MODE and RPL masks for more portable/clean code.
by ion＠svn.reactos.com 27 Nov '05

27 Nov '05

- Update selector names to official names and define/use the MODE and RPL masks for more portable/clean code. Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/hal/halx86/mp/mps.S Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/lib/kernel32/misc/utils.c Modified: trunk/reactos/lib/kernel32/thread/i386/fiber.S Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c Modified: trunk/reactos/ntoskrnl/ps/debug.c Modified: trunk/reactos/tools/nci/ncitool.c _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -919,7 +919,7 @@ idt = (KIDTENTRY*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(KIDTENTRY)); idt->Offset = address & 0xffff; - idt->Selector = KERNEL_CS; + idt->Selector = KGDT_R0_CODE; idt->Access = Access.Value; idt->ExtendedOffset = address >> 16; } _____ Modified: trunk/reactos/hal/halx86/mp/mps.S --- trunk/reactos/hal/halx86/mp/mps.S 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/hal/halx86/mp/mps.S 2005-11-27 03:08:35 UTC (rev 19668) @@ -22,11 +22,11 @@ pushl %es; \ pushl %fs; \ pushl %gs; \ - movl $(KERNEL_DS), %eax; \ + movl $(KGDT_R0_DATA), %eax; \ movl %eax, %ds; \ movl %eax, %es; \ movl %eax, %gs; \ - movl $(PCR_SELECTOR), %eax; \ + movl $(KGDT_R0_PCR), %eax; \ movl %eax, %fs; #define AFTER \ @@ -85,11 +85,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movl $(KERNEL_DS),%eax + movl $(KGDT_R0_DATA),%eax movl %eax,%ds movl %eax,%es movl %eax,%gs - movl $(PCR_SELECTOR),%eax + movl $(KGDT_R0_PCR),%eax movl %eax,%fs pushl %esp pushl %ebx _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/include/ndk/asm.h 2005-11-27 03:08:35 UTC (rev 19668) @@ -20,17 +20,19 @@ #define _ASM_H // -// FIXME: Use real names. +// Selector Names // -#define KERNEL_CS (0x8) -#define KERNEL_DS (0x10) -#define USER_CS (0x18 + 0x3) -#define USER_DS (0x20 + 0x3) -#define TSS_SELECTOR (0x28) -#define PCR_SELECTOR (0x30) -#define TEB_SELECTOR (0x38 + 0x3) -#define LDT_SELECTOR (0x48) -#define TRAP_TSS_SELECTOR (0x50) +#define RPL_MASK 0x0003 +#define MODE_MASK 0x0001 +#define KGDT_R0_CODE (0x8) +#define KGDT_R0_DATA (0x10) +#define KGDT_R3_CODE (0x18) +#define KGDT_R3_DATA (0x20) +#define KGDT_TSS (0x28) +#define KGDT_R0_PCR (0x30) +#define KGDT_R3_TEB (0x38) +#define KGDT_LDT (0x48) +#define KGDT_DF_TSS (0x50) // // KV86M_REGISTERS Offsets @@ -173,7 +175,6 @@ #define KUSER_SHARED_SYSCALL_RET KERNEL_USER_SHARED_DATA + 0x304 #define PROCESSOR_FEATURE_FXSR KUSER_SHARED_PROCESSOR_FEATURES + 0x4 - // // CONTEXT Offsets // _____ Modified: trunk/reactos/lib/kernel32/misc/utils.c --- trunk/reactos/lib/kernel32/misc/utils.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/lib/kernel32/misc/utils.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -351,11 +351,11 @@ /* The other registers are undefined */ /* Setup the Segments */ - Context->SegCs = USER_CS; - Context->SegDs = USER_DS; - Context->SegEs = USER_DS; - Context->SegFs = TEB_SELECTOR; - Context->SegSs = USER_DS; + Context->SegFs = KGDT_R3_TEB | RPL_MASK; + Context->SegEs = KGDT_R3_DATA | RPL_MASK; + Context->SegDs = KGDT_R3_DATA | RPL_MASK; + Context->SegCs = KGDT_R3_CODE | RPL_MASK; + Context->SegSs = KGDT_R3_DATA | RPL_MASK; Context->SegGs = 0; /* Set the EFLAGS */ _____ Modified: trunk/reactos/lib/kernel32/thread/i386/fiber.S --- trunk/reactos/lib/kernel32/thread/i386/fiber.S 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/lib/kernel32/thread/i386/fiber.S 2005-11-27 03:08:35 UTC (rev 19668) @@ -17,7 +17,7 @@ _SwitchToFiber@4: /* Get the TEB */ - mov edx, fs:[TEB_SELECTOR] + mov edx, fs:[KGDT_R3_TEB] /* Get the Fiber */ mov eax, [edx+TEB_FIBER_DATA] _____ Modified: trunk/reactos/lib/rtl/thread.c --- trunk/reactos/lib/rtl/thread.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/lib/rtl/thread.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -278,11 +278,11 @@ /* Set the Selectors */ ThreadContext->SegGs = 0; - ThreadContext->SegFs = TEB_SELECTOR; - ThreadContext->SegEs = USER_DS; - ThreadContext->SegDs = USER_DS; - ThreadContext->SegCs = USER_CS; - ThreadContext->SegSs = USER_DS; + ThreadContext->SegFs = KGDT_R3_TEB | RPL_MASK; + ThreadContext->SegEs = KGDT_R3_DATA | RPL_MASK; + ThreadContext->SegDs = KGDT_R3_DATA | RPL_MASK; + ThreadContext->SegCs = KGDT_R3_CODE | RPL_MASK; + ThreadContext->SegSs = KGDT_R3_DATA | RPL_MASK; /* Enable Interrupts */ ThreadContext->EFlags = 0x200; /*X86_EFLAGS_IF */ _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -614,10 +614,10 @@ Value = (ULONG_PTR) (KernelStack + 8); break; case CS: - Value = KERNEL_CS; + Value = KGDT_R0_CODE; break; case DS: - Value = KERNEL_DS; + Value = KGDT_R0_DATA; break; default: Value = 0; _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-11-27 03:08:35 UTC (rev 19668) @@ -196,12 +196,12 @@ /* Write the LDT Selector */ mov ebp, [ebx+KPCR_GDT] mov eax, [edi+KPROCESS_LDT_DESCRIPTOR0] - mov [ebp+LDT_SELECTOR], eax + mov [ebp+KGDT_LDT], eax mov eax, [edi+KPROCESS_LDT_DESCRIPTOR1] - mov [ebp+LDT_SELECTOR+4], eax + mov [ebp+KGDT_LDT+4], eax /* Save LDT Selector */ - mov eax, LDT_SELECTOR + mov eax, KGDT_LDT NoLdt: _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -274,7 +274,7 @@ DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x\nESP: %.8x ", OldTss->Edx, OldTss->Ebp, OldTss->Esi, Esp0); DbgPrint("EDI: %.8x EFLAGS: %.8x ", OldTss->Edi, OldTss->Eflags); - if (OldTss->Cs == KERNEL_CS) + if (OldTss->Cs == KGDT_R0_CODE) { DbgPrint("kESP %.8x ", Esp0); if (PsGetCurrentThread() != NULL) @@ -288,7 +288,7 @@ { DbgPrint("User ESP %.8x\n", OldTss->Esp); } - if ((OldTss->Cs & 0xffff) == KERNEL_CS) + if ((OldTss->Cs & 0xffff) == KGDT_R0_CODE) { if (PsGetCurrentThread() != NULL) { @@ -448,7 +448,7 @@ DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", Tf->Edx, Tf->Ebp, Tf->Esi, Esp0); DbgPrint("EDI: %.8x EFLAGS: %.8x ", Tf->Edi, Tf->Eflags); - if ((Tf->Cs&0xffff) == KERNEL_CS) + if ((Tf->Cs&0xffff) == KGDT_R0_CODE) { DbgPrint("kESP %.8x ", Esp0); if (PsGetCurrentThread() != NULL) @@ -561,7 +561,7 @@ /* * Handle user exceptions differently */ - if ((Tf->Cs & 0xFFFF) == USER_CS) + if ((Tf->Cs & 0xFFFF) == (KGDT_R3_CODE | RPL_MASK)) { return(KiUserTrapHandler(Tf, ExceptionNr, (PVOID)cr2)); } @@ -605,7 +605,7 @@ ULONG Previous = KiEspFromTrapFrame(TrapFrame); /* Check if this is user-mode or V86 */ - if ((TrapFrame->Cs & 1) || (TrapFrame->Eflags & X86_EFLAGS_VM)) + if ((TrapFrame->Cs & MODE_MASK) || (TrapFrame->Eflags & X86_EFLAGS_VM)) { /* Write it directly */ TrapFrame->Esp = Esp; @@ -650,15 +650,15 @@ /* Just return it */ return TrapFrame->Ss; } - else if (TrapFrame->Cs & 1) + else if (TrapFrame->Cs & MODE_MASK) { /* Usermode, return the User SS */ - return TrapFrame->Ss | 3; + return TrapFrame->Ss | RPL_MASK; } else { /* Kernel mode */ - return KERNEL_DS; + return KGDT_R0_DATA; } } @@ -676,10 +676,10 @@ /* Just write it */ TrapFrame->Ss = Ss; } - else if (TrapFrame->Cs & 1) + else if (TrapFrame->Cs & MODE_MASK) { /* Usermode, save the User SS */ - TrapFrame->Ss = Ss | 3; + TrapFrame->Ss = Ss | RPL_MASK; } } @@ -722,10 +722,10 @@ TrapFrame->Cs = Context->SegCs; /* Don't let it under 8, that's invalid */ - if ((PreviousMode !=KernelMode) && (TrapFrame->Cs < 8)) + if ((PreviousMode != KernelMode) && (TrapFrame->Cs < 8)) { /* Force it to User CS */ - TrapFrame->Cs = USER_CS; + TrapFrame->Cs = (KGDT_R3_CODE | RPL_MASK); } } @@ -762,11 +762,11 @@ TrapFrame->V86_Fs = Context->SegFs; TrapFrame->V86_Gs = Context->SegGs; } - else if (!(TrapFrame->Cs & 1)) + else if (!(TrapFrame->Cs & MODE_MASK)) { /* For user mode, write the values directly */ - TrapFrame->Ds = USER_DS; - TrapFrame->Es = USER_DS; + TrapFrame->Ds = KGDT_R3_DATA | RPL_MASK; + TrapFrame->Es = KGDT_R3_DATA | RPL_MASK; TrapFrame->Fs = Context->SegFs; TrapFrame->Gs = 0; } @@ -778,7 +778,7 @@ TrapFrame->Fs = Context->SegFs; /* Handle GS specially */ - if (TrapFrame->Cs == USER_CS) + if (TrapFrame->Cs == (KGDT_R3_CODE | RPL_MASK)) { /* Don't use it, if user */ TrapFrame->Gs = 0; @@ -863,13 +863,13 @@ else { /* Check if this was a Kernel Trap */ - if (TrapFrame->Cs == KERNEL_CS) + if (TrapFrame->Cs == KGDT_R0_CODE) { /* Set valid selectors */ TrapFrame->Gs = 0; - TrapFrame->Fs = PCR_SELECTOR; - TrapFrame->Es = USER_DS; - TrapFrame->Ds = USER_DS; + TrapFrame->Fs = KGDT_R0_PCR; + TrapFrame->Es = KGDT_R3_DATA | RPL_MASK; + TrapFrame->Ds = KGDT_R3_DATA | RPL_MASK; } /* Return the segments */ @@ -1083,7 +1083,7 @@ { DPRINT("sel %x %d\n",sel,sel); KiIdt[sel].a = (((int)func)&0xffff) + - (KERNEL_CS << 16); + (KGDT_R0_CODE << 16); KiIdt[sel].b = 0xef00 + (((int)func)&0xffff0000); DPRINT("idt[sel].b %x\n",KiIdt[sel].b); } @@ -1092,7 +1092,7 @@ { DPRINT("set_interrupt_gate(sel %d, func %x)\n",sel,func); KiIdt[sel].a = (((int)func)&0xffff) + - (KERNEL_CS << 16); + (KGDT_R0_CODE << 16); KiIdt[sel].b = 0x8e00 + (((int)func)&0xffff0000); } @@ -1101,7 +1101,7 @@ DPRINT("set_trap_gate(sel %d, func %x, dpl %d)\n",sel, func, dpl); ASSERT(dpl <= 3); KiIdt[sel].a = (((int)func)&0xffff) + - (KERNEL_CS << 16); + (KGDT_R0_CODE << 16); KiIdt[sel].b = 0x8f00 + (dpl << 13) + (((int)func)&0xffff0000); } @@ -1135,7 +1135,7 @@ set_trap_gate(5, (ULONG)KiTrap5, 0); set_trap_gate(6, (ULONG)KiTrap6, 0); set_trap_gate(7, (ULONG)KiTrap7, 0); - set_task_gate(8, TRAP_TSS_SELECTOR); + set_task_gate(8, KGDT_DF_TSS); set_trap_gate(9, (ULONG)KiTrap9, 0); set_trap_gate(10, (ULONG)KiTrap10, 0); set_trap_gate(11, (ULONG)KiTrap11, 0); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c --- trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -485,7 +485,7 @@ } KeLowerIrql(OldIrql); - PreviousMode = ((Tf->Cs & 0xffff) == USER_CS) ? (UserMode) : (KernelMode); + PreviousMode = ((Tf->Cs & 0xffff) == (KGDT_R3_CODE | RPL_MASK)) ? (UserMode) : (KernelMode); DPRINT("Math/Xmm fault happened! (PreviousMode = %s)\n", (PreviousMode != KernelMode) ? ("UserMode") : ("KernelMode")); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c --- trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -92,7 +92,7 @@ * Set the base address of the PCR */ Base = (ULONG)Pcr; - Entry = PCR_SELECTOR / 2; + Entry = KGDT_R0_PCR / 2; Gdt[Entry + 1] = (USHORT)(((ULONG)Base) & 0xffff); Gdt[Entry + 2] = Gdt[Entry + 2] & ~(0xff); @@ -117,24 +117,24 @@ "movl %1, %%fs\n\t" "movl %0, %%gs\n\t" : /* no output */ - : "a" (KERNEL_DS), "d" (PCR_SELECTOR)); + : "a" (KGDT_R0_DATA), "d" (KGDT_R0_PCR)); __asm__ ("pushl %0\n\t" "pushl $.l4\n\t" "lret\n\t" ".l4:\n\t" : /* no output */ - : "a" (KERNEL_CS)); + : "a" (KGDT_R0_CODE)); #elif defined(_MSC_VER) __asm { lgdt Descriptor; - mov ax, KERNEL_DS; - mov dx, PCR_SELECTOR; + mov ax, KGDT_R0_DATA; + mov dx, KGDT_R0_PCR; mov ds, ax; mov es, ax; mov fs, dx; mov gs, ax; - push KERNEL_CS; + push KGDT_R0_CODE; push offset l4 ; retf l4: _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -150,7 +150,7 @@ */ for (i=0;i<NR_IRQS;i++) { - KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KERNEL_CS<<16); + KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KGDT_R0_CODE<<16); KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+ I486_INTERRUPT_GATE; #ifdef CONFIG_SMP @@ -308,7 +308,7 @@ */ Ke386DisableInterrupts(); - if (old_level==PASSIVE_LEVEL && Trapframe->Cs != KERNEL_CS) + if (old_level==PASSIVE_LEVEL && Trapframe->Cs != KGDT_R0_CODE) { HalEndSystemInterrupt (APC_LEVEL, 0); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2005-11-27 03:08:35 UTC (rev 19668) @@ -29,11 +29,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movl $KERNEL_DS,%eax + movl $KGDT_R0_DATA,%eax movl %eax,%ds movl %eax,%es movl %eax,%gs - movl $PCR_SELECTOR,%eax + movl $KGDT_R0_PCR,%eax movl %eax,%fs pushl %esp pushl %ebx @@ -66,11 +66,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 0) @@ -93,11 +93,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 1) @@ -120,11 +120,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 2) @@ -147,11 +147,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 3) @@ -174,11 +174,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 4) @@ -201,11 +201,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 5) @@ -228,11 +228,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 6) @@ -255,11 +255,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 7) @@ -282,11 +282,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 8) @@ -309,11 +309,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 9) @@ -336,11 +336,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 10) @@ -363,11 +363,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 11) @@ -390,11 +390,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 12) @@ -417,11 +417,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 13) @@ -444,11 +444,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 14) @@ -471,11 +471,11 @@ pushl %gs movl $0xceafbeef,%eax pushl %eax - movw $KERNEL_DS,%ax + movw $KGDT_R0_DATA,%ax movw %ax,%ds movw %ax,%es movw %ax,%gs - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs pushl %esp pushl $(IRQ_BASE + 15) _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -244,7 +244,7 @@ extern void KiFastCallEntry(void); /* CS Selector of the target segment. */ - Ke386Wrmsr(0x174, KERNEL_CS, 0); + Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); /* Target ESP. */ Ke386Wrmsr(0x175, 0, 0); /* Target EIP. */ @@ -400,7 +400,7 @@ extern void KiFastCallEntry(void); /* CS Selector of the target segment. */ - Ke386Wrmsr(0x174, KERNEL_CS, 0); + Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); /* Target ESP. */ Ke386Wrmsr(0x175, 0, 0); /* Target EIP. */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c --- trunk/reactos/ntoskrnl/ke/i386/ldt.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -119,16 +119,16 @@ LdtDescriptor[3] = (USHORT)(((NewLdtSize & 0xf0000) >> 16) | ((NewLdtBase & 0xff000000) >> 16)); - KeSetGdtSelector(LDT_SELECTOR, + KeSetGdtSelector(KGDT_LDT, ((PULONG) LdtDescriptor)[0], ((PULONG) LdtDescriptor)[1]); #if defined(__GNUC__) __asm__("lldtw %%ax" : /* no output */ - : "a" (LDT_SELECTOR)); + : "a" (KGDT_LDT)); #elif defined(_MSC_VER) - __asm mov ax, LDT_SELECTOR + __asm mov ax, KGDT_LDT __asm lldt ax #else #error Unknown compiler for inline assembler @@ -171,9 +171,9 @@ */ base = length = 0; - Gdt[(LDT_SELECTOR / 2) + 0] = (length & 0xFFFF); - Gdt[(LDT_SELECTOR / 2) + 1] = (base & 0xFFFF); - Gdt[(LDT_SELECTOR / 2) + 2] = ((base & 0xFF0000) >> 16) | 0x8200; - Gdt[(LDT_SELECTOR / 2) + 3] = ((length & 0xF0000) >> 16) | + Gdt[(KGDT_LDT / 2) + 0] = (length & 0xFFFF); + Gdt[(KGDT_LDT / 2) + 1] = (base & 0xFFFF); + Gdt[(KGDT_LDT / 2) + 2] = ((base & 0xFF0000) >> 16) | 0x8200; + Gdt[(KGDT_LDT / 2) + 3] = ((length & 0xF0000) >> 16) | ((base & 0xFF000000) >> 16); } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/main_asm.S --- trunk/reactos/ntoskrnl/ke/i386/main_asm.S 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/main_asm.S 2005-11-27 03:08:35 UTC (rev 19668) @@ -12,7 +12,7 @@ lidt _KiIdtDescriptor /* Load the PCR selector */ - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs cmpl $AP_MAGIC, %ecx _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-11-27 03:08:35 UTC (rev 19668) @@ -102,10 +102,10 @@ push 0 /* Generate interrupt stack for Trap 6 */ - push USER_DS + push KGDT_R3_DATA + RPL_MASK push 0 push 0x20202 - push USER_CS + push KGDT_R3_CODE + RPL_MASK push 0 jmp _KiTrap6 @@ -113,11 +113,11 @@ // ==================== UNIQUE SYSENTER STUB. DO NOT DUPLICATE ============// /* Set FS to PCR */ - mov ecx, PCR_SELECTOR + mov ecx, KGDT_R0_PCR mov fs, cx /* Set DS/ES to Kernel Selector */ - mov ecx, KERNEL_DS + mov ecx, KGDT_R0_DATA mov ds, cx mov es, cx @@ -126,14 +126,14 @@ mov esp, ss:[ecx+KTSS_ESP0] /* Set up a fake INT Stack. */ - push USER_DS + push KGDT_R3_DATA + RPL_MASK push edx /* Ring 3 SS:ESP */ pushf /* Ring 3 EFLAGS */ push 2 /* Ring 0 EFLAGS */ add edx, 8 /* Skip user parameter list */ popf /* Set our EFLAGS */ or dword ptr [esp], X86_EFLAGS_IF /* Re-enable IRQs in EFLAGS, to fake INT */ - push USER_CS + push KGDT_R3_CODE + RPL_MASK push KUSER_SHARED_SYSCALL_RET /* Setup the Trap Frame stack */ @@ -142,7 +142,7 @@ push ebx push esi push edi - push TEB_SELECTOR + push KGDT_R3_TEB + RPL_MASK /* Save pointer to our PCR */ mov ebx, [fs:KPCR_SELF] @@ -163,10 +163,10 @@ .att_syntax /* Save other registers */ sub $0xC, %esp // + 0x70 - pushl $USER_DS // + 0x40 - pushl $USER_DS // + 0x44 + pushl $KGDT_R3_DATA + RPL_MASK // + 0x40 + pushl $KGDT_R3_DATA + RPL_MASK // + 0x44 pushl $0 // + 0x48 - sub $0x30, %esp // + 0x70 + sub $0x30, %esp // + 0x70 .intel_syntax noprefix /* Make space for us on the stack */ @@ -201,7 +201,7 @@ push fs /* Load PCR Selector into fs */ - mov ebx, PCR_SELECTOR + mov ebx, KGDT_R0_PCR mov fs, bx /* Get a pointer to the current thread */ @@ -410,9 +410,9 @@ // ================= PRESENT ONLY IF VOLATILES NEEDED ============// /* Save some stuff that raising IRQL will kill */ mov [ebx+KTRAP_FRAME_EAX], eax - mov dword ptr [ebx+KTRAP_FRAME_FS], TEB_SELECTOR - mov dword ptr [ebx+KTRAP_FRAME_DS], USER_DS - mov dword ptr [ebx+KTRAP_FRAME_ES], USER_DS + mov dword ptr [ebx+KTRAP_FRAME_FS], KGDT_R3_TEB + RPL_MASK + mov dword ptr [ebx+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + mov dword ptr [ebx+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK mov dword ptr [ebx+KTRAP_FRAME_GS], 0 // ============= END PRESENT ONLY IF VOLATILES NEEDED ============// @@ -464,7 +464,7 @@ // ==================== ONLY IF FULL RESTORE NEEDED ===================// /* Check the old mode */ - cmp word ptr [esp+KTRAP_FRAME_CS], USER_CS + cmp word ptr [esp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK bt word ptr [esp+KTRAP_FRAME_CS], 0 cmc ja RestoreAll @@ -524,7 +524,7 @@ jnz IntRet /* Restore FS to TIB */ - mov ecx, TEB_SELECTOR + mov ecx, KGDT_R3_TEB + RPL_MASK mov fs, ecx /* We will be cleaning up the stack ourselves */ @@ -702,7 +702,7 @@ mov eax, [esp+KTRAP_FRAME_EAX] /* Check if it was kernel */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KERNEL_CS + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE jz CommonStackClean2 /* Skip registers */ @@ -787,7 +787,7 @@ push fs /* Switch to correct FS */ - mov bx, PCR_SELECTOR + mov bx, KGDT_R0_PCR mov fs, bx /* Save Exception List */ @@ -806,7 +806,7 @@ sub esp, 0x30 /* Switch Segments to Kernel */ - mov ax, KERNEL_DS + mov ax, KGDT_R0_DATA mov ds, ax mov es, ax @@ -853,7 +853,7 @@ /* Check if this is kernel or user-mode */ test byte ptr [ebp+KTRAP_FRAME_CS], 1 jz CallDispatch - cmp word ptr [ebp+KTRAP_FRAME_CS], USER_CS + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK jnz NotUserMode /* Re-enable interrupts */ @@ -952,7 +952,7 @@ mov eax, [esp+KTRAP_FRAME_EAX] /* Check if it was kernel */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KERNEL_CS + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE jz CommonStackClean3 /* Skip registers */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-11-27 03:08:35 UTC (rev 19668) @@ -104,7 +104,7 @@ pushl %ebp /* XXX: DebugEBP */ /* Load the segment registers */ - movl $KERNEL_DS, %eax + movl $KGDT_R0_DATA, %eax movl %eax, %ds movl %eax, %es movl %eax, %gs @@ -113,7 +113,7 @@ movl %esp, %ebp /* Load the PCR selector into fs */ - movl $PCR_SELECTOR, %eax + movl $KGDT_R0_PCR, %eax movl %eax, %fs /* Save the old exception list */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c --- trunk/reactos/ntoskrnl/ke/i386/tss.c 2005-11-27 03:07:22 UTC (rev 19667) +++ trunk/reactos/ntoskrnl/ke/i386/tss.c 2005-11-27 03:08:35 UTC (rev 19668) @@ -119,7 +119,7 @@ /* Initialize the boot TSS. */ Tss->Esp0 = (ULONG)Ki386InitialStackArray[Id] + MM_STACK_SIZE; /* FIXME: - sizeof(FX_SAVE_AREA)? */ - Tss->Ss0 = KERNEL_DS; + Tss->Ss0 = KGDT_R0_DATA; Tss->IoMapBase = 0xFFFF; /* No i/o bitmap */ Tss->IoBitmap[8192] = 0xFF; Tss->Ldt = 0; @@ -130,23 +130,23 @@ base = (ULONG)Tss; length = sizeof(KTSS) - 1; - Gdt[(TSS_SELECTOR / 2) + 0] = (USHORT)(length & 0xFFFF); - Gdt[(TSS_SELECTOR / 2) + 1] = (USHORT)(base & 0xFFFF); - Gdt[(TSS_SELECTOR / 2) + 2] = (USHORT)(((base & 0xFF0000) >> 16) | 0x8900); - Gdt[(TSS_SELECTOR / 2) + 3] = (USHORT)(((length & 0xF0000) >> 16) | + Gdt[(KGDT_TSS / 2) + 0] = (USHORT)(length & 0xFFFF); + Gdt[(KGDT_TSS / 2) + 1] = (USHORT)(base & 0xFFFF); + Gdt[(KGDT_TSS / 2) + 2] = (USHORT)(((base & 0xFF0000) >> 16) | 0x8900); + Gdt[(KGDT_TSS / 2) + 3] = (USHORT)(((length & 0xF0000) >> 16) | ((base & 0xFF000000) >> 16)); /* Initialize the TSS used for handling double faults. */ TrapTss->Eflags = 0; TrapTss->Esp0 = ((ULONG)TrapStack + MM_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ - TrapTss->Ss0 = KERNEL_DS; + TrapTss->Ss0 = KGDT_R0_DATA; TrapTss->Esp = ((ULONG)TrapStack + MM_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ - TrapTss->Cs = KERNEL_CS; + TrapTss->Cs = KGDT_R0_CODE; TrapTss->Eip = (ULONG)KiTrap8; - TrapTss->Ss = KERNEL_DS; - TrapTss->Ds = KERNEL_DS; - TrapTss->Es = KERNEL_DS; - TrapTss->Fs = PCR_SELECTOR; + TrapTss->Ss = KGDT_R0_DATA; + TrapTss->Ds = KGDT_R0_DATA; + TrapTss->Es = KGDT_R0_DATA; + TrapTss->Fs = KGDT_R0_PCR; TrapTss->IoMapBase = 0xFFFF; /* No i/o bitmap */ TrapTss->IoBitmap[0] = 0xFF; TrapTss->Ldt = 0; @@ -158,10 +158,10 @@ base = (ULONG)TrapTss; length = sizeof(KTSSNOIOPM) - 1; - Gdt[(TRAP_TSS_SELECTOR / 2) + 0] = (USHORT)(length & 0xFFFF); - Gdt[(TRAP_TSS_SELECTOR / 2) + 1] = (USHORT)(base & 0xFFFF); - Gdt[(TRAP_TSS_SELECTOR / 2) + 2] = (USHORT)(((base & 0xFF0000) >> 16) | 0x8900); - Gdt[(TRAP_TSS_SELECTOR / 2) + 3] = (USHORT)(((length & 0xF0000) >> 16) | + Gdt[(KGDT_DF_TSS / 2) + 0] = (USHORT)(length & 0xFFFF); + Gdt[(KGDT_DF_TSS / 2) + 1] = (USHORT)(base & 0xFFFF); + Gdt[(KGDT_DF_TSS / 2) + 2] = (USHORT)(((base & 0xFF0000) >> 16) | 0x8900); + Gdt[(KGDT_DF_TSS / 2) + 3] = (USHORT)(((length & 0xF0000) >> 16) | ((base & 0xFF000000) >> 16)); /* @@ -170,9 +170,9 @@ #if defined(__GNUC__) __asm__("ltr %%ax" : /* no output */ - : "a" (TSS_SELECTOR)); + : "a" (KGDT_TSS)); #elif defined(_MSC_VER) - __asm mov ax, TSS_SELECTOR + __asm mov ax, KGDT_TSS __asm ltr ax #else #error Unknown compiler for inline assembler @@ -195,11 +195,11 @@ /* Initialize the boot TSS. */ KiBootTss.Esp0 = (ULONG)init_stack_top - sizeof(FX_SAVE_AREA); [truncated at 1000 lines; 106 more skipped]

1 0

[ion] 19667: - Fix a typo causing a potentially fatal bug in user-mode exceptions. Might fix hpoussin's bub.
by ion＠svn.reactos.com 27 Nov '05

27 Nov '05

- Fix a typo causing a potentially fatal bug in user-mode exceptions. Might fix hpoussin's bub. Modified: trunk/reactos/lib/ntdll/main/i386/dispatch.S _____ Modified: trunk/reactos/lib/ntdll/main/i386/dispatch.S --- trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-11-27 02:55:13 UTC (rev 19666) +++ trunk/reactos/lib/ntdll/main/i386/dispatch.S 2005-11-27 03:07:22 UTC (rev 19667) @@ -116,7 +116,7 @@ sub esp, SIZEOF_EXCEPTION_RECORD /* Fill out the record */ - mov eax, [fs:TEB_SELECTOR] + mov eax, [fs:KPCR_TEB] mov eax, [eax+TEB_EXCEPTION_CODE] mov [esp+EXCEPTION_RECORD_EXCEPTION_CODE], eax mov dword ptr [esp+EXCEPTION_RECORD_EXCEPTION_FLAGS], 0

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