Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[gvg] 13656: Don't use svn command line tool to get revision number
by gvg＠svn.reactos.com 19 Feb '05

19 Feb '05

Don't use svn command line tool to get revision number XML code stolen from the xmlbuildsystem branch, we need to merge this when merging the xmlbuildsystem back into trunk Modified: trunk/reactos/tools/Makefile Added: trunk/reactos/tools/buildno/ Added: trunk/reactos/tools/buildno/Makefile Added: trunk/reactos/tools/buildno/XML.cpp Added: trunk/reactos/tools/buildno/XML.h Added: trunk/reactos/tools/buildno/buildno.cpp Added: trunk/reactos/tools/buildno/exception.cpp Added: trunk/reactos/tools/buildno/exception.h Added: trunk/reactos/tools/buildno/pch.h Added: trunk/reactos/tools/buildno/ssprintf.cpp Added: trunk/reactos/tools/buildno/ssprintf.h Deleted: trunk/reactos/tools/buildno.c _____ Modified: trunk/reactos/tools/Makefile --- trunk/reactos/tools/Makefile 2005-02-19 22:59:17 UTC (rev 13655) +++ trunk/reactos/tools/Makefile 2005-02-19 23:05:09 UTC (rev 13656) @@ -5,7 +5,6 @@ CFLAGS += -Wall -Werror TOOLS = \ - buildno$(EXE_POSTFIX) \ regtests$(EXE_POSTFIX) \ rcopy$(EXE_POSTFIX) \ rdel$(EXE_POSTFIX) \ @@ -20,12 +19,8 @@ CLEAN_FILES = $(TOOLS) all: $(TOOLS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \ - wine2ros_target pipetools_target winebuild_target bin2res_target wrc_target + wine2ros_target pipetools_target winebuild_target bin2res_target wrc_target buildno_target -buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h - @$(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c - @$(EXE_PREFIX)buildno$(EXE_POSTFIX) - regtests$(EXE_POSTFIX): regtests.c @$(HOST_CC) $(CFLAGS) -o regtests$(EXE_POSTFIX) regtests.c @@ -133,11 +128,15 @@ wrc_target: $(MAKE) --silent -C wrc wrc$(EXE_POSTFIX) -.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target wrc_target +buildno_target: + $(MAKE) --silent -C buildno buildno$(EXE_POSTFIX) +.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target wrc_target buildno_target + ifeq ($(HOST),mingw32-linux) clean: + $(MAKE) --silent -C buildno clean $(MAKE) --silent -C wrc clean $(MAKE) --silent -C cabman clean $(MAKE) --silent -C cdmake clean @@ -148,12 +147,12 @@ $(MAKE) --silent -C winebuild clean $(MAKE) --silent -C bin2res clean $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean - @rm ../include/reactos/buildno.h @rm mkconfig @rm $(TOOLS) endif ifeq ($(HOST),mingw32-windows) clean: + $(MAKE) --silent -C buildno clean $(MAKE) --silent -C wrc clean $(MAKE) --silent -C cabman clean $(MAKE) --silent -C cdmake clean @@ -165,7 +164,6 @@ $(MAKE) --silent -C winebuild clean $(MAKE) --silent -C bin2res clean $(MAKE) --silent -C ../lib/zlib -f Makefile.host clean - -@del ..\include\reactos\buildno.h -@del *$(EXE_POSTFIX) endif Property changes on: trunk/reactos/tools/buildno ___________________________________________________________________ Name: svn:ignore + *.o buildno buildno.exe _____ Added: trunk/reactos/tools/buildno/Makefile --- trunk/reactos/tools/buildno/Makefile 2005-02-19 22:59:17 UTC (rev 13655) +++ trunk/reactos/tools/buildno/Makefile 2005-02-19 23:05:09 UTC (rev 13656) @@ -0,0 +1,42 @@ +PATH_TO_TOP = ../.. + +TARGET = buildno$(EXE_POSTFIX) + +all: $(TARGET) + +OBJECTS = buildno.o XML.o exception.o ssprintf.o + +CLEAN_FILES = *.o buildno$(EXE_POSTFIX) + +HOST_CXXFLAGS = -I$(PATH_TO_TOP)/include/reactos -g -Wall -Werror + +buildno.o: buildno.cpp $(PATH_TO_TOP)/include/reactos/version.h + $(HOST_CXX) $(HOST_CXXFLAGS) -o buildno.o -c buildno.cpp + +XML.o: XML.cpp + $(HOST_CXX) $(HOST_CXXFLAGS) -o XML.o -c XML.cpp + +exception.o: exception.cpp + $(HOST_CXX) $(HOST_CXXFLAGS) -o exception.o -c exception.cpp + +ssprintf.o: ssprintf.cpp + $(HOST_CXX) $(HOST_CXXFLAGS) -o ssprintf.o -c ssprintf.cpp + +buildno$(EXE_POSTFIX): $(OBJECTS) + $(HOST_CXX) -g $(OBJECTS) -o $(TARGET) + @$(EXE_PREFIX)buildno$(EXE_POSTFIX) + +ifeq ($(HOST),mingw32-linux) +clean: + -rm -f *.o $(TARGET) + -rm $(PATH_TO_TOP)/include/reactos/buildno.h +endif +ifneq ($(HOST),mingw32-linux) +clean: + -del *.o $(TARGET) + -del ..\..\include\reactos\buildno.h +endif + +.PHONY: clean + +include $(PATH_TO_TOP)/rules.mak Property changes on: trunk/reactos/tools/buildno/Makefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/tools/buildno/XML.cpp --- trunk/reactos/tools/buildno/XML.cpp 2005-02-19 22:59:17 UTC (rev 13655) +++ trunk/reactos/tools/buildno/XML.cpp 2005-02-19 23:05:09 UTC (rev 13656) @@ -0,0 +1,727 @@ +// 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 + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) + return 0; + return file_stat.st_size; +#endif +} + +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; +} Property changes on: trunk/reactos/tools/buildno/XML.cpp ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/tools/buildno/XML.h --- trunk/reactos/tools/buildno/XML.h 2005-02-19 22:59:17 UTC (rev 13655) +++ trunk/reactos/tools/buildno/XML.h 2005-02-19 23:05:09 UTC (rev 13656) @@ -0,0 +1,96 @@ +// 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 Property changes on: trunk/reactos/tools/buildno/XML.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/tools/buildno/buildno.cpp (from rev 13638, trunk/reactos/tools/buildno.c) --- trunk/reactos/tools/buildno.c 2005-02-18 22:46:49 UTC (rev 13638) +++ trunk/reactos/tools/buildno/buildno.cpp 2005-02-19 23:05:09 UTC (rev 13656) @@ -0,0 +1,369 @@ +/* $Id$ + * + * buildno - Generate the build number for ReactOS + * + * Copyright (c) 1999,2000 Emanuele Aliberti + * + * The build number is the day on which the build took + * place, as YYYYMMDD + * + * The build number is stored in the file + * <reactos/buildno.h> as a set of macros: + * + * KERNEL_VERSION_BUILD base 10 number + * KERNEL_VERSION_BUILD_STR C string + * KERNEL_VERSION_BUILD_RC RC string + * + * REVISIONS + * --------- + * 2000-01-22 (ea) + * Fixed bugs: tm_year is (current_year - 1900), + * tm_month is 0-11 not 1-12 and code ignored TZ. + * 2000-12-10 (ea) + * Added -p option to make it simply print the + * version number, but skip buildno.h generation. + */ +#include <stdio.h> [truncated at 1000 lines; 3031 more skipped]

1 0

[ea] 13655: SM: added keys for env subsystem startup (not yet used)
by ea＠svn.reactos.com 19 Feb '05

19 Feb '05

SM: added keys for env subsystem startup (not yet used) Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-02-19 22:58:18 UTC (rev 13654) +++ trunk/reactos/bootdata/hivesys.inf 2005-02-19 22:59:17 UTC (rev 13655) @@ -254,6 +254,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","PagingFiles",0x00010000, \ "C:\reactos\pagefile.sys" +; Subsystems +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys " +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00070000,"Posix Os2" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\os2ss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00070000,"Debug Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.ex e" + ; 3Com 3c905 Driver HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","ErrorControl",0x00010001 ,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","Group",0x00000000,"NDIS"

1 0

[ea] 13654: SM: subsystem registration (partial)
by ea＠svn.reactos.com 19 Feb '05

19 Feb '05

SM: subsystem registration (partial) - merged duplicate code in process creation - experimental implementation of env subsystem registration Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/initdosdev.c Modified: trunk/reactos/subsys/smss/initreg.c Modified: trunk/reactos/subsys/smss/initrun.c Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/makefile Added: trunk/reactos/subsys/smss/print.c Modified: trunk/reactos/subsys/smss/smapi.c Added: trunk/reactos/subsys/smss/smapicomp.c Added: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/client.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -26,6 +26,7 @@ #define NTOS_MODE_USER #include <ntos.h> #include "smss.h" +#include <sm/helper.h> #define NDEBUG #include <debug.h> @@ -41,7 +42,40 @@ } SmpClientDirectory; +#if 0 /********************************************************************** + * SmpRegisterSmss/0 + */ +static NTSTATUS +SmpRegisterSmss(VOID) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING SbApiPortName = {0,0,NULL}; + HANDLE hSmApiPort = (HANDLE) 0; + + DPRINT("SM: %s called\n",__FUNCTION__); + + Status = SmConnectApiPort(& SbApiPortName, + (HANDLE) -1, + IMAGE_SUBSYSTEM_NATIVE, + & hSmApiPort); + if(!NT_SUCCESS(Status)) + { + DPRINT("SM: %s: SMDLL!SmConnectApiPort failed (Status=0x%08lx)\n",__FUNCTION__,Status); + return Status; + } + Status = SmCompleteSession (hSmApiPort, (HANDLE)0, hSmApiPort); + if(!NT_SUCCESS(Status)) + { + DPRINT("SM: %s: SMDLL!SmCompleteSession failed (Status=0x%08lx)\n",__FUNCTION__,Status); + return Status; + } + NtClose(hSmApiPort); + return Status; +} +#endif + +/********************************************************************** * SmInitializeClientManagement/0 */ NTSTATUS @@ -51,11 +85,22 @@ RtlInitializeCriticalSection(& SmpClientDirectory.Lock); SmpClientDirectory.Count = 0; SmpClientDirectory.Client = NULL; +#if 0 + /* Register IMAGE_SUBSYSTE_NATIVE to be managed by SM */ + return SmpRegisterSmss(); +#endif return STATUS_SUCCESS; + } /********************************************************************** * SmpLookupClient/1 + * + * DESCRIPTION + * Lookup the subsystem server descriptor given its image ID. + * + * SIDE EFFECTS + * SmpClientDirectory.Lock is released only on success. */ static PSM_CLIENT_DATA STDCALL SmpLookupClient (USHORT SubsystemId) @@ -70,22 +115,31 @@ Client = SmpClientDirectory.Client; while (NULL != Client) { - if (SubsystemId == Client->SubsystemId) break; + if (SubsystemId == Client->SubsystemId) + { + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Client; + } Client = Client->Next; } } - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + /* + * Note that we do *not* release SmpClientDirectory.Lock here + * because SmpLookupClient is called to FAIL when SubsystemId + * is not registered yet. + */ return Client; } /********************************************************************** - * SmpCreateClient/1 + * SmpCreateClient/2 */ NTSTATUS STDCALL SmCreateClient(PSM_PORT_MESSAGE Request, PSM_CLIENT_DATA * ClientData) { PSM_CLIENT_DATA pClient = NULL; PSM_CONNECT_DATA ConnectData = (PSM_CONNECT_DATA) ((PBYTE) Request) + sizeof (LPC_REQUEST); + ULONG SbApiPortNameSize = SM_CONNECT_DATA_SIZE(*Request); DPRINT("SM: %s called\n", __FUNCTION__); @@ -94,9 +148,12 @@ */ if (SmpLookupClient(ConnectData->Subsystem)) { - DbgPrint("SMSS: %s: attempt to register again subsystem %d.\n",__FUNCTION__,0); + DPRINT("SMSS: %s: attempt to register again subsystem %d.\n", + __FUNCTION__, + ConnectData->Subsystem); return STATUS_UNSUCCESSFUL; } + DPRINT("SM: %s: registering subsystem %d \n", __FUNCTION__, ConnectData->Subsystem); /* * Allocate the storage for client data */ @@ -112,13 +169,17 @@ * Initialize the client data */ pClient->SubsystemId = ConnectData->Subsystem; - pClient->Initialized = FALSE; - // TODO + pClient->Initialized = (IMAGE_SUBSYSTEM_NATIVE == pClient->SubsystemId); + if (SbApiPortNameSize > 0) + { + RtlCopyMemory (pClient->SbApiPortName, + ConnectData->SbName, + SbApiPortNameSize); + } /* * Insert the new descriptor in the * client directory. */ - RtlEnterCriticalSection (& SmpClientDirectory.Lock); if (NULL == SmpClientDirectory.Client) { SmpClientDirectory.Client = pClient; @@ -132,8 +193,15 @@ } pClient->Next = NULL; ++ SmpClientDirectory.Count; + /* + * Note we unlock the client directory here, because + * it was locked by SmpLookupClient on failure. + */ RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - if (ClientData) *ClientData = pClient; + if (ClientData) + { + *ClientData = pClient; + } return STATUS_SUCCESS; } _____ Modified: trunk/reactos/subsys/smss/initdosdev.c --- trunk/reactos/subsys/smss/initdosdev.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/initdosdev.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -1,6 +1,6 @@ /* $Id: init.c 13449 2005-02-06 21:55:07Z ea $ * - * initdosdev.c - Define symbolic links to kernel devices (MS-DOS names) + * initdosdev.c - Define symbolic links to kernel devices (MS-DOS names). * * ReactOS Operating System * _____ Modified: trunk/reactos/subsys/smss/initreg.c --- trunk/reactos/subsys/smss/initreg.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/initreg.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -1,6 +1,6 @@ /* $Id: init.c 13449 2005-02-06 21:55:07Z ea $ * - * initenv.c - Environment initialization + * initenv.c - Hive loading * * ReactOS Operating System * _____ Modified: trunk/reactos/subsys/smss/initrun.c --- trunk/reactos/subsys/smss/initrun.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/initrun.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -32,6 +32,9 @@ HANDLE Children[2] = {0, 0}; /* csrss, winlogon */ +/********************************************************************** + * SmpRunBootAppsQueryRoutine/6 + */ static NTSTATUS STDCALL SmpRunBootAppsQueryRoutine(PWSTR ValueName, ULONG ValueType, @@ -40,14 +43,10 @@ PVOID Context, PVOID EntryContext) { - PRTL_USER_PROCESS_PARAMETERS ProcessParameters; - RTL_PROCESS_INFO ProcessInfo; - UNICODE_STRING ImagePathString; - UNICODE_STRING CommandLineString; - WCHAR Description[256]; - WCHAR ImageName[256]; - WCHAR ImagePath[256]; - WCHAR CommandLine[256]; + WCHAR Description [MAX_PATH]; + WCHAR ImageName [MAX_PATH]; + WCHAR ImagePath [MAX_PATH]; + WCHAR CommandLine [MAX_PATH]; PWSTR p1, p2; ULONG len; NTSTATUS Status; @@ -96,54 +95,23 @@ wcscat(ImagePath, ImageName); wcscat(ImagePath, L".exe"); - RtlInitUnicodeString(&ImagePathString, - ImagePath); - - RtlInitUnicodeString(&CommandLineString, - CommandLine); - - RtlCreateProcessParameters(&ProcessParameters, - &ImagePathString, - NULL, - NULL, - &CommandLineString, - NULL, - NULL, - NULL, - NULL, - NULL); - - Status = RtlCreateUserProcess(&ImagePathString, - OBJ_CASE_INSENSITIVE, - ProcessParameters, + /* Create NT process */ + Status = SmCreateUserProcess (ImagePath, + CommandLine, + TRUE, /* wait */ NULL, - NULL, - NULL, - FALSE, - NULL, - NULL, - &ProcessInfo); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Running %s failed (Status %lx)\n", Description, Status); - return(STATUS_SUCCESS); - } + TRUE, /* terminate */ + NULL); - RtlDestroyProcessParameters(ProcessParameters); - - /* Wait for process termination */ - NtWaitForSingleObject(ProcessInfo.ProcessHandle, - FALSE, - NULL); - - NtClose(ProcessInfo.ThreadHandle); - NtClose(ProcessInfo.ProcessHandle); - return(STATUS_SUCCESS); } -/* +/********************************************************************** + * SmRunBootApplications/0 + * + * DESCRIPTION + * * Run native applications listed in the registry. * * Key: _____ Modified: trunk/reactos/subsys/smss/initss.c --- trunk/reactos/subsys/smss/initss.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/initss.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -26,6 +26,7 @@ #include "smss.h" + #include <rosrtl/string.h> #define NDEBUG @@ -49,6 +50,9 @@ * e) make optional subsystems loadable (again: they must be described in the registry * key Optional="Posix Os2" to be allowed to run) */ + +/********************************************************************** + */ NTSTATUS SmLoadSubsystems(VOID) { @@ -56,7 +60,7 @@ NTSTATUS Status; DPRINT("SM: loading subsystems\n"); - + /* Load kernel mode subsystem (aka win32k.sys) */ RtlRosInitUnicodeStringFromLiteral(&ImageInfo.ModuleName, L"\\SystemRoot\\system32\\win32k.sys"); @@ -84,10 +88,9 @@ NTSTATUS Status; UNICODE_STRING UnicodeString; OBJECT_ATTRIBUTES ObjectAttributes; - PRTL_USER_PROCESS_PARAMETERS ProcessParameters; RTL_PROCESS_INFO ProcessInfo; HANDLE CsrssInitEvent; - WCHAR UnicodeBuffer[MAX_PATH]; + WCHAR ImagePath [MAX_PATH]; DPRINT("SM: initializing csrss\n"); @@ -114,36 +117,17 @@ */ /* initialize executable path */ - wcscpy(UnicodeBuffer, L"\\??\\"); - wcscat(UnicodeBuffer, SharedUserData->NtSystemRoot); - wcscat(UnicodeBuffer, L"\\system32\\csrss.exe"); - RtlInitUnicodeString(&UnicodeString, - UnicodeBuffer); + wcscpy(ImagePath, L"\\??\\"); + wcscat(ImagePath, SharedUserData->NtSystemRoot); + wcscat(ImagePath, L"\\system32\\csrss.exe"); - RtlCreateProcessParameters(&ProcessParameters, - &UnicodeString, - NULL, - NULL, - NULL, - SmSystemEnvironment, - NULL, - NULL, - NULL, - NULL); - - Status = RtlCreateUserProcess(&UnicodeString, - OBJ_CASE_INSENSITIVE, - ProcessParameters, + Status = SmCreateUserProcess(ImagePath, + L"", + FALSE, /* wait */ NULL, - NULL, - NULL, - FALSE, - NULL, - NULL, - &ProcessInfo); - - RtlDestroyProcessParameters (ProcessParameters); - + FALSE, /* terminate */ + & ProcessInfo); + if (!NT_SUCCESS(Status)) { DPRINT("SM: %s: Loading csrss.exe failed!\n", __FUNCTION__); @@ -162,11 +146,9 @@ NTSTATUS SmRunWinlogon(VOID) { - NTSTATUS Status; - UNICODE_STRING UnicodeString; - PRTL_USER_PROCESS_PARAMETERS ProcessParameters; + NTSTATUS Status = STATUS_SUCCESS; RTL_PROCESS_INFO ProcessInfo; - WCHAR UnicodeBuffer[MAX_PATH]; + WCHAR ImagePath [MAX_PATH]; /* * Start the logon process (winlogon.exe) @@ -175,43 +157,23 @@ DPRINT("SM: starting winlogon\n"); /* initialize executable path */ - wcscpy(UnicodeBuffer, L"\\??\\"); - wcscat(UnicodeBuffer, SharedUserData->NtSystemRoot); - wcscat(UnicodeBuffer, L"\\system32\\winlogon.exe"); - RtlInitUnicodeString(&UnicodeString, - UnicodeBuffer); + wcscpy(ImagePath, L"\\??\\"); + wcscat(ImagePath, SharedUserData->NtSystemRoot); + wcscat(ImagePath, L"\\system32\\winlogon.exe"); - RtlCreateProcessParameters(&ProcessParameters, - &UnicodeString, - NULL, - NULL, - NULL, - SmSystemEnvironment, - NULL, - NULL, - NULL, - NULL); - - Status = RtlCreateUserProcess(&UnicodeString, - OBJ_CASE_INSENSITIVE, - ProcessParameters, + Status = SmCreateUserProcess(ImagePath, + L"", + FALSE, /* wait */ NULL, - NULL, - NULL, - FALSE, - NULL, - NULL, - &ProcessInfo); - - RtlDestroyProcessParameters(ProcessParameters); - + FALSE, /* terminate */ + & ProcessInfo); if (!NT_SUCCESS(Status)) { DPRINT("SM: %s: Loading winlogon.exe failed!\n", __FUNCTION__); - NtTerminateProcess(Children[CHILD_CSRSS], - 0); + NtTerminateProcess(Children[CHILD_CSRSS], 0); return(Status); } + Children[CHILD_WINLOGON] = ProcessInfo.ProcessHandle; return Status; _____ Modified: trunk/reactos/subsys/smss/makefile --- trunk/reactos/subsys/smss/makefile 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/makefile 2005-02-19 22:58:18 UTC (rev 13654) @@ -6,6 +6,8 @@ TARGET_APPTYPE = native +TARGET_SDKLIBS = ntdll.a smdll.a + TARGET_NAME = smss TARGET_INSTALLDIR = system32 @@ -19,8 +21,8 @@ init.o initheap.o initenv.o initobdir.o initdosdev.o \ initrun.o initmv.o initwkdll.o initpage.o initss.o \ initreg.o \ - smapi.o \ - client.o debug.o + smapi.o smapicomp.o smapiexec.o \ + client.o debug.o print.o include $(PATH_TO_TOP)/rules.mak _____ Added: trunk/reactos/subsys/smss/print.c --- trunk/reactos/subsys/smss/print.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/print.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -0,0 +1,56 @@ +/* $Id: print.c 12852 2005-01-06 13:58:04Z mf $ + * + * print.c - Print on the blue screen + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#define NTOS_MODE_USER +#include <ntos.h> + +VOID STDCALL DisplayString(LPCWSTR lpwString) +{ + UNICODE_STRING us; + + RtlInitUnicodeString (&us, lpwString); + ZwDisplayString (&us); +} + +VOID STDCALL PrintString (char* fmt, ...) +{ + char buffer[512]; + va_list ap; + UNICODE_STRING UnicodeString; + ANSI_STRING AnsiString; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); + + RtlInitAnsiString (&AnsiString, buffer); + RtlAnsiStringToUnicodeString (&UnicodeString, + &AnsiString, + TRUE); + NtDisplayString(&UnicodeString); + RtlFreeUnicodeString (&UnicodeString); +} + +/* EOF */ _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/smapi.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -9,7 +9,7 @@ #include "smss.h" #include <rosrtl/string.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBAL VARIABLES *********************************************************/ @@ -18,9 +18,6 @@ /* SM API *******************************************************************/ -#define SMAPI(n) \ -NTSTATUS FASTCALL n (PSM_PORT_MESSAGE Request) - SMAPI(SmInvalid) { DPRINT("SM: %s called\n",__FUNCTION__); @@ -28,89 +25,193 @@ return STATUS_SUCCESS; } -SMAPI(SmCompSes) -{ - DPRINT("SM: %s called\n",__FUNCTION__); - Request->Status = STATUS_NOT_IMPLEMENTED; - return STATUS_SUCCESS; -} -SMAPI(SmExecPgm) -{ - DPRINT("SM: %s called\n",__FUNCTION__); - Request->Status = STATUS_NOT_IMPLEMENTED; - return STATUS_SUCCESS; -} - /* SM API Table */ typedef NTSTATUS (FASTCALL * SM_PORT_API)(PSM_PORT_MESSAGE); SM_PORT_API SmApi [] = { SmInvalid, /* unused */ - SmCompSes, + SmCompSes, /* smapicomp.c */ SmInvalid, /* obsolete */ SmInvalid, /* unknown */ - SmExecPgm + SmExecPgm /* smapiexec.c */ }; +#if !defined(__USE_NT_LPC__) +NTSTATUS STDCALL +SmpHandleConnectionRequest (PSM_PORT_MESSAGE Request); +#endif + /********************************************************************** * NAME - * SmpHandleConnectionRequest/2 + * SmpApiConnectedThread/1 * + * DESCRIPTION + * Entry point for the listener thread of LPC port "\SmApiPort". + */ +VOID STDCALL +SmpApiConnectedThread(PVOID dummy) +{ + NTSTATUS Status = STATUS_SUCCESS; + PVOID Unknown = NULL; + PLPC_MESSAGE Reply = NULL; + SM_PORT_MESSAGE Request = {{0}}; + + DPRINT("SM: %s running\n",__FUNCTION__); + + while (TRUE) + { + DPRINT("SM: %s: waiting for message\n",__FUNCTION__); + + Status = NtReplyWaitReceivePort(SmApiPort, + (PULONG) & Unknown, + Reply, + (PLPC_MESSAGE) & Request); + if (NT_SUCCESS(Status)) + { + DPRINT("SM: %s: message received (type=%d)\n", + __FUNCTION__, + PORT_MESSAGE_TYPE(Request)); + + switch (Request.Header.MessageType) + { + case LPC_CONNECTION_REQUEST: + SmpHandleConnectionRequest (&Request); + Reply = NULL; + break; + case LPC_DEBUG_EVENT: +// DbgSsHandleKmApiMsg (&Request, 0); + Reply = NULL; + break; + case LPC_PORT_CLOSED: + Reply = NULL; + break; + default: + if ((Request.ApiIndex) && + (Request.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) + { + Status = SmApi[Request.ApiIndex](&Request); + Reply = (PLPC_MESSAGE) & Request; + } else { + Request.Status = STATUS_NOT_IMPLEMENTED; + Reply = (PLPC_MESSAGE) & Request; + } + } + } + } +} + +/********************************************************************** + * NAME + * SmpHandleConnectionRequest/1 + * + * ARGUMENTS + * Request: LPC connection request message + * * REMARKS * Quoted in http://support.microsoft.com/kb/258060/EN-US/ */ NTSTATUS STDCALL -SmpHandleConnectionRequest (HANDLE Port, PSM_PORT_MESSAGE Request) +SmpHandleConnectionRequest (PSM_PORT_MESSAGE Request) { +#if defined(__USE_NT_LPC__) NTSTATUS Status = STATUS_SUCCESS; PSM_CLIENT_DATA ClientData = NULL; PVOID Context = NULL; DPRINT("SM: %s called\n",__FUNCTION__); + /* + * SmCreateClient/2 is called here explicitly to *fail*. + * If it succeeds, there is something wrong in the + * connection request. An environment subsystem *never* + * registers twice. (Security issue: maybe we will + * write this event into the security log). + */ Status = SmCreateClient (Request, & ClientData); if(STATUS_SUCCESS == Status) { -#ifdef __USE_NT_LPC__ + /* OK: the client is an environment subsystem + * willing to manage a free image type. + * Accept it. + */ Status = NtAcceptConnectPort (& ClientData->ApiPort, Context, - SmApiPort, + (PLPC_MESSAGE) Request, TRUE, //accept NULL, NULL); -#else + if(NT_SUCCESS(Status)) + { + Status = NtCompleteConnectPort(ClientData->ApiPort); + } + return STATUS_SUCCESS; + } else { + /* Reject the subsystem */ Status = NtAcceptConnectPort (& ClientData->ApiPort, Context, (PLPC_MESSAGE) Request, + FALSE, //reject + NULL, + NULL); + } +#else /* ReactOS LPC */ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CLIENT_DATA ClientData = NULL; + + DPRINT("SM: %s called\n",__FUNCTION__); + + Status = SmCreateClient (Request, & ClientData); + if(STATUS_SUCCESS == Status) + { + Status = NtAcceptConnectPort (& ClientData->ApiPort, + SmApiPort, + NULL, TRUE, //accept NULL, NULL); -#endif - if(NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { + DPRINT1("SM: %s: NtAcceptConnectPort() failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + return Status; + } else { Status = NtCompleteConnectPort(ClientData->ApiPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: NtCompleteConnectPort() failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + return Status; + } + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + FALSE, + 0, + NULL, + NULL, + (PTHREAD_START_ROUTINE) SmpApiConnectedThread, + ClientData->ApiPort, + & ClientData->ApiPortThread, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: Unable to create server thread (Status=0x%08lx)\n", + __FUNCTION__, Status); + return Status; + } } return STATUS_SUCCESS; } else { /* Reject the subsystem */ -#ifdef __USE_NT_LPC__ Status = NtAcceptConnectPort (& ClientData->ApiPort, - Context, SmApiPort, - FALSE, //reject NULL, - NULL); -#else - Status = NtAcceptConnectPort (& ClientData->ApiPort, - Context, - (PLPC_MESSAGE) Request, FALSE, //reject NULL, NULL); -#endif } +#endif /* defined __USE_NT_LPC__ */ return Status; } @@ -118,59 +219,39 @@ * NAME * SmpApiThread/1 * - * DESCRIPTION - * Entry point for the listener thread of LPC port "\SmApiPort". + * DECRIPTION + * Due to differences in LPC implementation between NT and ROS, + * we need a thread to listen for connection request that + * creates a new thread for each connected port. This is not + * necessary in NT LPC, because server side connected ports are + * never used to receive requests. */ VOID STDCALL -SmpApiThread(HANDLE Port) +SmpApiThread (HANDLE ListeningPort) { NTSTATUS Status = STATUS_SUCCESS; - PVOID Unknown = NULL; - PLPC_MESSAGE Reply = NULL; - SM_PORT_MESSAGE Request = {{0}}; - - DPRINT("SM: %s running\n",__FUNCTION__); - + LPC_MAX_MESSAGE Request = {{0}}; + while (TRUE) { - DPRINT("SM: %s: waiting for message\n",__FUNCTION__); - - Status = NtReplyWaitReceivePort(Port, - (PULONG) & Unknown, - Reply, - (PLPC_MESSAGE) & Request); - if (NT_SUCCESS(Status)) + Status = NtListenPort (ListeningPort, & Request.Header); + if (!NT_SUCCESS(Status)) { - DPRINT("SM: %s: message received (type=%d)\n", - __FUNCTION__, - PORT_MESSAGE_TYPE(Request)); - - switch (Request.Header.MessageType) - { - case LPC_CONNECTION_REQUEST: - SmpHandleConnectionRequest (Port, &Request); - Reply = NULL; - break; - case LPC_DEBUG_EVENT: -// DbgSsHandleKmApiMsg (&Request, 0); - Reply = NULL; - break; - case LPC_PORT_CLOSED: - Reply = NULL; - break; - default: - if ((Request.ApiIndex) && - (Request.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) - { - Status = SmApi[Request.ApiIndex](&Request); - Reply = (PLPC_MESSAGE) & Request; - } else { - Request.Status = STATUS_NOT_IMPLEMENTED; - Reply = (PLPC_MESSAGE) & Request; - } - } + DPRINT1("SM: %s: NtListenPort() failed! (Status==x%08lx)\n", __FUNCTION__, Status); + break; } + Status = SmpHandleConnectionRequest ((PSM_PORT_MESSAGE) & Request); + if(!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: SmpHandleConnectionRequest failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + break; + } } + /* Cleanup */ + NtClose(ListeningPort); + /* DIE */ + NtTerminateThread(NtCurrentThread(), Status); } @@ -186,9 +267,9 @@ NTSTATUS SmCreateApiPort(VOID) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeString; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes = {0}; + UNICODE_STRING UnicodeString = {0}; + NTSTATUS Status = STATUS_SUCCESS; RtlRosInitUnicodeStringFromLiteral(&UnicodeString, L"\\SmApiPort"); @@ -207,8 +288,10 @@ { return(Status); } - - /* Create two threads for "\SmApiPort" */ + /* + * Create one thread for the named LPC + * port \SmApiPort + */ RtlCreateUserThread(NtCurrentProcess(), NULL, FALSE, @@ -220,17 +303,6 @@ NULL, NULL); - RtlCreateUserThread(NtCurrentProcess(), - NULL, - FALSE, - 0, - NULL, - NULL, - (PTHREAD_START_ROUTINE)SmpApiThread, - (PVOID)SmApiPort, - NULL, - NULL); - return(Status); } _____ Added: trunk/reactos/subsys/smss/smapicomp.c --- trunk/reactos/subsys/smss/smapicomp.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/smapicomp.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -0,0 +1,27 @@ +/* $Id: $ + * + * smapicomp.c - SM_API_COMPLETE_SESSION + * + * Reactos Session Manager + * + */ + +#include "smss.h" +#include <rosrtl/string.h> + +#define NDEBUG +#include <debug.h> + + +/********************************************************************** + * SmCompSes/1 API + */ +SMAPI(SmCompSes) +{ + DPRINT("SM: %s called\n",__FUNCTION__); + Request->Status = STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; +} + + +/* EOF */ _____ Added: trunk/reactos/subsys/smss/smapiexec.c --- trunk/reactos/subsys/smss/smapiexec.c 2005-02-19 22:56:59 UTC (rev 13653) +++ trunk/reactos/subsys/smss/smapiexec.c 2005-02-19 22:58:18 UTC (rev 13654) @@ -0,0 +1,113 @@ +/* $Id: $ + * + * smapiexec.c - SM_API_EXECUTE_PROGRAM + * + * Reactos Session Manager + * + */ + +#include "smss.h" +#include <rosrtl/string.h> + +#define NDEBUG +#include <debug.h> + +/********************************************************************** + * SmCreateUserProcess/5 + * + */ +NTSTATUS STDCALL +SmCreateUserProcess (LPWSTR ImagePath, + LPWSTR CommandLine, + BOOLEAN WaitForIt, + PLARGE_INTEGER Timeout OPTIONAL, + BOOLEAN TerminateIt, + PRTL_PROCESS_INFO UserProcessInfo OPTIONAL + ) +{ + UNICODE_STRING ImagePathString = {0}; + UNICODE_STRING CommandLineString = {0}; + PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; + RTL_PROCESS_INFO ProcessInfo = {0}; + PRTL_PROCESS_INFO pProcessInfo = & ProcessInfo; + NTSTATUS Status = STATUS_SUCCESS; + + + DPRINT("SM: %s called\n",__FUNCTION__); + + RtlInitUnicodeString (& ImagePathString, ImagePath); + RtlInitUnicodeString (& CommandLineString, CommandLine); + + RtlCreateProcessParameters(& ProcessParameters, + & ImagePathString, + NULL, + NULL, + & CommandLineString, + SmSystemEnvironment, + NULL, + NULL, + NULL, + NULL); + + if(NULL != UserProcessInfo) + { + /* Use caller provided storage */ + pProcessInfo = UserProcessInfo; + } + + Status = RtlCreateUserProcess (& ImagePathString, + OBJ_CASE_INSENSITIVE, [truncated at 1000 lines; 141 more skipped]

