Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[royce] 12794: ssprintf() family of functions for std::string + printf functionality

by royce＠svn.reactos.com

ssprintf() family of functions for std::string + printf functionality Added: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.h _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp 2005-01-04 18:24:21 UTC (rev 12793) +++ branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp 2005-01-04 18:38:31 UTC (rev 12794) @@ -0,0 +1,1893 @@ +// ssprintf.cpp + +#include <malloc.h> +#include <math.h> +#include <float.h> +#include <assert.h> +#include "ssprintf.h" + +#ifdef _MSC_VER +#define alloca _alloca +#endif//_MSC_VER + +typedef __int64 LONGLONG; +typedef unsigned __int64 ULONGLONG; + +typedef struct { + unsigned int mantissa:23; + unsigned int exponent:8; + unsigned int sign:1; +} ieee_float_t; + +typedef struct { + unsigned int mantissal:32; + unsigned int mantissah:20; + unsigned int exponent:11; + unsigned int sign:1; +} ieee_double_t; + +typedef struct { + unsigned int mantissal:32; + unsigned int mantissah:32; + unsigned int exponent:15; + unsigned int sign:1; + unsigned int empty:16; +} ieee_long_double_t; + +std::string ssprintf ( const char* fmt, ... ) +{ + va_list arg; + va_start(arg, fmt); + std::string f = ssvprintf ( fmt, arg ); + va_end(arg); + return f; +} + +std::wstring sswprintf ( const wchar_t* fmt, ... ) +{ + va_list arg; + va_start(arg, fmt); + std::wstring f = sswvprintf ( fmt, arg ); + va_end(arg); + return f; +} + +#define ZEROPAD 1 /* pad with zero */ +#define SIGN 2 /* unsigned/signed long */ +#define PLUS 4 /* show plus */ +#define SPACE 8 /* space if plus */ +#define LEFT 16 /* left justified */ +#define SPECIAL 32 /* 0x */ +#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ +#define ZEROTRUNC 128 /* truncate zero 's */ + + +static int skip_atoi(const char **s) +{ + int i=0; + + while (isdigit(**s)) + i = i*10 + *((*s)++) - '0'; + return i; +} + +static int skip_wtoi(const wchar_t **s) +{ + int i=0; + + while (iswdigit(**s)) + i = i*10 + *((*s)++) - L'0'; + return i; +} + + +static int do_div(LONGLONG *n,int base) +{ + int __res = ((ULONGLONG) *n) % (unsigned) base; + *n = ((ULONGLONG) *n) / (unsigned) base; + return __res; +} + + +static bool number(std::string& f, LONGLONG num, int base, int size, int precision ,int type) +{ + char c,sign,tmp[66]; + const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; + int i; + + if (type & LARGE) + digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) { + if (num < 0) { + sign = '-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++]='0'; + else while (num != 0) + tmp[i++] = digits[do_div(&num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) + while(size-->0) + f += ' '; + if (sign) + f += sign; + if (type & SPECIAL) + { + if (base==8) + f += '0'; + else if (base==16) + { + f += '0'; + f += digits[33]; + } + } + if (!(type & LEFT)) + { + while (size-- > 0) + f += c; + } + while (i < precision--) + { + f += '0'; + } + while (i-- > 0) + { + f += tmp[i]; + } + while (size-- > 0) + { + f += ' '; + } + return true; +} + +static bool wnumber(std::wstring& f, LONGLONG num, int base, int size, int precision ,int type) +{ + wchar_t c,sign,tmp[66]; + const wchar_t *digits = L"0123456789abcdefghijklmnopqrstuvwxyz"; + int i; + + if (type & LARGE) + digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + c = (type & ZEROPAD) ? L'0' : L' '; + sign = 0; + if (type & SIGN) { + if (num < 0) { + sign = L'-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = L'+'; + size--; + } else if (type & SPACE) { + sign = L' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++]=L'0'; + else while (num != 0) + tmp[i++] = digits[do_div(&num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) + while(size-->0) + f += L' '; + if (sign) + f += sign; + if (type & SPECIAL) + { + if (base==8) + f += L'0'; + else if (base==16) + { + f += L'0'; + f += digits[33]; + } + } + if (!(type & LEFT)) + { + while (size-- > 0) + f += c; + } + while (i < precision--) + { + f += L'0'; + } + while (i-- > 0) + { + f += tmp[i]; + } + while (size-- > 0) + { + f += L' '; + } + return true; +} + + +static bool numberf(std::string& f, double __n, char exp_sign, int size, int precision, int type) +{ + double exponent = 0.0; + double e; + long ie; + + //int x; + char *buf, *tmp; + int i = 0; + int j = 0; + //int k = 0; + + double frac, intr; + double p; + char sign; + char c; + char ro = 0; + int result; + + union + { + double* __n; + ieee_double_t* n; + } n; + + n.__n = &__n; + + if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { + ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); + exponent = ie/3.321928; + } + + if ( exp_sign == 'g' || exp_sign == 'G' ) { + type |= ZEROTRUNC; + if ( exponent < -4 || fabs(exponent) >= precision ) + exp_sign -= 2; // g -> e and G -> E + } + + if ( exp_sign == 'e' || exp_sign == 'E' ) { + frac = modf(exponent,&e); + if ( frac > 0.5 ) + e++; + else if ( frac < -0.5 ) + e--; + + result = numberf(f,__n/pow(10.0L,e),'f',size-4, precision, type); + if (result < 0) + return false; + f += exp_sign; + size--; + ie = (long)e; + type = LEFT | PLUS; + if ( ie < 0 ) + type |= SIGN; + + result = number(f,ie, 10,2, 2,type ); + if (result < 0) + return false; + return true; + } + + if ( exp_sign == 'f' ) { + buf = (char*)alloca(4096); + if (type & LEFT) { + type &= ~ZEROPAD; + } + + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) { + if (__n < 0) { + sign = '-'; + __n = fabs(__n); + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + + frac = modf(__n,&intr); + + // # flags forces a . and prevents trucation of trailing zero's + + if ( precision > 0 ) { + //frac = modfl(__n,&intr); + i = precision-1; + while ( i >= 0 ) { + frac*=10.0L; + frac = modf(frac, &p); + buf[i] = (int)p + '0'; + i--; + } + i = precision; + size -= precision; + + ro = 0; + if ( frac > 0.5 ) { + ro = 1; + } + + if ( precision >= 1 || type & SPECIAL) { + buf[i++] = '.'; + size--; + } + } + + if ( intr == 0.0 ) { + buf[i++] = '0'; + size--; + } + else { + while ( intr > 0.0 ) { + p = intr; + intr/=10.0L; + modf(intr, &intr); + + p -= 10.0*intr; + + buf[i++] = (int)p + '0'; + size--; + } + } + + j = 0; + while ( j = '0' && buf[j] <= '8' ) { + buf[j]++; + ro = 0; + } + else if ( buf[j] == '9' ) { + buf[j] = '0'; + } + j++; + } + if ( ro == 1 ) + buf[i++] = '1'; + + buf[i] = 0; + + size -= precision; + if (!(type&(ZEROPAD+LEFT))) + { + while(size-->0) + f += ' '; + } + if (sign) + { + f += sign; + } + + if (!(type&(ZEROPAD+LEFT))) + while(size-->0) + { + f += ' '; + } + if (type & SPECIAL) { + } + + if (!(type & LEFT)) + while (size-- > 0) + { + f += c; + } + + tmp = buf; + if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) + { + j = 0; + while ( j 0) + { + f += tmp[i]; + } + while (size-- > 0) + { + f += ' '; + } + } + return true; +} + +static bool wnumberf(std::wstring& f, double __n, wchar_t exp_sign, int size, int precision, int type) +{ + double exponent = 0.0; + double e; + long ie; + + int i = 0; + int j = 0; + + double frac, intr; + double p; + wchar_t *buf, *tmp, sign, c, ro = 0; + int result; + + union + { + double* __n; + ieee_double_t* n; + } n; + + n.__n = &__n; + + if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) { + ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); + exponent = ie/3.321928; + } + + if ( exp_sign == L'g' || exp_sign == L'G' ) + { + type |= ZEROTRUNC; + if ( exponent < -4 || fabs(exponent) >= precision ) + exp_sign -= 2; // g -> e and G -> E + } + + if ( exp_sign == L'e' || exp_sign == L'E' ) + { + frac = modf(exponent,&e); + if ( frac > 0.5 ) + e++; + else if ( frac < -0.5 ) + e--; + + result = wnumberf(f,__n/pow(10.0L,e),L'f',size-4, precision, type); + if (result < 0) + return false; + f += exp_sign; + size--; + ie = (long)e; + type = LEFT | PLUS; + if ( ie < 0 ) + type |= SIGN; + + result = wnumber(f,ie, 10,2, 2,type ); + if (result < 0) + return false; + return true; + } + + if ( exp_sign == L'f' ) + { + buf = (wchar_t*)alloca(4096*sizeof(wchar_t)); + if (type & LEFT) + type &= ~ZEROPAD; + + c = (type & ZEROPAD) ? L'0' : L' '; + sign = 0; + if (type & SIGN) + { + if (__n < 0) + { + sign = L'-'; + __n = fabs(__n); + size--; + } + else if (type & PLUS) + { + sign = L'+'; + size--; + } + else if (type & SPACE) + { + sign = L' '; + size--; + } + } + + frac = modf(__n,&intr); + + // # flags forces a . and prevents trucation of trailing zero's + + if ( precision > 0 ) { + //frac = modfl(__n,&intr); + i = precision-1; + while ( i >= 0 ) { + frac*=10.0L; + frac = modf(frac, &p); + buf[i] = (int)p + L'0'; + i--; + } + i = precision; + size -= precision; + + ro = 0; + if ( frac > 0.5 ) { + ro = 1; + } + + if ( precision >= 1 || type & SPECIAL) { + buf[i++] = L'.'; + size--; + } + } + + if ( intr == 0.0 ) { + buf[i++] = L'0'; + size--; + } + else { + while ( intr > 0.0 ) { + p = intr; + intr/=10.0L; + modf(intr, &intr); + + p -= 10.0*intr; + + buf[i++] = (int)p + L'0'; + size--; + } + } + + j = 0; + while ( j = L'0' && buf[j] <= L'8' ) { + buf[j]++; + ro = 0; + } + else if ( buf[j] == L'9' ) { + buf[j] = L'0'; + } + j++; + } + if ( ro == 1 ) + buf[i++] = L'1'; + + buf[i] = 0; + + size -= precision; + if (!(type&(ZEROPAD+LEFT))) + { + while(size-->0) + f += L' '; + } + if (sign) + { + f += sign; + } + + if (!(type&(ZEROPAD+LEFT))) + while(size-->0) + { + f += L' '; + } + if (type & SPECIAL) { + } + + if (!(type & LEFT)) + while (size-- > 0) + { + f += c; + } + + tmp = buf; + if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) + { + j = 0; + while ( j 0) + { + f += tmp[i]; + } + while (size-- > 0) + { + f += L' '; + } + } + return true; +} + +static bool numberfl(std::string& f, long double __n, char exp_sign, int size, int precision, int type) +{ + long double exponent = 0.0; + long double e; + long ie; + + //int x; + char *buf, *tmp; + int i = 0; + int j = 0; + //int k = 0; + + long double frac, intr; + long double p; + char sign; + char c; + char ro = 0; + + int result; + + union + { + long double* __n; + ieee_long_double_t* n; + } n; + + n.__n = &__n; + + if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { + ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff); + exponent = ie/3.321928; + } + + if ( exp_sign == 'g' || exp_sign == 'G' ) { + type |= ZEROTRUNC; + if ( exponent < -4 || fabs(exponent) >= precision ) + exp_sign -= 2; // g -> e and G -> E + } + + if ( exp_sign == 'e' || exp_sign == 'E' ) { + frac = modfl(exponent,&e); + if ( frac > 0.5 ) + e++; + else if ( frac < -0.5 ) + e--; + + result = numberf(f,__n/powl(10.0L,e),'f',size-4, precision, type); + if (result < 0) + return false; + f += exp_sign; + size--; + ie = (long)e; + type = LEFT | PLUS; + if ( ie < 0 ) + type |= SIGN; + + result = number(f,ie, 10,2, 2,type ); + if (result < 0) + return false; + return true; + } + + if ( exp_sign == 'f' ) + { + + buf = (char*)alloca(4096); + if (type & LEFT) + { + type &= ~ZEROPAD; + } + + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) + { + if (__n < 0) + { + sign = '-'; + __n = fabs(__n); + size--; + } else if (type & PLUS) + { + sign = '+'; + size--; + } else if (type & SPACE) + { + sign = ' '; + size--; + } + } + + frac = modfl(__n,&intr); + + // # flags forces a . and prevents trucation of trailing zero's + if ( precision > 0 ) + { + //frac = modfl(__n,&intr); + + i = precision-1; + while ( i >= 0 ) + { + frac*=10.0L; + frac = modfl((long double)frac, &p); + buf[i] = (int)p + '0'; + i--; + } + i = precision; + size -= precision; + + ro = 0; + if ( frac > 0.5 ) + { + ro = 1; + } + + if ( precision >= 1 || type & SPECIAL) + { + buf[i++] = '.'; + size--; + } + } + + if ( intr == 0.0 ) + { + buf[i++] = '0'; + size--; + } + else + { + while ( intr > 0.0 ) + { + p=intr; + intr/=10.0L; + modfl(intr, &intr); + + p -= 10.0L*intr; + + buf[i++] = (int)p + '0'; + size--; + } + } + + j = 0; + while ( j = '0' && buf[j] <= '8' ) + { + buf[j]++; + ro = 0; + } + else if ( buf[j] == '9' ) + { + buf[j] = '0'; + } + j++; + } + if ( ro == 1 ) + buf[i++] = '1'; + + buf[i] = 0; + + size -= precision; + if (!(type&(ZEROPAD+LEFT))) + { + while(size-->0) + f += ' '; + } + if (sign) + { + f += sign; + } + + if (!(type&(ZEROPAD+LEFT))) + { + while(size-->0) + f += ' '; + } + if (type & SPECIAL) { + } + + if (!(type & LEFT)) + while (size-- > 0) + { + f += c; + } + tmp = buf; + if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) + { + j = 0; + while ( j 0) + { + f += tmp[i]; + } + while (size-- > 0) + { + f += ' '; + } + } + return true; +} + +static bool wnumberfl(std::wstring& f, long double __n, wchar_t exp_sign, int size, int precision, int type) +{ + long double exponent = 0.0; + long double e; + long ie; + + wchar_t *buf, *tmp, sign, c, ro = 0; + int i = 0; + int j = 0; + + long double frac, intr; + long double p; + + int result; + + union + { + long double* __n; + ieee_long_double_t* n; + } n; + + n.__n = &__n; + + if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) { + ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff); + exponent = ie/3.321928; + } + + if ( exp_sign == L'g' || exp_sign == L'G' ) { + type |= ZEROTRUNC; + if ( exponent < -4 || fabs(exponent) >= precision ) + exp_sign -= 2; // g -> e and G -> E + } + + if ( exp_sign == L'e' || exp_sign == L'E' ) { + frac = modfl(exponent,&e); + if ( frac > 0.5 ) + e++; + else if ( frac < -0.5 ) + e--; + + result = wnumberf(f,__n/powl(10.0L,e),L'f',size-4, precision, type); + if (result < 0) + return false; + f += exp_sign; + size--; + ie = (long)e; + type = LEFT | PLUS; + if ( ie < 0 ) + type |= SIGN; + + result = wnumber(f,ie, 10,2, 2,type ); + if (result < 0) + return false; + return true; + } + + if ( exp_sign == L'f' ) + { + + buf = (wchar_t*)alloca(4096*sizeof(wchar_t)); + if (type & LEFT) + { + type &= ~ZEROPAD; + } + + c = (type & ZEROPAD) ? L'0' : L' '; + sign = 0; + if (type & SIGN) + { + if (__n < 0) + { + sign = L'-'; + __n = fabs(__n); + size--; + } else if (type & PLUS) + { + sign = L'+'; + size--; + } else if (type & SPACE) + { + sign = L' '; + size--; + } + } + + frac = modfl(__n,&intr); + + // # flags forces a . and prevents trucation of trailing zero's + if ( precision > 0 ) + { + //frac = modfl(__n,&intr); + + i = precision-1; + while ( i >= 0 ) + { + frac*=10.0L; + frac = modfl((long double)frac, &p); + buf[i] = (int)p + L'0'; + i--; + } + i = precision; + size -= precision; + + ro = 0; + if ( frac > 0.5 ) + { + ro = 1; + } + + if ( precision >= 1 || type & SPECIAL) + { + buf[i++] = L'.'; + size--; + } + } + + if ( intr == 0.0 ) + { + buf[i++] = L'0'; + size--; + } + else + { + while ( intr > 0.0 ) + { + p=intr; + intr/=10.0L; + modfl(intr, &intr); + + p -= 10.0L*intr; + + buf[i++] = (int)p + L'0'; + size--; + } + } + + j = 0; + while ( j = L'0' && buf[j] <= L'8' ) + { + buf[j]++; + ro = 0; + } + else if ( buf[j] == L'9' ) + { + buf[j] = L'0'; + } + j++; + } + if ( ro == 1 ) + buf[i++] = L'1'; + + buf[i] = 0; + + size -= precision; + if (!(type&(ZEROPAD+LEFT))) + { + while(size-->0) [truncated at 1000 lines; 926 more skipped]

