Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[gadamopoulos] 49095: attempt to fix the branch

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Oct 10 14:31:24 2010 New Revision: 49095 URL: http://svn.reactos.org/svn/reactos?rev=49095&view=rev Log: attempt to fix the branch Removed: branches/Tree-restructure-test/sdk/include/host/ branches/Tree-restructure-test/sdk/include/psdk/ branches/Tree-restructure-test/sdk/include/reactos/ branches/Tree-restructure-test/sdk/libs/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ branches/Tree-restructure-test/sdk/libs/debugsup/ branches/Tree-restructure-test/sdk/libs/libxml2/ branches/Tree-restructure-test/sdk/libs/mingw/ branches/Tree-restructure-test/sdk/libs/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ branches/Tree-restructure-test/sdk/libs/wcsfuncs/ branches/Tree-restructure-test/sdk/libs/zlib/ branches/Tree-restructure-test/sdk/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/log2lines/ branches/Tree-restructure-test/sdk/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nandflash/ branches/Tree-restructure-test/sdk/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ branches/Tree-restructure-test/sdk/tools/sysgen/ branches/Tree-restructure-test/sdk/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/

14 years, 2 months

[tkreuzer] 49094: [XML] - Replace ssvprintf with _vsnprintf - get rid of ssprintf, a 2000 lines / 35 kb C++ reimplementation of vsprintf & friends

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 10 14:31:04 2010 New Revision: 49094 URL: http://svn.reactos.org/svn/reactos?rev=49094&view=rev Log: [XML] - Replace ssvprintf with _vsnprintf - get rid of ssprintf, a 2000 lines / 35 kb C++ reimplementation of vsprintf & friends Removed: branches/cmake-bringup/tools/ssprintf.cpp branches/cmake-bringup/tools/ssprintf.h Modified: branches/cmake-bringup/tools/CMakeLists.txt branches/cmake-bringup/tools/xml.cpp Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sun Oct 10 14:31:04 2010 @@ -1,4 +1,4 @@ -add_library(xml xml.cpp ssprintf.cpp) +add_library(xml xml.cpp) add_executable(bin2c bin2c.c) #add_executable(pefixup pefixup.c) Removed: branches/cmake-bringup/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/ssprintf.cp… ============================================================================== --- branches/cmake-bringup/tools/ssprintf.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/tools/ssprintf.cpp (removed) @@ -1,1969 +1,0 @@ -/* - * This program 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 program 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 program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -// For character conversion functions like "wctomb" and "alloca" under Unix -#include <stdlib.h> - -#if defined(WIN32) - // Under Win32 hosts, "alloca" is not defined by stdlib.h, but by malloc.h - // On the other hand, malloc.h is deprecated under some Unix hosts, so only include it for Win32 hosts. - #include <malloc.h> -#endif - -#include <ctype.h> -#include <math.h> -#include <float.h> -#include <assert.h> -#include "ssprintf.h" - -#ifndef WIN32 -#define _finite __finite -#define _isnan __isnan -#endif - -#ifndef __APPLE__ -inline int iswdigit ( wchar_t c ) -{ - return ( c >= L'0' && c <= L'9' ); -} -#endif - -#if defined(__sun__) -#include <alloca.h> -#include <ieee.h> -#endif - -#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__sun__) || defined(__CYGWIN__) -# define __isnan isnan -# define __finite finite -# define powl __builtin_powl -# define modfl __builtin_modfl -#endif // _FreeBSD__ - -#ifdef _MSC_VER -#define alloca _alloca -#endif//_MSC_VER - -#ifdef _MSC_VER -typedef __int64 LONGLONG; -typedef unsigned __int64 ULONGLONG; -#else -typedef long long LONGLONG; -typedef unsigned long long ULONGLONG; -#endif - -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 false; - 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 = false; - 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 i = 0; - int j = 0; - int ro = 0; - - double frac, intr; - double p; - char *buf, *tmp, sign, c; - 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 - else - exp_sign = 'f'; - } - - 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,(long double)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 ) - { - 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; - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - - 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; - int ro = 0; - - double frac, intr; - double p; - wchar_t *buf, *tmp, sign, c; - 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 - else - exp_sign = L'f'; - } - - 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,(long double) 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 ) - { - 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; - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += L' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += L' '; - } - - 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 i = 0; - int j = 0; - int ro = 0; - - long double frac, intr; - long double p; - char *buf, *tmp, sign, c; - 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 - else - exp_sign = 'f'; - } - - 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 ) - { - 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; - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - - 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; - - int i = 0; - int j = 0; - int ro = 0; - - long double frac, intr; - long double p; - wchar_t *buf, *tmp, sign, c; - 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 - else - exp_sign = 'f'; - } - - 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 ) - { - 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; - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += L' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += L' '; - } - - 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 int -do_string(std::string& f, const char* s, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (s == NULL) - { - s = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - f += ' '; - done++; - } - for (i = 0; i < len; ++i) - { - f += *s++; - done++; - } - while (len < field_width--) - { - f += ' '; - done++; - } - return done; -} - -static int -do_wstring(std::wstring& f, const wchar_t* s, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (s == NULL) - { - s = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - f += L' '; - done++; - } - for (i = 0; i < len; ++i) - { - f += *s++; - done++; - } - while (len < field_width--) - { - f += L' '; - done++; - } - return done; -} - -static int -stringw(std::string& f, const wchar_t* sw, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (sw == NULL) - { - sw = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sw[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - f += ' '; - done++; - } - for (i = 0; i < len; ++i) - { -#define MY_MB_CUR_MAX 1 - char mb[MY_MB_CUR_MAX]; - int mbcount, j; - mbcount = wctomb(mb, *sw++); - if (mbcount <= 0) - { - break; - } - for (j = 0; j < mbcount; j++) - { - f += mb[j]; - done++; - } - } - while (len < field_width--) - { - f += ' '; - done++; - } - return done; -} - -static int -wstringa(std::wstring& f, const char* sa, int len, int field_width, int precision, int flags) -{ - int i, done = 0; - if (sa == NULL) - { - sa = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sa[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - f += L' '; - done++; - } - for (i = 0; i < len;) - { - wchar_t w; - int mbcount; - mbcount = mbtowc(&w, sa+i, len-i); - if (mbcount <= 0) - break; - f += w; - done++; - i += mbcount; - } - while (len < field_width--) - { - f += L' '; - done++; - } - return done; -} - -#define _isnanl _isnan -#define _finitel _finite - -std::string -ssvprintf ( const char *fmt, va_list args ) -{ - ULONGLONG num; - int base; - long double _ldouble; - double _double; - const char *s; - const wchar_t* sw; - int result; - std::string f; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier = 0; /* 'h', 'l', 'L' or 'I64' for integer fields */ - - for (; *fmt ; ++fmt) - { - if (*fmt != '%') - { - f += *fmt; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (isdigit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = 0; - // %Z can be just stand alone or as size_t qualifier - if ( *fmt == 'Z' ) { - qualifier = *fmt; - switch ( *(fmt+1)) { - case 'o': - case 'b': - case 'X': - case 'x': - case 'd': - case 'i': - case 'u': - ++fmt; - break; - default: - break; - } - } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { - qualifier = *fmt; - fmt += 3; - } - - // go fine with ll instead of L - if ( *fmt == 'l' ) { - ++fmt; - qualifier = 'L'; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case 'c': - if (!(flags & LEFT)) - while (--field_width > 0) - { - f += ' '; - } - if (qualifier == 'l' || qualifier == 'w') - { - f += (char)(unsigned char)(wchar_t) va_arg(args,int); - } - else - { - f += (char)(unsigned char) va_arg(args,int); - } - while (--field_width > 0) - { - f += ' '; - } - continue; - - case 'C': - if (!(flags & LEFT)) - while (--field_width > 0) - { - f += ' '; - } - if (qualifier == 'h') - { - f += (char)(unsigned char) va_arg(args,int); - } - else - { - f += (char)(unsigned char)(wchar_t) va_arg(args,int); - } - while (--field_width > 0) - { - f += ' '; - } - continue; - - case 's': - if (qualifier == 'l' || qualifier == 'w') { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - result = stringw(f, sw, -1, field_width, precision, flags); - } else { - /* print ascii string */ - s = va_arg(args, char *); - result = do_string(f, s, -1, field_width, precision, flags); - } - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case 'S': - if (qualifier == 'h') { - /* print ascii string */ - s = va_arg(args, char *); - result = do_string(f, s, -1, field_width, precision, flags); - } else { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - result = stringw(f, sw, -1, field_width, precision, flags); - } - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - /*case 'Z': - if (qualifier == 'w') { - // print counted unicode string - PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - sw = NULL; - len = -1; - } else { - sw = pus->Buffer; - len = pus->Length / sizeof(WCHAR); - } - result = stringw(f, sw, len, field_width, precision, flags); - } else { - // print counted ascii string - PANSI_STRING pas = va_arg(args, PANSI_STRING); - if ((pas == NULL) || (pas->Buffer == NULL)) { - s = NULL; - len = -1; - } else { - s = pas->Buffer; - len = pas->Length; - } - result = string(f, s, -1, field_width, precision, flags); - } - if (result < 0) - return -1; - continue;*/ - - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - if (qualifier == 'l' || qualifier == 'L' ) { - _ldouble = va_arg(args, long double); - - if ( _isnanl(_ldouble) ) - { - f += "Nan"; - } - else if ( !_finitel(_ldouble) ) - { - if ( _ldouble < 0 ) - f += "-Inf"; - else - f += "+Inf"; - } else { - if ( precision == -1 ) - precision = 6; - result = numberfl(f,_ldouble,*fmt,field_width,precision,flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - } else { - _double = (double)va_arg(args, double); - - if ( _isnan(_double) ) - { - f += "Nan"; - } - else if ( !_finite(_double) ) - { - if ( _double < 0 ) - f += "-Inf"; - else - f += "+Inf"; - } - else - { - if ( precision == -1 ) - precision = 6; - result = numberf(f,_double,*fmt,field_width,precision,flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - } - continue; - - case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - result = number(f, - (size_t) va_arg(args, void *), 16, - field_width, precision, flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case 'n': - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = 0; - } else { - int * ip = va_arg(args, int *); - *ip = 0; - } - continue; - - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; - - case 'b': - base = 2; - break; - - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; - - default: - if (*fmt != '%') - { - f += '%'; - } - if (*fmt) - { - f += *fmt; - } - else - --fmt; - continue; - } - - if (qualifier == 'I') - num = va_arg(args, ULONGLONG); - else if (qualifier == 'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == 'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - result = number(f, num, base, field_width, precision, flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - //putc('\0',f); - return f; -} - -std::wstring -sswvprintf ( const wchar_t* fmt, va_list args ) -{ - ULONGLONG num; - int base; - long double _ldouble; - double _double; - const wchar_t* s; - const char* sa; - int result; - std::wstring f; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier = 0; /* 'h', 'l', 'L' or 'I64' for integer fields */ - - for (; *fmt ; ++fmt) - { - if (*fmt != L'%') - { - f += *fmt; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case L'-': flags |= LEFT; goto repeat; - case L'+': flags |= PLUS; goto repeat; - case L' ': flags |= SPACE; goto repeat; - case L'#': flags |= SPECIAL; goto repeat; - case L'0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_wtoi(&fmt); - else if (*fmt == L'*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == L'.') { - ++fmt; - if (iswdigit(*fmt)) - precision = skip_wtoi(&fmt); - else if (*fmt == L'*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = 0; - // %Z can be just stand alone or as size_t qualifier - if ( *fmt == L'Z' ) { - qualifier = *fmt; - switch ( *(fmt+1)) { - case L'o': - case L'b': - case L'X': - case L'x': - case L'd': - case L'i': - case L'u': - ++fmt; - break; - default: - break; - } - } else if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') { - qualifier = *fmt; - fmt += 3; - } - - // go fine with ll instead of L - if ( *fmt == L'l' ) { - ++fmt; - qualifier = L'L'; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case L'c': - if (!(flags & LEFT)) - while (--field_width > 0) - { - f += L' '; - } - if ( qualifier == L'h' ) - { - f += (wchar_t)(char)(unsigned char) va_arg(args,int); - } - else - { - f += (wchar_t) va_arg(args,int); - } - while (--field_width > 0) - { - f += ' '; - } - continue; - - case 'C': - if (!(flags & LEFT)) - while (--field_width > 0) - { - f += L' '; - } - if (qualifier == L'l' || qualifier == L'w') - { - f += (wchar_t) va_arg(args,int); - } - else - { - f += (wchar_t)(char)(unsigned char) va_arg(args,int); - } - while (--field_width > 0) - { - f += L' '; - } - continue; - - case 's': - if (qualifier == L'h') { - /* print ascii string */ - sa = va_arg(args, char *); - result = wstringa(f, sa, -1, field_width, precision, flags); - } else { - /* print unicode string */ - s = va_arg(args, wchar_t *); - result = do_wstring(f, s, -1, field_width, precision, flags); - } - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case 'S': - if (qualifier == L'l' || qualifier == L'w') { - /* print unicode string */ - s = va_arg(args, wchar_t *); - result = do_wstring(f, s, -1, field_width, precision, flags); - } else { - /* print ascii string */ - sa = va_arg(args, char *); - result = wstringa(f, sa, -1, field_width, precision, flags); - } - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case L'e': - case L'E': - case L'f': - case L'g': - case L'G': - if (qualifier == L'l' || qualifier == L'L' ) - { - _ldouble = va_arg(args, long double); - - if ( _isnanl(_ldouble) ) - { - f += L"Nan"; - } - else if ( !_finitel(_ldouble) ) - { - if ( _ldouble < 0 ) - f += L"-Inf"; - else - f += L"+Inf"; - } else { - if ( precision == -1 ) - precision = 6; - result = wnumberfl(f,_ldouble,*fmt,field_width,precision,flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - } else { - _double = (double)va_arg(args, double); - - if ( _isnan(_double) ) - { - f += L"Nan"; - } - else if ( !_finite(_double) ) - { - if ( _double < 0 ) - f += L"-Inf"; - else - f += L"+Inf"; - } - else - { - if ( precision == -1 ) - precision = 6; - result = wnumberf(f,_double,*fmt,field_width,precision,flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - } - continue; - - case L'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - result = wnumber(f, - (size_t) va_arg(args, void *), 16, - field_width, precision, flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - continue; - - case L'n': - if (qualifier == L'l') { - long * ip = va_arg(args, long *); - *ip = 0; - } else { - int * ip = va_arg(args, int *); - *ip = 0; - } - continue; - - /* integer number formats - set up the flags and "break" */ - case L'o': - base = 8; - break; - - case L'b': - base = 2; - break; - - case L'X': - flags |= LARGE; - case L'x': - base = 16; - break; - - case L'd': - case L'i': - flags |= SIGN; - case L'u': - break; - - default: - if (*fmt != L'%') - { - f += L'%'; - } - if (*fmt) - { - f += *fmt; - } - else - --fmt; - continue; - } - - if (qualifier == L'I') - num = va_arg(args, ULONGLONG); - else if (qualifier == L'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == L'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - result = wnumber(f, num, base, field_width, precision, flags); - if (result < 0) - { - assert(!"TODO FIXME handle error better"); - return f; - } - } - //putc('\0',f); - return f; -} Removed: branches/cmake-bringup/tools/ssprintf.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/ssprintf.h?… ============================================================================== --- branches/cmake-bringup/tools/ssprintf.h [iso-8859-1] (original) +++ branches/cmake-bringup/tools/ssprintf.h (removed) @@ -1,40 +1,0 @@ -/* - * This program 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 program 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 program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include <string> -#include <stdarg.h> - -#ifdef __CYGWIN__ -namespace std { - typedef basic_string<wchar_t> wstring; -} -#endif - -std::string ssprintf ( const char* fmt, ... ); -std::string ssvprintf ( const char* fmt, va_list args ); - -std::wstring sswprintf ( const wchar_t* fmt, ... ); -std::wstring sswvprintf ( const wchar_t* fmt, va_list args ); - -#ifdef _UNICODE -#define sstprintf sswprintf -#define sstvprintf sswvprintf -#else -#define sstprintf ssprintf -#define sstvprintf ssvprintf -#endif Modified: branches/cmake-bringup/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/xml.cpp?rev… ============================================================================== --- branches/cmake-bringup/tools/xml.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/tools/xml.cpp [iso-8859-1] Sun Oct 10 14:31:04 2010 @@ -18,6 +18,7 @@ #ifdef _MSC_VER #pragma warning ( disable : 4786 ) +#pragma warning ( disable : 4996 ) #endif//_MSC_VER #ifdef WIN32 @@ -41,7 +42,6 @@ #include <stdlib.h> #include <stdio.h> #include "xml.h" -#include "ssprintf.h" #ifndef MAX_PATH #define MAX_PATH _MAX_PATH @@ -100,7 +100,9 @@ void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) { - _e = location + ": " + ssvprintf(format,args); + char buffer[1024]; + _vsnprintf(buffer, sizeof(buffer)-1, format, args); + _e = location + ": " + buffer; } void XMLException::SetException ( const std::string& location, const char* format, ... ) @@ -424,13 +426,14 @@ XMLFile::Location() const { int line = 1; + char line_str[10]; 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 ); + return _filename + "(" + itoa(line, line_str, 10) + ")"; } XMLAttribute::XMLAttribute()