1 0

[ea] 13653: CSRSS: register CSRSS to manage IMAGE_SUBSYSTEM_WINDOWS_CUI (experimental).
by ea＠svn.reactos.com 19 Feb '05

19 Feb '05

CSRSS: register CSRSS to manage IMAGE_SUBSYSTEM_WINDOWS_CUI (experimental). Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/init.c Deleted: trunk/reactos/subsys/csrss/lpcstub.c Modified: trunk/reactos/subsys/csrss/makefile _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-02-19 22:30:27 UTC (rev 13652) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-02-19 22:56:59 UTC (rev 13653) @@ -178,7 +178,7 @@ Status = NtAcceptConnectPort(&ServerPort, PortHandle, NULL, - 1, + TRUE, 0, &LpcRead); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-02-19 22:30:27 UTC (rev 13652) +++ trunk/reactos/subsys/csrss/init.c 2005-02-19 22:56:59 UTC (rev 13653) @@ -17,11 +17,12 @@ #include <ntdll/ldr.h> #include <win32k/win32k.h> #include <rosrtl/string.h> +#include <sm/helper.h> #include "api.h" #include "csrplugin.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ******************************************************************/ @@ -218,7 +219,38 @@ { 0, 0, 0, NULL } }; +/********************************************************************** + * NAME + * CsrpRegisterSubsystem/0 + * + * DESCRIPTION + * Register CSRSS in the SM to manage IMAGE_SUBSYSTEM_WINDOWS_CUI + * processes (environment subsystem server). + * + * RETURN VALUE + * STATUS_SUCCESS on success. + */ +static NTSTATUS FASTCALL +CsrpRegisterSubsystem(PHANDLE hSmApiPort) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING SbApiPortName; + RtlInitUnicodeString (& SbApiPortName, L"\\Windows\\SbApiPort"); + Status = SmConnectApiPort (& SbApiPortName, + (HANDLE)-1, //unused + IMAGE_SUBSYSTEM_WINDOWS_CUI, + hSmApiPort); + if(!NT_SUCCESS(Status)) + { + DPRINT("CSR: unable to connect to the SM (Status=0x%lx)\n", Status); + return Status; + } + DisplayString(L"CSR: registered with SM\n"); + return Status; +} + + /********************************************************************** * NAME * CsrServerInitialization @@ -238,10 +270,21 @@ ) { NTSTATUS Status; + HANDLE hSmApiPort = (HANDLE) 0; OBJECT_ATTRIBUTES ObAttributes; UNICODE_STRING PortName; HANDLE ApiPortHandle; +// HANDLE hSbApiPort = (HANDLE) 0; +DisplayString(L"CSR: CsrServerInitialization\n"); + + Status = CsrpRegisterSubsystem(& hSmApiPort); + if (! NT_SUCCESS(Status)) + { + DPRINT1("CSR: Unable to register subsystem (Status: %x)\n", Status); + return FALSE; + } + Status = CsrParseCommandLine (ArgumentCount, ArgumentArray); if (! NT_SUCCESS(Status)) { @@ -269,7 +312,7 @@ return Status; } - /* NEW NAMED PORT: \ApiPort */ + /* NEW NAMED PORT: \Windows\ApiPort */ RtlRosInitUnicodeStringFromLiteral(&PortName, L"\\Windows\\ApiPort"); InitializeObjectAttributes(&ObAttributes, &PortName, @@ -283,7 +326,7 @@ 0); if (! NT_SUCCESS(Status)) { - DPRINT1("CSR: Unable to create \\ApiPort (Status %x)\n", Status); + DPRINT1("CSR: Unable to create \\Windows\\ApiPort (Status %x)\n", Status); return FALSE; } Status = RtlCreateUserThread(NtCurrentProcess(), @@ -302,6 +345,9 @@ NtClose(ApiPortHandle); return FALSE; } + + /* TODO: create \Windows\SbApiPort */ + Status = CsrClientConnectToServer(); if (!NT_SUCCESS(Status)) { @@ -315,7 +361,15 @@ return FALSE; } - return CallInitComplete(); + if (CallInitComplete()) + { +#if 0 + Status = SmCompleteSession (hSmApiPort,hSbApiPort,ApiPortHandle); +#endif + NtClose (hSmApiPort); + return TRUE; + } + return FALSE; } /* EOF */ _____ Deleted: trunk/reactos/subsys/csrss/lpcstub.c --- trunk/reactos/subsys/csrss/lpcstub.c 2005-02-19 22:30:27 UTC (rev 13652) +++ trunk/reactos/subsys/csrss/lpcstub.c 2005-02-19 22:56:59 UTC (rev 13653) @@ -1,42 +0,0 @@ -/* $Id$ - * - * lpcstub.c - * - * ReactOS Operating System - * - * - */ -#include <ddk/ntddk.h> -#include "api.h" - - -/* CUI & GUI Win32(tm) API port */ - -LPC_RETURN_CODE -PortDispatcher_Api( - PLPC_REQUEST_REPLY pLpcRequestReply - ) -{ - switch (pLpcRequestReply->Function) - { - case CSRSS_API_PROCESS_CREATE: - return CSRSS_CreateProcess(pLpcRequestReply); - case CSRSS_API_PROCESS_TERMINATE: - return CSRSS_TerminateProcess(pLpcRequestReply); - } - return LPC_ERROR_INVALID_FUNCTION; -} - - -/* The \SbApi dispatcher: what is this port for? */ - -LPC_RETURN_CODE -PortDispatcher_SbApi( - PLPC_REQUEST_REPLY pLpcRequestReply - ) -{ - return LPC_ERROR_INVALID_FUNCTION; -} - - -/* EOF */ _____ Modified: trunk/reactos/subsys/csrss/makefile --- trunk/reactos/subsys/csrss/makefile 2005-02-19 22:30:27 UTC (rev 13652) +++ trunk/reactos/subsys/csrss/makefile 2005-02-19 22:56:59 UTC (rev 13653) @@ -9,7 +9,7 @@ TARGET_NAME = csrss -TARGET_SDKLIBS = rosrtl.a ntdll.a +TARGET_SDKLIBS = rosrtl.a ntdll.a smdll.a TARGET_INSTALLDIR = system32

1 0

[gvg] 13652: Import Wine Resource Compiler and use it for winedll's
by gvg＠svn.reactos.com 19 Feb '05

19 Feb '05