19 years, 11 months

[chorns] 12793: Move project to its own file.

by chorns＠svn.reactos.com

Move project to its own file. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Added: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-04 17:53:26 UTC (rev 12792) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-04 18:24:21 UTC (rev 12793) @@ -4,7 +4,7 @@ all: $(TARGET) -BASE_OBJECTS = xml.o module.o +BASE_OBJECTS = xml.o project.o module.o OBJECTS = $(BASE_OBJECTS) rbuild.o _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-04 17:53:26 UTC (rev 12792) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-04 18:24:21 UTC (rev 12793) @@ -0,0 +1,49 @@ +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information +#endif//_MSC_VER + +#include "rbuild.h" + +using std::string; +using std::vector; + +Project::~Project() +{ + for ( size_t i = 0; i < modules.size(); i++ ) + delete modules[i]; +} + +void +Project::ProcessXML ( const XMLElement& e, const string& path ) +{ + const XMLAttribute *att; + string subpath(path); + if ( e.name == "project" ) + { + att = e.GetAttribute ( "name", false ); + if ( !att ) + name = "Unnamed"; + else + name = att->value; + } + else if ( e.name == "module" ) + { + att = e.GetAttribute ( "name", true ); + if ( !att ) + return; + Module* module = new Module ( e, att->value, path ); + modules.push_back ( module ); + module->ProcessXML ( e, path ); + return; + } + else if ( e.name == "directory" ) + { + // this code is duplicated between Project::ProcessXML() and Module::ProcessXML() :( + const XMLAttribute* att = e.GetAttribute ( "name", true ); + if ( !att ) + return; + subpath = path + "/" + att->value; + } + for ( size_t i = 0; i < e.subElements.size(); i++ ) + ProcessXML ( *e.subElements[i], subpath ); +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 17:53:26 UTC (rev 12792) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 18:24:21 UTC (rev 12793) @@ -12,47 +12,6 @@ using std::string; using std::vector; -Project::~Project() -{ - for ( size_t i = 0; i < modules.size(); i++ ) - delete modules[i]; -} - -void -Project::ProcessXML ( const XMLElement& e, const string& path ) -{ - const XMLAttribute *att; - string subpath(path); - if ( e.name == "project" ) - { - att = e.GetAttribute ( "name", false ); - if ( !att ) - name = "Unnamed"; - else - name = att->value; - } - else if ( e.name == "module" ) - { - att = e.GetAttribute ( "name", true ); - if ( !att ) - return; - Module* module = new Module ( e, att->value, path ); - modules.push_back ( module ); - module->ProcessXML ( e, path ); - return; - } - else if ( e.name == "directory" ) - { - // this code is duplicated between Project::ProcessXML() and Module::ProcessXML() :( - const XMLAttribute* att = e.GetAttribute ( "name", true ); - if ( !att ) - return; - subpath = path + "/" + att->value; - } - for ( size_t i = 0; i < e.subElements.size(); i++ ) - ProcessXML ( *e.subElements[i], subpath ); -} - int main ( int argc, char** argv ) {