14 years, 2 months

[gadamopoulos] 49093: Sync to trunk (2/2) Add crt, ndk, ddk, and dxsdk Remove from build mingw Fix generating buildno.h

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Oct 10 14:08:28 2010 New Revision: 49093 URL: http://svn.reactos.org/svn/reactos?rev=49093&view=rev Log: Sync to trunk (2/2) Add crt, ndk, ddk, and dxsdk Remove from build mingw Fix generating buildno.h Added: branches/Tree-restructure-test/sdk/include/ddk/ - copied from r48976, trunk/reactos/include/ddk/ branches/Tree-restructure-test/sdk/include/dxsdk/ - copied from r48976, trunk/reactos/include/dxsdk/ branches/Tree-restructure-test/sdk/include/host/ - copied from r48976, branches/Tree-restructure-test/sdk/include/host/ branches/Tree-restructure-test/sdk/include/ndk/ - copied from r48976, trunk/reactos/include/ndk/ branches/Tree-restructure-test/sdk/include/psdk/ - copied from r48976, branches/Tree-restructure-test/sdk/include/psdk/ branches/Tree-restructure-test/sdk/include/reactos/ - copied from r48976, branches/Tree-restructure-test/sdk/include/reactos/ branches/Tree-restructure-test/sdk/libs/atl/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/cmlib/ branches/Tree-restructure-test/sdk/libs/crt/ - copied from r48976, trunk/reactos/lib/sdk/crt/ branches/Tree-restructure-test/sdk/libs/debugsup/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/debugsup/ branches/Tree-restructure-test/sdk/libs/inflib/ - copied from r48976, trunk/reactos/lib/inflib/ branches/Tree-restructure-test/sdk/libs/libxml2/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/libxml2/ branches/Tree-restructure-test/sdk/libs/mingw/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/mingw/ branches/Tree-restructure-test/sdk/libs/pseh/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/rossym/ branches/Tree-restructure-test/sdk/libs/wcsfuncs/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/wcsfuncs/ branches/Tree-restructure-test/sdk/libs/zlib/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/zlib/ branches/Tree-restructure-test/sdk/tools/bin2c.c - copied unchanged from r48976, trunk/reactos/tools/bin2c.c branches/Tree-restructure-test/sdk/tools/buildno/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/dumpstab.c - copied unchanged from r48976, trunk/reactos/tools/dumpstab.c branches/Tree-restructure-test/sdk/tools/gendib/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/log2lines/ - copied from r48976, trunk/reactos/tools/log2lines/ branches/Tree-restructure-test/sdk/tools/mkconfig.c - copied unchanged from r48976, trunk/reactos/tools/mkconfig.c branches/Tree-restructure-test/sdk/tools/mkhive/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nandflash/ - copied from r48976, trunk/reactos/tools/nandflash/ branches/Tree-restructure-test/sdk/tools/nci/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pefixup.c - copied unchanged from r48976, trunk/reactos/tools/pefixup.c branches/Tree-restructure-test/sdk/tools/pipetools/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ - copied from r48976, trunk/reactos/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rsym/ branches/Tree-restructure-test/sdk/tools/ssprintf.cpp - copied unchanged from r48976, trunk/reactos/tools/ssprintf.cpp branches/Tree-restructure-test/sdk/tools/ssprintf.h - copied unchanged from r48976, trunk/reactos/tools/ssprintf.h branches/Tree-restructure-test/sdk/tools/stubgen.c - copied unchanged from r48976, trunk/reactos/tools/stubgen.c branches/Tree-restructure-test/sdk/tools/sysgen/ - copied from r48976, trunk/reactos/tools/sysgen/ branches/Tree-restructure-test/sdk/tools/unicode/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wrc/ branches/Tree-restructure-test/sdk/tools/xml.cpp - copied unchanged from r48976, trunk/reactos/tools/xml.cpp branches/Tree-restructure-test/sdk/tools/xml.h - copied unchanged from r48976, trunk/reactos/tools/xml.h Modified: branches/Tree-restructure-test/Makefile branches/Tree-restructure-test/ReactOS-amd64.rbuild branches/Tree-restructure-test/ReactOS-arm.rbuild branches/Tree-restructure-test/ReactOS-generic.rbuild branches/Tree-restructure-test/ReactOS-i386.rbuild branches/Tree-restructure-test/baseaddress.rbuild branches/Tree-restructure-test/config-arm.template.rbuild branches/Tree-restructure-test/sdk/include/include.rbuild branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak branches/Tree-restructure-test/sdk/libs/libs.rbuild branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln branches/Tree-restructure-test/sdk/tools/rbuild/test.h branches/Tree-restructure-test/sdk/tools/tools.mak Modified: branches/Tree-restructure-test/Makefile URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/Makefile?… ============================================================================== --- branches/Tree-restructure-test/Makefile [iso-8859-1] (original) +++ branches/Tree-restructure-test/Makefile [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -169,11 +169,7 @@ endif ifeq ($(ROS_AUTOMAKE),) - ifeq ($(ARCH),i386) - ROS_AUTOMAKE=makefile.auto - else ROS_AUTOMAKE=makefile-$(ARCH).auto - endif endif all: $(ROS_AUTOMAKE) @@ -423,7 +419,7 @@ endif endif -BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h +BUILDNO_H = $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos$(SEP)buildno.h include sdk/libs/lib.mak include sdk/tools/tools.mak @@ -432,9 +428,9 @@ PREAUTO := \ $(BIN2C_TARGET) \ $(BIN2RES_TARGET) \ -# $(BUILDNO_H) \ - $(GENDIB_DIB_FILES) \ - $(NCI_SERVICE_FILES) + $(BUILDNO_H) \ + $(NCI_SERVICE_FILES) \ + $(GENDIB_DIB_FILES) ifeq ($(ARCH),powerpc) PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS) @@ -444,8 +440,7 @@ ROS_BUILDENGINE=$(RBUILD_TARGET) endif -$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(PREAUTO) - ${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL) +$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(BUILDNO_H) $(ECHO_RBUILD) $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw Modified: branches/Tree-restructure-test/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-a… ============================================================================== --- branches/Tree-restructure-test/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-amd64.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true"> <xi:include href="config-amd64.rbuild"> <xi:fallback> <xi:include href="config-amd64.template.rbuild" /> @@ -18,6 +18,7 @@ <define name="TARGET_amd64" host="true" /> <define name="USE_COMPILER_EXCEPTIONS" /> + <define name ="NO_UNDERSCORE_PREFIX" /> <property name="PLATFORM" value="PC"/> <property name="usewrc" value="false"/> @@ -28,11 +29,13 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=4</compilerflag> <compilerflag compiler="midl">-m64 --win64</compilerflag>   <compilerflag>-U_X86_</compilerflag> + <compilerflag>-UWIN32</compilerflag> <compilerflag>-Wno-format</compilerflag> </group> @@ -42,11 +45,31 @@ <linkerflag>-section-alignment=0x1000</linkerflag> <linkerflag>--unique=.eh_frame</linkerflag> <linkerflag>-static</linkerflag> + <linkerflag>--exclude-all-symbols</linkerflag> </group> <if property="USERMODE" value="1"> <directory name="base"> - <xi:include href="base/base.rbuild" /> + <directory name="applications"> + <xi:include href="base/applications/applications.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="base/services/services.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="base/setup/setup.rbuild" /> + </directory> + <directory name="shell"> + <directory name="cmd"> + <xi:include href="base/shell/cmd/cmd.rbuild" /> + </directory> + <directory name="explorer-new"> + <xi:include href="base/shell/explorer-new/explorer.rbuild" /> + </directory> + </directory> + <directory name="system"> + <xi:include href="base/system/system.rbuild" /> + </directory> </directory> <directory name="dll"> <xi:include href="dll/dll.rbuild" /> Modified: branches/Tree-restructure-test/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-a… ============================================================================== --- branches/Tree-restructure-test/ReactOS-arm.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-arm.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -7,18 +7,18 @@ </xi:fallback> </xi:include> - <xi:include href="ReactOS-generic.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> -  +  <define name="_ARM_" /> <define name="__arm__" /> <define name="TARGET_arm" host="true" /> - <define name="USE_COMPILER_EXCEPTIONS" /> + <define name="USE_COMPILER_EXCEPTIONS" /> - <property name="WINEBUILD_FLAGS" value="--kill-at"/> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> - <include>include/reactos/arm</include> + <include>include/reactos/arm</include> <if property="SARCH" value="versatile"> <define name="BOARD_CONFIG_VERSATILE"/> @@ -28,17 +28,18 @@ <if property="OPTIMIZE" value="1"> <compilerflag>-ftracer</compilerflag> </if> - <compilerflag>-Wno-attributes</compilerflag> - <compilerflag>-U_UNICODE</compilerflag> - <compilerflag>-UUNICODE</compilerflag> + <compilerflag>-fms-extensions</compilerflag> + <compilerflag>-Wno-attributes</compilerflag> + <compilerflag>-U_UNICODE</compilerflag> + <compilerflag>-UUNICODE</compilerflag> </group> <define name="__MSVCRT__"/>  <group linkerset="ld"> - <linkerflag>--strip-debug</linkerflag>  - <linkerflag>-static</linkerflag>  + <linkerflag>--strip-debug</linkerflag>  + <linkerflag>-static</linkerflag>  <linkerflag>-file-alignment=0x1000</linkerflag> <linkerflag>-section-alignment=0x1000</linkerflag> </group> @@ -52,7 +53,10 @@ <directory name="drivers"> <directory name="csq"> <xi:include href="lib/drivers/csq/csq.rbuild" /> - </directory> + </directory> + </directory> + <directory name="cportlib"> + <xi:include href="lib/cportlib/cportlib.rbuild" /> </directory> <directory name="debugsup"> <xi:include href="lib/debugsup/debugsup.rbuild" /> @@ -73,6 +77,9 @@ <directory name="inflib"> <xi:include href="lib/inflib/inflib.rbuild" /> </directory> + <directory name="newinflib"> + <xi:include href="lib/newinflib/inflib.rbuild" /> + </directory> <directory name="cmlib"> <xi:include href="lib/cmlib/cmlib.rbuild" /> </directory> @@ -86,6 +93,9 @@ <directory name="crt"> <xi:include href="lib/sdk/crt/crt.rbuild" /> <xi:include href="lib/sdk/crt/libcntpr.rbuild" /> + </directory> + <directory name="ioevent"> + <xi:include href="lib/sdk/ioevent/ioevent.rbuild" /> </directory> <directory name="nt"> <xi:include href="lib/sdk/nt/nt.rbuild" /> @@ -111,17 +121,7 @@ <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> </directory> <directory name="hal"> - <directory name="halarm"> - <directory name="generic"> - <xi:include href="hal/halarm/generic/generic.rbuild" /> - </directory> - <directory name="up"> - <xi:include href="hal/halarm/up/halup.rbuild" /> - </directory> - </directory> - <directory name="hal"> - <xi:include href="hal/hal/hal.rbuild" /> - </directory> + <xi:include href="hal/hal.rbuild" /> </directory> <directory name="boot"> <xi:include href="boot/boot.rbuild" /> @@ -155,9 +155,9 @@ </directory> <directory name="base"> <directory name="system"> - <directory name="smss"> - <xi:include href="base/system/smss/smss.rbuild" /> - </directory> + <directory name="smss"> + <xi:include href="base/system/smss/smss.rbuild" /> + </directory> </directory> </directory> </project> Modified: branches/Tree-restructure-test/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-g… ============================================================================== --- branches/Tree-restructure-test/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-generic.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -63,31 +63,31 @@ <define name="_SETUPAPI_VER">0x600</define> </if> - <include>.</include> - <include>include</include> - <include root="intermediate">include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include root="intermediate">include/dxsdk</include> - <include>include/crt</include> - <include compilerset="gcc">include/crt/mingw32</include> - <include compilerset="msc">include/crt/msc</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include root="intermediate">include/reactos</include> - <include root="intermediate">include/reactos/mc</include> - <include>include/reactos/libs</include> + <include>sdk/include</include> + <include root="intermediate">sdk/include</include> + <include>sdk/include/psdk</include> + <include root="intermediate">sdk/include/psdk</include> + <include>sdk/include/dxsdk</include> + <include root="intermediate">sdk/include/dxsdk</include> + <include>sdk/include/crt</include> + <include compilerset="gcc">sdk/include/crt/mingw32</include> + <include compilerset="msc">sdk/include/crt/msc</include> + <include>sdk/include/ddk</include> + <include>sdk/include/GL</include> + <include>sdk/include/ndk</include> + <include>sdk/include/reactos</include> + <include root="intermediate">sdk/include/reactos</include> + <include root="intermediate">sdk/include/reactos/mc</include> + <include>sdk/include/reactos/libs</include> - <include host="true">include</include> - <include host="true" root="intermediate">include</include> - <include host="true">include/reactos</include> - <include host="true">include/reactos/wine</include> + <include host="true">sdk/include</include> + <include host="true" root="intermediate">sdk/include</include> + <include host="true">sdk/include/reactos</include> + <include host="true">sdk/include/reactos/wine</include> <group compilerset="gcc"> <compilerflag>-Wall</compilerflag> + <compilerflag>-Wno-char-subscripts</compilerflag> <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> </group> @@ -117,14 +117,9 @@ </if> <compilerflag>-fno-strict-aliasing</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> -   </group> Modified: branches/Tree-restructure-test/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-i… ============================================================================== --- branches/Tree-restructure-test/ReactOS-i386.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-i386.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config.rbuild"> <xi:fallback> <xi:include href="config.template.rbuild" /> @@ -24,9 +24,12 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> <compilerflag compiler="midl">-m32 --win32</compilerflag> <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag> + <compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag> <compilerflag compiler="as">-gstabs+</compilerflag> </group> Modified: branches/Tree-restructure-test/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/baseaddre… ============================================================================== --- branches/Tree-restructure-test/baseaddress.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/baseaddress.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -3,6 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <property name="BASEADDRESS_FAULTREP" value="0x107A0000" /> <property name="BASEADDRESS_QMGRPRXY" value="0x1f710000" /> <property name="BASEADDRESS_CRYPTDLG" value="0x209c0000" /> <property name="BASEADDRESS_COMCAT" value="0x20a50000" /> @@ -23,13 +24,16 @@ <property name="BASEADDRESS_PSTOREC" value="0x513d0000" /> <property name="BASEADDRESS_LPK" value="0x516c0000" /> <property name="BASEADDRESS_MSGSM32ACM" value="0x56db0000" /> + <property name="BASEADDRESS_MSDVBNP" value="0x58280000" /> <property name="BASEADDRESS_MSG711ACM" value="0x584f0000" /> <property name="BASEADDRESS_IMAADP32ACM" value="0x585e0000" /> + <property name="BASEADDRESS_BDAPLGIN" value="0x58600000" /> <property name="BASEADDRESS_TELEPHON" value="0x58750000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> <property name="BASEADDRESS_JOY" value="0x589b0000" /> <property name="BASEADDRESS_QMGR" value="0x59620000" /> + <property name="BASEADDRESS_MSVIDCTL" value="0x59660000" /> <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_UNTFS" value="0x5b340000" /> @@ -116,6 +120,7 @@ <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_WINHTTP" value="0x70c60000" /> + <property name="BASEADDRESS_BATT" value="0x70cb0000" /> <property name="BASEADDRESS_AMSTREAM" value="0x71030000" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> <property name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> @@ -128,6 +133,7 @@ <property name="BASEADDRESS_OLESVR32" value="0x71dd0000" /> <property name="BASEADDRESS_OLECLI32" value="0x71df0000" /> <property name="BASEADDRESS_OLETHK32" value="0x71e10000" /> + <property name="BASEADDRESS_NETEVENT" value="0x71e70000" /> <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> <property name="BASEADDRESS_MSSIGN32" value="0x720c0000" /> @@ -182,8 +188,8 @@ <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> <property name="BASEADDRESS_SHLWAPI" value="0x76100000" /> <property name="BASEADDRESS_INETCOMM" value="0x76140000" /> - <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> - <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> + <property name="BASEADDRESS_COMCTL32" value="0x76170000" /> + <property name="BASEADDRESS_COMDLG32" value="0x76230000" /> <property name="BASEADDRESS_WINSTA" value="0x762f0000" /> <property name="BASEADDRESS_IMM32" value="0x76320000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> @@ -197,15 +203,15 @@ <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_MSHTML" value="0x76650000" /> - <property name="BASEADDRESS_ODBC32" value="0x76660000" /> - <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> - <property name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> - <property name="BASEADDRESS_SHFOLDER" value="0x76760000" /> - <property name="BASEADDRESS_NTDSAPI" value="0x76780000" /> - <property name="BASEADDRESS_NTMARTA" value="0x768a0000" /> - <property name="BASEADDRESS_RASDLG" value="0x768d0000" /> - <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> - <property name="BASEADDRESS_ATL" value="0x76a80000" /> + <property name="BASEADDRESS_ODBC32" value="0x76710000" /> + <property name="BASEADDRESS_SETUPAPI" value="0x76730000" /> + <property name="BASEADDRESS_CRYPTDLL" value="0x768f0000" /> + <property name="BASEADDRESS_SHFOLDER" value="0x76900000" /> + <property name="BASEADDRESS_NTDSAPI" value="0x76910000" /> + <property name="BASEADDRESS_NTMARTA" value="0x76920000" /> + <property name="BASEADDRESS_RASDLG" value="0x76930000" /> + <property name="BASEADDRESS_GDIPLUS" value="0x76a70000" /> + <property name="BASEADDRESS_ATL" value="0x76ac0000" /> <property name="BASEADDRESS_SFC" value="0x76b50000" /> <property name="BASEADDRESS_CREDUI" value="0x76bf0000" /> <property name="BASEADDRESS_SFC_OS" value="0x76c10000" /> @@ -236,7 +242,7 @@ <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_VERSION" value="0x77a40000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_OLEPRO32" value="0x77b10000" /> + <property name="BASEADDRESS_OLEPRO32" value="0x77b20000" /> <property name="BASEADDRESS_ACTIVEDS" value="0x77cb0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <property name="BASEADDRESS_USER32" value="0x77e50000" /> Modified: branches/Tree-restructure-test/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/config-ar… ============================================================================== --- branches/Tree-restructure-test/config-arm.template.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/config-arm.template.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -18,7 +18,7 @@ kurobox versatile omap3 --> -<property name="SARCH" value="omap3" /> +<property name="SARCH" value="versatile" />  <directory name="psdk"> <xi:include href="psdk/psdk.rbuild" /> </directory> Modified: branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude $(HOST_CFLAGS) + -Isdk/include/reactos -Isdk/include $(HOST_CFLAGS) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_HOSTAR) Modified: branches/Tree-restructure-test/sdk/libs/libs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- branches/Tree-restructure-test/sdk/libs/libs.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/libs.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -7,14 +7,14 @@ <directory name="cmlib"> <xi:include href="cmlib/cmlib.rbuild" /> </directory> + <directory name="crt"> + <xi:include href="crt/crt.rbuild" /> + </directory> <directory name="debugsup"> <xi:include href="debugsup/debugsup.rbuild" /> </directory> <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> - </directory> - <directory name="mingw"> - <xi:include href="mingw/mingw.rbuild" /> </directory> <directory name="pseh"> <xi:include href="pseh/pseh.rbuild" /> Modified: branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -25,11 +25,11 @@ BUILDNO_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o)) -BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Iinclude/reactos $(TOOLS_CPPFLAGS) +BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Isdk/include/reactos $(TOOLS_CPPFLAGS) BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS) -BUILDNO_VERSION = include$(SEP)reactos$(SEP)version.h +BUILDNO_VERSION = sdk$(SEP)include$(SEP)reactos$(SEP)version.h .PHONY: buildno buildno: $(BUILDNO_TARGET) @@ -52,6 +52,6 @@ #.PHONY: $(BUILDNO_TARGET) $(BUILDNO_H): $(BUILDNO_TARGET) - ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos 2>$(NUL) $(ECHO_BUILDNO) $(Q)$(BUILDNO_TARGET) $(BUILDNO_QUIET) $(BUILDNO_H) Modified: branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -358,13 +358,13 @@ GenerateGlobalVariables (); GenerateXmlBuildFilesMacro (); ProcessModules (); - GenerateInstallTarget (); - GenerateTestTarget (); +// GenerateInstallTarget (); +// GenerateTestTarget (); GenerateDirectoryTargets (); GenerateDirectories (); - GenerateTestSupportCode (); +// GenerateTestSupportCode (); GenerateCompilationUnitSupportCode (); - GenerateSysSetup (); +// GenerateSysSetup (); GenerateProxyMakefiles (); CheckAutomaticDependencies (); CloseMakefile (); @@ -429,9 +429,9 @@ void MingwBackend::GenerateGlobalVariables () const { - fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", ProjectNode.GetLinkerSet ().c_str () ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", ProjectNode.GetCompilerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)rules.mak\n", RBUILD_BASE ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetLinkerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetCompilerSet ().c_str () ); if ( mscPath.length() ) fprintf ( fMakefile, "export RBUILD_CL_PATH=%s\n", mscPath.c_str () ); @@ -1093,7 +1093,8 @@ { printf ( "Detecting compiler -pipe support..." ); - string pipe_detection = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; + string rbuild_base = RBUILD_BASE; + string pipe_detection = rbuild_base + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection, ".o" ); string command = ssprintf ( @@ -1130,7 +1131,8 @@ if ( configuration.PrecompiledHeadersEnabled && ProjectNode.configuration.Compiler == GnuGcc ) { - string path = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; + string rbuild_base = RBUILD_BASE; + string path = rbuild_base + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; string cmd = ssprintf ( "%s -c %s 1>%s 2>%s", FixSeparatorForSystemCommand(compilerCommand).c_str (), Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -67,6 +67,10 @@ #define DEF_SSEP "/" #define DEF_SBAD_SEP "\\" #endif + +#define SSEP DEF_SSEP +#define TOOLS_BASE "sdk" SSEP "tools" SSEP +#define RBUILD_BASE TOOLS_BASE "rbuild" SSEP #define MS_VS_DEF_VERSION "9.00" Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -296,7 +296,7 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_TEST_SPECIAL_OBJECTS) -RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos +RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Isdk/include -Isdk/include/reactos RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" +ï»¿ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcxproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Modified: branches/Tree-restructure-test/sdk/tools/rbuild/test.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -20,10 +20,6 @@ #include "rbuild.h" #include "backend/mingw/mingw.h" - -#define SSEP DEF_SSEP - -#define RBUILD_BASE "tools" SSEP "rbuild" SSEP class BaseTest { Modified: branches/Tree-restructure-test/sdk/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -43,7 +43,7 @@ include sdk/tools/bin2c.mak include sdk/tools/buildno/buildno.mak include sdk/tools/gendib/gendib.mak -include sdk/tools/rsym/log2lines.mak +include sdk/tools/log2lines/log2lines.mak include sdk/tools/nci/nci.mak ifeq ($(ARCH),powerpc) include sdk/tools/ofw_interface/ofw_interface.mak