Import Wine Resource Compiler and use it for winedll's Modified: trunk/reactos/rules.mak Modified: trunk/reactos/tools/Makefile Modified: trunk/reactos/tools/helper.mk Added: trunk/reactos/tools/wrc/ Added: trunk/reactos/tools/wrc/Makefile Added: trunk/reactos/tools/wrc/lex.yy.c Added: trunk/reactos/tools/wrc/port/ Added: trunk/reactos/tools/wrc/port/mkstemps.c Modified: trunk/reactos/tools/wrc/readres.c Added: trunk/reactos/tools/wrc/unicode/ Added: trunk/reactos/tools/wrc/unicode/wine/ Added: trunk/reactos/tools/wrc/unicode/wine/unicode.h Modified: trunk/reactos/tools/wrc/utils.c Added: trunk/reactos/tools/wrc/wpp/ Added: trunk/reactos/tools/wrc/wpp/lex.yy.c Modified: trunk/reactos/tools/wrc/wpp/ppl.l Modified: trunk/reactos/tools/wrc/wpp/ppy.y Modified: trunk/reactos/tools/wrc/wpp/preproc.c Modified: trunk/reactos/tools/wrc/wpp/wpp.c Added: trunk/reactos/tools/wrc/wpp/wpp.tab.c Added: trunk/reactos/tools/wrc/wpp/wpp.tab.h Modified: trunk/reactos/tools/wrc/wpp/wpp_private.h Modified: trunk/reactos/tools/wrc/wrc.c Modified: trunk/reactos/tools/wrc/writeres.c Added: trunk/reactos/tools/wrc/y.tab.c Added: trunk/reactos/tools/wrc/y.tab.h _____ Modified: trunk/reactos/rules.mak --- trunk/reactos/rules.mak 2005-02-19 22:22:45 UTC (rev 13651) +++ trunk/reactos/rules.mak 2005-02-19 22:30:27 UTC (rev 13652) @@ -162,6 +162,7 @@ export BIN2RES = $(Q)$(TOOLS_PATH)/bin2res/bin2res export XSLTPROC = $(Q)xsltproc export MS2PS = $(Q)$(TOOLS_PATH)/ms2ps/ms2ps +export WRC = $(Q)$(TOOLS_PATH)/wrc/wrc export STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=$(OARCH) -D_M_IX86 export STD_CPPFLAGS = $(STD_CFLAGS) _____ Modified: trunk/reactos/tools/Makefile --- trunk/reactos/tools/Makefile 2005-02-19 22:22:45 UTC (rev 13651) +++ trunk/reactos/tools/Makefile 2005-02-19 22:30:27 UTC (rev 13652) @@ -20,7 +20,7 @@ CLEAN_FILES = $(TOOLS) all: $(TOOLS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \ - wine2ros_target pipetools_target winebuild_target bin2res_target + wine2ros_target pipetools_target winebuild_target bin2res_target wrc_target buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h @$(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c @@ -130,11 +130,15 @@ bin2res_target: $(MAKE) --silent -C bin2res bin2res$(EXE_POSTFIX) -.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target +wrc_target: + $(MAKE) --silent -C wrc wrc$(EXE_POSTFIX) +.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target wrc_target + ifeq ($(HOST),mingw32-linux) clean: + $(MAKE) --silent -C wrc clean $(MAKE) --silent -C cabman clean $(MAKE) --silent -C cdmake clean $(MAKE) --silent -C mkhive clean @@ -150,6 +154,7 @@ endif ifeq ($(HOST),mingw32-windows) clean: + $(MAKE) --silent -C wrc clean $(MAKE) --silent -C cabman clean $(MAKE) --silent -C cdmake clean $(MAKE) --silent -C mkhive clean _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-02-19 22:22:45 UTC (rev 13651) +++ trunk/reactos/tools/helper.mk 2005-02-19 22:30:27 UTC (rev 13652) @@ -474,7 +474,7 @@ MK_SDKLIBS := MK_CFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D_STDDEF_H -I$(PATH_TO_TOP)/include/wine MK_CPPFLAGS := -D__USE_W32API -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501 -DWINVER=0x501 -D__need_offsetof -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/include/wine - MK_RCFLAGS := --define __USE_W32API --include-dir $(PATH_TO_TOP)/include/wine + MK_PREPROC_FOR_RC_FLAGS := -xc -E -DRC_INVOKED -D__USE_W32API -I$(PATH_TO_TOP)/include/wine -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/w32api/include MK_IMPLIB := yes MK_IMPLIBONLY := no MK_IMPLIBDEFPATH := $(SDK_PATH_LIB) @@ -931,7 +931,7 @@ - $(RM) *.o $(MK_PCHCLEAN) $(MK_BASENAME).a $(MK_RESOURCE) \ $(MK_FULLNAME) $(MK_NOSTRIPNAME) $(MK_CLEANFILES) $(MK_CLEANDEPS) $(MK_BASENAME).map \ junk.tmp base.tmp temp.exp $(MK_RC_BINARIES) $(MK_SPECDEF) $(MK_STUBS_SRC) \ - $(MK_GENERATED_MAKEFILE) $(TARGET_CLEAN) + $(MK_RES_TEMPS) $(MK_GENERATED_MAKEFILE) $(TARGET_CLEAN) ifneq ($(TARGET_HEADERS),) $(TARGET_OBJECTS): $(TARGET_HEADERS) @@ -1007,6 +1007,8 @@ $(BIN2RES) -f -o $@ $(TARGET_RC_BINSRC) $(MK_RESOURCE): $(MK_RC_BINARIES) + +MK_RES_TEMPS = $(MK_RESOURCE:.coff=.rci) $(MK_RESOURCE:.coff=.res) endif REGTEST_TESTS = $(wildcard tests/tests/*.c) @@ -1091,9 +1093,19 @@ %.o: %.asm $(HALFVERBOSEECHO) [NASM] $< $(NASM_CMD) $(TARGET_NFLAGS) $< -o $@ +ifeq ($(TARGET_TYPE),winedll) %.coff: %.rc $(HALFVERBOSEECHO) [RC] $< + $(CC) $(MK_PREPROC_FOR_RC_FLAGS) $< > $(<:.rc=.rci) + $(WRC) $(<:.rc=.rci) $(<:.rc=.res) + $(RM) $(<:.rc=.rci) + $(RC) $(<:.rc=.res) -o $@ + $(RM) $(<:.rc=.res) +else +%.coff: %.rc + $(HALFVERBOSEECHO) [RC] $< $(RC) $(TARGET_RCFLAGS) $< -o $@ +endif %.spec.def: %.spec $(HALFVERBOSEECHO) [DEF] $< $(WINEBUILD) $(DEFS) -o $@ --def $< _____ Copied: trunk/reactos/tools/wrc (from rev 13651, vendor/wine/tools/wrc/current) _____ Added: trunk/reactos/tools/wrc/Makefile --- vendor/wine/tools/wrc/current/Makefile 2005-02-19 22:22:45 UTC (rev 13651) +++ trunk/reactos/tools/wrc/Makefile 2005-02-19 22:30:27 UTC (rev 13652) @@ -0,0 +1,157 @@ +# +# wrc +# +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +TARGET = wrc$(EXE_POSTFIX) + +all: $(TARGET) + +BASE_OBJECTS = \ + dumpres.o \ + genres.o \ + newstruc.o \ + readres.o \ + translation.o \ + utils.o \ + wrc.o \ + writeres.o \ + y.tab.o \ + lex.yy.o + +WPP_OBJECTS = \ + wpp/preproc.o \ + wpp/wpp.o \ + wpp/wpp.tab.o \ + wpp/lex.yy.o + +CODEPAGES = \ + 037 \ + 424 \ + 437 \ + 500 \ + 737 \ + 775 \ + 850 \ + 852 \ + 855 \ + 856 \ + 857 \ + 860 \ + 861 \ + 862 \ + 863 \ + 864 \ + 865 \ + 866 \ + 869 \ + 874 \ + 875 \ + 878 \ + 932 \ + 936 \ + 949 \ + 950 \ + 1006 \ + 1026 \ + 1250 \ + 1251 \ + 1252 \ + 1253 \ + 1254 \ + 1255 \ + 1256 \ + 1257 \ + 1258 \ + 10000 \ + 10006 \ + 10007 \ + 10029 \ + 10079 \ + 10081 \ + 20866 \ + 20932 \ + 21866 \ + 28591 \ + 28592 \ + 28593 \ + 28594 \ + 28595 \ + 28596 \ + 28597 \ + 28598 \ + 28599 \ + 28600 \ + 28603 \ + 28604 \ + 28605 \ + 28606 + +UNICODE_OBJECTS = \ + unicode/casemap.o \ + unicode/compose.o \ + unicode/cptable.o \ + unicode/mbtowc.o \ + unicode/string.o \ + unicode/wctomb.o \ + unicode/wctype.o \ + $(CODEPAGES:%=unicode/c_%.o) + +PORT_OBJECTS = \ + port/mkstemps.o + +OBJECTS = $(BASE_OBJECTS) $(WPP_OBJECTS) $(UNICODE_OBJECTS) $(PORT_OBJECTS) + +CLEAN_FILES = *.o $(TARGET) + +HOST_CFLAGS = -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ + -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ + -Iunicode -Iwpp -I$(PATH_TO_TOP)/include/wine \ + -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/w32api/include + +%.o: %.c + $(HOST_CC) $(HOST_CFLAGS) -c $< -o $@ + +$(TARGET): $(OBJECTS) + $(HOST_CC) $(OBJECTS) -o $(TARGET) + +ifeq ($(HOST),mingw32-linux) +clean: + -rm -f $(OBJECTS) $(TARGET) +endif +ifneq ($(HOST),mingw32-linux) +clean: + -del $(TARGET) + -del *.o + -del wpp\*.o + -del unicode\*.o + -del port\*.o +endif + +.PHONY: clean + +LEXOPT = -Cf #-w -b +YACCOPT = #-v +# +# Optional use of bison, this will allow independent building from +# Wine. +# +# Bison is requiered for building msi.dll. If MingW32 for windows, +# download bison from http://gnuwin32.sourceforge.net/ +# Make sure bison.exe is placed in your command path for execution. +# +# +# +#y.tab.c y.tab.h: parser.y +# bison $(YACCOPT) -d -t parser.y -o y.tab.c +# +#lex.yy.c: parser.l +# flex $(LEXOPT) -d -8 parser.l +# +#wpp/y.tab.c wpp/y.tab.h: wpp/ppl.l +# bison $(YACCOPT) -ppp -d -t wpp/ppy.y -o wpp/wpp.tab.c +# +#wpp/lex.yy.c: wpp/ppl.l +# flex $(LEXOPT) -d -8 -Ppp -owpp/lex.yy.c wpp/ppl.l Property changes on: trunk/reactos/tools/wrc/Makefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/tools/wrc/lex.yy.c --- vendor/wine/tools/wrc/current/lex.yy.c 2005-02-19 22:22:45 UTC (rev 13651) +++ trunk/reactos/tools/wrc/lex.yy.c 2005-02-19 22:30:27 UTC (rev 13652) @@ -0,0 +1,9072 @@ +/* A lexical scanner generated by flex */ + +/* Scanner skeleton version: + * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 + +#include <stdio.h> +#include <errno.h> + +/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ +#ifdef c_plusplus +#ifndef __cplusplus +#define __cplusplus +#endif +#endif + + +#ifdef __cplusplus + +#include <stdlib.h> +#ifndef _WIN32 +#include <unistd.h> +#endif + +/* Use prototypes in function declarations. */ +#define YY_USE_PROTOS + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +#if __STDC__ + +#define YY_USE_PROTOS +#define YY_USE_CONST + +#endif /* __STDC__ */ +#endif /* ! __cplusplus */ + +#ifdef __TURBOC__ + #pragma warn -rch + #pragma warn -use +#include <io.h> +#include <stdlib.h> +#define YY_USE_CONST +#define YY_USE_PROTOS +#endif + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + + +#ifdef YY_USE_PROTOS +#define YY_PROTO(proto) proto +#else +#define YY_PROTO(proto) () +#endif + + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN yy_start = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START ((yy_start - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE yyrestart( yyin ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#define YY_BUF_SIZE 16384 + +typedef struct yy_buffer_state *YY_BUFFER_STATE; + +extern int yyleng; +extern FILE *yyin, *yyout; + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + +/* The funky do-while in the following #define is used to turn the definition + * int a single C statement (which needs a semi-colon terminator). This + * avoids problems with code like: + * + * if ( condition_holds ) + * yyless( 5 ); + * else + * do_something_else(); + * + * Prior to using the do-while the compiler would get upset at the + * "else" because it interpreted the "if" statement as being all + * done when it reached the ';' after the yyless() call. + */ + +/* Return all but the first 'n' matched characters back to the input stream. */ + +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + *yy_cp = yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ + yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, yytext_ptr ) + +/* The following is because we cannot portably get our hands on size_t + * (without autoconf's help, which isn't available because we want + * flex-generated scanners to compile on their own). + */ +typedef unsigned int yy_size_t; + + +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + }; + +static YY_BUFFER_STATE yy_current_buffer = 0; + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + */ +#define YY_CURRENT_BUFFER yy_current_buffer + + +/* yy_hold_char holds the character lost when yytext is formed. */ +static char yy_hold_char; + +static int yy_n_chars; /* number of characters read into yy_ch_buf */ + + +int yyleng; + +/* Points to current character in buffer. */ +static char *yy_c_buf_p = (char *) 0; +static int yy_init = 1; /* whether we need to initialize */ +static int yy_start = 0; /* start state number */ + +/* Flag which is used to allow yywrap()'s to do buffer switches + * instead of setting up a fresh yyin. A bit of a hack ... + */ +static int yy_did_buffer_switch_on_eof; + +void yyrestart YY_PROTO(( FILE *input_file )); + +void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); +void yy_load_buffer_state YY_PROTO(( void )); +YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); +void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); +void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); +void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); +#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) + +YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); +YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); +YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); + +static void *yy_flex_alloc YY_PROTO(( yy_size_t )); +static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); +static void yy_flex_free YY_PROTO(( void * )); + +#define yy_new_buffer yy_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) + + +#define FLEX_DEBUG +typedef unsigned char YY_CHAR; +FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +typedef int yy_state_type; + +#define FLEX_DEBUG +extern char *yytext; +#define yytext_ptr yytext +static yyconst short yy_nxt[][256] = + { + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 + }, + + { + 25, 26, 26, 26, 26, 26, 26, 26, 26, 27, + 28, 26, 27, 27, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 27, 26, 29, 26, 26, 26, 26, 30, + + 26, 26, 26, 26, 26, 26, 31, 32, 33, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 26, 35, + 26, 26, 26, 26, 26, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 37, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 26, 31, 26, 26, 36, 26, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 38, 26, 39, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26 + }, + + { + 25, 26, 26, 26, 26, 26, 26, 26, 26, 40, + 28, 26, 40, 40, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 40, 26, 29, 41, 26, 26, 26, 30, + 26, 26, 26, 26, 26, 26, 31, 32, 33, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 26, 35, + 26, 26, 26, 26, 26, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 37, 36, 36, 36, + + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 26, 31, 26, 26, 36, 26, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 38, 26, 39, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 26 + }, + + { + 25, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 43, 42, 42, 42, 42, 42, 42, 42, 42, 42, + + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 44, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 45, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42 + }, + + { + 25, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 43, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 44, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 45, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42 + + }, + + { + 25, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 47, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 48, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 49, 46, 46, 46, 46, 46, 46, 46, + + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46 + }, + + { + 25, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 47, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 48, 46, 46, 46, 46, 46, + + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 49, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46 + }, + + { + 25, 50, 50, 50, 50, 50, 50, 50, 50, 51, + 52, 50, 51, 51, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 51, 50, 50, 50, 50, 50, 50, 53, + 50, 50, 50, 50, 50, 50, 50, 50, 54, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 50, 50, + 50, 50, 50, 50, 50, 54, 54, 54, 54, 54, + 54, 50, 50, 50, 50, 50, 50, 50, 50, 50, + + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 54, 54, 54, + 54, 54, 54, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50 + }, + + { + 25, 50, 50, 50, 50, 50, 50, 50, 50, 51, + 52, 50, 51, 51, 50, 50, 50, 50, 50, 50, + + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 51, 50, 50, 50, 50, 50, 50, 53, + 50, 50, 50, 50, 50, 50, 50, 50, 54, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 50, 50, + 50, 50, 50, 50, 50, 54, 54, 54, 54, 54, + 54, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 54, 54, 54, + 54, 54, 54, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50 + }, + + { + 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 56, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 57, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55 + + }, + + { + 25, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 56, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 57, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55 + }, + + { + 25, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58 + }, + + { + 25, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58 + }, + + { + 25, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 60, 59, 59, 59, 59, 59, 59, 59, 59, 59, + + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 58, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 61, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 62, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + + 59, 59, 59, 63, 59, 64, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59 + }, + + { + 25, 59, 59, 59, 59, 59, 59, 59, 59, 65, + 60, 59, 65, 65, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 65, 59, 59, 66, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 61, 59, 59, [truncated at 1000 lines; 34349 more skipped]

1 0

[arty] 13651: Zero queue fields needed for accept.
by arty＠svn.reactos.com 19 Feb '05

19 Feb '05

Zero queue fields needed for accept. Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-02-19 22:21:25 UTC (rev 13650) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-02-19 22:22:45 UTC (rev 13651) @@ -120,6 +120,8 @@ so->so_connection = context; so->so_state = SS_NBIO; so->so_error = 0; + so->so_q = so->so_q0 = NULL; + so->so_qlen = 0; *aso = so; } return error;

1 0

[gvg] 13650: Set eol-style
by gvg＠svn.reactos.com 19 Feb '05

19 Feb '05