19 years, 11 months

[royce] 12792: break XML-parsing stuff into it's own files, and fix 'make test'

by royce＠svn.reactos.com

break XML-parsing stuff into it's own files, and fix 'make test' Added: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-04 17:19:43 UTC (rev 12791) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-04 17:53:26 UTC (rev 12792) @@ -0,0 +1,538 @@ +// XML.cpp + +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information +#endif//_MSC_VER + +#include <direct.h> +#include <io.h> +#include <assert.h> + +#include "XML.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; + +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) ); +#elif defined(UNIX) + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) + return 0; + return file_stat.st_size; +#endif +} + +Path::Path() +{ + 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++ ) + { + // this squirreliness is b/c win32 has drive letters and *nix doesn't... +#ifdef WIN32 + if ( i ) out += "/"; +#else + out += "/"; +#endif + 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() +{ + while ( _f.size() ) + { + fclose ( _f.back() ); + _f.pop_back(); + } + _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 ); + _p = _buf.c_str(); + _end = _p + len; + _f.push_back ( f ); + 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 ( *_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; +} + +XMLAttribute::XMLAttribute() +{ +} + +XMLAttribute::XMLAttribute(const string& name_, + const string& value_) + : name(name_), value(value_) +{ +} + +XMLElement::XMLElement() + : 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 ); + } + 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 ) + { + printf ( "syntax error: attribute '%s' required for <%s>\n", + attribute.c_str(), name.c_str() ); + } + 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 ) + { + printf ( "syntax error: attribute '%s' required for <%s>\n", + attribute.c_str(), name.c_str() ); + } + return NULL; +} + +// XMLParse() +// This function reads a "token" from the file loaded in XMLFile +// REM TODO FIXME: At the moment it can't handle comments or non-xml tags. +// 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, + const Path& path, + bool* pend_tag /*= NULL*/) +{ + string token; + if ( !f.get_token(token) ) + return NULL; + bool end_tag; + + while ( token[0] != '<' ) + { + printf ( "syntax error: expecting xml tag, not '%s'\n", token.c_str() ); + if ( !f.get_token(token) ) + return NULL; + } + + XMLElement* e = new XMLElement; + bool bNeedEnd = e->Parse ( token, end_tag ); + + if ( e->name == "xi:include" ) + { + XMLAttribute* att; + att = e->GetAttribute("href",true); + if ( 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 ) ) + printf ( "xi:include error, couldn't find file '%s'\n", file.c_str() ); + else + { + Path path2 ( path, att->value ); + for ( ;; ) + { + XMLElement* e2 = XMLParse ( fInc, path2 ); + if ( !e2 ) + break; + e->AddSubElement ( e2 ); + } + } + } + } + + if ( !bNeedEnd ) + { + if ( pend_tag ) + *pend_tag = end_tag; + else if ( end_tag ) + { + delete e; + printf ( "syntax error: end tag '%s' not expected\n", 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() ) + { + printf ( "internal tool error - get_token() failed when more_tokens() returned true\n" ); + break; + } + if ( e->subElements.size() && !bThisMixingErrorReported ) + { + printf ( "syntax error: mixing of inner text with sub elements\n" ); + bThisMixingErrorReported = true; + } + if ( e->value.size() ) + { + printf ( "syntax error: multiple instances of inner text\n" ); + e->value += " " + token; + } + else + e->value = token; + } + else + { + XMLElement* e2 = XMLParse ( f, path, &end_tag ); + if ( end_tag ) + { + if ( e->name != e2->name ) + printf ( "end tag name mismatch\n" ); + delete e2; + break; + } + if ( e->value.size() && !bThisMixingErrorReported ) + { + printf ( "syntax error: mixing of inner text with sub elements\n" ); + bThisMixingErrorReported = true; + } + e->AddSubElement ( e2 ); + } + } + return e; +} _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-04 17:19:43 UTC (rev 12791) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-04 17:53:26 UTC (rev 12792) @@ -0,0 +1,83 @@ +// XML.h + +#ifndef __XML_H +#define __XML_H + +#include <string> +#include <vector> + +void +InitWorkingDirectory(); + +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); + +private: + std::vector<FILE*> _f; + std::string _buf; + + const char *_p, *_end; +}; + + +class XMLAttribute +{ +public: + std::string name; + std::string value; + + XMLAttribute(); + XMLAttribute ( const std::string& name_, const std::string& value_ ); +}; + + +class XMLElement +{ +public: + std::string name; + std::vector<XMLAttribute*> attributes; + XMLElement* parentElement; + std::vector<XMLElement*> subElements; + std::string value; + + XMLElement(); + ~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* +XMLParse(XMLFile& f, + const Path& path, + bool* pend_tag = NULL); + +#endif//__XML_H _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-04 17:19:43 UTC (rev 12791) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-04 17:53:26 UTC (rev 12792) @@ -4,7 +4,7 @@ all: $(TARGET) -BASE_OBJECTS = module.o +BASE_OBJECTS = xml.o module.o OBJECTS = $(BASE_OBJECTS) rbuild.o _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 17:19:43 UTC (rev 12791) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 17:53:26 UTC (rev 12792) @@ -7,525 +7,11 @@ #include <stdio.h> #include <io.h> #include <assert.h> -#include <direct.h> #include "rbuild.h" using std::string; using std::vector; -#ifdef WIN32 -#define getcwd _getcwd -#endif//WIN32 -string working_directory; - -#ifdef _MSC_VER -unsigned __int64 -#else -unsigned long long -#endif -filelen ( FILE* f ) -{ -#ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); -#elif defined(UNIX) - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) - return 0; - return file_stat.st_size; -#endif -} - -static const char* WS = " \t\r\n"; -static const char* WSEQ = " =\t\r\n"; - -Path::Path() -{ - 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++ ) - { - // this squirreliness is b/c win32 has drive letters and *nix doesn't... -#ifdef WIN32 - if ( i ) out += "/"; -#else - out += "/"; -#endif - 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() -{ - while ( _f.size() ) - { - fclose ( _f.back() ); - _f.pop_back(); - } - _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 ); - _p = _buf.c_str(); - _end = _p + len; - _f.push_back ( f ); - 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 ( *_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; -} - -XMLAttribute::XMLAttribute() -{ -} - -XMLAttribute::XMLAttribute(const string& name_, - const string& value_) - : name(name_), value(value_) -{ -} - -XMLElement::XMLElement() - : 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 ); [truncated at 1000 lines; 282 more skipped]