14 years, 2 months

[gadamopoulos] 49092: Remove empty folders Attempt to sync to trunk(1/2)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Oct 10 13:43:06 2010 New Revision: 49092 URL: http://svn.reactos.org/svn/reactos?rev=49092&view=rev Log: Remove empty folders Attempt to sync to trunk(1/2) Removed: branches/Tree-restructure-test/addons/ branches/Tree-restructure-test/audio/ branches/Tree-restructure-test/directx/ branches/Tree-restructure-test/gui/ branches/Tree-restructure-test/network/ branches/Tree-restructure-test/ntcore/ branches/Tree-restructure-test/sdk/include/crt/ branches/Tree-restructure-test/sdk/include/host/ branches/Tree-restructure-test/sdk/include/psdk/ branches/Tree-restructure-test/sdk/include/reactos/ branches/Tree-restructure-test/sdk/libs/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ branches/Tree-restructure-test/sdk/libs/debugsup/ branches/Tree-restructure-test/sdk/libs/inflib/ branches/Tree-restructure-test/sdk/libs/libxml2/ branches/Tree-restructure-test/sdk/libs/mingw/ branches/Tree-restructure-test/sdk/libs/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ branches/Tree-restructure-test/sdk/libs/wcsfuncs/ branches/Tree-restructure-test/sdk/libs/zlib/ branches/Tree-restructure-test/sdk/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ branches/Tree-restructure-test/sdk/tools/syssetup.inf.tpl branches/Tree-restructure-test/sdk/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/ branches/Tree-restructure-test/win32core/ Removed: branches/Tree-restructure-test/sdk/tools/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== Binary file - no diff available.