Set eol-style Modified: vendor/wine/tools/wrc/current/CHANGES Modified: vendor/wine/tools/wrc/current/parser.l Modified: vendor/wine/tools/wrc/current/parser.y Modified: vendor/wine/tools/wrc/current/wrc.doc Modified: vendor/wine/tools/wrc/current/wrc.man _____ Modified: vendor/wine/tools/wrc/current/CHANGES --- vendor/wine/tools/wrc/current/CHANGES 2005-02-19 22:19:39 UTC (rev 13649) +++ vendor/wine/tools/wrc/current/CHANGES 2005-02-19 22:21:25 UTC (rev 13650) @@ -1,336 +1,336 @@ ------------------------------------------------------------------------ ---- -Version 1.1.9 (31-Dec-2000) - -Ulrich Weigand <weigand(a)informatik.uni-erlangen.de> -- Fixed a byteorder conversion problem with message tables. -- Carefully read and write (possibly) misaligned data elements - to avoid crashes on architectures where this is not allowed. - ------------------------------------------------------------------------ ---- -Version 1.1.8 (24-Aug-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Fixed a LALR(2) problem while scanning usertype resources which - had identifiers for both name and type. - ------------------------------------------------------------------------ ---- -Version 1.1.7 (24-Jul-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Implemented a bug-work-arround for Berkeley yacc (byacc) which - does not generate proper default transition rules for non-terminals. - See comments in parser.y how the fix works. -- Changed the error-line/char position to make emacs happy parsing - the position of the error. -- Added comments in the documentation in which order the line-numer - and character-position of the error is written. - ------------------------------------------------------------------------ ---- -Version 1.1.6 (05-Jun-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Bugfix: Macro expansion of strings would assert an internal error - or a segfault due to a lacking '\0' in the expansion. -- Bugfix: Prevent buffer overflow in reallocation of macro expansion - buffers. -- Bugfix: Wrc's version information was not passed as numerical to the - preprocessor due to an error in the definition of the macro. -- Relaxed the newline constraint in global LANGUAGE statements, which - was introduced in version 1.1.3, so that some fancy preprocessor - constructs can work. -- Removed the gcc-style #line handling from the resource-parser to the - resource-scanner so that it is possible to include files at any stage - of the source, independent of the parser-state. -- Bugfix: Stringtables were not correctly searched for duplicates - because the language comparison disregarded the sublanguage. -- Eliminated a repetitive warning when writing stringtables with zero - length string entries. These are perfectly valid (but make no sense:-). - Warning are now only generated during parse in pedantic mode. - ------------------------------------------------------------------------ ---- -Version 1.1.5 (12-Jun-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Bugfix: Corrected "off by one" error in the linenumber while parsing - resource. -- Bugfix: A segfault would occur if messagetables were parsed without - memory options attached. Also added buffer-overflow safeguard while - converting between byteorders. -- Finished remapping usertype resources onto standars types by tricking - the parser into accepting a different token. The remapping can be - disabled with a new commandline option '-m'. -- Resolved some warning about chars used as index on SGI O2 machine - (the ctype isXXX() routines are macros there). - ------------------------------------------------------------------------ ---- -Version 1.1.4 (07-Jun-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Implemented MESSAGETABLE resource type. -- Usertype resources that cause a type-clash with defined resources - are now detected and a warning is generated. Some types should be - rerouted through other code so that they will be (re-)interpreted. -- Bugfix: Line-continuation in strings in resources include a newline. - This `feature' got deleted with the builtin preprocessor, but has been - put back into place (see last changes comment from version 1.1.0). -- Bugfix: The preprocessor now correctly will see "\\\r\n" as a line- - continuation. -- Bugfix: Assemblers on some platforms do not use 16bit quantities - for `.word'. This directive is now changed into `.short'. -- All types that accept inline data definitions (a la RCDATA) now - also accept a file specification. This unifies the structure a bit. - ------------------------------------------------------------------------ ---- -Version 1.1.3 (21-May-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Implemented animated cursors and icons resource types. -- Added partial support for font resources (user supplied fontdir is - required). -- All resources with inline data (a la RCDATA) now support language, - version and characteristics data. -- Implemented resource name duplicate checks. It is now an error if - two resources of the same type have the same name. -- Bugfix: Language propagation was not correct when .res files were - generated. -- Bugfix: VERSIONINFO now handles memory options. -- Bugfix: resource names and the resource type may be equal (e.g. MENU - MENU {...}). This support was mistakingly deleted in the upgrade to - the builtin preprocessor. - The standalone LANGUAGE setting became context sensitive as a consequence - of this. Now it *must* end with a newline *after* both expressions and - no newlines are allowed within the line (the statement must fit on one - line). This is no practical problem though. - -Patrik Stridvall <ps(a)leissner.se> -- Fixed byte order on Solaris and FreeBSD. - ------------------------------------------------------------------------ ---- -Version 1.1.2 (08-May-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Bugfix: Corrected a SEGV in the rawdata handling. Mistakingly took the - address of a pointer instead of its value. This probably slipped in - during the merge of my tree into the winetree. - Lesson learned: always double check. -- Verified most resources so that win16 compile also generates correct - output for reversed endian. - ------------------------------------------------------------------------ ---- -Version 1.1.1 (07-May-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Implemented byte-ordering for resources. All resources can be forced - to be little-, big- or native endian with command-line option -B. -- Reading resources from .res-files are only accepted in native byte- - ordering so that no additional semantic analysis is required. -- Resource directory is still written in native-only format, including - the strings. -- Wrc is now installed through the makefile with 'make install' and also - uninstalled with 'make uninstall'. -- Wrote a man-page for better reference. The manpage also gets installed - and uninstalled. -- Cleaned up the namespace a bit by more agressive use of static. - ------------------------------------------------------------------------ ---- -Version 1.1.0 (01-May-2000) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Implemented a new preprocessor that is (nearly) ANSI-C compliant. The - old parser has been stripped from the old preprocessor-code which - cleaned up both resource-scanner and -parser. -- Standard defines have been introduced (see README.wrc) -- Both preprocessor- and resource-scanner have been optimized slightly - so that no backing up is required (one char lookahead is enough). -- Filename-scanning has been cleaned up, though not perfect yet. -- User-type resources are compatible now. -- Line-continuation in strings is corrected so that it does not - introduce a newline in the output. - ------------------------------------------------------------------------ ---- -Version 1.0.18 (28-Dec-1999) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Bugfix: The named resources were not named correctly for indirectly - addressable resources, which resulted in an undefined variable. The - previous fix was incomplete (I was probably sleeping while I made it). - ------------------------------------------------------------------------ ---- -Version 1.0.17 (20-Dec-1999) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Bugfix: Named resources of different types generated the same assembly- - label twice, resulting in a compile failure. - ------------------------------------------------------------------------ ---- -Version 1.0.16 (6-Nov-1999) - -Juergen.Schmied(a)debitel.net -- Bugfix: Styles were evaluated as expressions. The NOT in combination - with style flags was not overwriting the default styles like WS_VISIBLE. - Solved by introducing own rules for parsing styles. - ------------------------------------------------------------------------ ---- -Version 1.0.15 (13-Aug-1999) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Bugfix: IDs were not checked which resulted in numbers > 2^16-1 being - accepted as IDs. This resulted in duplicate IDs and all other sort of - trouble. - ------------------------------------------------------------------------ ---- -Version 1.0.14 (08-Aug-1999) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Deeply ashamed that I thought that flex had a bug. Of course my own fault - not recognizing unmatched text in start condition yyrcd and pp_strip[ps]. - There is a catch all rule now in the flexer with a warning to mark the - condition and promptly revealed errors in the wine-headers. - ------------------------------------------------------------------------ ---- -Version 1.0.13 (08-Aug-1999) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Fixed uppercase conversion of titles in dialog controls which was - introduced with the icon changes. -- Fixed strings longer than 1024 bytes/shorts by autosizing the array. A - warning is issued whenever more than 64k is allocated. -- Made a workarround for a flex bug where an ECHO put '\\' and '\n' - characters on the screen. - ------------------------------------------------------------------------ ---- -Version 1.0.12 (18-Jul-1999) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Generalized the distinction between 2 and 4 byte integers slightly through - a new parser state. The is now a warning when a 2 byte integer is larger - than 16 bit (and is truncated). -- Fixed a couple of cosmetic things in the DLGINIT stuff so that dumping of - this type will work as expected. -- Added generalized language/version/characteristics support to the DLGINIT - resource type. - -Ulrich Czekalla <ulrichc(a)corel.ca> -- Added support for DLGINIT resource-type. -- Added string continuation and embedded quoting. -- Added numeric IDs for icons in controls. - -Eric Pouech <Eric.Pouech(a)wanadoo.fr> -- Bugfix: Distinguish between 2 and 4 byte integers in RCDATA. - ------------------------------------------------------------------------ ---- -Version 1.0.11 (22-Apr-1999) - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Fixed a counting bug in the win32 count and sort routine. -- Fixed sort order of resources (must be name before ordinal). -- Shuffled a couple of global variables so that built-in dlls now can - load resources through the proper PE interface. - ------------------------------------------------------------------------ ---- -Version 1.0.10 (18-Feb-1999) - -Alexandre Julliard <julliard(a)lrc.epfl.ch> -- Fixed the TIME_LONG ugliness. - -David Luyer <luyer(a)ucs.uwa.edu.au> -- Added string.h include in newstruc.c for compilation on 64bit platforms. -- Added TIME_LONG to support time_t==int in printf formats on alpha - platforms. - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Added some more use of TIME_LONG in implicit format used in header-file - generation. -- Removed the windows.h include and replaced it with wintypes.h in - wrctypes.h and added winuser.h in two other sources. This cuts compilation - time by a factor of 2 and final executable size with debug by a factor 2.5. - ------------------------------------------------------------------------ ---- -Version 1.0.9 (01-Feb-1999) - -Albert den Haan <albertd(a)corel.ca>: -- Fixed wrong order of res_ico and res_bmp which must be in RT_xxx order. - ------------------------------------------------------------------------ ---- -Version 1.0.8 (10-Jan-1999) - -Albert den Haan <albertd(a)corel.ca>: -- Added TOOLBAR support. -- Buffer overflow fix in strncpyWtoA. -- Open embedded files in resource definitions through the include path from - the commandline. -- Support named icons in dialogs with unquoted names - -Bertho Stultiens <bertho(a)akhphd.au.dk> -- Fixed a major bug in the language propagation in the parser. The parser - did not copy the current language while binding it to a resource structure - causing wrong sorting if multiple global languages were in use and was a - potential segfault because the pointer might not be valid. -- Added language/version/characteristics support for toolbar. -- Moved some defines from wrc.h to wrctypes.h to support in toolbars. -- Removed function stricmp from source and replaced with native function - strcasecmp. -- Allocate cursor and icon ordinals according to the language of the item to - decrease the amount of ordinals in use. This reduces the resource - directory size by reducing the tree size. -- Versions 1.0.5 through 1.0.7 were never commited to cvs but were available - for download from an alternate site for elf-dll test generation. - ------------------------------------------------------------------------ ---- -Version 1.0.7 (19-Dec-1998) -- Changed a couple of labels that are used by dllglue. Also reversed a patch - that made wrc's generated code dependent on dllglue's code. - ------------------------------------------------------------------------ ---- -Version 1.0.6 (12-Dec-1998) -- Fixed the _PEResTab table where incorrect RVA's were put in the table. - The dllglue should now be merged into wrc for correct labels and the least - number of loadtime fixups. - ------------------------------------------------------------------------ ---- -Version 1.0.5 (12-Dec-1998) -- Fixed an omited .globl statement for dllglue linking. - ------------------------------------------------------------------------ ---- -Version 1.0.4 (10-Dec-1998) -- Added a global label for elf-dll linking and a long with the resource - size and a long with the directory size. -- Killed an annoying warning since version 1.0.0 in parser.y about a - var being used before init. - ------------------------------------------------------------------------ ---- -Version 1.0.3 (02-Nov-1998) -- Bugfix in write_name_str() [writeres.c] where the length byte/word was - wrongly counted in the length of the string. - Thanks to Ulrich Weigand <weigand(a)informatik.uni-erlangen.de> - ------------------------------------------------------------------------ ---- -Version 1.0.2 (20-Jun-1998) -- Started this file -- Fixed a bug in filename scanning when they are double quoted. The code now - is compatible with MS' rc and Borland's brc. There is a compromise in the - filenames because of case-sensitivity under *nix. -- Backslashes in a filepath are now converted to forward slashes and double -- Fixed a bug in printing the filename if loading of a file should fail. - backslashes are converted to single forward slash. -- Added -L option to prevent conversion to lower case for embedded filenames - in resource statements. -- Added language posibilities to icons and cursors so that the current - language is put into the .res ans .s file. -- Added character position indication of an error. -- Fixed CLASS statement so that it accepts double quoted strings as class - argument. This seems to be the correct behaviour (see SDK). The unquoted - class-name is still supported because it seems a reasonable option. -- Fixed accelerators with CONTROL option set so that they generate correct - code instead of generating an error. -- Added testing for flex version 2.5 or better because wrc needs the - yy_scan* functions to do preprocessing. - ------------------------------------------------------------------------ ---- -Version 1.0.1 (08-Jun-1998) -- Added -A commandline option to generate autoregister code for the winelib - programs. - ------------------------------------------------------------------------ ---- -Version 1.0.0 (28-May-1998) -- Initial release +----------------------------------------------------------------------- ---- +Version 1.1.9 (31-Dec-2000) + +Ulrich Weigand <weigand(a)informatik.uni-erlangen.de> +- Fixed a byteorder conversion problem with message tables. +- Carefully read and write (possibly) misaligned data elements + to avoid crashes on architectures where this is not allowed. + +----------------------------------------------------------------------- ---- +Version 1.1.8 (24-Aug-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Fixed a LALR(2) problem while scanning usertype resources which + had identifiers for both name and type. + +----------------------------------------------------------------------- ---- +Version 1.1.7 (24-Jul-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented a bug-work-arround for Berkeley yacc (byacc) which + does not generate proper default transition rules for non-terminals. + See comments in parser.y how the fix works. +- Changed the error-line/char position to make emacs happy parsing + the position of the error. +- Added comments in the documentation in which order the line-numer + and character-position of the error is written. + +----------------------------------------------------------------------- ---- +Version 1.1.6 (05-Jun-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: Macro expansion of strings would assert an internal error + or a segfault due to a lacking '\0' in the expansion. +- Bugfix: Prevent buffer overflow in reallocation of macro expansion + buffers. +- Bugfix: Wrc's version information was not passed as numerical to the + preprocessor due to an error in the definition of the macro. +- Relaxed the newline constraint in global LANGUAGE statements, which + was introduced in version 1.1.3, so that some fancy preprocessor + constructs can work. +- Removed the gcc-style #line handling from the resource-parser to the + resource-scanner so that it is possible to include files at any stage + of the source, independent of the parser-state. +- Bugfix: Stringtables were not correctly searched for duplicates + because the language comparison disregarded the sublanguage. +- Eliminated a repetitive warning when writing stringtables with zero + length string entries. These are perfectly valid (but make no sense:-). + Warning are now only generated during parse in pedantic mode. + +----------------------------------------------------------------------- ---- +Version 1.1.5 (12-Jun-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: Corrected "off by one" error in the linenumber while parsing + resource. +- Bugfix: A segfault would occur if messagetables were parsed without + memory options attached. Also added buffer-overflow safeguard while + converting between byteorders. +- Finished remapping usertype resources onto standars types by tricking + the parser into accepting a different token. The remapping can be + disabled with a new commandline option '-m'. +- Resolved some warning about chars used as index on SGI O2 machine + (the ctype isXXX() routines are macros there). + +----------------------------------------------------------------------- ---- +Version 1.1.4 (07-Jun-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented MESSAGETABLE resource type. +- Usertype resources that cause a type-clash with defined resources + are now detected and a warning is generated. Some types should be + rerouted through other code so that they will be (re-)interpreted. +- Bugfix: Line-continuation in strings in resources include a newline. + This `feature' got deleted with the builtin preprocessor, but has been + put back into place (see last changes comment from version 1.1.0). +- Bugfix: The preprocessor now correctly will see "\\\r\n" as a line- + continuation. +- Bugfix: Assemblers on some platforms do not use 16bit quantities + for `.word'. This directive is now changed into `.short'. +- All types that accept inline data definitions (a la RCDATA) now + also accept a file specification. This unifies the structure a bit. + +----------------------------------------------------------------------- ---- +Version 1.1.3 (21-May-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented animated cursors and icons resource types. +- Added partial support for font resources (user supplied fontdir is + required). +- All resources with inline data (a la RCDATA) now support language, + version and characteristics data. +- Implemented resource name duplicate checks. It is now an error if + two resources of the same type have the same name. +- Bugfix: Language propagation was not correct when .res files were + generated. +- Bugfix: VERSIONINFO now handles memory options. +- Bugfix: resource names and the resource type may be equal (e.g. MENU + MENU {...}). This support was mistakingly deleted in the upgrade to + the builtin preprocessor. + The standalone LANGUAGE setting became context sensitive as a consequence + of this. Now it *must* end with a newline *after* both expressions and + no newlines are allowed within the line (the statement must fit on one + line). This is no practical problem though. + +Patrik Stridvall <ps(a)leissner.se> +- Fixed byte order on Solaris and FreeBSD. + +----------------------------------------------------------------------- ---- +Version 1.1.2 (08-May-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: Corrected a SEGV in the rawdata handling. Mistakingly took the + address of a pointer instead of its value. This probably slipped in + during the merge of my tree into the winetree. + Lesson learned: always double check. +- Verified most resources so that win16 compile also generates correct + output for reversed endian. + +----------------------------------------------------------------------- ---- +Version 1.1.1 (07-May-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented byte-ordering for resources. All resources can be forced + to be little-, big- or native endian with command-line option -B. +- Reading resources from .res-files are only accepted in native byte- + ordering so that no additional semantic analysis is required. +- Resource directory is still written in native-only format, including + the strings. +- Wrc is now installed through the makefile with 'make install' and also + uninstalled with 'make uninstall'. +- Wrote a man-page for better reference. The manpage also gets installed + and uninstalled. +- Cleaned up the namespace a bit by more agressive use of static. + +----------------------------------------------------------------------- ---- +Version 1.1.0 (01-May-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented a new preprocessor that is (nearly) ANSI-C compliant. The + old parser has been stripped from the old preprocessor-code which + cleaned up both resource-scanner and -parser. +- Standard defines have been introduced (see README.wrc) +- Both preprocessor- and resource-scanner have been optimized slightly + so that no backing up is required (one char lookahead is enough). +- Filename-scanning has been cleaned up, though not perfect yet. +- User-type resources are compatible now. +- Line-continuation in strings is corrected so that it does not + introduce a newline in the output. + +----------------------------------------------------------------------- ---- +Version 1.0.18 (28-Dec-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: The named resources were not named correctly for indirectly + addressable resources, which resulted in an undefined variable. The + previous fix was incomplete (I was probably sleeping while I made it). + +----------------------------------------------------------------------- ---- +Version 1.0.17 (20-Dec-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: Named resources of different types generated the same assembly- + label twice, resulting in a compile failure. + +----------------------------------------------------------------------- ---- +Version 1.0.16 (6-Nov-1999) + +Juergen.Schmied(a)debitel.net +- Bugfix: Styles were evaluated as expressions. The NOT in combination + with style flags was not overwriting the default styles like WS_VISIBLE. + Solved by introducing own rules for parsing styles. + +----------------------------------------------------------------------- ---- +Version 1.0.15 (13-Aug-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: IDs were not checked which resulted in numbers > 2^16-1 being + accepted as IDs. This resulted in duplicate IDs and all other sort of + trouble. + +----------------------------------------------------------------------- ---- +Version 1.0.14 (08-Aug-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Deeply ashamed that I thought that flex had a bug. Of course my own fault + not recognizing unmatched text in start condition yyrcd and pp_strip[ps]. + There is a catch all rule now in the flexer with a warning to mark the + condition and promptly revealed errors in the wine-headers. + +----------------------------------------------------------------------- ---- +Version 1.0.13 (08-Aug-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Fixed uppercase conversion of titles in dialog controls which was + introduced with the icon changes. +- Fixed strings longer than 1024 bytes/shorts by autosizing the array. A + warning is issued whenever more than 64k is allocated. +- Made a workarround for a flex bug where an ECHO put '\\' and '\n' + characters on the screen. + +----------------------------------------------------------------------- ---- +Version 1.0.12 (18-Jul-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Generalized the distinction between 2 and 4 byte integers slightly through + a new parser state. The is now a warning when a 2 byte integer is larger + than 16 bit (and is truncated). +- Fixed a couple of cosmetic things in the DLGINIT stuff so that dumping of + this type will work as expected. +- Added generalized language/version/characteristics support to the DLGINIT + resource type. + +Ulrich Czekalla <ulrichc(a)corel.ca> +- Added support for DLGINIT resource-type. +- Added string continuation and embedded quoting. +- Added numeric IDs for icons in controls. + +Eric Pouech <Eric.Pouech(a)wanadoo.fr> +- Bugfix: Distinguish between 2 and 4 byte integers in RCDATA. + +----------------------------------------------------------------------- ---- +Version 1.0.11 (22-Apr-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Fixed a counting bug in the win32 count and sort routine. +- Fixed sort order of resources (must be name before ordinal). +- Shuffled a couple of global variables so that built-in dlls now can + load resources through the proper PE interface. + +----------------------------------------------------------------------- ---- +Version 1.0.10 (18-Feb-1999) + +Alexandre Julliard <julliard(a)lrc.epfl.ch> +- Fixed the TIME_LONG ugliness. + +David Luyer <luyer(a)ucs.uwa.edu.au> +- Added string.h include in newstruc.c for compilation on 64bit platforms. +- Added TIME_LONG to support time_t==int in printf formats on alpha + platforms. + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Added some more use of TIME_LONG in implicit format used in header-file + generation. +- Removed the windows.h include and replaced it with wintypes.h in + wrctypes.h and added winuser.h in two other sources. This cuts compilation + time by a factor of 2 and final executable size with debug by a factor 2.5. + +----------------------------------------------------------------------- ---- +Version 1.0.9 (01-Feb-1999) + +Albert den Haan <albertd(a)corel.ca>: +- Fixed wrong order of res_ico and res_bmp which must be in RT_xxx order. + +----------------------------------------------------------------------- ---- +Version 1.0.8 (10-Jan-1999) + +Albert den Haan <albertd(a)corel.ca>: +- Added TOOLBAR support. +- Buffer overflow fix in strncpyWtoA. +- Open embedded files in resource definitions through the include path from + the commandline. +- Support named icons in dialogs with unquoted names + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Fixed a major bug in the language propagation in the parser. The parser + did not copy the current language while binding it to a resource structure + causing wrong sorting if multiple global languages were in use and was a + potential segfault because the pointer might not be valid. +- Added language/version/characteristics support for toolbar. +- Moved some defines from wrc.h to wrctypes.h to support in toolbars. +- Removed function stricmp from source and replaced with native function + strcasecmp. +- Allocate cursor and icon ordinals according to the language of the item to + decrease the amount of ordinals in use. This reduces the resource + directory size by reducing the tree size. +- Versions 1.0.5 through 1.0.7 were never commited to cvs but were available + for download from an alternate site for elf-dll test generation. + +----------------------------------------------------------------------- ---- +Version 1.0.7 (19-Dec-1998) +- Changed a couple of labels that are used by dllglue. Also reversed a patch + that made wrc's generated code dependent on dllglue's code. + +----------------------------------------------------------------------- ---- +Version 1.0.6 (12-Dec-1998) +- Fixed the _PEResTab table where incorrect RVA's were put in the table. + The dllglue should now be merged into wrc for correct labels and the least + number of loadtime fixups. + +----------------------------------------------------------------------- ---- +Version 1.0.5 (12-Dec-1998) +- Fixed an omited .globl statement for dllglue linking. + +----------------------------------------------------------------------- ---- +Version 1.0.4 (10-Dec-1998) +- Added a global label for elf-dll linking and a long with the resource + size and a long with the directory size. +- Killed an annoying warning since version 1.0.0 in parser.y about a + var being used before init. + +----------------------------------------------------------------------- ---- +Version 1.0.3 (02-Nov-1998) +- Bugfix in write_name_str() [writeres.c] where the length byte/word was + wrongly counted in the length of the string. + Thanks to Ulrich Weigand <weigand(a)informatik.uni-erlangen.de> + +----------------------------------------------------------------------- ---- +Version 1.0.2 (20-Jun-1998) +- Started this file +- Fixed a bug in filename scanning when they are double quoted. The code now + is compatible with MS' rc and Borland's brc. There is a compromise in the + filenames because of case-sensitivity under *nix. +- Backslashes in a filepath are now converted to forward slashes and double +- Fixed a bug in printing the filename if loading of a file should fail. + backslashes are converted to single forward slash. +- Added -L option to prevent conversion to lower case for embedded filenames + in resource statements. +- Added language posibilities to icons and cursors so that the current + language is put into the .res ans .s file. +- Added character position indication of an error. +- Fixed CLASS statement so that it accepts double quoted strings as class + argument. This seems to be the correct behaviour (see SDK). The unquoted + class-name is still supported because it seems a reasonable option. +- Fixed accelerators with CONTROL option set so that they generate correct + code instead of generating an error. +- Added testing for flex version 2.5 or better because wrc needs the + yy_scan* functions to do preprocessing. + +----------------------------------------------------------------------- ---- +Version 1.0.1 (08-Jun-1998) +- Added -A commandline option to generate autoregister code for the winelib + programs. + +----------------------------------------------------------------------- ---- +Version 1.0.0 (28-May-1998) +- Initial release Property changes on: vendor/wine/tools/wrc/current/CHANGES ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: vendor/wine/tools/wrc/current/parser.l --- vendor/wine/tools/wrc/current/parser.l 2005-02-19 22:19:39 UTC (rev 13649) +++ vendor/wine/tools/wrc/current/parser.l 2005-02-19 22:21:25 UTC (rev 13650) @@ -1,682 +1,682 @@ -/* -*-C-*- - * - * Copyright 1998-2000 Bertho A. Stultiens (BS) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * History: - * 21-May-2000 BS - Fixed the ident requirement of resource names - * which can be keywords. - * 30-Apr-2000 BS - Reintegration into the wine-tree - * 11-Jan-2000 BS - Very drastic cleanup because we don't have a - * preprocessor in here anymore. - * 02-Jan-2000 BS - Removed the preprocessor code - * 23-Dec-1999 BS - Removed the copyright for Martin von Loewis. - * There is really nothing left of his code in - * this parser. - * 20-Jun-1998 BS - Changed the filename conversion. Filenames are - * case-sensitive inder *nix, but not under dos. - * default behaviour is to convert to lower case. - * - All backslashes are converted to forward and - * both single and double slash is recognized as - * MS/Borland does. - * - Fixed a bug in 'yywf' case that prevented - * double quoted names to be scanned propperly. - * - * 19-May-1998 BS - Started to build a preprocessor. - * - Changed keyword processing completely to - * table-lookups. - * - * 20-Apr-1998 BS - Added ';' comment stripping - * - * 17-Apr-1998 BS - Made the win32 keywords optional when compiling in - * 16bit mode - * - * 15-Apr-1998 BS - Changed string handling to include escapes - * - Added unicode string handling (no codepage - * translation though). - * - 'Borrowed' the main idea of string scanning from - * the flex manual pages. - * - Added conditional handling of scanning depending - * on the state of the parser. This was mainly required - * to distinguish a file to load or raw data that - * follows. MS's definition of filenames is rather - * complex... It can be unquoted or double quoted. If - * double quoted, then the '\\' char is not automatically - * escaped according to Borland's rc compiler, but it - * accepts both "\\path\\file.rc" and "\path\file.rc". - * This makes life very hard! I go for the escaped - * version, as this seems to be the documented way... - * - Single quoted strings are now parsed and converted - * here. - * - Added comment stripping. The implementation is - * 'borrowed' from the flex manpages. - * - Rebuild string processing so that it may contain - * escaped '\0'. - */ - -/* Exclusive string handling */ -%x yystr -/* Exclusive unicode string handling */ -%x yylstr -/* Exclusive rcdata single quoted data handling */ -%x yyrcd -/* Exclusive comment eating... */ -%x comment -/* Set when stripping c-junk */ -%x pp_stripe -%x pp_strips -%x pp_stripp -%x pp_stripp_final -/* Set when scanning #line style directives */ -%x pp_line -/* Set when scanning #pragma */ -%x pp_pragma -%x pp_code_page - -%option stack -%option never-interactive - -/* Some shortcut definitions */ -ws [ \f\t\r] -cident [a-zA-Z_][0-9a-zA-Z_]* - -%{ - -/*#define LEX_DEBUG*/ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ctype.h> -#include <assert.h> - -#include "wine/unicode.h" -#include "wrc.h" -#include "utils.h" -#include "parser.h" -#include "newstruc.h" - -#include "y.tab.h" - -#define YY_USE_PROTOS -#define YY_NO_UNPUT -#define YY_NO_TOP_STATE - -/* Always update the current character position within a line */ -#define YY_USER_ACTION char_number+=yyleng; wanted_id = want_id; want_id = 0; - -static void addcchar(char c); -static void addwchar(WCHAR s); -static string_t *get_buffered_cstring(void); -static string_t *get_buffered_wstring(void); -static string_t *make_string(char *s); - -static char *cbuffer; /* Buffers for string collection */ -static int cbufidx; -static int cbufalloc = 0; -static WCHAR *wbuffer; -static int wbufidx; -static int wbufalloc = 0; -static int stripslevel = 0; /* Count {} during pp_strips/pp_stripe mode */ -static int stripplevel = 0; /* Count () during pp_strips mode */ -static int cjunk_tagline; /* Where did we start stripping (helps error tracking) */ - -static int current_codepage = -1; /* use language default */ - -/* - * This one is a bit tricky. - * We set 'want_id' in the parser to get the first - * identifier we get across in the scanner, but we - * also want it to be reset at nearly any token we - * see. Exceptions are: - * - newlines - * - comments - * - whitespace - * - * The scanner will automatically reset 'want_id' - * after *each* scanner reduction and puts is value - * into the var below. In this way we can see the - * state after the YY_RULE_SETUP (i.e. the user action; - * see above) and don't have to worry too much when - * it needs to be reset. - */ -static int wanted_id = 0; -static int save_wanted_id; /* To save across comment reductions */ - -struct keyword { - const char *keyword; - int token; - int isextension; - int needcase; - int alwayskw; -}; - -static struct keyword keywords[] = { - { "ACCELERATORS", tACCELERATORS, 0, 0, 0}, - { "ALT", tALT, 0, 0, 0}, - { "ASCII", tASCII, 0, 0, 0}, - { "AUTO3STATE", tAUTO3STATE, 1, 0, 0}, - { "AUTOCHECKBOX", tAUTOCHECKBOX, 1, 0, 0}, - { "AUTORADIOBUTTON", tAUTORADIOBUTTON, 1, 0, 0}, - { "BEGIN", tBEGIN, 0, 0, 0}, - { "BITMAP", tBITMAP, 0, 0, 0}, - { "BLOCK", tBLOCK, 0, 0, 0}, - { "BUTTON", tBUTTON, 1, 0, 0}, - { "CAPTION", tCAPTION, 0, 0, 0}, - { "CHARACTERISTICS", tCHARACTERISTICS, 1, 0, 0}, - { "CHECKBOX", tCHECKBOX, 0, 0, 0}, - { "CHECKED", tCHECKED, 0, 0, 0}, - { "CLASS", tCLASS, 0, 0, 0}, - { "COMBOBOX", tCOMBOBOX, 0, 0, 0}, - { "CONTROL", tCONTROL, 0, 0, 0}, - { "CTEXT", tCTEXT, 0, 0, 0}, - { "CURSOR", tCURSOR, 0, 0, 0}, - { "DEFPUSHBUTTON", tDEFPUSHBUTTON, 0, 0, 0}, - { "DIALOG", tDIALOG, 0, 0, 0}, - { "DIALOGEX", tDIALOGEX, 1, 0, 0}, - { "DISCARDABLE", tDISCARDABLE, 0, 0, 0}, - { "DLGINIT", tDLGINIT, 0, 0, 0}, - { "EDITTEXT", tEDITTEXT, 0, 0, 0}, - { "END", tEND, 0, 0, 0}, - { "EXSTYLE", tEXSTYLE, 0, 0, 0}, - { "FILEFLAGS", tFILEFLAGS, 0, 0, 0}, - { "FILEFLAGSMASK", tFILEFLAGSMASK, 0, 0, 0}, - { "FILEOS", tFILEOS, 0, 0, 0}, - { "FILESUBTYPE", tFILESUBTYPE, 0, 0, 0}, - { "FILETYPE", tFILETYPE, 0, 0, 0}, - { "FILEVERSION", tFILEVERSION, 0, 0, 0}, - { "FIXED", tFIXED, 0, 0, 0}, - { "FONT", tFONT, 0, 0, 0}, - { "FONTDIR", tFONTDIR, 0, 0, 0}, /* This is a Borland BRC extension */ - { "GRAYED", tGRAYED, 0, 0, 0}, - { "GROUPBOX", tGROUPBOX, 0, 0, 0}, - { "HELP", tHELP, 0, 0, 0}, - { "ICON", tICON, 0, 0, 0}, - { "IMPURE", tIMPURE, 0, 0, 0}, - { "INACTIVE", tINACTIVE, 0, 0, 0}, - { "LANGUAGE", tLANGUAGE, 1, 0, 1}, - { "LISTBOX", tLISTBOX, 0, 0, 0}, - { "LOADONCALL", tLOADONCALL, 0, 0, 0}, - { "LTEXT", tLTEXT, 0, 0, 0}, - { "MENU", tMENU, 0, 0, 0}, - { "MENUBARBREAK", tMENUBARBREAK, 0, 0, 0}, - { "MENUBREAK", tMENUBREAK, 0, 0, 0}, - { "MENUEX", tMENUEX, 1, 0, 0}, - { "MENUITEM", tMENUITEM, 0, 0, 0}, - { "MESSAGETABLE", tMESSAGETABLE, 1, 0, 0}, - { "MOVEABLE", tMOVEABLE, 0, 0, 0}, - { "NOINVERT", tNOINVERT, 0, 0, 0}, - { "NOT", tNOT, 0, 0, 0}, - { "POPUP", tPOPUP, 0, 0, 0}, - { "PRELOAD", tPRELOAD, 0, 0, 0}, - { "PRODUCTVERSION", tPRODUCTVERSION, 0, 0, 0}, - { "PURE", tPURE, 0, 0, 0}, - { "PUSHBUTTON", tPUSHBUTTON, 0, 0, 0}, - { "RADIOBUTTON", tRADIOBUTTON, 0, 0, 0}, - { "RCDATA", tRCDATA, 0, 0, 0}, - { "RTEXT", tRTEXT, 0, 0, 0}, - { "SCROLLBAR", tSCROLLBAR, 0, 0, 0}, - { "SEPARATOR", tSEPARATOR, 0, 0, 0}, - { "SHIFT", tSHIFT, 0, 0, 0}, - { "STATE3", tSTATE3, 1, 0, 0}, - { "STRING", tSTRING, 0, 0, 0}, - { "STRINGTABLE", tSTRINGTABLE, 0, 0, 1}, - { "STYLE", tSTYLE, 0, 0, 0}, - { "TOOLBAR", tTOOLBAR, 1, 0, 0}, - { "VALUE", tVALUE, 0, 0, 0}, - { "VERSION", tVERSION, 1, 0, 0}, - { "VERSIONINFO", tVERSIONINFO, 0, 0, 0}, - { "VIRTKEY", tVIRTKEY, 0, 0, 0} -}; - -#define NKEYWORDS (sizeof(keywords)/sizeof(keywords[0])) -#define KWP(p) ((const struct keyword *)(p)) -static int kw_cmp_func(const void *s1, const void *s2) -{ - int ret; - ret = strcasecmp(KWP(s1)->keyword, KWP(s2)->keyword); - if(!ret && (KWP(s1)->needcase || KWP(s2)->needcase)) - return strcmp(KWP(s1)->keyword, KWP(s2)->keyword); - else - return ret; -} - -#define KW_BSEARCH -#define DO_SORT -static struct keyword *iskeyword(char *kw) -{ - struct keyword *kwp; - struct keyword key; - key.keyword = kw; - key.needcase = 0; -#ifdef DO_SORT - { - /* Make sure that it is sorted for bsearsh */ - static int sorted = 0; - if(!sorted) - { - qsort(keywords, NKEYWORDS, sizeof(keywords[0]), kw_cmp_func); - sorted = 1; - } - } -#endif -#ifdef KW_BSEARCH - kwp = bsearch(&key, keywords, NKEYWORDS, sizeof(keywords[0]), kw_cmp_func); -#else - { - int i; - for(i = 0; i < NKEYWORDS; i++) - { - if(!kw_cmp_func(&key, &keywords[i])) - break; - } - if(i < NKEYWORDS) - kwp = &keywords[i]; - else - kwp = NULL; - } -#endif - - if(kwp == NULL || (kwp->isextension && !extensions)) - return NULL; - else - return kwp; -} - -%} - -/* - ************************************************************************ ** - * The flexer starts here - ************************************************************************ ** - */ -%% - /* - * Catch the GCC-style line statements here and parse them. - * This has the advantage that you can #include at any - * stage in the resource file. - * The preprocessor generates line directives in the format: - * # <linenum> "filename" <codes> - * - * Codes can be a sequence of: [truncated at 1000 lines; 7881 more skipped]

1 0

[gvg] 13649: wrc vendor drop
by gvg＠svn.reactos.com 19 Feb '05

19 Feb '05

wrc vendor drop Added: vendor/wine/tools/wrc/ Added: vendor/wine/tools/wrc/current/ Added: vendor/wine/tools/wrc/current/CHANGES Added: vendor/wine/tools/wrc/current/Makefile.in Added: vendor/wine/tools/wrc/current/dumpres.c Added: vendor/wine/tools/wrc/current/dumpres.h Added: vendor/wine/tools/wrc/current/genres.c Added: vendor/wine/tools/wrc/current/genres.h Added: vendor/wine/tools/wrc/current/newstruc.c Added: vendor/wine/tools/wrc/current/newstruc.h Added: vendor/wine/tools/wrc/current/parser.h Added: vendor/wine/tools/wrc/current/parser.l Added: vendor/wine/tools/wrc/current/parser.y Added: vendor/wine/tools/wrc/current/readres.c Added: vendor/wine/tools/wrc/current/readres.h Added: vendor/wine/tools/wrc/current/translation.c Added: vendor/wine/tools/wrc/current/utils.c Added: vendor/wine/tools/wrc/current/utils.h Added: vendor/wine/tools/wrc/current/wrc.c Added: vendor/wine/tools/wrc/current/wrc.doc Added: vendor/wine/tools/wrc/current/wrc.h Added: vendor/wine/tools/wrc/current/wrc.man Added: vendor/wine/tools/wrc/current/wrctypes.h Added: vendor/wine/tools/wrc/current/writeres.c _____ Added: vendor/wine/tools/wrc/current/CHANGES --- vendor/wine/tools/wrc/current/CHANGES 2005-02-19 22:18:00 UTC (rev 13648) +++ vendor/wine/tools/wrc/current/CHANGES 2005-02-19 22:19:39 UTC (rev 13649) @@ -0,0 +1,336 @@ +----------------------------------------------------------------------- ---- +Version 1.1.9 (31-Dec-2000) + +Ulrich Weigand <weigand(a)informatik.uni-erlangen.de> +- Fixed a byteorder conversion problem with message tables. +- Carefully read and write (possibly) misaligned data elements + to avoid crashes on architectures where this is not allowed. + +----------------------------------------------------------------------- ---- +Version 1.1.8 (24-Aug-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Fixed a LALR(2) problem while scanning usertype resources which + had identifiers for both name and type. + +----------------------------------------------------------------------- ---- +Version 1.1.7 (24-Jul-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented a bug-work-arround for Berkeley yacc (byacc) which + does not generate proper default transition rules for non-terminals. + See comments in parser.y how the fix works. +- Changed the error-line/char position to make emacs happy parsing + the position of the error. +- Added comments in the documentation in which order the line-numer + and character-position of the error is written. + +----------------------------------------------------------------------- ---- +Version 1.1.6 (05-Jun-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: Macro expansion of strings would assert an internal error + or a segfault due to a lacking '\0' in the expansion. +- Bugfix: Prevent buffer overflow in reallocation of macro expansion + buffers. +- Bugfix: Wrc's version information was not passed as numerical to the + preprocessor due to an error in the definition of the macro. +- Relaxed the newline constraint in global LANGUAGE statements, which + was introduced in version 1.1.3, so that some fancy preprocessor + constructs can work. +- Removed the gcc-style #line handling from the resource-parser to the + resource-scanner so that it is possible to include files at any stage + of the source, independent of the parser-state. +- Bugfix: Stringtables were not correctly searched for duplicates + because the language comparison disregarded the sublanguage. +- Eliminated a repetitive warning when writing stringtables with zero + length string entries. These are perfectly valid (but make no sense:-). + Warning are now only generated during parse in pedantic mode. + +----------------------------------------------------------------------- ---- +Version 1.1.5 (12-Jun-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: Corrected "off by one" error in the linenumber while parsing + resource. +- Bugfix: A segfault would occur if messagetables were parsed without + memory options attached. Also added buffer-overflow safeguard while + converting between byteorders. +- Finished remapping usertype resources onto standars types by tricking + the parser into accepting a different token. The remapping can be + disabled with a new commandline option '-m'. +- Resolved some warning about chars used as index on SGI O2 machine + (the ctype isXXX() routines are macros there). + +----------------------------------------------------------------------- ---- +Version 1.1.4 (07-Jun-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented MESSAGETABLE resource type. +- Usertype resources that cause a type-clash with defined resources + are now detected and a warning is generated. Some types should be + rerouted through other code so that they will be (re-)interpreted. +- Bugfix: Line-continuation in strings in resources include a newline. + This `feature' got deleted with the builtin preprocessor, but has been + put back into place (see last changes comment from version 1.1.0). +- Bugfix: The preprocessor now correctly will see "\\\r\n" as a line- + continuation. +- Bugfix: Assemblers on some platforms do not use 16bit quantities + for `.word'. This directive is now changed into `.short'. +- All types that accept inline data definitions (a la RCDATA) now + also accept a file specification. This unifies the structure a bit. + +----------------------------------------------------------------------- ---- +Version 1.1.3 (21-May-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented animated cursors and icons resource types. +- Added partial support for font resources (user supplied fontdir is + required). +- All resources with inline data (a la RCDATA) now support language, + version and characteristics data. +- Implemented resource name duplicate checks. It is now an error if + two resources of the same type have the same name. +- Bugfix: Language propagation was not correct when .res files were + generated. +- Bugfix: VERSIONINFO now handles memory options. +- Bugfix: resource names and the resource type may be equal (e.g. MENU + MENU {...}). This support was mistakingly deleted in the upgrade to + the builtin preprocessor. + The standalone LANGUAGE setting became context sensitive as a consequence + of this. Now it *must* end with a newline *after* both expressions and + no newlines are allowed within the line (the statement must fit on one + line). This is no practical problem though. + +Patrik Stridvall <ps(a)leissner.se> +- Fixed byte order on Solaris and FreeBSD. + +----------------------------------------------------------------------- ---- +Version 1.1.2 (08-May-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: Corrected a SEGV in the rawdata handling. Mistakingly took the + address of a pointer instead of its value. This probably slipped in + during the merge of my tree into the winetree. + Lesson learned: always double check. +- Verified most resources so that win16 compile also generates correct + output for reversed endian. + +----------------------------------------------------------------------- ---- +Version 1.1.1 (07-May-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented byte-ordering for resources. All resources can be forced + to be little-, big- or native endian with command-line option -B. +- Reading resources from .res-files are only accepted in native byte- + ordering so that no additional semantic analysis is required. +- Resource directory is still written in native-only format, including + the strings. +- Wrc is now installed through the makefile with 'make install' and also + uninstalled with 'make uninstall'. +- Wrote a man-page for better reference. The manpage also gets installed + and uninstalled. +- Cleaned up the namespace a bit by more agressive use of static. + +----------------------------------------------------------------------- ---- +Version 1.1.0 (01-May-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Implemented a new preprocessor that is (nearly) ANSI-C compliant. The + old parser has been stripped from the old preprocessor-code which + cleaned up both resource-scanner and -parser. +- Standard defines have been introduced (see README.wrc) +- Both preprocessor- and resource-scanner have been optimized slightly + so that no backing up is required (one char lookahead is enough). +- Filename-scanning has been cleaned up, though not perfect yet. +- User-type resources are compatible now. +- Line-continuation in strings is corrected so that it does not + introduce a newline in the output. + +----------------------------------------------------------------------- ---- +Version 1.0.18 (28-Dec-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: The named resources were not named correctly for indirectly + addressable resources, which resulted in an undefined variable. The + previous fix was incomplete (I was probably sleeping while I made it). + +----------------------------------------------------------------------- ---- +Version 1.0.17 (20-Dec-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: Named resources of different types generated the same assembly- + label twice, resulting in a compile failure. + +----------------------------------------------------------------------- ---- +Version 1.0.16 (6-Nov-1999) + +Juergen.Schmied(a)debitel.net +- Bugfix: Styles were evaluated as expressions. The NOT in combination + with style flags was not overwriting the default styles like WS_VISIBLE. + Solved by introducing own rules for parsing styles. + +----------------------------------------------------------------------- ---- +Version 1.0.15 (13-Aug-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Bugfix: IDs were not checked which resulted in numbers > 2^16-1 being + accepted as IDs. This resulted in duplicate IDs and all other sort of + trouble. + +----------------------------------------------------------------------- ---- +Version 1.0.14 (08-Aug-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Deeply ashamed that I thought that flex had a bug. Of course my own fault + not recognizing unmatched text in start condition yyrcd and pp_strip[ps]. + There is a catch all rule now in the flexer with a warning to mark the + condition and promptly revealed errors in the wine-headers. + +----------------------------------------------------------------------- ---- +Version 1.0.13 (08-Aug-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Fixed uppercase conversion of titles in dialog controls which was + introduced with the icon changes. +- Fixed strings longer than 1024 bytes/shorts by autosizing the array. A + warning is issued whenever more than 64k is allocated. +- Made a workarround for a flex bug where an ECHO put '\\' and '\n' + characters on the screen. + +----------------------------------------------------------------------- ---- +Version 1.0.12 (18-Jul-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Generalized the distinction between 2 and 4 byte integers slightly through + a new parser state. The is now a warning when a 2 byte integer is larger + than 16 bit (and is truncated). +- Fixed a couple of cosmetic things in the DLGINIT stuff so that dumping of + this type will work as expected. +- Added generalized language/version/characteristics support to the DLGINIT + resource type. + +Ulrich Czekalla <ulrichc(a)corel.ca> +- Added support for DLGINIT resource-type. +- Added string continuation and embedded quoting. +- Added numeric IDs for icons in controls. + +Eric Pouech <Eric.Pouech(a)wanadoo.fr> +- Bugfix: Distinguish between 2 and 4 byte integers in RCDATA. + +----------------------------------------------------------------------- ---- +Version 1.0.11 (22-Apr-1999) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Fixed a counting bug in the win32 count and sort routine. +- Fixed sort order of resources (must be name before ordinal). +- Shuffled a couple of global variables so that built-in dlls now can + load resources through the proper PE interface. + +----------------------------------------------------------------------- ---- +Version 1.0.10 (18-Feb-1999) + +Alexandre Julliard <julliard(a)lrc.epfl.ch> +- Fixed the TIME_LONG ugliness. + +David Luyer <luyer(a)ucs.uwa.edu.au> +- Added string.h include in newstruc.c for compilation on 64bit platforms. +- Added TIME_LONG to support time_t==int in printf formats on alpha + platforms. + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Added some more use of TIME_LONG in implicit format used in header-file + generation. +- Removed the windows.h include and replaced it with wintypes.h in + wrctypes.h and added winuser.h in two other sources. This cuts compilation + time by a factor of 2 and final executable size with debug by a factor 2.5. + +----------------------------------------------------------------------- ---- +Version 1.0.9 (01-Feb-1999) + +Albert den Haan <albertd(a)corel.ca>: +- Fixed wrong order of res_ico and res_bmp which must be in RT_xxx order. + +----------------------------------------------------------------------- ---- +Version 1.0.8 (10-Jan-1999) + +Albert den Haan <albertd(a)corel.ca>: +- Added TOOLBAR support. +- Buffer overflow fix in strncpyWtoA. +- Open embedded files in resource definitions through the include path from + the commandline. +- Support named icons in dialogs with unquoted names + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Fixed a major bug in the language propagation in the parser. The parser + did not copy the current language while binding it to a resource structure + causing wrong sorting if multiple global languages were in use and was a + potential segfault because the pointer might not be valid. +- Added language/version/characteristics support for toolbar. +- Moved some defines from wrc.h to wrctypes.h to support in toolbars. +- Removed function stricmp from source and replaced with native function + strcasecmp. +- Allocate cursor and icon ordinals according to the language of the item to + decrease the amount of ordinals in use. This reduces the resource + directory size by reducing the tree size. +- Versions 1.0.5 through 1.0.7 were never commited to cvs but were available + for download from an alternate site for elf-dll test generation. + +----------------------------------------------------------------------- ---- +Version 1.0.7 (19-Dec-1998) +- Changed a couple of labels that are used by dllglue. Also reversed a patch + that made wrc's generated code dependent on dllglue's code. + +----------------------------------------------------------------------- ---- +Version 1.0.6 (12-Dec-1998) +- Fixed the _PEResTab table where incorrect RVA's were put in the table. + The dllglue should now be merged into wrc for correct labels and the least + number of loadtime fixups. + +----------------------------------------------------------------------- ---- +Version 1.0.5 (12-Dec-1998) +- Fixed an omited .globl statement for dllglue linking. + +----------------------------------------------------------------------- ---- +Version 1.0.4 (10-Dec-1998) +- Added a global label for elf-dll linking and a long with the resource + size and a long with the directory size. +- Killed an annoying warning since version 1.0.0 in parser.y about a + var being used before init. + +----------------------------------------------------------------------- ---- +Version 1.0.3 (02-Nov-1998) +- Bugfix in write_name_str() [writeres.c] where the length byte/word was + wrongly counted in the length of the string. + Thanks to Ulrich Weigand <weigand(a)informatik.uni-erlangen.de> + +----------------------------------------------------------------------- ---- +Version 1.0.2 (20-Jun-1998) +- Started this file +- Fixed a bug in filename scanning when they are double quoted. The code now + is compatible with MS' rc and Borland's brc. There is a compromise in the + filenames because of case-sensitivity under *nix. +- Backslashes in a filepath are now converted to forward slashes and double +- Fixed a bug in printing the filename if loading of a file should fail. + backslashes are converted to single forward slash. +- Added -L option to prevent conversion to lower case for embedded filenames + in resource statements. +- Added language posibilities to icons and cursors so that the current + language is put into the .res ans .s file. +- Added character position indication of an error. +- Fixed CLASS statement so that it accepts double quoted strings as class + argument. This seems to be the correct behaviour (see SDK). The unquoted + class-name is still supported because it seems a reasonable option. +- Fixed accelerators with CONTROL option set so that they generate correct + code instead of generating an error. +- Added testing for flex version 2.5 or better because wrc needs the + yy_scan* functions to do preprocessing. + +----------------------------------------------------------------------- ---- +Version 1.0.1 (08-Jun-1998) +- Added -A commandline option to generate autoregister code for the winelib + programs. + +----------------------------------------------------------------------- ---- +Version 1.0.0 (28-May-1998) +- Initial release _____ Added: vendor/wine/tools/wrc/current/Makefile.in --- vendor/wine/tools/wrc/current/Makefile.in 2005-02-19 22:18:00 UTC (rev 13648) +++ vendor/wine/tools/wrc/current/Makefile.in 2005-02-19 22:19:39 UTC (rev 13649) @@ -0,0 +1,53 @@ +DEFS = -DINCLUDEDIR="\"$(includedir)\"" +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +LEXOPT = -Cf #-w -b +YACCOPT = #-v +EXEEXT = @EXEEXT@ + +PROGRAMS = wrc$(EXEEXT) +MODULE = none + +C_SRCS = \ + dumpres.c \ + genres.c \ + newstruc.c \ + readres.c \ + translation.c \ + utils.c \ + wrc.c \ + writeres.c + +EXTRA_SRCS = parser.y parser.l +EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o + +all: $(PROGRAMS) + +@MAKE_RULES@ + +wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a + $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_unicode -lwine_port $(LEXLIB) $(LDFLAGS) + +y.tab.c y.tab.h: parser.y + $(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y + +# hack to allow parallel make +y.tab.h: y.tab.c +y.tab.o: y.tab.h + +@LEX_OUTPUT_ROOT@.c: parser.l + $(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l + +@LEX_OUTPUT_ROOT@.o: y.tab.h + +install:: $(PROGRAMS) + $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) + $(INSTALL_DATA) $(SRCDIR)/wrc.man $(mandir)/man$(prog_manext)/wrc.$(prog_manext) + $(INSTALL_PROGRAM) wrc$(EXEEXT) $(bindir)/wrc$(EXEEXT) + +uninstall:: + $(RM) $(bindir)/wrc$(EXEEXT) $(mandir)/man$(prog_manext)/wrc.$(prog_manext) + +### Dependencies: Property changes on: vendor/wine/tools/wrc/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/tools/wrc/current/dumpres.c --- vendor/wine/tools/wrc/current/dumpres.c 2005-02-19 22:18:00 UTC (rev 13648) +++ vendor/wine/tools/wrc/current/dumpres.c 2005-02-19 22:19:39 UTC (rev 13649) @@ -0,0 +1,1038 @@ +/* + * Copyright 1998 Bertho A. Stultiens (BS) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <assert.h> +#include <stdio.h> +#include <ctype.h> + +#include "wrc.h" +#include "dumpres.h" + +/* + ************************************************************************ ***** + * Function : get_typename + * Syntax : char *get_typename(resource_t* r) + * Input : + * r - Resource description + * Output : A pointer to a string representing the resource type + * Description : + * Remarks : + ************************************************************************ ***** +*/ +const char *get_typename(const resource_t* r) +{ + switch(r->type){ + case res_acc: return "ACCELERATOR"; + case res_bmp: return "BITMAP"; + case res_cur: return "CURSOR"; + case res_curg: return "GROUP_CURSOR"; + case res_dlg: return "DIALOG"; + case res_dlgex: return "DIALOGEX"; + case res_fnt: return "FONT"; + case res_ico: return "ICON"; + case res_icog: return "GROUP_ICON"; + case res_men: return "MENU"; + case res_menex: return "MENUEX"; + case res_rdt: return "RCDATA"; + case res_stt: return "STRINGTABLE"; + case res_usr: return "UserResource"; + case res_msg: return "MESSAGETABLE"; + case res_ver: return "VERSIONINFO"; + case res_dlginit: return "DLGINIT"; + case res_toolbar: return "TOOLBAR"; + case res_anicur: return "CURSOR (animated)"; + case res_aniico: return "ICON (animated)"; + default: return "Unknown"; + } +} + +/* + ************************************************************************ ***** + * Function : strncpyWtoA + * Syntax : char *strncpyWtoA(char *cs, short *ws, int maxlen) + * Input : + * cs - Pointer to buffer to receive result + * ws - Source wide-string + * maxlen - Max chars to copy + * Output : 'cs' + * Description : Copy a unicode string to ascii. Copying stops after the + * first occurring '\0' or when maxlen-1 chars are copied. The + * String is always nul terminated. + * Remarks : No codepage translation is done. + ************************************************************************ ***** +*/ +static char *strncpyWtoA(char *cs, const short *ws, int maxlen) +{ + char *cptr = cs; + const short *wsMax = ws + maxlen - 1; + while(*ws && ws < wsMax) + { + if(*ws < -128 || *ws > 127) + fprintf(stderr, "***Warning: Unicode string contains non-printable chars***\n"); + *cptr++ = (char)*ws++; + } + *cptr = '\0'; + return cs; +} + +/* + ************************************************************************ ***** + * Function : print_string + * Syntax : void print_string(string_t *str) + * Input : + * Output : + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void print_string(const string_t *str) +{ + char buffer[512]; + if(!str) + printf("<none>"); + else if(str->type == str_char) + printf("\"%s\"", str->str.cstr); + else + { + strncpyWtoA(buffer, str->str.wstr, sizeof(buffer)); + printf("L\"%s\"", buffer); + } +} + +/* + ************************************************************************ ***** + * Function : get_nameid_str + * Syntax : const char *get_nameid_str(const name_id_t *n) + * Input : + * n - nameid to convert to text + * Output : A pointer to the name. + * Description : + * Remarks : Not reentrant because of static buffer + ************************************************************************ ***** +*/ +const char *get_nameid_str(const name_id_t *n) +{ + static char buffer[256]; + + if(!n) + return "<none>"; + + if(n->type == name_ord) + { + sprintf(buffer, "%d", n->name.i_name); + return buffer; + } + else if(n->type == name_str) + { + if(n->name.s_name->type == str_char) + return n->name.s_name->str.cstr; + else + { + strncpyWtoA(buffer, n->name.s_name->str.wstr, sizeof(buffer)); + return buffer; + } + } + else + return "Hoooo, report this: wrong type in nameid"; +} + +/* + ************************************************************************ ***** + * Function : dump_memopt + * Syntax : void dump_memopt(DWORD memopt) + * Input : + * memopt - flag bits of the options set + * Output : + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_memopt(DWORD memopt) +{ + printf("Memory/load options: "); + if(memopt & 0x0040) + printf("PRELOAD "); + else + printf("LOADONCALL "); + if(memopt & 0x0010) + printf("MOVEABLE "); + else + printf("FIXED "); + if(memopt & 0x0020) + printf("PURE "); + else + printf("IMPURE "); + if(memopt & 0x1000) + printf("DISCARDABLE"); + printf("\n"); +} + +/* + ************************************************************************ ***** + * Function : dump_lvc + * Syntax : void dump_lvc(const lvc_t *l) + * Input : + * l - pointer to lvc structure + * Output : + * Description : Dump language, version and characteristics + * Remarks : + ************************************************************************ ***** +*/ +static void dump_lvc(const lvc_t *l) +{ + if(l->language) + printf("LANGUAGE %04x, %04x\n", l->language->id, l->language->sub); + else + printf("LANGUAGE <not set>\n"); + + if(l->version) + printf("VERSION %08lx\n", *(l->version)); + else + printf("VERSION <not set>\n"); + + if(l->characts) + printf("CHARACTERISTICS %08lx\n", *(l->characts)); + else + printf("CHARACTERISTICS <not set>\n"); +} + +/* + ************************************************************************ ***** + * Function : dump_raw_data + * Syntax : void dump_raw_data(const raw_data_t *d) + * Input : + * d - Raw data descriptor + * Output : + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_raw_data(const raw_data_t *d) +{ + unsigned int n; + int i; + int j; + + if(!d) + { + printf("<none>"); + return; + } + printf("Rawdata size: %d\n", d->size); + if(debuglevel < 2) + return; + + for(n = 0; n < d->size; n++) + { + if((n % 16) == 0) + { + if(n) + { + printf("- "); + for(i = 0; i < 16; i++) + printf("%c", isprint(d->data[n-16+i] & 0xff) ? d->data[n-16+i] : '.'); + printf("\n%08x: ", n); + } + else + printf("%08x: ", n); + } + printf("%02x ", d->data[n] & 0xff); + } + printf("- "); + j = d->size % 16; + if(!j) + j = 16; + for(i = 0; i < j; i++) + printf("%c", isprint(d->data[n-j+i] & 0xff) ? d->data[n-j+i] : '.'); + printf("\n"); +} + +/* + ************************************************************************ ***** + * Function : dump_accelerator + * Syntax : void dump_accelerator(const accelerator_t *acc) + * Input : + * acc - Accelerator resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_accelerator(const accelerator_t *acc) +{ + event_t *ev = acc->events; + + dump_memopt(acc->memopt); + dump_lvc(&(acc->lvc)); + + printf("Events: %s\n", ev ? "" : "<none>"); + while(ev) + { + printf("Key="); + if(isprint(ev->key)) + printf("\"%c\"", ev->key); + else if(iscntrl(ev->key)) + printf("\"^%c\"", ev->key +'@'); + else + printf("\\x%02x", ev->key & 0xff); + + printf(" Id=%d flags=%04x\n", ev->id, ev->flags); + ev = ev->next; + } +} + +/* + ************************************************************************ ***** + * Function : dump_cursor + * Syntax : void dump_cursor(const cursor_t *cur) + * Input : + * cur - Cursor resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_cursor(const cursor_t *cur) +{ + printf("Id: %d\n", cur->id); + printf("Width: %d\n", cur->width); + printf("Height: %d\n", cur->height); + printf("X Hotspot: %d\n", cur->xhot); + printf("Y Hotspot: %d\n", cur->yhot); + dump_raw_data(cur->data); +} + +/* + ************************************************************************ ***** + * Function : dump_cursor_group + * Syntax : void dump_cursor_group(const cursor_group_t *cur) + * Input : + * cur - Cursor group resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_cursor_group(const cursor_group_t *curg) +{ + dump_memopt(curg->memopt); + printf("There are %d cursors in this group\n", curg->ncursor); +} + +/* + ************************************************************************ ***** + * Function : dump_icon + * Syntax : void dump_icon(const icon_t *ico) + * Input : + * ico - Icon resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_icon(const icon_t *ico) +{ + printf("Id: %d\n", ico->id); + printf("Width: %d\n", ico->width); + printf("Height: %d\n", ico->height); + printf("NColor: %d\n", ico->nclr); + printf("NPlanes: %d\n", ico->planes); + printf("NBits: %d\n", ico->bits); + dump_raw_data(ico->data); +} + +/* + ************************************************************************ ***** + * Function : dump_icon_group + * Syntax : void dump_icon_group(const icon_group_t *ico) + * Input : + * ico - Icon group resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_icon_group(const icon_group_t *icog) +{ + dump_memopt(icog->memopt); + printf("There are %d icons in this group\n", icog->nicon); +} + +/* + ************************************************************************ ***** + * Function : dump_ani_curico + * Syntax : void dump_ani_curico(const ani_curico_t *ani) + * Input : + * ani - Animated object resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_ani_curico(const ani_curico_t *ani) +{ + dump_memopt(ani->memopt); + dump_lvc(&ani->data->lvc); + dump_raw_data(ani->data); +} + +/* + ************************************************************************ ***** + * Function : dump_font + * Syntax : void dump_font(const font_t *fnt) + * Input : + * fnt - Font resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_font(const font_t *fnt) +{ + dump_memopt(fnt->memopt); + dump_lvc(&(fnt->data->lvc)); + dump_raw_data(fnt->data); +} + +/* + ************************************************************************ ***** + * Function : dump_bitmap + * Syntax : void dump_bitmap(const bitmap_t *bmp) + * Input : + * bmp - Bitmap resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_bitmap(const bitmap_t *bmp) +{ + dump_memopt(bmp->memopt); + dump_lvc(&(bmp->data->lvc)); + dump_raw_data(bmp->data); +} + +/* + ************************************************************************ ***** + * Function : dump_rcdata + * Syntax : void dump_rcdata(const rcdata_t *rdt) + * Input : + * rdt - RCData resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_rcdata(const rcdata_t *rdt) +{ + dump_memopt(rdt->memopt); + dump_lvc(&(rdt->data->lvc)); + dump_raw_data(rdt->data); +} + +/* + ************************************************************************ ***** + * Function : dump_user + * Syntax : void dump_user(const user_t *usr) + * Input : + * usr - User resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_user(const user_t *usr) +{ + dump_memopt(usr->memopt); + dump_lvc(&(usr->data->lvc)); + printf("Class %s\n", get_nameid_str(usr->type)); + dump_raw_data(usr->data); +} + +/* + ************************************************************************ ***** + * Function : dump_messagetable + * Syntax : void dump_messagetable(const messagetable_t *msg) + * Input : + * msg - Messagetable resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_messagetable(const messagetable_t *msg) +{ + dump_memopt(msg->memopt); + dump_lvc(&(msg->data->lvc)); + dump_raw_data(msg->data); +} + +/* + ************************************************************************ ***** + * Function : dump_stringtable + * Syntax : void dump_stringtable(const stringtable_t *stt) + * Input : + * stt - Stringtable resource descriptor + * Output : nop + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_stringtable(const stringtable_t *stt) +{ + int i; + for(; stt; stt = stt->next) + { + printf("{\n"); + dump_memopt(stt->memopt); + dump_lvc(&(stt->lvc)); + for(i = 0; i < stt->nentries; i++) + { + printf("Id=%-5d (%d) ", stt->idbase+i, stt->entries[i].id); + if(stt->entries[i].str) + print_string(stt->entries[i].str); + else + printf("<none>"); + printf("\n"); + } + printf("}\n"); + } +} + +/* + ************************************************************************ ***** + * Function : dump_control + * Syntax : void dump_control(const control_t *ctrl) + * Input : + * ctrl - Control resource descriptor + * Output : + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_control(const control_t *ctrl) +{ + printf("Control {\n\tClass: %s\n", get_nameid_str(ctrl->ctlclass)); + printf("\tText: "); get_nameid_str(ctrl->title); printf("\n"); + printf("\tId: %d\n", ctrl->id); + printf("\tx, y, w, h: %d, %d, %d, %d\n", ctrl->x, ctrl->y, ctrl->width, ctrl->height); + if(ctrl->gotstyle) + { + assert(ctrl->style != NULL); + assert(ctrl->style->and_mask == 0); + printf("\tStyle: %08lx\n", ctrl->style->or_mask); + } + if(ctrl->gotexstyle) + { + assert(ctrl->exstyle != NULL); + assert(ctrl->exstyle->and_mask == 0); + printf("\tExStyle: %08lx\n", ctrl->exstyle->or_mask); + } + if(ctrl->gothelpid) + printf("\tHelpid: %ld\n", ctrl->helpid); + if(ctrl->extra) + { + printf("\t"); + dump_raw_data(ctrl->extra); + } + printf("}\n"); +} + +/* + ************************************************************************ ***** + * Function : dump_dialog + * Syntax : void dump_dialog(const dialog_t *dlg) + * Input : + * dlg - Dialog resource descriptor + * Output : + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static void dump_dialog(const dialog_t *dlg) +{ + control_t *c = dlg->controls; + + dump_memopt(dlg->memopt); + dump_lvc(&(dlg->lvc)); + printf("x, y, w, h: %d, %d, %d, %d\n", dlg->x, dlg->y, dlg->width, dlg->height); + if(dlg->gotstyle) + { + assert(dlg->style != NULL); + assert(dlg->style->and_mask == 0); + printf("Style: %08lx\n", dlg->style->or_mask); + + } + if(dlg->gotexstyle) + { + assert(dlg->exstyle != NULL); + assert(dlg->exstyle->and_mask == 0); + printf("ExStyle: %08lx\n", dlg->exstyle->or_mask); + } + printf("Menu: %s\n", get_nameid_str(dlg->menu)); + printf("Class: %s\n", get_nameid_str(dlg->dlgclass)); [truncated at 1000 lines; 11461 more skipped]

1 0

[gvg] 13648: Set eol style
by gvg＠svn.reactos.com 19 Feb '05

19 Feb '05

Set eol style Modified: vendor/wine/libs/wpp/current/ppl.l Modified: vendor/wine/libs/wpp/current/ppy.y _____ Modified: vendor/wine/libs/wpp/current/ppl.l --- vendor/wine/libs/wpp/current/ppl.l 2005-02-19 22:16:09 UTC (rev 13647) +++ vendor/wine/libs/wpp/current/ppl.l 2005-02-19 22:18:00 UTC (rev 13648) @@ -1,1476 +1,1476 @@ -/* - * Wrc preprocessor lexical analysis - * - * Copyright 1999-2000 Bertho A. Stultiens (BS) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * History: - * 24-Apr-2000 BS - Started from scratch to restructure everything - * and reintegrate the source into the wine-tree. - * 04-Jan-2000 BS - Added comments about the lexicographical - * grammar to give some insight in the complexity. - * 28-Dec-1999 BS - Eliminated backing-up of the flexer by running - * `flex -b' on the source. This results in some - * weirdo extra rules, but a much faster scanner. - * 23-Dec-1999 BS - Started this file - * - *----------------------------------------------------------------------- -- - * The preprocessor's lexographical grammar (approximately): - * - * pp := {ws} # {ws} if {ws} {expr} {ws} \n - * | {ws} # {ws} ifdef {ws} {id} {ws} \n - * | {ws} # {ws} ifndef {ws} {id} {ws} \n - * | {ws} # {ws} elif {ws} {expr} {ws} \n - * | {ws} # {ws} else {ws} \n - * | {ws} # {ws} endif {ws} \n - * | {ws} # {ws} include {ws} < {anytext} > \n - * | {ws} # {ws} include {ws} " {anytext} " \n - * | {ws} # {ws} define {ws} {anytext} \n - * | {ws} # {ws} define( {arglist} ) {ws} {expansion} \n - * | {ws} # {ws} pragma {ws} {anytext} \n - * | {ws} # {ws} ident {ws} {anytext} \n - * | {ws} # {ws} error {ws} {anytext} \n - * | {ws} # {ws} warning {ws} {anytext} \n - * | {ws} # {ws} line {ws} " {anytext} " {number} \n - * | {ws} # {ws} {number} " {anytext} " {number} [ {number} [{number}] ] \n - * | {ws} # {ws} \n - * - * ws := [ \t\r\f\v]* - * - * expr := {expr} [+-*%^/|&] {expr} - * | {expr} {logor|logand} {expr} - * | [!~+-] {expr} - * | {expr} ? {expr} : {expr} - * - * logor := || - * - * logand := && - * - * id := [a-zA-Z_][a-zA-Z0-9_]* - * - * anytext := [^\n]* (see note) - * - * arglist := - * | {id} - * | {arglist} , {id} - * | {arglist} , {id} ... - * - * expansion := {id} - * | # {id} - * | {anytext} - * | {anytext} ## {anytext} - * - * number := [0-9]+ - * - * Note: "anytext" is not always "[^\n]*". This is because the - * trailing context must be considered as well. - * - * The only certain assumption for the preprocessor to make is that - * directives start at the beginning of the line, followed by a '#' - * and end with a newline. - * Any directive may be suffixed with a line-continuation. Also - * classical comment / *...* / (note: no comments within comments, - * therefore spaces) is considered to be a line-continuation - * (according to gcc and egcs AFAIK, ANSI is a bit vague). - * Comments have not been added to the above grammar for simplicity - * reasons. However, it is allowed to enter comment anywhere within - * the directives as long as they do not interfere with the context. - * All comments are considered to be deletable whitespace (both - * classical form "/ *...* /" and C++ form "//...\n"). - * - * All recursive scans, except for macro-expansion, are done by the - * parser, whereas the simple state transitions of non-recursive - * directives are done in the scanner. This results in the many - * exclusive start-conditions of the scanner. - * - * Macro expansions are slightly more difficult because they have to - * prescan the arguments. Parameter substitution is literal if the - * substitution is # or ## (either side). This enables new identifiers - * to be created (see 'info cpp' node Macro|Pitfalls|Prescan for more - * information). - * - * FIXME: Variable macro parameters is recognized, but not yet - * expanded. I have to reread the ANSI standard on the subject (yes, - * ANSI defines it). - * - * The following special defines are supported: - * __FILE__ -> "thissource.c" - * __LINE__ -> 123 - * __DATE__ -> "May 1 2000" - * __TIME__ -> "23:59:59" - * These macros expand, as expected, into their ANSI defined values. - * - * The same include prevention is implemented as gcc and egcs does. - * This results in faster processing because we do not read the text - * at all. Some wine-sources attempt to include the same file 4 or 5 - * times. This strategy also saves a lot blank output-lines, which in - * its turn improves the real resource scanner/parser. - * - */ - -/* - * Special flex options and exclusive scanner start-conditions - */ -%option stack -%option never-interactive - -%x pp_pp -%x pp_eol -%x pp_inc -%x pp_dqs -%x pp_sqs -%x pp_iqs -%x pp_comment -%x pp_def -%x pp_define -%x pp_macro -%x pp_mbody -%x pp_macign -%x pp_macscan -%x pp_macexp -%x pp_if -%x pp_ifd -%x pp_endif -%x pp_line -%x pp_defined -%x pp_ignore -%x RCINCL - -ws [ \v\f\t\r] -cident [a-zA-Z_][0-9a-zA-Z_]* -ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] - -%{ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ctype.h> -#include <assert.h> - -#include "wpp_private.h" -#include "y.tab.h" - -/* - * Make sure that we are running an appropriate version of flex. - */ -#if !defined(YY_FLEX_MAJOR_VERSION) || (1000 * YY_FLEX_MAJOR_VERSION + YY_FLEX_MINOR_VERSION < 2005) -#error Must use flex version 2.5.1 or higher (yy_scan_* routines are required). -#endif - -#define YY_USE_PROTOS -#define YY_NO_UNPUT -#define YY_READ_BUF_SIZE 65536 /* So we read most of a file at once */ - -#define yy_current_state() YY_START -#define yy_pp_state(x) yy_pop_state(); yy_push_state(x) - -/* - * Always update the current character position within a line - */ -#define YY_USER_ACTION pp_status.char_number+=ppleng; - -/* - * Buffer management for includes and expansions - */ -#define MAXBUFFERSTACK 128 /* Nesting more than 128 includes or macro expansion textss is insane */ - -typedef struct bufferstackentry { - YY_BUFFER_STATE bufferstate; /* Buffer to switch back to */ - pp_entry_t *define; /* Points to expanding define or NULL if handling includes */ - int line_number; /* Line that we were handling */ - int char_number; /* The current position on that line */ - const char *filename; /* Filename that we were handling */ - int if_depth; /* How many #if:s deep to check matching #endif:s */ - int ncontinuations; /* Remember the continuation state */ - int should_pop; /* Set if we must pop the start-state on EOF */ - /* Include management */ - include_state_t incl; - char *include_filename; - int pass_data; -} bufferstackentry_t; - -#define ALLOCBLOCKSIZE (1 << 10) /* Allocate these chunks at a time for string-buffers */ - -/* - * Macro expansion nesting - * We need the stack to handle expansions while scanning - * a macro's arguments. The TOS must always be the macro - * that receives the current expansion from the scanner. - */ -#define MAXMACEXPSTACK 128 /* Nesting more than 128 macro expansions is insane */ - -typedef struct macexpstackentry { - pp_entry_t *ppp; /* This macro we are scanning */ - char **args; /* With these arguments */ - char **ppargs; /* Resulting in these preprocessed arguments */ - int *nnls; /* Number of newlines per argument */ - int nargs; /* And this many arguments scanned */ - int parentheses; /* Nesting level of () */ - int curargsize; /* Current scanning argument's size */ - int curargalloc; /* Current scanning argument's block allocated */ - char *curarg; /* Current scanning argument's content */ -} macexpstackentry_t; - -#define MACROPARENTHESES() (top_macro()->parentheses) - -/* - * Prototypes - */ -static void newline(int); -static int make_number(int radix, YYSTYPE *val, const char *str, int len); -static void put_buffer(const char *s, int len); -/* Buffer management */ -static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop); -static bufferstackentry_t *pop_buffer(void); -/* String functions */ -static void new_string(void); -static void add_string(const char *str, int len); -static char *get_string(void); -static void put_string(void); -static int string_start(void); -/* Macro functions */ -static void push_macro(pp_entry_t *ppp); -static macexpstackentry_t *top_macro(void); -static macexpstackentry_t *pop_macro(void); -static void free_macro(macexpstackentry_t *mep); -static void add_text_to_macro(const char *text, int len); -static void macro_add_arg(int last); -static void macro_add_expansion(void); -/* Expansion */ -static void expand_special(pp_entry_t *ppp); -static void expand_define(pp_entry_t *ppp); -static void expand_macro(macexpstackentry_t *mep); - -/* - * Local variables - */ -static int ncontinuations; - -static int strbuf_idx = 0; -static int strbuf_alloc = 0; -static char *strbuffer = NULL; -static int str_startline; - -static macexpstackentry_t *macexpstack[MAXMACEXPSTACK]; -static int macexpstackidx = 0; - -static bufferstackentry_t bufferstack[MAXBUFFERSTACK]; -static int bufferstackidx = 0; - -static int pass_data=1; - -/* - * Global variables - */ -include_state_t pp_incl_state = -{ - -1, /* state */ - NULL, /* ppp */ - 0, /* ifdepth */ - 0 /* seen_junk */ -}; - -includelogicentry_t *pp_includelogiclist = NULL; - -%} - -/* - ************************************************************************ ** - * The scanner starts here - ************************************************************************ ** - */ - -%% - /* - * Catch line-continuations. - * Note: Gcc keeps the line-continuations in, for example, strings - * intact. However, I prefer to remove them all so that the next - * scanner will not need to reduce the continuation state. - * - * <*>\\\n newline(0); - */ - - /* - * Detect the leading # of a preprocessor directive. - */ -<INITIAL,pp_ignore>^{ws}*# pp_incl_state.seen_junk++; yy_push_state(pp_pp); - - /* - * Scan for the preprocessor directives - */ -<pp_pp>{ws}*include{ws}* if(yy_top_state() != pp_ignore) {yy_pp_state(pp_inc); return tINCLUDE;} else {yy_pp_state(pp_eol);} -<pp_pp>{ws}*define{ws}* yy_pp_state(yy_current_state() != pp_ignore ? pp_def : pp_eol); -<pp_pp>{ws}*error{ws}* yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tERROR; -<pp_pp>{ws}*warning{ws}* yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tWARNING; -<pp_pp>{ws}*pragma{ws}* yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPRAGMA; -<pp_pp>{ws}*ident{ws}* yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPPIDENT; -<pp_pp>{ws}*undef{ws}* if(yy_top_state() != pp_ignore) {yy_pp_state(pp_ifd); return tUNDEF;} else {yy_pp_state(pp_eol);} -<pp_pp>{ws}*ifdef{ws}* yy_pp_state(pp_ifd); return tIFDEF; -<pp_pp>{ws}*ifndef{ws}* pp_incl_state.seen_junk--; yy_pp_state(pp_ifd); return tIFNDEF; -<pp_pp>{ws}*if{ws}* yy_pp_state(pp_if); return tIF; -<pp_pp>{ws}*elif{ws}* yy_pp_state(pp_if); return tELIF; -<pp_pp>{ws}*else{ws}* yy_pp_state(pp_endif); return tELSE; -<pp_pp>{ws}*endif{ws}* yy_pp_state(pp_endif); return tENDIF; -<pp_pp>{ws}*line{ws}* if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tLINE;} else {yy_pp_state(pp_eol);} -<pp_pp>{ws}+ if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tGCCLINE;} else {yy_pp_state(pp_eol);} -<pp_pp>{ws}*[a-z]+ pperror("Invalid preprocessor token '%s'", pptext); -<pp_pp>\r?\n newline(1); yy_pop_state(); return tNL; /* This could be the null-token */ -<pp_pp>\\\r?\n newline(0); -<pp_pp>\\\r? pperror("Preprocessor junk '%s'", pptext); -<pp_pp>. return *pptext; - - /* - * Handle #include and #line - */ -<pp_line>[0-9]+ return make_number(10, &pplval, pptext, ppleng); -<pp_inc>\< new_string(); add_string(pptext, ppleng); yy_push_state(pp_iqs); -<pp_inc,pp_line>\" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); -<pp_inc,pp_line>{ws}+ ; -<pp_inc,pp_line>\n newline(1); yy_pop_state(); return tNL; -<pp_inc,pp_line>\\\r?\n newline(0); -<pp_inc,pp_line>(\\\r?)|(.) pperror(yy_current_state() == pp_inc ? "Trailing junk in #include" : "Trailing junk in #line"); - - /* - * Ignore all input when a false clause is parsed - */ -<pp_ignore>[^#/\\\n]+ ; -<pp_ignore>\n newline(1); -<pp_ignore>\\\r?\n newline(0); -<pp_ignore>(\\\r?)|(.) ; - - /* - * Handle #if and #elif. - * These require conditionals to be evaluated, but we do not - * want to jam the scanner normally when we see these tokens. - * Note: tIDENT is handled below. - */ - -<pp_if>0[0-7]*{ul}? return make_number(8, &pplval, pptext, ppleng); -<pp_if>0[0-7]*[8-9]+{ul}? pperror("Invalid octal digit"); -<pp_if>[1-9][0-9]*{ul}? return make_number(10, &pplval, pptext, ppleng); -<pp_if>0[xX][0-9a-fA-F]+{ul}? return make_number(16, &pplval, pptext, ppleng); -<pp_if>0[xX] pperror("Invalid hex number"); -<pp_if>defined yy_push_state(pp_defined); return tDEFINED; -<pp_if>"<<" return tLSHIFT; -<pp_if>">>" return tRSHIFT; -<pp_if>"&&" return tLOGAND; -<pp_if>"||" return tLOGOR; -<pp_if>"==" return tEQ; -<pp_if>"!=" return tNE; -<pp_if>"<=" return tLTE; -<pp_if>">=" return tGTE; -<pp_if>\n newline(1); yy_pop_state(); return tNL; -<pp_if>\\\r?\n newline(0); -<pp_if>\\\r? pperror("Junk in conditional expression"); -<pp_if>{ws}+ ; -<pp_if>\' new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); -<pp_if>\" pperror("String constants not allowed in conditionals"); -<pp_if>. return *pptext; - - /* - * Handle #ifdef, #ifndef and #undef - * to get only an untranslated/unexpanded identifier - */ -<pp_ifd>{cident} pplval.cptr = pp_xstrdup(pptext); return tIDENT; -<pp_ifd>{ws}+ ; -<pp_ifd>\n newline(1); yy_pop_state(); return tNL; -<pp_ifd>\\\r?\n newline(0); -<pp_ifd>(\\\r?)|(.) pperror("Identifier expected"); - - /* - * Handle #else and #endif. - */ -<pp_endif>{ws}+ ; -<pp_endif>\n newline(1); yy_pop_state(); return tNL; -<pp_endif>\\\r?\n newline(0); -<pp_endif>. pperror("Garbage after #else or #endif."); - - /* - * Handle the special 'defined' keyword. - * This is necessary to get the identifier prior to any - * substitutions. - */ -<pp_defined>{cident} yy_pop_state(); pplval.cptr = pp_xstrdup(pptext); return tIDENT; -<pp_defined>{ws}+ ; -<pp_defined>($)|($) return *pptext; -<pp_defined>\\\r?\n newline(0); -<pp_defined>(\\.)|(\n)|(.) pperror("Identifier expected"); - - /* - * Handle #error, #warning, #pragma and #ident. - * Pass everything literally to the parser, which - * will act appropriately. - * Comments are stripped from the literal text. - */ -<pp_eol>[^/\\\n]+ if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } -<pp_eol>\/[^/\\\n*]* if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } -<pp_eol>(\\\r?)|(\/[^/*]) if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } -<pp_eol>\n newline(1); yy_pop_state(); if(yy_current_state() != pp_ignore) { return tNL; } -<pp_eol>\\\r?\n newline(0); - - /* - * Handle left side of #define - */ -<pp_def>{cident}$ pplval.cptr = pp_xstrdup(pptext); pplval.cptr[ppleng-1] = '\0'; yy_pp_state(pp_macro); return tMACRO; -<pp_def>{cident} pplval.cptr = pp_xstrdup(pptext); yy_pp_state(pp_define); return tDEFINE; -<pp_def>{ws}+ ; -<pp_def>\\\r?\n newline(0); -<pp_def>(\\\r?)|(\n)|(.) perror("Identifier expected"); - - /* - * Scan the substitution of a define - */ -<pp_define>[^'"/\\\n]+ pplval.cptr = pp_xstrdup(pptext); return tLITERAL; -<pp_define>(\\\r?)|(\/[^/*]) pplval.cptr = pp_xstrdup(pptext); return tLITERAL; -<pp_define>\\\r?\n{ws}+ newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL; -<pp_define>\\\r?\n newline(0); -<pp_define>\n newline(1); yy_pop_state(); return tNL; -<pp_define>\' new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); -<pp_define>\" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); - - /* - * Scan the definition macro arguments - */ -<pp_macro>${ws}* yy_pp_state(pp_mbody); return tMACROEND; -<pp_macro>{ws}+ ; -<pp_macro>{cident} pplval.cptr = pp_xstrdup(pptext); return tIDENT; -<pp_macro>, return ','; -<pp_macro>"..." return tELIPSIS; -<pp_macro>(\\\r?)|(\n)|(.)|(\.\.?) pperror("Argument identifier expected"); -<pp_macro>\\\r?\n newline(0); - - /* - * Scan the substitution of a macro - */ -<pp_mbody>[^a-zA-Z0-9'"#/\\\n]+ pplval.cptr = pp_xstrdup(pptext); return tLITERAL; -<pp_mbody>{cident} pplval.cptr = pp_xstrdup(pptext); return tIDENT; -<pp_mbody>\#\# return tCONCAT; -<pp_mbody>\# return tSTRINGIZE; -<pp_mbody>[0-9][^'"#/\\\n]* pplval.cptr = pp_xstrdup(pptext); return tLITERAL; -<pp_mbody>(\\\r?)|(\/[^/*'"#\\\n]*) pplval.cptr = pp_xstrdup(pptext); return tLITERAL; -<pp_mbody>\\\r?\n{ws}+ newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL; -<pp_mbody>\\\r?\n newline(0); -<pp_mbody>\n newline(1); yy_pop_state(); return tNL; -<pp_mbody>\' new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); -<pp_mbody>\" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); - - /* - * Macro expansion text scanning. - * This state is active just after the identifier is scanned - * that triggers an expansion. We *must* delete the leading - * whitespace before we can start scanning for arguments. - * - * If we do not see a '(' as next trailing token, then we have - * a false alarm. We just continue with a nose-bleed... - */ -<pp_macign>{ws}*/$ yy_pp_state(pp_macscan); -<pp_macign>{ws}*\n { - if(yy_top_state() != pp_macscan) - newline(0); - } -<pp_macign>{ws}*\\\r?\n newline(0); -<pp_macign>{ws}+|{ws}*\\\r?|. { - macexpstackentry_t *mac = pop_macro(); - yy_pop_state(); - put_buffer(mac->ppp->ident, strlen(mac->ppp->ident)); - put_buffer(pptext, ppleng); - free_macro(mac); - } - - /* - * Macro expansion argument text scanning. - * This state is active when a macro's arguments are being read for expansion. - */ -<pp_macscan>\( { - if(++MACROPARENTHESES() > 1) - add_text_to_macro(pptext, ppleng); - } -<pp_macscan>$ { - if(--MACROPARENTHESES() == 0) - { - yy_pop_state(); - macro_add_arg(1); - } - else - add_text_to_macro(pptext, ppleng); - } -<pp_macscan>, { - if(MACROPARENTHESES() > 1) - add_text_to_macro(pptext, ppleng); - else - macro_add_arg(0); - } -<pp_macscan>\" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); -<pp_macscan>\' new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); -<pp_macscan>"/*" yy_push_state(pp_comment); add_text_to_macro(" ", 1); -<pp_macscan>\n pp_status.line_number++; pp_status.char_number = 1; add_text_to_macro(pptext, ppleng); -<pp_macscan>([^/(),\\\n"']+)|(\/[^/*(),\\\n'"]*)|(\\\r?)|(.) add_text_to_macro(pptext, ppleng); -<pp_macscan>\\\r?\n newline(0); - - /* - * Comment handling (almost all start-conditions) - */ -<INITIAL,pp_pp,pp_ignore,pp_eol,pp_inc,pp_if,pp_ifd,pp_endif,pp_defined ,pp_def,pp_define,pp_macro,pp_mbody,RCINCL>"/*" yy_push_state(pp_comment); -<pp_comment>[^*\n]*|"*"+[^*/\n]* ; -<pp_comment>\n newline(0); -<pp_comment>"*"+"/" yy_pop_state(); - - /* - * Remove C++ style comment (almost all start-conditions) - */ -<INITIAL,pp_pp,pp_ignore,pp_eol,pp_inc,pp_if,pp_ifd,pp_endif,pp_defined ,pp_def,pp_define,pp_macro,pp_mbody,pp_macscan,RCINCL>"//"[^\n]* { - if(pptext[ppleng-1] == '\\') - ppwarning("C++ style comment ends with an escaped newline (escape ignored)"); - } - - /* - * Single, double and <> quoted constants - */ -<INITIAL,pp_macexp>\" pp_incl_state.seen_junk++; new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); -<INITIAL,pp_macexp>\' pp_incl_state.seen_junk++; new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); -<pp_dqs>[^"\\\n]+ add_string(pptext, ppleng); -<pp_dqs>\" { - add_string(pptext, ppleng); - yy_pop_state(); - switch(yy_current_state()) - { - case pp_pp: - case pp_define: - case pp_mbody: - case pp_inc: - case pp_line: - case RCINCL: - if (yy_current_state()==RCINCL) yy_pop_state(); - pplval.cptr = get_string(); - return tDQSTRING; - default: - put_string(); - } - } -<pp_sqs>[^'\\\n]+ add_string(pptext, ppleng); -<pp_sqs>\' { - add_string(pptext, ppleng); - yy_pop_state(); - switch(yy_current_state()) - { - case pp_if: - case pp_define: - case pp_mbody: - pplval.cptr = get_string(); - return tSQSTRING; - default: - put_string(); - } - } -<pp_iqs>[^\>\\\n]+ add_string(pptext, ppleng); -<pp_iqs>\> { - add_string(pptext, ppleng); - yy_pop_state(); - pplval.cptr = get_string(); - return tIQSTRING; - } -<pp_dqs>\\\r?\n { - /* - * This is tricky; we need to remove the line-continuation - * from preprocessor strings, but OTOH retain them in all - * other strings. This is because the resource grammar is - * even more braindead than initially analysed and line- - * continuations in strings introduce, sigh, newlines in - * the output. There goes the concept of non-breaking, non- - * spacing whitespace. - */ - switch(yy_top_state()) - { - case pp_pp: - case pp_define: - case pp_mbody: - case pp_inc: - case pp_line: - newline(0); - break; - default: - add_string(pptext, ppleng); - newline(-1); - } - } -<pp_iqs,pp_dqs,pp_sqs>\\. add_string(pptext, ppleng); -<pp_iqs,pp_dqs,pp_sqs>\n { - newline(1); - add_string(pptext, ppleng); - ppwarning("Newline in string constant encounterd (started line %d)", string_start()); - } - - /* - * Identifier scanning - */ -<INITIAL,pp_if,pp_inc,pp_macexp>{cident} { - pp_entry_t *ppp; - pp_incl_state.seen_junk++; - if(!(ppp = pplookup(pptext))) - { - if(yy_current_state() == pp_inc) - pperror("Expected include filename"); - - if(yy_current_state() == pp_if) - { - pplval.cptr = pp_xstrdup(pptext); - return tIDENT; - } - else { - if((yy_current_state()==INITIAL) && (strcasecmp(pptext,"RCINCLUDE")==0)){ - yy_push_state(RCINCL); - return tRCINCLUDE; - } - else put_buffer(pptext, ppleng); - } - } - else if(!ppp->expanding) - { - switch(ppp->type) - { - case def_special: - expand_special(ppp); - break; - case def_define: - expand_define(ppp); - break; - case def_macro: - yy_push_state(pp_macign); - push_macro(ppp); - break; - default: - pp_internal_error(__FILE__, __LINE__, "Invalid define type %d\n", ppp->type); - } - } - } - - /* - * Everything else that needs to be passed and - * newline and continuation handling - */ -<INITIAL,pp_macexp>[^a-zA-Z_#'"/\\\n \r\t\f\v]+|(\/|\\)[^a-zA-Z_/*'"\\\n \r\t\v\f]* pp_incl_state.seen_junk++; put_buffer(pptext, ppleng); -<INITIAL,pp_macexp>{ws}+ put_buffer(pptext, ppleng); -<INITIAL>\n newline(1); -<INITIAL>\\\r?\n newline(0); -<INITIAL>\\\r? pp_incl_state.seen_junk++; put_buffer(pptext, ppleng); - - /* - * Special catcher for macro argmument expansion to prevent - * newlines to propagate to the output or admin. - */ -<pp_macexp>(\n)|(.)|(\\\r?(\n|.)) put_buffer(pptext, ppleng); - -<RCINCL>[A-Za-z0-9_\.\\/]+ { - pplval.cptr=pp_xstrdup(pptext); - yy_pop_state(); - return tRCINCLUDEPATH; - } - -<RCINCL>{ws}+ ; - -<RCINCL>\" { - new_string(); add_string(pptext,ppleng);yy_push_state(pp_dqs); - } - - /* - * This is a 'catch-all' rule to discover errors in the scanner - * in an orderly manner. - */ -<*>. pp_incl_state.seen_junk++; ppwarning("Unmatched text '%c' (0x%02x); please report\n", isprint(*pptext & 0xff) ? *pptext : ' ', *pptext); - -<<EOF>> { - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; - bufferstackentry_t *bep = pop_buffer(); - - if((!bep && pp_get_if_depth()) || (bep && pp_get_if_depth() != bep->if_depth)) - ppwarning("Unmatched #if/#endif at end of file"); - - if(!bep) - { - if(YY_START != INITIAL) - pperror("Unexpected end of file during preprocessing"); - yyterminate(); - } - else if(bep->should_pop == 2) - { - macexpstackentry_t *mac; - mac = pop_macro(); - expand_macro(mac); - } - pp_delete_buffer(b); - } - -%% -/* - ************************************************************************ ** - * Support functions - ************************************************************************ ** - */ - -#ifndef ppwrap -int ppwrap(void) -{ - return 1; -} -#endif - - -/* - *----------------------------------------------------------------------- -- - * Output newlines or set them as continuations - * - * Input: -1 - Don't count this one, but update local position (see pp_dqs) - * 0 - Line-continuation seen and cache output - * 1 - Newline seen and flush output - *----------------------------------------------------------------------- -- - */ -static void newline(int dowrite) -{ - pp_status.line_number++; - pp_status.char_number = 1; - - if(dowrite == -1) - return; - - ncontinuations++; - if(dowrite) - { - for(;ncontinuations; ncontinuations--) - put_buffer("\n", 1); - } -} - - -/* - *----------------------------------------------------------------------- -- - * Make a number out of an any-base and suffixed string - * - * Possible number extensions: - * - "" int - * - "L" long int - * - "LL" long long int - * - "U" unsigned int - * - "UL" unsigned long int - * - "ULL" unsigned long long int - * - "LU" unsigned long int - * - "LLU" unsigned long long int - * - "LUL" invalid - * - * FIXME: - * The sizes of resulting 'int' and 'long' are compiler specific. - * I depend on sizeof(int) > 2 here (although a relatively safe - * assumption). - * Long longs are not yet implemented because this is very compiler - * specific and I don't want to think too much about the problems. - * - *----------------------------------------------------------------------- -- - */ -static int make_number(int radix, YYSTYPE *val, const char *str, int len) -{ - int is_l = 0; - int is_ll = 0; - int is_u = 0; - char ext[4]; - - ext[3] = '\0'; - ext[2] = toupper(str[len-1]); - ext[1] = len > 1 ? toupper(str[len-2]) : ' '; - ext[0] = len > 2 ? toupper(str[len-3]) : ' '; - - if(!strcmp(ext, "LUL")) - pperror("Invalid constant suffix"); - else if(!strcmp(ext, "LLU") || !strcmp(ext, "ULL")) - { - is_ll++; - is_u++; - } - else if(!strcmp(ext+1, "LU") || !strcmp(ext+1, "UL")) - { - is_l++; - is_u++; - } - else if(!strcmp(ext+1, "LL")) - { - is_ll++; - } - else if(!strcmp(ext+2, "L")) - { - is_l++; - } - else if(!strcmp(ext+2, "U")) - { - is_u++; - } - - if(is_ll) - pp_internal_error(__FILE__, __LINE__, "long long constants not implemented yet"); - - if(is_u && is_l) - { - val->ulong = strtoul(str, NULL, radix); - return tULONG; - } - else if(!is_u && is_l) - { - val->slong = strtol(str, NULL, radix); - return tSLONG; - } - else if(is_u && !is_l) - { - val->uint = (unsigned int)strtoul(str, NULL, radix); - return tUINT; - } - - /* Else it must be an int... */ - val->sint = (int)strtol(str, NULL, radix); - return tSINT; -} - - -/* - *----------------------------------------------------------------------- -- - * Macro and define expansion support - * - * FIXME: Variable macro arguments. - *----------------------------------------------------------------------- -- - */ -static void expand_special(pp_entry_t *ppp) -{ - const char *dbgtext = "?"; - static char *buf = NULL; - - assert(ppp->type == def_special); - - if(!strcmp(ppp->ident, "__LINE__")) - { - dbgtext = "def_special(__LINE__)"; - buf = pp_xrealloc(buf, 32); - sprintf(buf, "%d", pp_status.line_number); - } - else if(!strcmp(ppp->ident, "__FILE__")) - { - dbgtext = "def_special(__FILE__)"; - buf = pp_xrealloc(buf, strlen(pp_status.input) + 3); - sprintf(buf, "\"%s\"", pp_status.input); - } - else - pp_internal_error(__FILE__, __LINE__, "Special macro '%s' not found...\n", ppp->ident); - - if(pp_flex_debug) - fprintf(stderr, "expand_special(%d): %s:%d: '%s' -> '%s'\n", - macexpstackidx, - pp_status.input, - pp_status.line_number, - ppp->ident, - buf ? buf : ""); - - if(buf && buf[0]) - { - push_buffer(ppp, NULL, NULL, 0); - yy_scan_string(buf); - } -} - -static void expand_define(pp_entry_t *ppp) -{ - assert(ppp->type == def_define); - - if(pp_flex_debug) - fprintf(stderr, "expand_define(%d): %s:%d: '%s' -> '%s'\n", - macexpstackidx, - pp_status.input, - pp_status.line_number, - ppp->ident, - ppp->subst.text); - if(ppp->subst.text && ppp->subst.text[0]) - { - push_buffer(ppp, NULL, NULL, 0); - yy_scan_string(ppp->subst.text); - } -} - -static int curdef_idx = 0; -static int curdef_alloc = 0; -static char *curdef_text = NULL; - -static void add_text(const char *str, int len) -{ - if(len == 0) - return; - if(curdef_idx >= curdef_alloc || curdef_alloc - curdef_idx < len) - { - curdef_alloc += (len + ALLOCBLOCKSIZE-1) & ~(ALLOCBLOCKSIZE-1); - curdef_text = pp_xrealloc(curdef_text, curdef_alloc * sizeof(curdef_text[0])); - if(curdef_alloc > 65536) - ppwarning("Reallocating macro-expansion buffer larger than 64kB"); - } - memcpy(&curdef_text[curdef_idx], str, len); - curdef_idx += len; -} - -static mtext_t *add_expand_text(mtext_t *mtp, macexpstackentry_t *mep, int *nnl) -{ - char *cptr; - char *exp; - int tag; - int n; - - if(mtp == NULL) - return NULL; - - switch(mtp->type) - { - case exp_text: - if(pp_flex_debug) - fprintf(stderr, "add_expand_text: exp_text: '%s'\n", mtp->subst.text); - add_text(mtp->subst.text, strlen(mtp->subst.text)); - break; - - case exp_stringize: - if(pp_flex_debug) - fprintf(stderr, "add_expand_text: exp_stringize(%d): '%s'\n", - mtp->subst.argidx, - mep->args[mtp->subst.argidx]); - cptr = mep->args[mtp->subst.argidx]; - add_text("\"", 1); - while(*cptr) - { - if(*cptr == '"' || *cptr == '\\') - add_text("\\", 1); - add_text(cptr, 1); - cptr++; - } - add_text("\"", 1); - break; - - case exp_concat: - if(pp_flex_debug) - fprintf(stderr, "add_expand_text: exp_concat\n"); - /* Remove trailing whitespace from current expansion text */ - while(curdef_idx) - { - if(isspace(curdef_text[curdef_idx-1] & 0xff)) - curdef_idx--; - else - break; - } - /* tag current position and recursively expand the next part */ - tag = curdef_idx; - mtp = add_expand_text(mtp->next, mep, nnl); - - /* Now get rid of the leading space of the expansion */ - cptr = &curdef_text[tag]; - n = curdef_idx - tag; - while(n) - { - if(isspace(*cptr & 0xff)) - { - cptr++; - n--; - } - else - break; - } - if(cptr != &curdef_text[tag]) - { - memmove(&curdef_text[tag], cptr, n); - curdef_idx -= (curdef_idx - tag) - n; - } - break; - - case exp_subst: - if((mtp->next && mtp->next->type == exp_concat) || (mtp->prev && mtp->prev->type == exp_concat)) [truncated at 1000 lines; 3286 more skipped]

1 0

[gvg] 13647: wpp vendor drop
by gvg＠svn.reactos.com 19 Feb '05

19 Feb '05

wpp vendor drop Added: vendor/wine/libs/wpp/ Added: vendor/wine/libs/wpp/current/ Added: vendor/wine/libs/wpp/current/Makefile.in Added: vendor/wine/libs/wpp/current/ppl.l Added: vendor/wine/libs/wpp/current/ppy.y Added: vendor/wine/libs/wpp/current/preproc.c Added: vendor/wine/libs/wpp/current/wpp.c Added: vendor/wine/libs/wpp/current/wpp_private.h _____ Added: vendor/wine/libs/wpp/current/Makefile.in --- vendor/wine/libs/wpp/current/Makefile.in 2005-02-19 18:27:30 UTC (rev 13646) +++ vendor/wine/libs/wpp/current/Makefile.in 2005-02-19 22:16:09 UTC (rev 13647) @@ -0,0 +1,37 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +LEXOPT = -Cf #-w -b +YACCOPT = #-v +MODULE = libwpp.a + +C_SRCS = \ + preproc.c \ + wpp.c + +EXTRA_SRCS = ppy.y ppl.l +EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o + +all: $(MODULE) + +@MAKE_RULES@ + +$(MODULE): $(OBJS) + $(RM) $@ + $(AR) $@ $(OBJS) + $(RANLIB) $@ + +y.tab.c y.tab.h: ppy.y + $(YACC) $(YACCOPT) -ppp -d -t $(SRCDIR)/ppy.y + +# hack to allow parallel make +y.tab.h: y.tab.c +y.tab.o: y.tab.h + +@LEX_OUTPUT_ROOT@.c: ppl.l + $(LEX) $(LEXOPT) -d -Ppp -o$@ -8 $(SRCDIR)/ppl.l + +@LEX_OUTPUT_ROOT@.o: y.tab.h + +### Dependencies: Property changes on: vendor/wine/libs/wpp/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/libs/wpp/current/ppl.l --- vendor/wine/libs/wpp/current/ppl.l 2005-02-19 18:27:30 UTC (rev 13646) +++ vendor/wine/libs/wpp/current/ppl.l 2005-02-19 22:16:09 UTC (rev 13647) @@ -0,0 +1,1476 @@ +/* + * Wrc preprocessor lexical analysis + * + * Copyright 1999-2000 Bertho A. Stultiens (BS) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * History: + * 24-Apr-2000 BS - Started from scratch to restructure everything + * and reintegrate the source into the wine-tree. + * 04-Jan-2000 BS - Added comments about the lexicographical + * grammar to give some insight in the complexity. + * 28-Dec-1999 BS - Eliminated backing-up of the flexer by running + * `flex -b' on the source. This results in some + * weirdo extra rules, but a much faster scanner. + * 23-Dec-1999 BS - Started this file + * + *----------------------------------------------------------------------- -- + * The preprocessor's lexographical grammar (approximately): + * + * pp := {ws} # {ws} if {ws} {expr} {ws} \n + * | {ws} # {ws} ifdef {ws} {id} {ws} \n + * | {ws} # {ws} ifndef {ws} {id} {ws} \n + * | {ws} # {ws} elif {ws} {expr} {ws} \n + * | {ws} # {ws} else {ws} \n + * | {ws} # {ws} endif {ws} \n + * | {ws} # {ws} include {ws} < {anytext} > \n + * | {ws} # {ws} include {ws} " {anytext} " \n + * | {ws} # {ws} define {ws} {anytext} \n + * | {ws} # {ws} define( {arglist} ) {ws} {expansion} \n + * | {ws} # {ws} pragma {ws} {anytext} \n + * | {ws} # {ws} ident {ws} {anytext} \n + * | {ws} # {ws} error {ws} {anytext} \n + * | {ws} # {ws} warning {ws} {anytext} \n + * | {ws} # {ws} line {ws} " {anytext} " {number} \n + * | {ws} # {ws} {number} " {anytext} " {number} [ {number} [{number}] ] \n + * | {ws} # {ws} \n + * + * ws := [ \t\r\f\v]* + * + * expr := {expr} [+-*%^/|&] {expr} + * | {expr} {logor|logand} {expr} + * | [!~+-] {expr} + * | {expr} ? {expr} : {expr} + * + * logor := || + * + * logand := && + * + * id := [a-zA-Z_][a-zA-Z0-9_]* + * + * anytext := [^\n]* (see note) + * + * arglist := + * | {id} + * | {arglist} , {id} + * | {arglist} , {id} ... + * + * expansion := {id} + * | # {id} + * | {anytext} + * | {anytext} ## {anytext} + * + * number := [0-9]+ + * + * Note: "anytext" is not always "[^\n]*". This is because the + * trailing context must be considered as well. + * + * The only certain assumption for the preprocessor to make is that + * directives start at the beginning of the line, followed by a '#' + * and end with a newline. + * Any directive may be suffixed with a line-continuation. Also + * classical comment / *...* / (note: no comments within comments, + * therefore spaces) is considered to be a line-continuation + * (according to gcc and egcs AFAIK, ANSI is a bit vague). + * Comments have not been added to the above grammar for simplicity + * reasons. However, it is allowed to enter comment anywhere within + * the directives as long as they do not interfere with the context. + * All comments are considered to be deletable whitespace (both + * classical form "/ *...* /" and C++ form "//...\n"). + * + * All recursive scans, except for macro-expansion, are done by the + * parser, whereas the simple state transitions of non-recursive + * directives are done in the scanner. This results in the many + * exclusive start-conditions of the scanner. + * + * Macro expansions are slightly more difficult because they have to + * prescan the arguments. Parameter substitution is literal if the + * substitution is # or ## (either side). This enables new identifiers + * to be created (see 'info cpp' node Macro|Pitfalls|Prescan for more + * information). + * + * FIXME: Variable macro parameters is recognized, but not yet + * expanded. I have to reread the ANSI standard on the subject (yes, + * ANSI defines it). + * + * The following special defines are supported: + * __FILE__ -> "thissource.c" + * __LINE__ -> 123 + * __DATE__ -> "May 1 2000" + * __TIME__ -> "23:59:59" + * These macros expand, as expected, into their ANSI defined values. + * + * The same include prevention is implemented as gcc and egcs does. + * This results in faster processing because we do not read the text + * at all. Some wine-sources attempt to include the same file 4 or 5 + * times. This strategy also saves a lot blank output-lines, which in + * its turn improves the real resource scanner/parser. + * + */ + +/* + * Special flex options and exclusive scanner start-conditions + */ +%option stack +%option never-interactive + +%x pp_pp +%x pp_eol +%x pp_inc +%x pp_dqs +%x pp_sqs +%x pp_iqs +%x pp_comment +%x pp_def +%x pp_define +%x pp_macro +%x pp_mbody +%x pp_macign +%x pp_macscan +%x pp_macexp +%x pp_if +%x pp_ifd +%x pp_endif +%x pp_line +%x pp_defined +%x pp_ignore +%x RCINCL + +ws [ \v\f\t\r] +cident [a-zA-Z_][0-9a-zA-Z_]* +ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] + +%{ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <assert.h> + +#include "wpp_private.h" +#include "y.tab.h" + +/* + * Make sure that we are running an appropriate version of flex. + */ +#if !defined(YY_FLEX_MAJOR_VERSION) || (1000 * YY_FLEX_MAJOR_VERSION + YY_FLEX_MINOR_VERSION < 2005) +#error Must use flex version 2.5.1 or higher (yy_scan_* routines are required). +#endif + +#define YY_USE_PROTOS +#define YY_NO_UNPUT +#define YY_READ_BUF_SIZE 65536 /* So we read most of a file at once */ + +#define yy_current_state() YY_START +#define yy_pp_state(x) yy_pop_state(); yy_push_state(x) + +/* + * Always update the current character position within a line + */ +#define YY_USER_ACTION pp_status.char_number+=ppleng; + +/* + * Buffer management for includes and expansions + */ +#define MAXBUFFERSTACK 128 /* Nesting more than 128 includes or macro expansion textss is insane */ + +typedef struct bufferstackentry { + YY_BUFFER_STATE bufferstate; /* Buffer to switch back to */ + pp_entry_t *define; /* Points to expanding define or NULL if handling includes */ + int line_number; /* Line that we were handling */ + int char_number; /* The current position on that line */ + const char *filename; /* Filename that we were handling */ + int if_depth; /* How many #if:s deep to check matching #endif:s */ + int ncontinuations; /* Remember the continuation state */ + int should_pop; /* Set if we must pop the start-state on EOF */ + /* Include management */ + include_state_t incl; + char *include_filename; + int pass_data; +} bufferstackentry_t; + +#define ALLOCBLOCKSIZE (1 << 10) /* Allocate these chunks at a time for string-buffers */ + +/* + * Macro expansion nesting + * We need the stack to handle expansions while scanning + * a macro's arguments. The TOS must always be the macro + * that receives the current expansion from the scanner. + */ +#define MAXMACEXPSTACK 128 /* Nesting more than 128 macro expansions is insane */ + +typedef struct macexpstackentry { + pp_entry_t *ppp; /* This macro we are scanning */ + char **args; /* With these arguments */ + char **ppargs; /* Resulting in these preprocessed arguments */ + int *nnls; /* Number of newlines per argument */ + int nargs; /* And this many arguments scanned */ + int parentheses; /* Nesting level of () */ + int curargsize; /* Current scanning argument's size */ + int curargalloc; /* Current scanning argument's block allocated */ + char *curarg; /* Current scanning argument's content */ +} macexpstackentry_t; + +#define MACROPARENTHESES() (top_macro()->parentheses) + +/* + * Prototypes + */ +static void newline(int); +static int make_number(int radix, YYSTYPE *val, const char *str, int len); +static void put_buffer(const char *s, int len); +/* Buffer management */ +static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop); +static bufferstackentry_t *pop_buffer(void); +/* String functions */ +static void new_string(void); +static void add_string(const char *str, int len); +static char *get_string(void); +static void put_string(void); +static int string_start(void); +/* Macro functions */ +static void push_macro(pp_entry_t *ppp); +static macexpstackentry_t *top_macro(void); +static macexpstackentry_t *pop_macro(void); +static void free_macro(macexpstackentry_t *mep); +static void add_text_to_macro(const char *text, int len); +static void macro_add_arg(int last); +static void macro_add_expansion(void); +/* Expansion */ +static void expand_special(pp_entry_t *ppp); +static void expand_define(pp_entry_t *ppp); +static void expand_macro(macexpstackentry_t *mep); + +/* + * Local variables + */ +static int ncontinuations; + +static int strbuf_idx = 0; +static int strbuf_alloc = 0; +static char *strbuffer = NULL; +static int str_startline; + +static macexpstackentry_t *macexpstack[MAXMACEXPSTACK]; +static int macexpstackidx = 0; + +static bufferstackentry_t bufferstack[MAXBUFFERSTACK]; +static int bufferstackidx = 0; + +static int pass_data=1; + +/* + * Global variables + */ +include_state_t pp_incl_state = +{ + -1, /* state */ + NULL, /* ppp */ + 0, /* ifdepth */ + 0 /* seen_junk */ +}; + +includelogicentry_t *pp_includelogiclist = NULL; + +%} + +/* + ************************************************************************ ** + * The scanner starts here + ************************************************************************ ** + */ + +%% + /* + * Catch line-continuations. + * Note: Gcc keeps the line-continuations in, for example, strings + * intact. However, I prefer to remove them all so that the next + * scanner will not need to reduce the continuation state. + * + * <*>\\\n newline(0); + */ + + /* + * Detect the leading # of a preprocessor directive. + */ +<INITIAL,pp_ignore>^{ws}*# pp_incl_state.seen_junk++; yy_push_state(pp_pp); + + /* + * Scan for the preprocessor directives + */ +<pp_pp>{ws}*include{ws}* if(yy_top_state() != pp_ignore) {yy_pp_state(pp_inc); return tINCLUDE;} else {yy_pp_state(pp_eol);} +<pp_pp>{ws}*define{ws}* yy_pp_state(yy_current_state() != pp_ignore ? pp_def : pp_eol); +<pp_pp>{ws}*error{ws}* yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tERROR; +<pp_pp>{ws}*warning{ws}* yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tWARNING; +<pp_pp>{ws}*pragma{ws}* yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPRAGMA; +<pp_pp>{ws}*ident{ws}* yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPPIDENT; +<pp_pp>{ws}*undef{ws}* if(yy_top_state() != pp_ignore) {yy_pp_state(pp_ifd); return tUNDEF;} else {yy_pp_state(pp_eol);} +<pp_pp>{ws}*ifdef{ws}* yy_pp_state(pp_ifd); return tIFDEF; +<pp_pp>{ws}*ifndef{ws}* pp_incl_state.seen_junk--; yy_pp_state(pp_ifd); return tIFNDEF; +<pp_pp>{ws}*if{ws}* yy_pp_state(pp_if); return tIF; +<pp_pp>{ws}*elif{ws}* yy_pp_state(pp_if); return tELIF; +<pp_pp>{ws}*else{ws}* yy_pp_state(pp_endif); return tELSE; +<pp_pp>{ws}*endif{ws}* yy_pp_state(pp_endif); return tENDIF; +<pp_pp>{ws}*line{ws}* if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tLINE;} else {yy_pp_state(pp_eol);} +<pp_pp>{ws}+ if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tGCCLINE;} else {yy_pp_state(pp_eol);} +<pp_pp>{ws}*[a-z]+ pperror("Invalid preprocessor token '%s'", pptext); +<pp_pp>\r?\n newline(1); yy_pop_state(); return tNL; /* This could be the null-token */ +<pp_pp>\\\r?\n newline(0); +<pp_pp>\\\r? pperror("Preprocessor junk '%s'", pptext); +<pp_pp>. return *pptext; + + /* + * Handle #include and #line + */ +<pp_line>[0-9]+ return make_number(10, &pplval, pptext, ppleng); +<pp_inc>\< new_string(); add_string(pptext, ppleng); yy_push_state(pp_iqs); +<pp_inc,pp_line>\" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); +<pp_inc,pp_line>{ws}+ ; +<pp_inc,pp_line>\n newline(1); yy_pop_state(); return tNL; +<pp_inc,pp_line>\\\r?\n newline(0); +<pp_inc,pp_line>(\\\r?)|(.) pperror(yy_current_state() == pp_inc ? "Trailing junk in #include" : "Trailing junk in #line"); + + /* + * Ignore all input when a false clause is parsed + */ +<pp_ignore>[^#/\\\n]+ ; +<pp_ignore>\n newline(1); +<pp_ignore>\\\r?\n newline(0); +<pp_ignore>(\\\r?)|(.) ; + + /* + * Handle #if and #elif. + * These require conditionals to be evaluated, but we do not + * want to jam the scanner normally when we see these tokens. + * Note: tIDENT is handled below. + */ + +<pp_if>0[0-7]*{ul}? return make_number(8, &pplval, pptext, ppleng); +<pp_if>0[0-7]*[8-9]+{ul}? pperror("Invalid octal digit"); +<pp_if>[1-9][0-9]*{ul}? return make_number(10, &pplval, pptext, ppleng); +<pp_if>0[xX][0-9a-fA-F]+{ul}? return make_number(16, &pplval, pptext, ppleng); +<pp_if>0[xX] pperror("Invalid hex number"); +<pp_if>defined yy_push_state(pp_defined); return tDEFINED; +<pp_if>"<<" return tLSHIFT; +<pp_if>">>" return tRSHIFT; +<pp_if>"&&" return tLOGAND; +<pp_if>"||" return tLOGOR; +<pp_if>"==" return tEQ; +<pp_if>"!=" return tNE; +<pp_if>"<=" return tLTE; +<pp_if>">=" return tGTE; +<pp_if>\n newline(1); yy_pop_state(); return tNL; +<pp_if>\\\r?\n newline(0); +<pp_if>\\\r? pperror("Junk in conditional expression"); +<pp_if>{ws}+ ; +<pp_if>\' new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); +<pp_if>\" pperror("String constants not allowed in conditionals"); +<pp_if>. return *pptext; + + /* + * Handle #ifdef, #ifndef and #undef + * to get only an untranslated/unexpanded identifier + */ +<pp_ifd>{cident} pplval.cptr = pp_xstrdup(pptext); return tIDENT; +<pp_ifd>{ws}+ ; +<pp_ifd>\n newline(1); yy_pop_state(); return tNL; +<pp_ifd>\\\r?\n newline(0); +<pp_ifd>(\\\r?)|(.) pperror("Identifier expected"); + + /* + * Handle #else and #endif. + */ +<pp_endif>{ws}+ ; +<pp_endif>\n newline(1); yy_pop_state(); return tNL; +<pp_endif>\\\r?\n newline(0); +<pp_endif>. pperror("Garbage after #else or #endif."); + + /* + * Handle the special 'defined' keyword. + * This is necessary to get the identifier prior to any + * substitutions. + */ +<pp_defined>{cident} yy_pop_state(); pplval.cptr = pp_xstrdup(pptext); return tIDENT; +<pp_defined>{ws}+ ; +<pp_defined>($)|($) return *pptext; +<pp_defined>\\\r?\n newline(0); +<pp_defined>(\\.)|(\n)|(.) pperror("Identifier expected"); + + /* + * Handle #error, #warning, #pragma and #ident. + * Pass everything literally to the parser, which + * will act appropriately. + * Comments are stripped from the literal text. + */ +<pp_eol>[^/\\\n]+ if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } +<pp_eol>\/[^/\\\n*]* if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } +<pp_eol>(\\\r?)|(\/[^/*]) if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } +<pp_eol>\n newline(1); yy_pop_state(); if(yy_current_state() != pp_ignore) { return tNL; } +<pp_eol>\\\r?\n newline(0); + + /* + * Handle left side of #define + */ +<pp_def>{cident}$ pplval.cptr = pp_xstrdup(pptext); pplval.cptr[ppleng-1] = '\0'; yy_pp_state(pp_macro); return tMACRO; +<pp_def>{cident} pplval.cptr = pp_xstrdup(pptext); yy_pp_state(pp_define); return tDEFINE; +<pp_def>{ws}+ ; +<pp_def>\\\r?\n newline(0); +<pp_def>(\\\r?)|(\n)|(.) perror("Identifier expected"); + + /* + * Scan the substitution of a define + */ +<pp_define>[^'"/\\\n]+ pplval.cptr = pp_xstrdup(pptext); return tLITERAL; +<pp_define>(\\\r?)|(\/[^/*]) pplval.cptr = pp_xstrdup(pptext); return tLITERAL; +<pp_define>\\\r?\n{ws}+ newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL; +<pp_define>\\\r?\n newline(0); +<pp_define>\n newline(1); yy_pop_state(); return tNL; +<pp_define>\' new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); +<pp_define>\" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); + + /* + * Scan the definition macro arguments + */ +<pp_macro>${ws}* yy_pp_state(pp_mbody); return tMACROEND; +<pp_macro>{ws}+ ; +<pp_macro>{cident} pplval.cptr = pp_xstrdup(pptext); return tIDENT; +<pp_macro>, return ','; +<pp_macro>"..." return tELIPSIS; +<pp_macro>(\\\r?)|(\n)|(.)|(\.\.?) pperror("Argument identifier expected"); +<pp_macro>\\\r?\n newline(0); + + /* + * Scan the substitution of a macro + */ +<pp_mbody>[^a-zA-Z0-9'"#/\\\n]+ pplval.cptr = pp_xstrdup(pptext); return tLITERAL; +<pp_mbody>{cident} pplval.cptr = pp_xstrdup(pptext); return tIDENT; +<pp_mbody>\#\# return tCONCAT; +<pp_mbody>\# return tSTRINGIZE; +<pp_mbody>[0-9][^'"#/\\\n]* pplval.cptr = pp_xstrdup(pptext); return tLITERAL; +<pp_mbody>(\\\r?)|(\/[^/*'"#\\\n]*) pplval.cptr = pp_xstrdup(pptext); return tLITERAL; +<pp_mbody>\\\r?\n{ws}+ newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL; +<pp_mbody>\\\r?\n newline(0); +<pp_mbody>\n newline(1); yy_pop_state(); return tNL; +<pp_mbody>\' new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); +<pp_mbody>\" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); + + /* + * Macro expansion text scanning. + * This state is active just after the identifier is scanned + * that triggers an expansion. We *must* delete the leading + * whitespace before we can start scanning for arguments. + * + * If we do not see a '(' as next trailing token, then we have + * a false alarm. We just continue with a nose-bleed... + */ +<pp_macign>{ws}*/$ yy_pp_state(pp_macscan); +<pp_macign>{ws}*\n { + if(yy_top_state() != pp_macscan) + newline(0); + } +<pp_macign>{ws}*\\\r?\n newline(0); +<pp_macign>{ws}+|{ws}*\\\r?|. { + macexpstackentry_t *mac = pop_macro(); + yy_pop_state(); + put_buffer(mac->ppp->ident, strlen(mac->ppp->ident)); + put_buffer(pptext, ppleng); + free_macro(mac); + } + + /* + * Macro expansion argument text scanning. + * This state is active when a macro's arguments are being read for expansion. + */ +<pp_macscan>\( { + if(++MACROPARENTHESES() > 1) + add_text_to_macro(pptext, ppleng); + } +<pp_macscan>$ { + if(--MACROPARENTHESES() == 0) + { + yy_pop_state(); + macro_add_arg(1); + } + else + add_text_to_macro(pptext, ppleng); + } +<pp_macscan>, { + if(MACROPARENTHESES() > 1) + add_text_to_macro(pptext, ppleng); + else + macro_add_arg(0); + } +<pp_macscan>\" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); +<pp_macscan>\' new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); +<pp_macscan>"/*" yy_push_state(pp_comment); add_text_to_macro(" ", 1); +<pp_macscan>\n pp_status.line_number++; pp_status.char_number = 1; add_text_to_macro(pptext, ppleng); +<pp_macscan>([^/(),\\\n"']+)|(\/[^/*(),\\\n'"]*)|(\\\r?)|(.) add_text_to_macro(pptext, ppleng); +<pp_macscan>\\\r?\n newline(0); + + /* + * Comment handling (almost all start-conditions) + */ +<INITIAL,pp_pp,pp_ignore,pp_eol,pp_inc,pp_if,pp_ifd,pp_endif,pp_defined ,pp_def,pp_define,pp_macro,pp_mbody,RCINCL>"/*" yy_push_state(pp_comment); +<pp_comment>[^*\n]*|"*"+[^*/\n]* ; +<pp_comment>\n newline(0); +<pp_comment>"*"+"/" yy_pop_state(); + + /* + * Remove C++ style comment (almost all start-conditions) + */ +<INITIAL,pp_pp,pp_ignore,pp_eol,pp_inc,pp_if,pp_ifd,pp_endif,pp_defined ,pp_def,pp_define,pp_macro,pp_mbody,pp_macscan,RCINCL>"//"[^\n]* { + if(pptext[ppleng-1] == '\\') + ppwarning("C++ style comment ends with an escaped newline (escape ignored)"); + } + + /* + * Single, double and <> quoted constants + */ +<INITIAL,pp_macexp>\" pp_incl_state.seen_junk++; new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); +<INITIAL,pp_macexp>\' pp_incl_state.seen_junk++; new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); +<pp_dqs>[^"\\\n]+ add_string(pptext, ppleng); +<pp_dqs>\" { + add_string(pptext, ppleng); + yy_pop_state(); + switch(yy_current_state()) + { + case pp_pp: + case pp_define: + case pp_mbody: + case pp_inc: + case pp_line: + case RCINCL: + if (yy_current_state()==RCINCL) yy_pop_state(); + pplval.cptr = get_string(); + return tDQSTRING; + default: + put_string(); + } + } +<pp_sqs>[^'\\\n]+ add_string(pptext, ppleng); +<pp_sqs>\' { + add_string(pptext, ppleng); + yy_pop_state(); + switch(yy_current_state()) + { + case pp_if: + case pp_define: + case pp_mbody: + pplval.cptr = get_string(); + return tSQSTRING; + default: + put_string(); + } + } +<pp_iqs>[^\>\\\n]+ add_string(pptext, ppleng); +<pp_iqs>\> { + add_string(pptext, ppleng); + yy_pop_state(); + pplval.cptr = get_string(); + return tIQSTRING; + } +<pp_dqs>\\\r?\n { + /* + * This is tricky; we need to remove the line-continuation + * from preprocessor strings, but OTOH retain them in all + * other strings. This is because the resource grammar is + * even more braindead than initially analysed and line- + * continuations in strings introduce, sigh, newlines in + * the output. There goes the concept of non-breaking, non- + * spacing whitespace. + */ + switch(yy_top_state()) + { + case pp_pp: + case pp_define: + case pp_mbody: + case pp_inc: + case pp_line: + newline(0); + break; + default: + add_string(pptext, ppleng); + newline(-1); + } + } +<pp_iqs,pp_dqs,pp_sqs>\\. add_string(pptext, ppleng); +<pp_iqs,pp_dqs,pp_sqs>\n { + newline(1); + add_string(pptext, ppleng); + ppwarning("Newline in string constant encounterd (started line %d)", string_start()); + } + + /* + * Identifier scanning + */ +<INITIAL,pp_if,pp_inc,pp_macexp>{cident} { + pp_entry_t *ppp; + pp_incl_state.seen_junk++; + if(!(ppp = pplookup(pptext))) + { + if(yy_current_state() == pp_inc) + pperror("Expected include filename"); + + if(yy_current_state() == pp_if) + { + pplval.cptr = pp_xstrdup(pptext); + return tIDENT; + } + else { + if((yy_current_state()==INITIAL) && (strcasecmp(pptext,"RCINCLUDE")==0)){ + yy_push_state(RCINCL); + return tRCINCLUDE; + } + else put_buffer(pptext, ppleng); + } + } + else if(!ppp->expanding) + { + switch(ppp->type) + { + case def_special: + expand_special(ppp); + break; + case def_define: + expand_define(ppp); + break; + case def_macro: + yy_push_state(pp_macign); + push_macro(ppp); + break; + default: + pp_internal_error(__FILE__, __LINE__, "Invalid define type %d\n", ppp->type); + } + } + } + + /* + * Everything else that needs to be passed and + * newline and continuation handling + */ +<INITIAL,pp_macexp>[^a-zA-Z_#'"/\\\n \r\t\f\v]+|(\/|\\)[^a-zA-Z_/*'"\\\n \r\t\v\f]* pp_incl_state.seen_junk++; put_buffer(pptext, ppleng); +<INITIAL,pp_macexp>{ws}+ put_buffer(pptext, ppleng); +<INITIAL>\n newline(1); +<INITIAL>\\\r?\n newline(0); +<INITIAL>\\\r? pp_incl_state.seen_junk++; put_buffer(pptext, ppleng); + + /* + * Special catcher for macro argmument expansion to prevent + * newlines to propagate to the output or admin. + */ +<pp_macexp>(\n)|(.)|(\\\r?(\n|.)) put_buffer(pptext, ppleng); + +<RCINCL>[A-Za-z0-9_\.\\/]+ { + pplval.cptr=pp_xstrdup(pptext); + yy_pop_state(); + return tRCINCLUDEPATH; + } + +<RCINCL>{ws}+ ; + +<RCINCL>\" { + new_string(); add_string(pptext,ppleng);yy_push_state(pp_dqs); + } + + /* + * This is a 'catch-all' rule to discover errors in the scanner + * in an orderly manner. + */ +<*>. pp_incl_state.seen_junk++; ppwarning("Unmatched text '%c' (0x%02x); please report\n", isprint(*pptext & 0xff) ? *pptext : ' ', *pptext); + +<<EOF>> { + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + bufferstackentry_t *bep = pop_buffer(); + + if((!bep && pp_get_if_depth()) || (bep && pp_get_if_depth() != bep->if_depth)) + ppwarning("Unmatched #if/#endif at end of file"); + + if(!bep) + { + if(YY_START != INITIAL) + pperror("Unexpected end of file during preprocessing"); + yyterminate(); + } + else if(bep->should_pop == 2) + { + macexpstackentry_t *mac; + mac = pop_macro(); + expand_macro(mac); + } + pp_delete_buffer(b); + } + +%% +/* + ************************************************************************ ** + * Support functions + ************************************************************************ ** + */ + +#ifndef ppwrap +int ppwrap(void) +{ + return 1; +} +#endif + + +/* + *----------------------------------------------------------------------- -- + * Output newlines or set them as continuations + * + * Input: -1 - Don't count this one, but update local position (see pp_dqs) + * 0 - Line-continuation seen and cache output + * 1 - Newline seen and flush output + *----------------------------------------------------------------------- -- + */ +static void newline(int dowrite) +{ + pp_status.line_number++; + pp_status.char_number = 1; + + if(dowrite == -1) + return; + + ncontinuations++; + if(dowrite) + { + for(;ncontinuations; ncontinuations--) + put_buffer("\n", 1); + } +} + + +/* + *----------------------------------------------------------------------- -- + * Make a number out of an any-base and suffixed string + * + * Possible number extensions: + * - "" int + * - "L" long int + * - "LL" long long int + * - "U" unsigned int + * - "UL" unsigned long int + * - "ULL" unsigned long long int + * - "LU" unsigned long int + * - "LLU" unsigned long long int + * - "LUL" invalid + * + * FIXME: + * The sizes of resulting 'int' and 'long' are compiler specific. + * I depend on sizeof(int) > 2 here (although a relatively safe + * assumption). + * Long longs are not yet implemented because this is very compiler + * specific and I don't want to think too much about the problems. + * + *----------------------------------------------------------------------- -- + */ +static int make_number(int radix, YYSTYPE *val, const char *str, int len) +{ + int is_l = 0; + int is_ll = 0; + int is_u = 0; + char ext[4]; + + ext[3] = '\0'; + ext[2] = toupper(str[len-1]); + ext[1] = len > 1 ? toupper(str[len-2]) : ' '; + ext[0] = len > 2 ? toupper(str[len-3]) : ' '; + + if(!strcmp(ext, "LUL")) + pperror("Invalid constant suffix"); + else if(!strcmp(ext, "LLU") || !strcmp(ext, "ULL")) + { + is_ll++; + is_u++; + } + else if(!strcmp(ext+1, "LU") || !strcmp(ext+1, "UL")) + { + is_l++; + is_u++; + } + else if(!strcmp(ext+1, "LL")) + { + is_ll++; + } + else if(!strcmp(ext+2, "L")) + { + is_l++; + } + else if(!strcmp(ext+2, "U")) + { + is_u++; + } + + if(is_ll) + pp_internal_error(__FILE__, __LINE__, "long long constants not implemented yet"); + + if(is_u && is_l) + { + val->ulong = strtoul(str, NULL, radix); + return tULONG; + } + else if(!is_u && is_l) + { + val->slong = strtol(str, NULL, radix); + return tSLONG; + } + else if(is_u && !is_l) + { + val->uint = (unsigned int)strtoul(str, NULL, radix); + return tUINT; + } + + /* Else it must be an int... */ + val->sint = (int)strtol(str, NULL, radix); + return tSINT; +} + + +/* + *----------------------------------------------------------------------- -- + * Macro and define expansion support + * + * FIXME: Variable macro arguments. + *----------------------------------------------------------------------- -- + */ +static void expand_special(pp_entry_t *ppp) +{ + const char *dbgtext = "?"; + static char *buf = NULL; + + assert(ppp->type == def_special); + + if(!strcmp(ppp->ident, "__LINE__")) + { + dbgtext = "def_special(__LINE__)"; + buf = pp_xrealloc(buf, 32); + sprintf(buf, "%d", pp_status.line_number); + } + else if(!strcmp(ppp->ident, "__FILE__")) + { + dbgtext = "def_special(__FILE__)"; + buf = pp_xrealloc(buf, strlen(pp_status.input) + 3); + sprintf(buf, "\"%s\"", pp_status.input); + } + else + pp_internal_error(__FILE__, __LINE__, "Special macro '%s' not found...\n", ppp->ident); + + if(pp_flex_debug) + fprintf(stderr, "expand_special(%d): %s:%d: '%s' -> '%s'\n", + macexpstackidx, + pp_status.input, + pp_status.line_number, + ppp->ident, + buf ? buf : ""); + + if(buf && buf[0]) + { + push_buffer(ppp, NULL, NULL, 0); + yy_scan_string(buf); + } +} + +static void expand_define(pp_entry_t *ppp) +{ + assert(ppp->type == def_define); + + if(pp_flex_debug) + fprintf(stderr, "expand_define(%d): %s:%d: '%s' -> '%s'\n", + macexpstackidx, + pp_status.input, + pp_status.line_number, + ppp->ident, + ppp->subst.text); + if(ppp->subst.text && ppp->subst.text[0]) + { + push_buffer(ppp, NULL, NULL, 0); + yy_scan_string(ppp->subst.text); + } +} + +static int curdef_idx = 0; +static int curdef_alloc = 0; +static char *curdef_text = NULL; + +static void add_text(const char *str, int len) +{ + if(len == 0) + return; + if(curdef_idx >= curdef_alloc || curdef_alloc - curdef_idx < len) + { + curdef_alloc += (len + ALLOCBLOCKSIZE-1) & ~(ALLOCBLOCKSIZE-1); + curdef_text = pp_xrealloc(curdef_text, curdef_alloc * sizeof(curdef_text[0])); + if(curdef_alloc > 65536) + ppwarning("Reallocating macro-expansion buffer larger than 64kB"); + } + memcpy(&curdef_text[curdef_idx], str, len); + curdef_idx += len; +} + +static mtext_t *add_expand_text(mtext_t *mtp, macexpstackentry_t *mep, int *nnl) +{ + char *cptr; + char *exp; + int tag; + int n; + + if(mtp == NULL) + return NULL; + + switch(mtp->type) + { + case exp_text: + if(pp_flex_debug) + fprintf(stderr, "add_expand_text: exp_text: '%s'\n", mtp->subst.text); + add_text(mtp->subst.text, strlen(mtp->subst.text)); + break; + + case exp_stringize: + if(pp_flex_debug) + fprintf(stderr, "add_expand_text: exp_stringize(%d): '%s'\n", + mtp->subst.argidx, + mep->args[mtp->subst.argidx]); + cptr = mep->args[mtp->subst.argidx]; [truncated at 1000 lines; 2307 more skipped]

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
42
Older →

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 February 2005