19 years, 11 months

[chorns] 12791: Kill warnings.

by chorns＠svn.reactos.com

Kill warnings. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 16:23:29 UTC (rev 12790) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 17:19:43 UTC (rev 12791) @@ -133,7 +133,7 @@ if ( i < vwork.size() ) { // path goes above our working directory, we will need some ..'s - for ( int j = 0; j < i; j++ ) + for ( size_t j = 0; j < i; j++ ) vout.push_back ( ".." ); } while ( i < vpath.size() ) @@ -384,7 +384,7 @@ { // 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 ( int i = 0; i < attributes.size(); i++ ) + for ( size_t i = 0; i < attributes.size(); i++ ) { if ( attribute == attributes[i]->name ) return attributes[i]; @@ -403,7 +403,7 @@ { // 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 ( int i = 0; i < attributes.size(); i++ ) + for ( size_t i = 0; i < attributes.size(); i++ ) { if ( attribute == attributes[i]->name ) return attributes[i]; @@ -606,7 +606,7 @@ proj->ProcessXML ( *head, "." ); // REM TODO FIXME actually do something with Project object... - printf ( "Found %lu modules:\n", proj->modules.size() ); + printf ( "Found %d modules:\n", proj->modules.size() ); for ( size_t i = 0; i < proj->modules.size(); i++ ) { Module& m = *proj->modules[i];

19 years, 11 months

[hbirr] 12790: - Removed the 'shadow' NtGlobalFlag from ntdll.dll.

by hbirr＠svn.reactos.com

- Removed the 'shadow' NtGlobalFlag from ntdll.dll. - Initialized NumberOfProcessors from the PEB structure. Modified: trunk/reactos/include/ntdll/ntdll.h Modified: trunk/reactos/lib/ntdll/ldr/startup.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/lib/ntdll/rtl/misc.c Modified: trunk/reactos/lib/rtl/version.c Modified: trunk/reactos/ntoskrnl/Makefile Added: trunk/reactos/ntoskrnl/rtl/misc.c _____ Modified: trunk/reactos/include/ntdll/ntdll.h --- trunk/reactos/include/ntdll/ntdll.h 2005-01-04 14:46:06 UTC (rev 12789) +++ trunk/reactos/include/ntdll/ntdll.h 2005-01-04 16:23:29 UTC (rev 12790) @@ -17,7 +17,7 @@ #ifdef NDEBUG #if defined(__GNUC__) -#define TRACE_LDR(args...) if (NtGlobalFlag & FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } +#define TRACE_LDR(args...) if (RtlGetNtGlobalFlags() & FLG_SHOW_LDR_SNAPS) { DbgPrint("(LDR:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } #define DPRINT(args...) #else #define DPRINT _____ Modified: trunk/reactos/lib/ntdll/ldr/startup.c --- trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-04 14:46:06 UTC (rev 12789) +++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-04 16:23:29 UTC (rev 12790) @@ -37,8 +37,6 @@ static RTL_BITMAP TlsBitMap; PLDR_MODULE ExeModule; -ULONG NtGlobalFlag = 0; - NTSTATUS LdrpAttachThread (VOID); @@ -102,7 +100,6 @@ * read more options */ } - NtGlobalFlag = Peb->NtGlobalFlag; } @@ -242,6 +239,8 @@ PLDR_MODULE NtModule; // ntdll NLSTABLEINFO NlsTable; WCHAR FullNtDllPath[MAX_PATH]; + SYSTEM_BASIC_INFORMATION SystemInformation; + NTSTATUS Status; DPRINT("LdrInitializeThunk()\n"); if (NtCurrentPeb()->Ldr == NULL || NtCurrentPeb()->Ldr->Initialized == FALSE) @@ -280,6 +279,18 @@ NTHeaders = (PIMAGE_NT_HEADERS)(ImageBase + PEDosHeader->e_lfanew); + + /* Get number of processors */ + Status = ZwQuerySystemInformation(SystemBasicInformation, + &SystemInformation, + sizeof(SYSTEM_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + ZwTerminateProcess(NtCurrentProcess(), Status); + } + + Peb->NumberOfProcessors = SystemInformation.NumberProcessors; /* create process heap */ RtlInitializeHeapManager(); Peb->ProcessHeap = RtlCreateHeap(HEAP_GROWABLE, _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-04 14:46:06 UTC (rev 12789) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-04 16:23:29 UTC (rev 12790) @@ -1,4 +1,4 @@ -/* $Id: utils.c,v 1.104 2004/12/25 11:18:51 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -51,7 +51,6 @@ static HANDLE LdrpKnownDllsDirHandle = NULL; static UNICODE_STRING LdrpKnownDllPath = {0, 0, NULL}; static PLDR_MODULE LdrpLastModule = NULL; -extern ULONG NtGlobalFlag; extern PLDR_MODULE ExeModule; /* PROTOTYPES ****************************************************************/ _____ Modified: trunk/reactos/lib/ntdll/rtl/misc.c --- trunk/reactos/lib/ntdll/rtl/misc.c 2005-01-04 14:46:06 UTC (rev 12789) +++ trunk/reactos/lib/ntdll/rtl/misc.c 2005-01-04 16:23:29 UTC (rev 12790) @@ -1,4 +1,4 @@ -/* $Id: misc.c,v 1.11 2004/12/13 23:11:13 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -96,3 +96,14 @@ *build = (0xF0000000 | pPeb->OSBuildNumber); } } + +/* +* @implemented +*/ +ULONG +STDCALL +RtlGetNtGlobalFlags(VOID) +{ + PPEB pPeb = NtCurrentPeb(); + return pPeb->NtGlobalFlag; +} _____ Modified: trunk/reactos/lib/rtl/version.c --- trunk/reactos/lib/rtl/version.c 2005-01-04 14:46:06 UTC (rev 12789) +++ trunk/reactos/lib/rtl/version.c 2005-01-04 16:23:29 UTC (rev 12790) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: version.c,v 1.4 2004/11/07 18:45:52 hyperion Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * PURPOSE: Runtime code @@ -36,7 +36,6 @@ /* GLOBALS ******************************************************************/ -extern ULONG NtGlobalFlag; /* FUNCTIONS ****************************************************************/ @@ -72,16 +71,6 @@ } /* -* @implemented -*/ -ULONG -STDCALL -RtlGetNtGlobalFlags(VOID) -{ - return(NtGlobalFlag); -} - -/* * @unimplemented */ /* _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-01-04 14:46:06 UTC (rev 12789) +++ trunk/reactos/ntoskrnl/Makefile 2005-01-04 16:23:29 UTC (rev 12790) @@ -100,6 +100,7 @@ rtl/ctype.o \ rtl/handle.o \ rtl/message.o \ + rtl/misc.o \ rtl/purecall.o \ rtl/regio.o \ rtl/sprintf.o \ _____ Added: trunk/reactos/ntoskrnl/rtl/misc.c --- trunk/reactos/ntoskrnl/rtl/misc.c 2005-01-04 14:46:06 UTC (rev 12789) +++ trunk/reactos/ntoskrnl/rtl/misc.c 2005-01-04 16:23:29 UTC (rev 12790) @@ -0,0 +1,32 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Various functions + * FILE: lib/ntoskrnl/rtl/misc.c + * PROGRAMER: Hartmut Birr + * REVISION HISTORY: + * 01/03/2005: Created + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* GLOBALS *******************************************************************/ + +extern ULONG NtGlobalFlag; + +/* FUNCTIONS *****************************************************************/ + +/* +* @implemented +*/ +ULONG +STDCALL +RtlGetNtGlobalFlags(VOID) +{ + return(NtGlobalFlag); +}

19 years, 11 months

[royce] 12789: parse a module's files into a vector ( conditions are still a TODO )

by royce＠svn.reactos.com

parse a module's files into a vector ( conditions are still a TODO ) Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-04 14:27:27 UTC (rev 12788) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-04 14:46:06 UTC (rev 12789) @@ -17,3 +17,34 @@ path(modulePath) { } + +Module::~Module() +{ + for ( size_t i = 0; i < files.size(); i++ ) + delete files[i]; +} + +void +Module::ProcessXML ( const XMLElement& e, const string& path ) +{ + string subpath ( path ); + if ( e.name == "file" && e.value.size() ) + { + files.push_back ( new File(path + "/" + e.value) ); + } + else if ( e.name == "directory" ) + { + // this code is duplicated between Project::ProcessXML() and Module::ProcessXML() :( + const XMLAttribute* att = e.GetAttribute ( "name", true ); + if ( !att ) + return; + subpath = path + "/" + att->value; + } + for ( size_t i = 0; i < e.subElements.size(); i++ ) + ProcessXML ( *e.subElements[i], subpath ); +} + +File::File ( const std::string& _name ) + : name(_name) +{ +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 14:27:27 UTC (rev 12788) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 14:46:06 UTC (rev 12789) @@ -552,10 +552,12 @@ return; Module* module = new Module ( e, att->value, path ); modules.push_back ( module ); - return; // REM TODO FIXME no processing of modules... yet + module->ProcessXML ( e, path ); + return; } else if ( e.name == "directory" ) { + // this code is duplicated between Project::ProcessXML() and Module::ProcessXML() :( const XMLAttribute* att = e.GetAttribute ( "name", true ); if ( !att ) return; @@ -611,6 +613,25 @@ printf ( "\t%s in folder: %s\n", m.name.c_str(), m.path.c_str() ); + printf ( "\txml dependencies:\n\t\tReactOS.xml\n" ); + const XMLElement* e = &m.node; + while ( e ) + { + if ( e->name == "xi:include" ) + { + const XMLAttribute* att = e->GetAttribute("top_href",false); + if ( att ) + { + printf ( "\t\t%s\n", att->value.c_str() ); + } + } + e = e->parentElement; + } + printf ( "\tfiles:\n" ); + for ( size_t j = 0; j < m.files.size(); j++ ) + { + printf ( "\t\t%s\n", m.files[j]->name.c_str() ); + } } delete proj; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-04 14:27:27 UTC (rev 12788) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-04 14:46:06 UTC (rev 12789) @@ -72,6 +72,7 @@ class Project; class Module; +class File; class Project { @@ -89,10 +90,23 @@ const XMLElement& node; std::string name; std::string path; + std::vector<File*> files; Module ( const XMLElement& moduleNode, const std::string& moduleName, const std::string& modulePath ); + + ~Module(); + + void ProcessXML ( const XMLElement& e, const std::string& path ); }; +class File +{ +public: + std::string name; + + File ( const std::string& _name ); +}; + #endif /* __RBUILD_H */

19 years, 11 months

[royce] 12788: handle xml comments and added handling for some possible error conditions

by royce＠svn.reactos.com

handle xml comments and added handling for some possible error conditions Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 14:02:04 UTC (rev 12787) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 14:27:27 UTC (rev 12788) @@ -234,8 +234,16 @@ XMLFile::get_token(string& token) { const char* tokend; - if ( *_p == '<' ) + if ( !strncmp ( _p, "" ); + if ( !tokend ) + tokend = _end; + else + tokend += 3; + } + else if ( *_p == '<' ) + { tokend = strchr ( _p, '>' ); if ( !tokend ) tokend = _end; @@ -301,8 +309,17 @@ { const char* p = token.c_str(); assert ( *p == '<' ); - 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 ) { @@ -415,9 +432,16 @@ string token; if ( !f.get_token(token) ) return NULL; - XMLElement* e = new XMLElement; bool end_tag; + while ( token[0] != '<' ) + { + printf ( "syntax error: expecting xml tag, not '%s'\n", token.c_str() ); + if ( !f.get_token(token) ) + return NULL; + } + + XMLElement* e = new XMLElement; bool bNeedEnd = e->Parse ( token, end_tag ); if ( e->name == "xi:include" ) @@ -458,6 +482,7 @@ } return e; } + bool bThisMixingErrorReported = false; while ( f.more_tokens() ) { if ( f.next_is_text() ) @@ -467,8 +492,11 @@ printf ( "internal tool error - get_token() failed when more_tokens() returned true\n" ); break; } - if ( e->subElements.size() ) + if ( e->subElements.size() && !bThisMixingErrorReported ) + { printf ( "syntax error: mixing of inner text with sub elements\n" ); + bThisMixingErrorReported = true; + } if ( e->value.size() ) { printf ( "syntax error: multiple instances of inner text\n" ); @@ -487,6 +515,11 @@ delete e2; break; } + if ( e->value.size() && !bThisMixingErrorReported ) + { + printf ( "syntax error: mixing of inner text with sub elements\n" ); + bThisMixingErrorReported = true; + } e->AddSubElement ( e2 ); } } @@ -558,6 +591,9 @@ if ( !head ) break; // end of file + if ( head->name == "!--" ) + continue; // ignore comments + if ( head->name != "project" ) { printf ( "error: expecting 'project', got '%s'\n", head->name.c_str() );