14 years, 2 months

[ekohl] 49091: [NTOSKRNL] Implement SeImpersonateClientEx() and simplify SeImpersonateClient().

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 10 11:31:51 2010 New Revision: 49091 URL: http://svn.reactos.org/svn/reactos?rev=49091&view=rev Log: [NTOSKRNL] Implement SeImpersonateClientEx() and simplify SeImpersonateClient(). Modified: trunk/reactos/ntoskrnl/se/access.c Modified: trunk/reactos/ntoskrnl/se/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/access.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] Sun Oct 10 11:31:51 2010 @@ -331,15 +331,36 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI SeImpersonateClientEx(IN PSECURITY_CLIENT_CONTEXT ClientContext, IN PETHREAD ServerThread OPTIONAL) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + BOOLEAN EffectiveOnly; + + PAGED_CODE(); + + if (ClientContext->DirectlyAccessClientToken == FALSE) + { + EffectiveOnly = ClientContext->SecurityQos.EffectiveOnly; + } + else + { + EffectiveOnly = ClientContext->DirectAccessEffectiveOnly; + } + + if (ServerThread == NULL) + { + ServerThread = PsGetCurrentThread(); + } + + return PsImpersonateClient(ServerThread, + ClientContext->ClientToken, + TRUE, + EffectiveOnly, + ClientContext->SecurityQos.ImpersonationLevel); } /* @@ -350,29 +371,10 @@ SeImpersonateClient(IN PSECURITY_CLIENT_CONTEXT ClientContext, IN PETHREAD ServerThread OPTIONAL) { - UCHAR b; - - PAGED_CODE(); - - if (ClientContext->DirectlyAccessClientToken == FALSE) - { - b = ClientContext->SecurityQos.EffectiveOnly; - } - else - { - b = ClientContext->DirectAccessEffectiveOnly; - } - - if (ServerThread == NULL) - { - ServerThread = PsGetCurrentThread(); - } - - PsImpersonateClient(ServerThread, - ClientContext->ClientToken, - 1, - b, - ClientContext->SecurityQos.ImpersonationLevel); + PAGED_CODE(); + + SeImpersonateClientEx(ClientContext, + ServerThread); } /* EOF */