19 years, 11 months

[royce] 12787: each XMLElement now stores a pointer to it's parent node, so the tree can be traversed from the bottom

by royce＠svn.reactos.com

each XMLElement now stores a pointer to it's parent node, so the tree can be traversed from the bottom Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 13:40:05 UTC (rev 12786) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 14:02:04 UTC (rev 12787) @@ -177,7 +177,8 @@ { } -void XMLFile::close() +void +XMLFile::close() { while ( _f.size() ) { @@ -188,7 +189,8 @@ _p = _end = NULL; } -bool XMLFile::open(const string& filename) +bool +XMLFile::open(const string& filename) { close(); FILE* f = fopen ( filename.c_str(), "rb" ); @@ -208,24 +210,28 @@ // 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() +void +XMLFile::next_token() { _p += strspn ( _p, WS ); } -bool XMLFile::next_is_text() +bool +XMLFile::next_is_text() { return *_p != '<'; } -bool XMLFile::more_tokens() +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) +bool +XMLFile::get_token(string& token) { const char* tokend; if ( *_p == '<' ) @@ -258,11 +264,12 @@ XMLAttribute::XMLAttribute(const string& name_, const string& value_) -: name(name_), value(value_) + : name(name_), value(value_) { } XMLElement::XMLElement() + : parentElement(NULL) { } @@ -275,14 +282,22 @@ 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) +bool +XMLElement::Parse(const string& token, + bool& end_tag) { const char* p = token.c_str(); assert ( *p == '<' ); @@ -392,9 +407,10 @@ // 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, - const Path& path, - bool* pend_tag = NULL) +XMLElement* +XMLParse(XMLFile& f, + const Path& path, + bool* pend_tag = NULL) { string token; if ( !f.get_token(token) ) @@ -424,7 +440,7 @@ XMLElement* e2 = XMLParse ( fInc, path2 ); if ( !e2 ) break; - e->subElements.push_back ( e2 ); + e->AddSubElement ( e2 ); } } } @@ -471,7 +487,7 @@ delete e2; break; } - e->subElements.push_back ( e2 ); + e->AddSubElement ( e2 ); } } return e; @@ -483,7 +499,8 @@ delete modules[i]; } -void Project::ProcessXML ( const XMLElement& e, const string& path ) +void +Project::ProcessXML ( const XMLElement& e, const string& path ) { const XMLAttribute *att; string subpath(path); @@ -515,7 +532,8 @@ ProcessXML ( *e.subElements[i], subpath ); } -int main ( int argc, char** argv ) +int +main ( int argc, char** argv ) { // store the current directory for path calculations working_directory.resize ( _MAX_PATH ); @@ -525,12 +543,15 @@ XMLFile f; Path path; - if ( !f.open ( "ReactOS.xml" ) ) + string xml_file ( "ReactOS.xml" ); + if ( !f.open ( xml_file ) ) { printf ( "couldn't open ReactOS.xml!\n" ); return -1; } + vector<string> xml_dependencies; + xml_dependencies.push_back ( xml_file ); for ( ;; ) { XMLElement* head = XMLParse ( f, path ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-04 13:40:05 UTC (rev 12786) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-04 14:02:04 UTC (rev 12787) @@ -55,6 +55,7 @@ public: std::string name; std::vector<XMLAttribute*> attributes; + XMLElement* parentElement; std::vector<XMLElement*> subElements; std::string value; @@ -62,6 +63,7 @@ ~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,