14 years, 2 months

[fireball] 49090: [HEAP] - Add 64 bit compatibility.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Oct 10 11:16:55 2010 New Revision: 49090 URL: http://svn.reactos.org/svn/reactos?rev=49090&view=rev Log: [HEAP] - Add 64 bit compatibility. Modified: trunk/reactos/lib/rtl/heap.h Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=49090&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Sun Oct 10 11:16:55 2010 @@ -16,7 +16,11 @@ #define HEAP_SEGMENTS 64 #define HEAP_ENTRY_SIZE ((ULONG)sizeof(HEAP_ENTRY)) +#ifdef _WIN64 +#define HEAP_ENTRY_SHIFT 4 +#else #define HEAP_ENTRY_SHIFT 3 +#endif #define HEAP_MAX_BLOCK_SIZE ((0x80000 - PAGE_SIZE) >> HEAP_ENTRY_SHIFT) #define ARENA_INUSE_FILLER 0xBAADF00D @@ -106,7 +110,11 @@ struct _HEAP_COMMON_ENTRY; } HEAP_ENTRY, *PHEAP_ENTRY; +#ifdef _WIN64 +C_ASSERT(sizeof(HEAP_ENTRY) == 16); +#else C_ASSERT(sizeof(HEAP_ENTRY) == 8); +#endif C_ASSERT((1 << HEAP_ENTRY_SHIFT) == sizeof(HEAP_ENTRY)); typedef struct _HEAP_TAG_ENTRY

14 years, 2 months

[bfreisen] 49089: [PAINT] - apply patch by Black_Fox (see bug 5434) - fix minor bugs introduced by it - generalize changes related to mirroring rectangular selections to free form selections - solv...

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sun Oct 10 09:57:44 2010 New Revision: 49089 URL: http://svn.reactos.org/svn/reactos?rev=49089&view=rev Log: [PAINT] - apply patch by Black_Fox (see bug 5434) - fix minor bugs introduced by it - generalize changes related to mirroring rectangular selections to free form selections - solve problem regarding selection contents update Modified: trunk/reactos/base/applications/paint/globalvar.h trunk/reactos/base/applications/paint/lang/cs-CZ.rc trunk/reactos/base/applications/paint/mouse.c trunk/reactos/base/applications/paint/registry.c trunk/reactos/base/applications/paint/selection.c trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl… ============================================================================== --- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Sun Oct 10 09:57:44 2010 @@ -101,3 +101,5 @@ extern POINT pointStack[256]; extern short pointSP; +extern POINT *ptStack; +extern int ptSP; Modified: trunk/reactos/base/applications/paint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/cs-CZ.rc [iso-8859-1] Sun Oct 10 09:57:44 2010 @@ -12,8 +12,8 @@ BEGIN POPUP "&Soubor" BEGIN - MENUITEM "Nový\tCtrl+N", IDM_FILENEW - MENUITEM "Otevøít...\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Nový\tCtrl+N", IDM_FILENEW + MENUITEM "&Otevøít...\tCtrl+O", IDM_FILEOPEN MENUITEM "Uloit\tCtrl+S", IDM_FILESAVE MENUITEM "Uloit jako...", IDM_FILESAVEAS MENUITEM SEPARATOR @@ -60,7 +60,7 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "Zobrazit møíku", IDM_VIEWSHOWGRID + MENUITEM "Zobrazit møíku\tCtrl+G", IDM_VIEWSHOWGRID MENUITEM "Zobrazit miniaturu", IDM_VIEWSHOWMINIATURE END MENUITEM "Celá obrazovka\tCtrl+F", IDM_VIEWFULLSCREEN Modified: trunk/reactos/base/applications/paint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] Sun Oct 10 09:57:44 2010 @@ -284,6 +284,10 @@ placeSelWin(); ShowWindow(hSelection, SW_SHOW); + /* force refresh of selection contents */ + SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0); + SendMessage(hSelection, WM_MOUSEMOVE, 0, 0); + SendMessage(hSelection, WM_LBUTTONUP, 0, 0); } HeapFree(GetProcessHeap(), 0, ptStack); ptStack = NULL; @@ -310,6 +314,10 @@ placeSelWin(); ShowWindow(hSelection, SW_SHOW); + /* force refresh of selection contents */ + SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0); + SendMessage(hSelection, WM_MOUSEMOVE, 0, 0); + SendMessage(hSelection, WM_LBUTTONUP, 0, 0); } break; case TOOL_RUBBER: Modified: trunk/reactos/base/applications/paint/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/re… ============================================================================== --- trunk/reactos/base/applications/paint/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/registry.c [iso-8859-1] Sun Oct 10 09:57:44 2010 @@ -14,11 +14,11 @@ /* FUNCTIONS ********************************************************/ void -SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: The pattern (tiled/stretched) is not set +SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too { SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) FileName, SPIF_UPDATEINIFILE); - /*HKEY hDesktop; + HKEY hDesktop; TCHAR szStyle[3], szTile[3]; if ((dwStyle > 2) || (dwTile > 2)) @@ -39,5 +39,5 @@ _tcslen(szTile) * sizeof(TCHAR)); RegCloseKey(hDesktop); - }*/ + } } Modified: trunk/reactos/base/applications/paint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/se… ============================================================================== --- trunk/reactos/base/applications/paint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/selection.c [iso-8859-1] Sun Oct 10 09:57:44 2010 @@ -9,6 +9,8 @@ /* INCLUDES *********************************************************/ #include <windows.h> +#include <commctrl.h> +#include <tchar.h> #include "globalvar.h" #include "drawing.h" #include "history.h" @@ -87,6 +89,7 @@ case WM_MOUSEMOVE: if (moving) { + TCHAR sizeStr[100]; int xDelta; int yDelta; resetToU1(); @@ -146,6 +149,9 @@ rectSel_dest[3] += yDelta; break; } + + _stprintf(sizeStr, _T("%d x %d"), rectSel_dest[2], rectSel_dest[3]); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); if (action != 0) StretchBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); @@ -182,6 +188,7 @@ int h = rectSel_dest[3] * zoom / 1000 + 6; xPos = LOWORD(lParam); yPos = HIWORD(lParam); + SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL); action = identifyCorner(xPos, yPos, w, h); if (action != 0) SetCursor(LoadCursor(NULL, cursors[action])); Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Sun Oct 10 09:57:44 2010 @@ -151,6 +151,11 @@ { switch (message) /* handle the messages */ { + case WM_CREATE: + ptStack = NULL; + ptSP = 0; + break; + case WM_DESTROY: PostQuitMessage(0); /* send a WM_QUIT to the message queue */ break; @@ -446,9 +451,7 @@ HDC hdc; GetClientRect(hwndMiniature, (LPRECT) &mclient); hdc = GetDC(hwndMiniature); - BitBlt(hdc, -min(imgXRes * GetScrollPos(hScrollbox, SB_HORZ) / 10000, imgXRes - mclient[2]), - -min(imgYRes * GetScrollPos(hScrollbox, SB_VERT) / 10000, imgYRes - mclient[3]), - imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); + BitBlt(hdc, 0, 0, imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); ReleaseDC(hwndMiniature, hdc); } break; @@ -562,6 +565,24 @@ SendMessage(hPalWin, WM_PAINT, 0, 0); } SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); + } + break; + + case WM_KEYDOWN: + if (wParam == VK_ESCAPE) + { + if (!drawing) + { + /* Deselect */ + if ((activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL)) + { + startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); + whilePaintingL(hDrawingDC, 0, 0, fgColor, bgColor); + endPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); + ShowWindow(hSelection, SW_HIDE); + } + } + /* FIXME: also cancel current drawing underway */ } break; @@ -640,6 +661,8 @@ if ((activeTool >= TOOL_TEXT) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL)) { TCHAR sizeStr[100]; + if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; _stprintf(sizeStr, _T("%d x %d"), xRel, yRel); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); } @@ -651,6 +674,8 @@ if (activeTool >= TOOL_TEXT) { TCHAR sizeStr[100]; + if ((activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; _stprintf(sizeStr, _T("%d x %d"), xRel, yRel); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); } @@ -783,7 +808,7 @@ case IDM_EDITDELETESELECTION: { /* remove selection window and already painted content using undo(), - paint Rect for rectangular selections and nothing for freeform selections */ + paint Rect for rectangular selections and Poly for freeform selections */ undo(); if (activeTool == TOOL_RECTSEL) { @@ -791,16 +816,23 @@ Rect(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2] + rectSel_dest[0], rectSel_dest[3] + rectSel_dest[1], bgColor, bgColor, 0, TRUE); } + if (activeTool == TOOL_FREESEL) + { + newReversible(); + Poly(hDrawingDC, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE); + } break; } case IDM_EDITSELECTALL: - if (activeTool == TOOL_RECTSEL) - { - startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); - whilePaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); - endPaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); - } - break; + { + HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL); + SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); + SendMessage(hwnd, WM_COMMAND, ID_RECTSEL, 0); + startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); + whilePaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); + endPaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); + break; + } case IDM_EDITCOPYTO: if (GetSaveFileName(&ofn) != 0) SaveDIBToFile(hSelBm, ofn.lpstrFile, hDrawingDC, NULL, NULL, fileHPPM, fileVPPM); @@ -829,23 +861,73 @@ case IDM_IMAGEROTATEMIRROR: switch (mirrorRotateDlg()) { - case 1: - newReversible(); - StretchBlt(hDrawingDC, imgXRes - 1, 0, -imgXRes, imgYRes, hDrawingDC, 0, 0, - imgXRes, imgYRes, SRCCOPY); - SendMessage(hImageArea, WM_PAINT, 0, 0); + case 1: /* flip horizontally */ + if (IsWindowVisible(hSelection)) + { + SelectObject(hSelDC, hSelMask); + StretchBlt(hSelDC, rectSel_dest[2] - 1, 0, -rectSel_dest[2], rectSel_dest[3], hSelDC, + 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + SelectObject(hSelDC, hSelBm); + StretchBlt(hSelDC, rectSel_dest[2] - 1, 0, -rectSel_dest[2], rectSel_dest[3], hSelDC, + 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + /* force refresh of selection contents, used also in case 2 and case 4 */ + SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0); + SendMessage(hSelection, WM_MOUSEMOVE, 0, 0); + SendMessage(hSelection, WM_LBUTTONUP, 0, 0); + } + else + { + newReversible(); + StretchBlt(hDrawingDC, imgXRes - 1, 0, -imgXRes, imgYRes, hDrawingDC, 0, 0, + imgXRes, imgYRes, SRCCOPY); + SendMessage(hImageArea, WM_PAINT, 0, 0); + } break; - case 2: - newReversible(); - StretchBlt(hDrawingDC, 0, imgYRes - 1, imgXRes, -imgYRes, hDrawingDC, 0, 0, - imgXRes, imgYRes, SRCCOPY); - SendMessage(hImageArea, WM_PAINT, 0, 0); + case 2: /* flip vertically */ + if (IsWindowVisible(hSelection)) + { + SelectObject(hSelDC, hSelMask); + StretchBlt(hSelDC, 0, rectSel_dest[3] - 1, rectSel_dest[2], -rectSel_dest[3], hSelDC, + 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + SelectObject(hSelDC, hSelBm); + StretchBlt(hSelDC, 0, rectSel_dest[3] - 1, rectSel_dest[2], -rectSel_dest[3], hSelDC, + 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0); + SendMessage(hSelection, WM_MOUSEMOVE, 0, 0); + SendMessage(hSelection, WM_LBUTTONUP, 0, 0); + } + else + { + newReversible(); + StretchBlt(hDrawingDC, 0, imgYRes - 1, imgXRes, -imgYRes, hDrawingDC, 0, 0, + imgXRes, imgYRes, SRCCOPY); + SendMessage(hImageArea, WM_PAINT, 0, 0); + } break; - case 4: - newReversible(); - StretchBlt(hDrawingDC, imgXRes - 1, imgYRes - 1, -imgXRes, -imgYRes, hDrawingDC, - 0, 0, imgXRes, imgYRes, SRCCOPY); - SendMessage(hImageArea, WM_PAINT, 0, 0); + case 3: /* rotate 90 degrees */ + break; + case 4: /* rotate 180 degrees */ + if (IsWindowVisible(hSelection)) + { + SelectObject(hSelDC, hSelMask); + StretchBlt(hSelDC, rectSel_dest[2] - 1, rectSel_dest[3] - 1, -rectSel_dest[2], -rectSel_dest[3], hSelDC, + 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + SelectObject(hSelDC, hSelBm); + StretchBlt(hSelDC, rectSel_dest[2] - 1, rectSel_dest[3] - 1, -rectSel_dest[2], -rectSel_dest[3], hSelDC, + 0, 0, rectSel_dest[2], rectSel_dest[3], SRCCOPY); + SendMessage(hSelection, WM_LBUTTONDOWN, 0, 0); + SendMessage(hSelection, WM_MOUSEMOVE, 0, 0); + SendMessage(hSelection, WM_LBUTTONUP, 0, 0); + } + else + { + newReversible(); + StretchBlt(hDrawingDC, imgXRes - 1, imgYRes - 1, -imgXRes, -imgYRes, hDrawingDC, + 0, 0, imgXRes, imgYRes, SRCCOPY); + SendMessage(hImageArea, WM_PAINT, 0, 0); + } + break; + case 5: /* rotate 270 degrees */ break; } break; @@ -895,6 +977,7 @@ case IDM_VIEWSHOWGRID: showGrid = !showGrid; + SendMessage(hImageArea, WM_PAINT, 0, 0); break; case IDM_VIEWSHOWMINIATURE: showMiniature = !showMiniature;