19 years, 11 months

[royce] 12786: create virtual attribute "top_href" for <xi:include> that is a path relative to top level of project to make it easier to generate non-recursive makefiles

by royce＠svn.reactos.com

create virtual attribute "top_href" for <xi:include> that is a path relative to top level of project to make it easier to generate non-recursive makefiles Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-04 09:35:28 UTC (rev 12785) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-04 13:40:05 UTC (rev 12786) @@ -1,3 +1,9 @@ +// module.cpp + +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information +#endif//_MSC_VER + #include "rbuild.h" using std::string; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 09:35:28 UTC (rev 12785) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 13:40:05 UTC (rev 12786) @@ -1,7 +1,7 @@ // rbuild.cpp #ifdef _MSC_VER -#pragma warning ( disable : 4786 ) +#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information #endif//_MSC_VER #include <stdio.h> @@ -16,6 +16,7 @@ #ifdef WIN32 #define getcwd _getcwd #endif//WIN32 +string working_directory; #ifdef _MSC_VER unsigned __int64 @@ -39,11 +40,7 @@ Path::Path() { - string s; - s.resize ( _MAX_PATH ); - s[0] = 0; - getcwd ( &s[0], s.size() ); - s.resize ( strlen ( s.c_str() ) ); + string s ( working_directory ); const char* p = strtok ( &s[0], "/\\" ); while ( p ) { @@ -65,7 +62,8 @@ } } -string Path::Fixup ( const string& file, bool include_filename ) const +string +Path::Fixup ( const string& file, bool include_filename ) const { if ( strchr ( "/\\", file[0] ) #ifdef WIN32 @@ -117,6 +115,64 @@ 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 ( int 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++ ) + { + // this squirreliness is b/c win32 has drive letters and *nix doesn't... +#ifdef WIN32 + if ( i ) out += "/"; +#else + out += "/"; +#endif + 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() { } @@ -290,8 +346,9 @@ return !( *p == '/' ) && !end_tag; } -const XMLAttribute* XMLElement::GetAttribute ( const string& attribute, - bool required ) const +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. @@ -308,6 +365,25 @@ 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 ( int i = 0; i < attributes.size(); i++ ) + { + if ( attribute == attributes[i]->name ) + return attributes[i]; + } + if ( required ) + { + printf ( "syntax error: attribute '%s' required for <%s>\n", + attribute.c_str(), name.c_str() ); + } + return NULL; +} + // XMLParse() // This function reads a "token" from the file loaded in XMLFile // REM TODO FIXME: At the moment it can't handle comments or non-xml tags. @@ -330,11 +406,13 @@ if ( e->name == "xi:include" ) { - const XMLAttribute* att; + XMLAttribute* att; att = e->GetAttribute("href",true); if ( 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 ) ) printf ( "xi:include error, couldn't find file '%s'\n", file.c_str() ); @@ -439,6 +517,12 @@ int main ( int argc, char** argv ) { + // 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() ) ); + XMLFile f; Path path; if ( !f.open ( "ReactOS.xml" ) ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-04 09:35:28 UTC (rev 12785) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-04 13:40:05 UTC (rev 12786) @@ -11,6 +11,12 @@ 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 @@ -56,8 +62,10 @@ ~XMLElement(); bool Parse(const std::string& token, bool& end_tag); + XMLAttribute* GetAttribute ( const std::string& attribute, + bool required); const XMLAttribute* GetAttribute ( const std::string& attribute, - bool required) const; + bool required) const; }; class Project;