14 years, 2 months

[tkreuzer] 49088: [CMAKE] - add Windows.cmake, copied from cmake, but with command line file disabled for debugging puposes - for now use /MTd (static crt) for C++ apps compiled with MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 10 08:56:52 2010 New Revision: 49088 URL: http://svn.reactos.org/svn/reactos?rev=49088&view=rev Log: [CMAKE] - add Windows.cmake, copied from cmake, but with command line file disabled for debugging puposes - for now use /MTd (static crt) for C++ apps compiled with MSVC Added: branches/cmake-bringup/cmake/Modules/Platform/Windows.cmake Modified: branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake Modified: branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Modules/Pla… ============================================================================== --- branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake [iso-8859-1] Sun Oct 10 08:56:52 2010 @@ -208,10 +208,10 @@ SET(CMAKE_BUILD_TYPE_INIT Debug) IF($ENV{DDKBUILDENV} OR (NOT CMAKE_CROSSCOMPILING)) - SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") + SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od") SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") ELSE() - SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1") + SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1") SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1") ENDIF() @@ -242,7 +242,7 @@ ELSE(CMAKE_USING_VC_FREE_TOOLS) SET(CMAKE_BUILD_TYPE_INIT Debug) SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR") - SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /GZ") + SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") Added: branches/cmake-bringup/cmake/Modules/Platform/Windows.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Modules/Pla… ============================================================================== --- branches/cmake-bringup/cmake/Modules/Platform/Windows.cmake (added) +++ branches/cmake-bringup/cmake/Modules/Platform/Windows.cmake [iso-8859-1] Sun Oct 10 08:56:52 2010 @@ -1,0 +1,36 @@ +SET(WIN32 1) + +SET(CMAKE_STATIC_LIBRARY_PREFIX "") +SET(CMAKE_STATIC_LIBRARY_SUFFIX ".lib") +SET(CMAKE_SHARED_LIBRARY_PREFIX "") # lib +SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") # .so +SET(CMAKE_IMPORT_LIBRARY_PREFIX "") +SET(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib") +SET(CMAKE_EXECUTABLE_SUFFIX ".exe") # .exe +SET(CMAKE_LINK_LIBRARY_SUFFIX ".lib") +SET(CMAKE_DL_LIBS "") + +SET(CMAKE_FIND_LIBRARY_PREFIXES "") +SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") + +# for borland make long command lines are redirected to a file +# with the following syntax, see Windows-bcc32.cmake for use +IF(CMAKE_GENERATOR MATCHES "Borland") + SET(CMAKE_START_TEMP_FILE "@&&|\n") + SET(CMAKE_END_TEMP_FILE "\n|") +ENDIF(CMAKE_GENERATOR MATCHES "Borland") + +# for nmake make long command lines are redirected to a file +# with the following syntax, see Windows-bcc32.cmake for use +IF(CMAKE_GENERATOR MATCHES "NMake") +# SET(CMAKE_START_TEMP_FILE "@<<\n") +# SET(CMAKE_END_TEMP_FILE "\n<<") +ENDIF(CMAKE_GENERATOR MATCHES "NMake") + +INCLUDE(Platform/WindowsPaths) + +# uncomment these out to debug nmake and borland makefiles +#SET(CMAKE_START_TEMP_FILE "") +#SET(CMAKE_END_TEMP_FILE "") +#SET(CMAKE_VERBOSE_MAKEFILE 1) +