19 years, 11 months

[ekohl] 12785: Implement BuildExplicitAccessWithNameA/W() and BuildImpersonateExplicitAccessWithNameA/W().

by ekohl＠svn.reactos.com

Implement BuildExplicitAccessWithNameA/W() and BuildImpersonateExplicitAccessWithNameA/W(). Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/sec/trustee.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-01-04 07:05:31 UTC (rev 12784) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-01-04 09:35:28 UTC (rev 12785) @@ -1,4 +1,4 @@ -; $Id: advapi32.def,v 1.28 2004/12/15 12:29:36 ekohl Exp $ +; $Id$ ; ; advapi32.def ; @@ -31,10 +31,10 @@ BackupEventLogW@8 ;BuildAccessRequestA ;BuildAccessRequestW -;BuildExplicitAccessWithNameA@20 -;BuildExplicitAccessWithNameW@20 -;BuildImpersonateExplicitAccessWithNameA@24 -;BuildImpersonateExplicitAccessWithNameW@24 +BuildExplicitAccessWithNameA@20 +BuildExplicitAccessWithNameW@20 +BuildImpersonateExplicitAccessWithNameA@24 +BuildImpersonateExplicitAccessWithNameW@24 BuildImpersonateTrusteeA@8 BuildImpersonateTrusteeW@8 ;BuildSecurityDescriptorA@36 _____ Modified: trunk/reactos/lib/advapi32/sec/trustee.c --- trunk/reactos/lib/advapi32/sec/trustee.c 2005-01-04 07:05:31 UTC (rev 12784) +++ trunk/reactos/lib/advapi32/sec/trustee.c 2005-01-04 09:35:28 UTC (rev 12785) @@ -1,4 +1,4 @@ -/* $Id: trustee.c,v 1.3 2004/12/15 12:29:13 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -37,6 +37,96 @@ /*********************************************************************** ******* + * BuildExplicitAccessWithNameA [ADVAPI32.@] + */ +VOID WINAPI +BuildExplicitAccessWithNameA(PEXPLICIT_ACCESSA pExplicitAccess, + LPSTR pTrusteeName, + DWORD AccessPermissions, + ACCESS_MODE AccessMode, + DWORD Inheritance) +{ + pExplicitAccess->grfAccessPermissions = AccessPermissions; + pExplicitAccess->grfAccessMode = AccessMode; + pExplicitAccess->grfInheritance = Inheritance; + + pExplicitAccess->Trustee.pMultipleTrustee = NULL; + pExplicitAccess->Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pExplicitAccess->Trustee.TrusteeForm = TRUSTEE_IS_NAME; + pExplicitAccess->Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + pExplicitAccess->Trustee.ptstrName = pTrusteeName; +} + + +/********************************************************************** ******** + * BuildExplicitAccessWithNameW [ADVAPI32.@] + */ +VOID WINAPI +BuildExplicitAccessWithNameW(PEXPLICIT_ACCESSW pExplicitAccess, + LPWSTR pTrusteeName, + DWORD AccessPermissions, + ACCESS_MODE AccessMode, + DWORD Inheritance) +{ + pExplicitAccess->grfAccessPermissions = AccessPermissions; + pExplicitAccess->grfAccessMode = AccessMode; + pExplicitAccess->grfInheritance = Inheritance; + + pExplicitAccess->Trustee.pMultipleTrustee = NULL; + pExplicitAccess->Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pExplicitAccess->Trustee.TrusteeForm = TRUSTEE_IS_NAME; + pExplicitAccess->Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + pExplicitAccess->Trustee.ptstrName = pTrusteeName; +} + + +/********************************************************************** ******** + * BuildImpersonateExplicitAccessWithNameA [ADVAPI32.@] + */ +VOID WINAPI +BuildImpersonateExplicitAccessWithNameA(PEXPLICIT_ACCESS_A pExplicitAccess, + LPSTR pTrusteeName, + PTRUSTEE_A pTrustee, + DWORD AccessPermissions, + ACCESS_MODE AccessMode, + DWORD Inheritance) +{ + pExplicitAccess->grfAccessPermissions = AccessPermissions; + pExplicitAccess->grfAccessMode = AccessMode; + pExplicitAccess->grfInheritance = Inheritance; + + pExplicitAccess->Trustee.pMultipleTrustee = pTrustee; + pExplicitAccess->Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; + pExplicitAccess->Trustee.TrusteeForm = TRUSTEE_IS_NAME; + pExplicitAccess->Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + pExplicitAccess->Trustee.ptstrName = pTrusteeName; +} + + +/********************************************************************** ******** + * BuildImpersonateExplicitAccessWithNameW [ADVAPI32.@] + */ +VOID WINAPI +BuildImpersonateExplicitAccessWithNameW(PEXPLICIT_ACCESS_W pExplicitAccess, + LPWSTR pTrusteeName, + PTRUSTEE_W pTrustee, + DWORD AccessPermissions, + ACCESS_MODE AccessMode, + DWORD Inheritance) +{ + pExplicitAccess->grfAccessPermissions = AccessPermissions; + pExplicitAccess->grfAccessMode = AccessMode; + pExplicitAccess->grfInheritance = Inheritance; + + pExplicitAccess->Trustee.pMultipleTrustee = pTrustee; + pExplicitAccess->Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; + pExplicitAccess->Trustee.TrusteeForm = TRUSTEE_IS_NAME; + pExplicitAccess->Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + pExplicitAccess->Trustee.ptstrName = pTrusteeName; +} + + +/********************************************************************** ******** * BuildTrusteeWithSidA [ADVAPI32.@] */ VOID WINAPI

19 years, 11 months

← Newer
1
...
56
57
58
59
60
61
62
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005