14 years, 2 months

[ekohl] 49087: [WIDL] - Revert r49085 and r49086.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 9 23:13:57 2010 New Revision: 49087 URL: http://svn.reactos.org/svn/reactos?rev=49087&view=rev Log: [WIDL] - Revert r49085 and r49086. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/expr.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.c?rev=4908… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=49… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=49… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=49… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=490… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=4… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=4908… Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev…

14 years, 2 months

[ekohl] 49086: [WIDL] Fix Unix build.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 9 22:54:37 2010 New Revision: 49086 URL: http://svn.reactos.org/svn/reactos?rev=49086&view=rev Log: [WIDL] Fix Unix build. Modified: trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/widl_ros.diff Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… ============================================================================== --- trunk/reactos/tools/widl/typelib_struct.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib_struct.h [iso-8859-1] Sat Oct 9 22:54:37 2010 @@ -302,7 +302,7 @@ * */ -#include "pshpack1.h" +#include <host/pshpack1.h> typedef struct { /*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */ @@ -599,7 +599,7 @@ WORD typeofarray */ -#include "poppack.h" +#include <host/poppack.h> /*---------------------------END--------------------------------------------*/ #endif Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] Sat Oct 9 22:54:37 2010 @@ -41,6 +41,27 @@ #include "widl.h" #include "utils.h" +diff -u wine-1.3.4/tools/widl/typelib_struct.h tools/widl/typelib_struct.h +--- wine-1.3.4/tools/widl/typelib_struct.h 2010-09-19 17:50:40.953125000 +0200 ++++ tools/widl/typelib_struct.h 2010-10-10 00:50:32.921875000 +0200 +@@ -302,7 +302,7 @@ + * + */ + +-#include "pshpack1.h" ++#include <host/pshpack1.h> + + typedef struct { + /*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */ +@@ -599,7 +599,7 @@ + WORD typeofarray + */ + +-#include "poppack.h" ++#include <host/poppack.h> + + /*---------------------------END--------------------------------------------*/ + #endif diff -u wine-1.3.4/tools/widl/widltypes.h tools/widl/widltypes.h --- wine-1.3.4/tools/widl/widltypes.h 2010-09-19 17:51:38.890625000 +0200 +++ tools/widl/widltypes.h 2010-09-19 19:17:19.656250000 +0200

14 years, 2 months

← Newer
1
...
27
28
29
30
31
32
33
...
44
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 October 2010