Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 41440: modified include/crt/math.h Ported <math.h> to Visual C++ Fixed some miscellaneous stupidity. I see Arch has been committing to MinGW-W64 too
by hyperion＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: hyperion Date: Thu Jun 18 03:25:22 2009 New Revision: 41440 URL: http://svn.reactos.org/svn/reactos?rev=41440&view=rev Log: modified include/crt/math.h Ported <math.h> to Visual C++ Fixed some miscellaneous stupidity. I see Arch has been committing to MinGW-W64 too Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=414… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Thu Jun 18 03:25:22 2009 @@ -100,7 +100,7 @@ _CRTIMP double __cdecl _y1(double _X); _CRTIMP double __cdecl _yn(int _X,double _Y); -#if(defined(_X86_) && !defined(__x86_64)) +#if defined(__i386__) || defined(_M_IX86) _CRTIMP int __cdecl _set_SSE2_enable(int _Flag); /* from libmingwex */ float __cdecl _hypotf(float _X,float _Y); @@ -131,7 +131,7 @@ float __cdecl fmodf(float _X,float _Y); float __cdecl _hypotf(float _X,float _Y); float __cdecl fabsf(float _X); -#if !defined(__ia64__) +#if !defined(__ia64__) && !defined(_M_IA64) /* from libmingwex */ float __cdecl _copysignf (float _Number,float _Sign); float __cdecl _chgsignf (float _X); @@ -142,57 +142,52 @@ int __cdecl _fpclassf(float _X); #endif -#ifndef __cplusplus +#if defined(__GNUC__) + +#define __fabs(x, res) \ + __asm__ ("fabs;" : "=t" (res) : "0" (x)) + +#elif defined(_MSC_VER) + +#define __fabs(x, res) \ + __asm { fld [(x)] } \ + __asm { fabs } \ + __asm { fstp [(res)] } + +#endif + __CRT_INLINE long double __cdecl fabsl (long double x) { long double res; - __asm__ ("fabs;" : "=t" (res) : "0" (x)); + __fabs(x, res); return res; } -#define _hypotl(x,y) ((long double)_hypot((double)(x),(double)(y))) -#define _matherrl _matherr + __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign((double)(_Number)); } __CRT_INLINE long double _copysignl(long double _Number,long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); } + __CRT_INLINE long double _hypotl(long double _X,long double _Y) { return _hypot((double)(_X),(double)(_Y)); } __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); } -#if !defined (__ia64__) +#if !defined (__ia64__) && !defined (_M_IA64) __CRT_INLINE float __cdecl fabsf (float x) { float res; - __asm__ ("fabs;" : "=t" (res) : "0" (x)); + __fabs(x, res); return res; } __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); } #endif -#else - // cplusplus - __CRT_INLINE long double __cdecl fabsl (long double x) - { - long double res; - __asm__ ("fabs;" : "=t" (res) : "0" (x)); - return res; - } + +#define _matherrl _matherr + __CRT_INLINE long double modfl(long double _X,long double *_Y) { double _Di,_Df = modf((double)_X,&_Di); *_Y = (long double)_Di; return (_Df); } - __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign(static_cast<double>(_Number)); } - __CRT_INLINE long double _copysignl(long double _Number,long double _Sign) { return _copysign(static_cast<double>(_Number),static_cast<double>(_Sign)); } - __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); } -#ifndef __ia64__ - __CRT_INLINE float __cdecl fabsf (float x) - { - float res; - __asm__ ("fabs;" : "=t" (res) : "0" (x)); - return res; - } - __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); } -#endif -#endif - -#ifndef __x86_64 + +#if !defined(__x86_64) && !defined(_M_AMD64) __CRT_INLINE float acosf(float _X) { return ((float)acos((double)_X)); } __CRT_INLINE float asinf(float _X) { return ((float)asin((double)_X)); } __CRT_INLINE float atanf(float _X) { return ((float)atan((double)_X)); } @@ -255,11 +250,26 @@ #define FP_SUBNORMAL (FP_NORMAL | FP_ZERO) /* 0x0200 is signbit mask */ +#if defined(__GNUC__) + +#define __fxam(x, sw) \ + __asm__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)) + +#elif defined(_MSC_VER) + +#define __fxam(x, sw) \ + __asm { fld [(x)] } \ + __asm { fxam } \ + __asm { wait } \ + __asm { fnstsw [(sw)] } \ + __asm { fstp st(0) } + +#endif /* We can't __CRT_INLINE float or double, because we want to ensure truncation - to semantic type before classification. - (A normal long double value might become subnormal when + to semantic type before classification. + (A normal long double value might become subnormal when converted to double, and zero when converted to float.) */ @@ -268,7 +278,7 @@ __CRT_INLINE int __cdecl __fpclassifyl (long double x){ unsigned short sw; - __asm__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + __fxam(x, sw); return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); } @@ -310,8 +320,7 @@ __CRT_INLINE int __cdecl __isnan (double _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __fxam(_x, sw); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -319,8 +328,7 @@ __CRT_INLINE int __cdecl __isnanf (float _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __fxam(_x, sw); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -328,8 +336,7 @@ __CRT_INLINE int __cdecl __isnanl (long double _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __fxam(_x, sw); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -345,19 +352,19 @@ /* 7.12.3.6 The signbit macro */ __CRT_INLINE int __cdecl __signbit (double x) { unsigned short stw; - __asm__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __fxam(x, stw); return stw & 0x0200; } __CRT_INLINE int __cdecl __signbitf (float x) { unsigned short stw; - __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __fxam(x, stw); return stw & 0x0200; } __CRT_INLINE int __cdecl __signbitl (long double x) { unsigned short stw; - __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __fxam(x, stw); return stw & 0x0200; } @@ -387,27 +394,40 @@ extern float __cdecl logbf (float); extern long double __cdecl logbl (long double); +#if defined(__GNUC__) + +#define __fxtract(x, res) \ + __asm__ ("fxtract\n\t" \ + "fstp %%st" : "=t" (res) : "0" (x)) + +#elif defined(_MSC_VER) + +#define __fxtract(x, res) \ + __asm { fld [(x)] } \ + __asm { fxtract } \ + __asm { fstp st(0) } \ + __asm { fstp [(res)] } + +#endif + __CRT_INLINE double __cdecl logb (double x) { double res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __fxtract(x, res); return res; } __CRT_INLINE float __cdecl logbf (float x) { float res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __fxtract(x, res); return res; } __CRT_INLINE long double __cdecl logbl (long double x) { long double res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __fxtract(x, res); return res; } @@ -423,7 +443,7 @@ extern long double __cdecl scalblnl (long double, long); /* 7.12.7.1 */ - /* Implementations adapted from Cephes versions */ + /* Implementations adapted from Cephes versions */ extern double __cdecl cbrt (double); extern float __cdecl cbrtf (float); extern long double __cdecl cbrtl (long double); @@ -449,14 +469,14 @@ extern float __cdecl erff (float); /* TODO extern long double __cdecl erfl (long double); - */ + */ /* 7.12.8.2 The erfc functions */ extern double __cdecl erfc (double); extern float __cdecl erfcf (float); /* TODO extern long double __cdecl erfcl (long double); - */ + */ /* 7.12.8.3 The lgamma functions */ extern double __cdecl lgamma (double); @@ -485,74 +505,102 @@ /* 7.12.9.4 */ /* round, using fpu control word settings */ +#if defined(__GNUC__) + +#define __frndint(x, res) \ + __asm__ ("fabs;" : "=t" (res) : "0" (x)) + +#elif defined(_MSC_VER) + +#define __frndint(x, res) \ + __asm { fld [(x)] } \ + __asm { frndint } \ + __asm { fstp [(res)] } + +#endif + __CRT_INLINE double __cdecl rint (double x) { double retval; - __asm__ ("frndint;": "=t" (retval) : "0" (x)); + __frndint(x, retval); return retval; } __CRT_INLINE float __cdecl rintf (float x) { float retval; - __asm__ ("frndint;" : "=t" (retval) : "0" (x) ); + __frndint(x, retval); return retval; } __CRT_INLINE long double __cdecl rintl (long double x) { long double retval; - __asm__ ("frndint;" : "=t" (retval) : "0" (x) ); + __frndint(x, retval); return retval; } /* 7.12.9.5 */ - __CRT_INLINE long __cdecl lrint (double x) - { - long retval; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintf (float x) +#if defined(__GNUC__) + +#define __fistpl(x, res) \ + __asm__ __volatile__("fistpl %0" : "=m" (res) : "t" (x) : "st") + +#define __fistpll(x, res) \ + __asm__ __volatile__("fistpll %0" : "=m" (res) : "t" (x) : "st") + +#elif defined(_MSC_VER) + +#define __fistpl(x, res) \ + __asm { fld [(x)] } \ + __asm { fistp [(res)] } + +#define __fistpll(x, res) \ + __asm { fld [(x)] } \ + __asm { fistp [(res)] } + +#endif + + __CRT_INLINE long __cdecl lrint (double x) { long retval; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintl (long double x) + __fistpl(x, retval); + return retval; + } + + __CRT_INLINE long __cdecl lrintf (float x) { long retval; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long long __cdecl llrint (double x) + __fistpl(x, retval); + return retval; + } + + __CRT_INLINE long __cdecl lrintl (long double x) + { + long retval; + __fistpl(x, retval); + return retval; + } + + __CRT_INLINE long long __cdecl llrint (double x) { long long retval; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long long __cdecl llrintf (float x) + __fistpll(x, retval); + return retval; + } + + __CRT_INLINE long long __cdecl llrintf (float x) { long long retval; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long long __cdecl llrintl (long double x) + __fistpll(x, retval); + return retval; + } + + __CRT_INLINE long long __cdecl llrintl (long double x) { long long retval; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; + __fistpll(x, retval); + return retval; } /* 7.12.9.6 */ @@ -578,7 +626,7 @@ extern long double __cdecl fmodl (long double, long double); - /* 7.12.10.2 */ + /* 7.12.10.2 */ extern double __cdecl remainder (double, double); extern float __cdecl remainderf (float, float); extern long double __cdecl remainderl (long double, long double); @@ -633,22 +681,22 @@ extern long double __cdecl fminl (long double, long double); /* 7.12.13.1 */ - /* return x * y + z as a ternary op */ + /* return x * y + z as a ternary op */ extern double __cdecl fma (double, double, double); extern float __cdecl fmaf (float, float, float); extern long double __cdecl fmal (long double, long double, long double); /* 7.12.14 */ - /* + /* * With these functions, comparisons involving quiet NaNs set the FP * condition code to "unordered". The IEEE floating-point spec * dictates that the result of floating-point comparisons should be - * false whenever a NaN is involved, with the exception of the != op, + * false whenever a NaN is involved, with the exception of the != op, * which always returns true: yes, (NaN != NaN) is true). */ -#if __GNUC__ >= 3 +#if defined(__GNUC__) && __GNUC__ >= 3 #define isgreater(x, y) __builtin_isgreater(x, y) #define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) @@ -662,8 +710,20 @@ __CRT_INLINE int __cdecl __fp_unordered_compare (long double x, long double y){ unsigned short retval; +#if defined(__GNUC__) __asm__ ("fucom %%st(1);" "fnstsw;": "=a" (retval) : "t" (x), "u" (y)); +#elif defined(_MSC_VER) + __asm { + fld [x] + fld [y] + fxch st(1) + fucom st(1) + fnstsw [retval] + fstp st(0) + fstp st(0) + } +#endif return retval; } @@ -695,7 +755,7 @@ else _N = (unsigned int)(-_Y); for(_Ty _Z = _Ty(1);;_X *= _X) { if((_N & 1)!=0) _Z *= _X; - if((_N >>= 1)==0) return (_Y < 0 ? _Ty(1) / _Z : _Z); + if((_N >>= 1)==0) return (_Y < 0 ? _Ty(1) / _Z : _Z); } } } @@ -735,47 +795,4 @@ #define _FPCLASS_PINF 0x0200 /* Positive Infinity */ #endif /* __MINGW_FPCLASS_DEFINED */ -/* 7.12.14 */ -/* - * With these functions, comparisons involving quiet NaNs set the FP - * condition code to "unordered". The IEEE floating-point spec - * dictates that the result of floating-point comparisons should be - * false whenever a NaN is involved, with the exception of the != op, - * which always returns true: yes, (NaN != NaN) is true). - */ - -#if __GNUC__ >= 3 - -#define isgreater(x, y) __builtin_isgreater(x, y) -#define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) -#define isless(x, y) __builtin_isless(x, y) -#define islessequal(x, y) __builtin_islessequal(x, y) -#define islessgreater(x, y) __builtin_islessgreater(x, y) -#define isunordered(x, y) __builtin_isunordered(x, y) - -#else -/* helper */ -__CRT_INLINE int __cdecl -__fp_unordered_compare (long double x, long double y){ - unsigned short retval; - __asm__ ("fucom %%st(1);" - "fnstsw;": "=a" (retval) : "t" (x), "u" (y)); - return retval; -} - -#define isgreater(x, y) ((__fp_unordered_compare(x, y) \ - & 0x4500) == 0) -#define isless(x, y) ((__fp_unordered_compare (y, x) \ - & 0x4500) == 0) -#define isgreaterequal(x, y) ((__fp_unordered_compare (x, y) \ - & FP_INFINITE) == 0) -#define islessequal(x, y) ((__fp_unordered_compare(y, x) \ - & FP_INFINITE) == 0) -#define islessgreater(x, y) ((__fp_unordered_compare(x, y) \ - & FP_SUBNORMAL) == 0) -#define isunordered(x, y) ((__fp_unordered_compare(x, y) \ - & 0x4500) == 0x4500) - -#endif - #endif /* !_INC_MATH */

1 0

[cfinck] 436: Avoid using variables where this doesn't make the code easier. This also fixes a problem with a variable being used twice. (introduced by my previous commit)
by cfinck＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: cfinck Date: Thu Jun 18 01:57:27 2009 New Revision: 436 URL: http://svn.reactos.org/svn/reactos?rev=436&view=rev Log: Avoid using variables where this doesn't make the code easier. This also fixes a problem with a variable being used twice. (introduced by my previous commit) Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] Thu Jun 18 01:57:27 2009 @@ -354,24 +354,15 @@ for(var i = 0; i < results.length; i++) { - var ResultID = GetTagData(results[i], "id"); - var ResultRevision = GetTagData(results[i], "revision"); - var ResultDate = GetTagData(results[i], "date"); - var ResultCount = GetTagData(results[i], "count"); - var ResultFailures = GetTagData(results[i], "failures"); - var ResultUser = GetTagData(results[i], "user"); - var ResultPlatform = GetTagData(results[i], "platform"); - var ResultComment = GetTagData(results[i], "comment"); - html += '<tr class="' + (oddeven ? "odd" : "even") + '" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">'; - html += '<td><input onclick="ResultCheckbox_OnClick(this)" type="checkbox" id="test_' + ResultID + '" \/><\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultRevision + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultDate + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultCount + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultFailures + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultUser + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultPlatform + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultComment + '<\/td>'; + html += '<td><input onclick="ResultCheckbox_OnClick(this)" type="checkbox" id="test_' + GetTagData(results[i], "id") + '" \/><\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "revision") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "date") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "count") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "failures") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "user") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "platform") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "comment") + '<\/td>'; html += '<\/tr>'; oddeven = !oddeven;

1 0

[cfinck] 435: - Add general "Total Tests" and "Failed Tests" column headers to the search results to get sums of all executed and failed tests. A feature for comparing these general numbers through the Compare page will follow later. - Identify crashed tests by an extra column, not by a negative number of total tests. - Add a new status "CANCELED": If we can detect that a test was canceled by testman (maximum log size exceeded) or sysreg (timeout), we show that, otherwise "CRASH" is used. - Simp
by cfinck＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: cfinck Date: Thu Jun 18 01:27:17 2009 New Revision: 435 URL: http://svn.reactos.org/svn/reactos?rev=435&view=rev Log: - Add general "Total Tests" and "Failed Tests" column headers to the search results to get sums of all executed and failed tests. A feature for comparing these general numbers through the Compare page will follow later. - Identify crashed tests by an extra column, not by a negative number of total tests. - Add a new status "CANCELED": If we can detect that a test was canceled by testman (maximum log size exceeded) or sysreg (timeout), we show that, otherwise "CRASH" is used. - Simplify some code now that we have only one search result box to care about. - Also sort the results ascending if a user uses the "Compare first two Results" button. Modified: branches/danny-web/resources/testman/testman.sql branches/danny-web/www/www.reactos.org/testman/ajax-search.php branches/danny-web/www/www.reactos.org/testman/compare.php branches/danny-web/www/www.reactos.org/testman/css/compare.css branches/danny-web/www/www.reactos.org/testman/css/detail.css branches/danny-web/www/www.reactos.org/testman/detail.php branches/danny-web/www/www.reactos.org/testman/js/index.js.php branches/danny-web/www/www.reactos.org/testman/utils.inc.php branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… Modified: branches/danny-web/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/resources/testman/tes… ============================================================================== --- branches/danny-web/resources/testman/testman.sql [iso-8859-1] (original) +++ branches/danny-web/resources/testman/testman.sql [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -15,6 +15,7 @@ `id` int(10) unsigned NOT NULL auto_increment, `test_id` int(10) unsigned NOT NULL, `suite_id` int(10) unsigned NOT NULL, + `status` enum('ok','crash','canceled') collate latin1_general_ci NOT NULL, `count` int(10) NOT NULL COMMENT 'Number of all executed tests', `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', `skipped` int(10) unsigned NOT NULL COMMENT 'Number of skipped tests', @@ -30,6 +31,8 @@ `revision` int(9) unsigned NOT NULL, `platform` varchar(24) collate latin1_general_ci NOT NULL, `comment` varchar(255) collate latin1_general_ci default NULL, + `count` int(10) unsigned NOT NULL COMMENT 'Sum of all executed tests', + `failures` int(10) unsigned NOT NULL COMMENT 'Sum of all test failures', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; Modified: branches/danny-web/www/www.reactos.org/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -90,7 +90,7 @@ if($_GET["resultlist"]) { $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment, r.count, r.failures " . $tables . $where . $order . "LIMIT " . $result_count ) or die("<error>Query failed #2</error>"); @@ -113,6 +113,8 @@ printf("<revision>%d</revision>", $row["revision"]); printf("<platform>%s</platform>", GetPlatformString($row["platform"])); printf("<comment>%s</comment>", htmlspecialchars($row["comment"])); + printf("<count>%d</count>", $row["count"]); + printf("<failures>%d</failures>", $row["failures"]); echo "</result>"; $last_revision = $row["revision"]; Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -23,11 +23,8 @@ // Return   ("" is not possible because of IE...) if // - we have nothing to compare // - both values are identical - // - a crash occured in one of the results if(!$prev_result_row["id"] || - $current_result_row[$subject] == $prev_result_row[$subject] || - $current_result_row[$subject] == -1 || - $prev_result_row[$subject] == -1) + $current_result_row[$subject] == $prev_result_row[$subject]) { return " "; } @@ -45,7 +42,7 @@ if($changed) return; - if($temp == -2) + if($temp == -1) $temp = $current; else if($current != $temp) $changed = true; @@ -140,7 +137,7 @@ for($i = 0; $i < count($id_array); $i++) { $result_stmt[$i] = $dbh->prepare( - "SELECT e.id, e.count, e.failures, e.skipped " . + "SELECT e.id, e.status, e.count, e.failures, e.skipped " . "FROM " . DB_TESTMAN . ".winetest_suites s " . "LEFT JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id AND e.test_id = :testid " . "WHERE s.id IN (" . $suite_idlist . ")" . @@ -194,9 +191,9 @@ $changed = false; $prev_result_row = null; - $temp_totaltests = -2; - $temp_failedtests = -2; - $temp_skippedtests = -2; + $temp_totaltests = -1; + $temp_failedtests = -1; + $temp_skippedtests = -1; for($i = 0; $i < count($result_stmt); $i++) { @@ -216,8 +213,8 @@ if($result_row["id"]) { - printf('<div title="%s" class="box totaltests">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); - printf('<div title="%s" class="box %s_failedtests">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["count"] == -1) ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); + printf('<div title="%s" class="box totaltests">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], GetTotalTestsString($result_row), GetDifference($result_row, $prev_result_row, "count")); + printf('<div title="%s" class="box %s_failedtests">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["status"] != "ok") ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); printf('<div title="%s" class="box skippedtests">%d <span class="diff">%s</span></div>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); } else Modified: branches/danny-web/www/www.reactos.org/testman/css/compare.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -101,5 +101,5 @@ #comparetable td div.totaltests { font-weight: bold; - width: 120px; + width: 130px; } Modified: branches/danny-web/www/www.reactos.org/testman/css/detail.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/css/detail.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/css/detail.css [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -6,7 +6,7 @@ */ .datatable { - width: 800px; + width: 90%; } .datatable th, .datatable td { Modified: branches/danny-web/www/www.reactos.org/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -52,7 +52,7 @@ // Get information about this result $stmt = $dbh->prepare( - "SELECT l.log, e.count, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . + "SELECT l.log, e.status, e.count, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . "FROM " . DB_TESTMAN . ".winetest_results e " . "JOIN " . DB_TESTMAN . ".winetest_logs l ON e.id = l.id " . "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . @@ -76,17 +76,17 @@ </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["totaltests"]; ?>:</td> - <td><?php echo GetTotalTestsString($row["count"]); ?></td> + <td><?php echo GetTotalTestsString($row); ?></td> </tr> <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["failedtests"]; ?>:</td> <td><?php echo $row["failures"]; ?></td> </tr> - <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["skippedtests"]; ?>:</td> <td><?php echo $row["skipped"]; ?></td> </tr> - <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["log"]; ?>:</td> <td><pre><?php $patterns[0] = "#^([a-z]*:?$)([a-zA-Z0-9\/]+.[a-z]+):([0-9]+)($)#m"; Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -56,14 +56,8 @@ return; } - var id = checkbox.name.substr(5); - - // Make sure all checkboxes belonging to this test show the same state - var elems = document.getElementsByName(checkbox.name); - - for(var i = 0; i < elems.length; i++) - elems[i].checked = checkbox.checked; - + var id = checkbox.id.substr(5); + if(checkbox.checked) { SelectedResults[id] = true; @@ -86,19 +80,19 @@ { for(id in SelectedResults) { - var elems = document.getElementsByName("test_" + id); - - for(var i = 0; i < elems.length; i++) - elems[i].checked = true; - } -} - -function Result_OnCheckboxClick(checkbox) + var checkbox = document.getElementById("test_" + id); + + if(checkbox) + checkbox.checked = true; + } +} + +function ResultCheckbox_OnClick(checkbox) { UpdateSelectedResults(checkbox); } -function Result_OnCellClick(elem) +function ResultCell_OnClick(elem) { var checkbox = elem.parentNode.firstChild.firstChild; checkbox.checked = !checkbox.checked; @@ -340,6 +334,8 @@ html += '<th class="TestCheckbox"><\/th>'; html += '<th><?php echo addslashes($testman_langres["revision"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["date"]); ?><\/th>'; + html += '<th><?php echo addslashes($testman_langres["totaltests"]); ?><\/th>'; + html += '<th><?php echo addslashes($testman_langres["failedtests"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["user"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["platform"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["comment"]); ?><\/th>'; @@ -350,7 +346,7 @@ if(!results.length) { - html += '<tr class="even"><td colspan="6"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; + html += '<tr class="even"><td colspan="8"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; } else { @@ -361,17 +357,21 @@ var ResultID = GetTagData(results[i], "id"); var ResultRevision = GetTagData(results[i], "revision"); var ResultDate = GetTagData(results[i], "date"); + var ResultCount = GetTagData(results[i], "count"); + var ResultFailures = GetTagData(results[i], "failures"); var ResultUser = GetTagData(results[i], "user"); var ResultPlatform = GetTagData(results[i], "platform"); var ResultComment = GetTagData(results[i], "comment"); html += '<tr class="' + (oddeven ? "odd" : "even") + '" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">'; - html += '<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_' + ResultID + '" \/><\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultRevision + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultDate + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultUser + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultPlatform + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultComment + '<\/td>'; + html += '<td><input onclick="ResultCheckbox_OnClick(this)" type="checkbox" id="test_' + ResultID + '" \/><\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultRevision + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultDate + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultCount + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultFailures + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultUser + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultPlatform + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultComment + '<\/td>'; html += '<\/tr>'; oddeven = !oddeven; @@ -423,8 +423,30 @@ document.getElementById("ajax_loading_search").style.visibility = "hidden"; } -function OpenComparePage(parameters) -{ +/** + * Open the Compare page in the user-defined area + * + * @param ResultArray + * Array containing the result IDs to pass to the Compare page. + * The array will be sorted ascending before. + */ +function OpenComparePage(ResultArray) +{ + var parameters = "ids="; + + ResultArray.sort(NumericComparison); + + for(i = 0; i < ResultArray.length; i++) + { + if(!i) + { + parameters += ResultArray[i]; + continue; + } + + parameters += "," + ResultArray[i]; + } + if(document.getElementById("opennewwindow").checked || DetectObsoleteIE()) { window.open("compare.php?" + parameters); @@ -440,19 +462,20 @@ function CompareFirstTwoButton_OnClick() { - var parameters = "ids="; + var IDArray; var trs = document.getElementById("resulttable").getElementsByTagName("tbody")[0].getElementsByTagName("tr"); if(trs[0].firstChild.firstChild.nodeName != "INPUT") return; - // Get the IDs through the "name" attribute of the checkboxes - parameters += trs[0].firstChild.firstChild.name.substr(5); + // Get the IDs through the "id" attribute of the checkboxes + IDArray = new Array(); + IDArray.push(parseInt(trs[0].firstChild.firstChild.id.substr(5))); if(trs[1]) - parameters += "," + trs[1].firstChild.firstChild.name.substr(5); - - OpenComparePage(parameters); + IDArray.push(parseInt(trs[1].firstChild.firstChild.id.substr(5))); + + OpenComparePage(IDArray); } function PageSwitch(NewPage, StartID) @@ -502,7 +525,6 @@ function CompareSelectedButton_OnClick() { - var parameters = "ids="; var IDArray = new Array(); // Sort the selected IDs @@ -515,21 +537,7 @@ return; } - IDArray.sort(NumericComparison); - - for(i = 0; i < IDArray.length; i++) - { - if(!i) - { - parameters += IDArray[i]; - first = false; - continue; - } - - parameters += "," + IDArray[i]; - } - - OpenComparePage(parameters); + OpenComparePage(IDArray); } function OpenNewWindowCheckbox_OnClick(checkbox) Modified: branches/danny-web/www/www.reactos.org/testman/utils.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/utils.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/utils.inc.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -126,12 +126,11 @@ return date("Y-m-d H:i", $timestamp); } - function GetTotalTestsString($count) + function GetTotalTestsString($row) { - // The number of total tests being -1 indicates that the test crashed while running - if($count == -1) - return "CRASH"; + if($row["status"] != "ok") + return strtoupper($row["status"]); - return $count; + return $row["count"]; } ?> Modified: branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -85,24 +85,32 @@ } else if($result == 0) { - // We found no summary line, so the test probably crashed - // Indicate this by setting count to -1 and set the rest to zero. - $count = -1; + // We found no summary line, now check whether we find any signs that the test was canceled + $lastline = strrchr($log, "["); + + if($lastline && (strpos($lastline, "[SYSREG]") !== FALSE || strpos($lastline, "[TESTMAN]") !== FALSE)) + $status = "canceled"; + else + $status = "crash"; + + $count = 0; $failures = 0; $skipped = 0; } else { // Sum up the values of each summary line + $status = "ok"; $count = array_sum($matches[1]); $failures = array_sum($matches[2]); $skipped = array_sum($matches[3]); } // Add the information into the DB - $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, count, failures, skipped) VALUES (:testid, :suiteid, :count, :failures, :skipped)"); + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, status, count, failures, skipped) VALUES (:testid, :suiteid, :status, :count, :failures, :skipped)"); $stmt->bindValue(":testid", (int)$test_id); $stmt->bindValue(":suiteid", (int)$suite_id); + $stmt->bindParam(":status", $status); $stmt->bindParam(":count", $count); $stmt->bindParam(":failures", $failures); $stmt->bindParam(":skipped", $skipped); @@ -124,8 +132,15 @@ if(!isset($test_id)) return "Necessary sub-information not specified!"; - // Mark this test as finished, so no more results can be submitted for it - $stmt = $dbh->prepare("UPDATE " . DB_TESTMAN . ".winetest_runs SET finished = 1 WHERE id = :testid AND user_id = :userid"); + // Sum up all results and mark this test as finished, so no more results can be submitted for it + $stmt = $dbh->prepare( + "UPDATE " . DB_TESTMAN . ".winetest_runs " . + "SET " . + "finished = 1, " . + "count = (SELECT SUM(count) FROM " . DB_TESTMAN . ".winetest_results WHERE test_id = :testid), " . + "failures = (SELECT SUM(failures) FROM " . DB_TESTMAN . ".winetest_results WHERE test_id = :testid) " . + "WHERE id = :testid AND user_id = :userid" + ); $stmt->bindParam(":userid", $user_id); $stmt->bindParam(":testid", $test_id); $stmt->execute() or die("Finish(): SQL failed #1");

1 0

[dgorbachev] 41439: Do not lie about compiler optimizations.
by dgorbachev＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: dgorbachev Date: Wed Jun 17 22:17:45 2009 New Revision: 41439 URL: http://svn.reactos.org/svn/reactos?rev=41439&view=rev Log: Do not lie about compiler optimizations. Modified: trunk/reactos/config-arm.template.rbuild trunk/reactos/config-ppc.template.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild… ============================================================================== --- trunk/reactos/config-arm.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-arm.template.rbuild [iso-8859-1] Wed Jun 17 22:17:45 2009 @@ -55,8 +55,7 @@  <property name="DBG" value="1" /> Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-ppc.template.rbuild [iso-8859-1] Wed Jun 17 22:17:45 2009 @@ -51,8 +51,7 @@  <property name="DBG" value="1" /> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Wed Jun 17 22:17:45 2009 @@ -59,8 +59,7 @@  <property name="DBG" value="1" />

1 0

[cwittich] 41438: fix msvc build
by cwittich＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: cwittich Date: Wed Jun 17 17:48:36 2009 New Revision: 41438 URL: http://svn.reactos.org/svn/reactos?rev=41438&view=rev Log: fix msvc build Modified: trunk/reactos/base/applications/paint/lang/cs-CZ.rc trunk/reactos/base/applications/paint/lang/de-DE.rc trunk/reactos/base/applications/paint/lang/en-GB.rc trunk/reactos/base/applications/paint/lang/en-US.rc trunk/reactos/base/applications/paint/lang/es-ES.rc trunk/reactos/base/applications/paint/lang/fr-FR.rc trunk/reactos/base/applications/paint/lang/it-IT.rc trunk/reactos/base/applications/paint/lang/nl-NL.rc trunk/reactos/base/applications/paint/lang/no-NO.rc trunk/reactos/base/applications/paint/lang/pl-PL.rc trunk/reactos/base/applications/paint/lang/pt-BR.rc trunk/reactos/base/applications/paint/lang/pt-PT.rc trunk/reactos/base/applications/paint/lang/ro-RO.rc trunk/reactos/base/applications/paint/lang/ru-RU.rc trunk/reactos/base/applications/paint/lang/sk-SK.rc trunk/reactos/base/applications/paint/lang/uk-UA.rc 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] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Zmìnit velikost" BEGIN GROUPBOX "Zmìnit velikost", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Vodorovnì:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Svisle:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/de-DE.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Größe ändern" BEGIN GROUPBOX "Größe ändern", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horizontal:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Vertikal:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Change size" BEGIN GROUPBOX "Change size", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horizontally:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Vertically:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Change size" BEGIN GROUPBOX "Change size", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horizontally:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Vertically:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/es-ES.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Redimensionar" BEGIN GROUPBOX "Redimensionar", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horizontalmente:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Verticalmente:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Redimensionner" BEGIN GROUPBOX "Redimensionnement", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horizontal :", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Vertical :", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Ridimensiona" BEGIN GROUPBOX "Ridimensiona", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Orizzontalmente:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Verticalmente:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/nl-NL.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Formaat wijzigen" BEGIN GROUPBOX "Formaat wijzigen", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horizontaal:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Verticaal:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/no-NO.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Endre størrelse" BEGIN GROUPBOX "Endre størrelse", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horisontalt:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Vertikalt:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Zmiana rozmiaru" BEGIN GROUPBOX "Zmieñ rozmiar", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Poziomo:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Pionowo:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pt-BR.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Alterar tamanho" BEGIN GROUPBOX "Alterar tamanho", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horizontal:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Vertical:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pt-PT.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Alterar tamanho" BEGIN GROUPBOX "Alterar tamanho", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Horizontal:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Vertical:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -152,11 +152,11 @@ CAPTION "Schimbare dimensiune" BEGIN GROUPBOX "Schimbare dimensiune", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Orizontal:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Vertical:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -147,11 +147,11 @@ CAPTION "Èçìåíåíèå ðàçìåðîâ" BEGIN GROUPBOX "Ðàçìåð", IDD_CHANGESIZEGROUP, 6, 6, 145, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Ïî ãîðèçîíòàëè:", IDD_CHANGESIZETEXT1, 39, 24, 62, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 102, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 137, 24, 12, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Ïî âåðòèêàëè:", IDD_CHANGESIZETEXT3, 39, 49, 62, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 102, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 137, 49, 12, 10 Modified: trunk/reactos/base/applications/paint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -153,11 +153,11 @@ CAPTION "Zmena ve¾kosti" BEGIN GROUPBOX "Zmeni ve¾kos", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "&Vodorovne:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "&Zvislo:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 Modified: trunk/reactos/base/applications/paint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] Wed Jun 17 17:48:36 2009 @@ -153,11 +153,11 @@ CAPTION "Çì³íà ðîçì³ðó" BEGIN GROUPBOX "Çì³íåííÿ ðîçì³ðó", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 - ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 LTEXT "Ïî ãîðèçîíòàë³:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 - ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 LTEXT "Ïî âåðòèêàë³:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10

1 0

[sginsberg] 41437: - Leftover from 41436
by sginsberg＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: sginsberg Date: Wed Jun 17 16:44:56 2009 New Revision: 41437 URL: http://svn.reactos.org/svn/reactos?rev=41437&view=rev Log: - Leftover from 41436 Modified: trunk/rosapps/applications/net/roshttpd/include/debug.h trunk/rosapps/applications/net/tditest/include/debug.h trunk/rosapps/applications/net/tditest/tditest/tditest.c trunk/rosapps/applications/sysutils/regexpl/ph.h Modified: trunk/rosapps/applications/net/roshttpd/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/… ============================================================================== --- trunk/rosapps/applications/net/roshttpd/include/debug.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/roshttpd/include/debug.h [iso-8859-1] Wed Jun 17 16:44:56 2009 @@ -8,7 +8,7 @@ #include <stdio.h> -#ifdef DBG +#if DBG #define DPRINT(x, ...) printf(x) #else #define DPRINT(x...) Modified: trunk/rosapps/applications/net/tditest/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/i… ============================================================================== --- trunk/rosapps/applications/net/tditest/include/debug.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tditest/include/debug.h [iso-8859-1] Wed Jun 17 16:44:56 2009 @@ -21,7 +21,7 @@ #undef ASSERT #endif -#ifdef DBG +#if DBG extern ULONG DebugTraceLevel; Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/t… ============================================================================== --- trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] Wed Jun 17 16:44:56 2009 @@ -12,7 +12,7 @@ #include <tditest.h> -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ ULONG DebugTraceLevel = -1; Modified: trunk/rosapps/applications/sysutils/regexpl/ph.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ph.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ph.h [iso-8859-1] Wed Jun 17 16:44:56 2009 @@ -14,7 +14,7 @@ //#define UNICODE //#define _UNICODE -#ifdef DBG +#if DBG #define _DEBUG #endif

1 0

[sginsberg] 41436: - In Win32 DBG is defined to 0 for a non-debug build and to 1 for a debug build. In ReactOS we do this slightly different: DBG is correctly defined to 1 for debug, but not defined at all on non-debug/release build. Because gcc is awesome we can then check for debug compilation with both #ifdef DBG and #if DBG (error free! yay gcc!), and so we have mixed usage all over the tree. - Fix this by defining DBG on non-debug build too and deprecate all usage of #ifdef DBG.
by sginsberg＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: sginsberg Date: Wed Jun 17 16:44:05 2009 New Revision: 41436 URL: http://svn.reactos.org/svn/reactos?rev=41436&view=rev Log: - In Win32 DBG is defined to 0 for a non-debug build and to 1 for a debug build. In ReactOS we do this slightly different: DBG is correctly defined to 1 for debug, but not defined at all on non-debug/release build. Because gcc is awesome we can then check for debug compilation with both #ifdef DBG and #if DBG (error free! yay gcc!), and so we have mixed usage all over the tree. - Fix this by defining DBG on non-debug build too and deprecate all usage of #ifdef DBG. Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-generic.rbuild trunk/reactos/base/services/dhcp/include/debug.h trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/system/services/services.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/dll/win32/iprtprio/iprtprio.c trunk/reactos/dll/win32/msafd/include/debug.h trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/snmpapi/debug.h trunk/reactos/dll/win32/snmpapi/snmpapi.c trunk/reactos/dll/win32/ws2_32/include/debug.h trunk/reactos/dll/win32/ws2_32/misc/catalog.c trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/dll/win32/ws2help/debug.h trunk/reactos/dll/win32/ws2help/ws2help.c trunk/reactos/dll/win32/wshirda/debug.h trunk/reactos/dll/win32/wshirda/wshirda.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/input/i8042prt/registry.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/include/debug.h trunk/reactos/drivers/network/dd/ne2000/include/debug.h trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c trunk/reactos/drivers/network/lan/include/debug.h trunk/reactos/drivers/network/ndis/include/debug.h trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/main.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/include/address.h trunk/reactos/drivers/network/tcpip/include/debug.h trunk/reactos/drivers/network/tcpip/include/memtrack.h trunk/reactos/drivers/network/tcpip/include/routines.h trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/drivers/storage/class/cdrom/cdrom.c trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/include/ddk/mcd.h trunk/reactos/include/ddk/srb.h trunk/reactos/include/ddk/storport.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/reactos/debug.h trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/memtrack.c trunk/reactos/lib/drivers/ip/network/routines.c trunk/reactos/lib/drivers/oskittcp/include/memtrack.h trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h trunk/reactos/lib/rtl/handle.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S trunk/reactos/ntoskrnl/ex/pushlock.c trunk/reactos/ntoskrnl/ex/resource.c trunk/reactos/ntoskrnl/include/config.h trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/systimer.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/spinlock.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/rpoolmgr.h trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/hpp/hpp.c Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=414… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -19,6 +19,10 @@ <define name="_SEH_ENABLE_TRACE" /> <property name="DBG_OR_KDBG" value="true" /> </if> + <if property="DBG" value="0"> + <define name="DBG">0</define> + </if> + <if property="KDBG" value="1"> <define name="KDBG">1</define> <property name="DBG_OR_KDBG" value="true" /> Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -11,6 +11,10 @@ <define name="_SEH_ENABLE_TRACE" /> <property name="DBG_OR_KDBG" value="true" /> </if> + <if property="DBG" value="0"> + <define name="DBG">0</define> + </if> + <if property="KDBG" value="1"> <define name="KDBG">1</define> <property name="DBG_OR_KDBG" value="true" /> Modified: trunk/reactos/base/services/dhcp/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -18,7 +18,7 @@ #define DEBUG_ADAPTER 0x00000100 #define DEBUG_ULTRA 0xFFFFFFFF -#ifdef DBG +#if DBG extern unsigned long debug_trace_level; Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -43,7 +43,7 @@ IniSection = IniCacheAppendSection(IniCache, L"FREELOADER"); -#ifdef DBG +#if DBG if (IsUnattendedSetup) { /* DefaultOS=ReactOS */ @@ -64,7 +64,7 @@ L"ReactOS"); } -#ifdef DBG +#if DBG if (IsUnattendedSetup) #endif { @@ -75,7 +75,7 @@ L"TimeOut", L"0"); } -#ifdef DBG +#if DBG else { /* Timeout=0 or 10 */ @@ -380,7 +380,7 @@ L"ReactOS_Debug", L"\"ReactOS (Debug)\""); -#ifdef DBG +#if DBG /* ReactOS_KdSerial="ReactOS (RosDbg)" */ IniCacheInsertKey(IniSection, NULL, @@ -453,7 +453,7 @@ L"Options", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); -#ifdef DBG +#if DBG /* Create "ReactOS_KdSerial" section */ IniSection = IniCacheAppendSection(IniCache, Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -34,7 +34,7 @@ VOID PrintString(LPCSTR fmt, ...) { -#ifdef DBG +#if DBG CHAR buffer[512]; va_list ap; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -163,7 +163,7 @@ memcpy(Buffer, Ptr, BufferSize); -#ifdef DBG +#if DBG DPRINTM(DPRINT_DISK, "size of buffer: %x\n", Ptr[0]); DPRINTM(DPRINT_DISK, "information flags: %x\n", Ptr[1]); DPRINTM(DPRINT_DISK, "number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2]); Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -23,7 +23,7 @@ /* MACROS *******************************************************************/ -#ifdef DBG +#if DBG #define DEFAULT_BAUD_RATE 19200 @@ -275,11 +275,11 @@ WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend); } -#endif /* defined DBG */ +#endif /* DBG */ BOOLEAN Rs232PortInUse(ULONG Base) { -#ifdef DBG +#if DBG return PortInitialized && Rs232PortBase == (PUCHAR)(ULONG_PTR)Base ? TRUE : FALSE; #else return FALSE; Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -21,7 +21,7 @@ #include <debug.h> -#ifdef DBG +#if DBG //#define DEBUG_ALL //#define DEBUG_INIFILE @@ -297,7 +297,7 @@ return 0; } -#endif // defined DBG +#endif // DBG ULONG MsgBoxPrint(const char *Format, ...) Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -427,7 +427,7 @@ return NtfsFixupRecord((PNTFS_RECORD)Buffer); } -#ifdef DBG +#if DBG VOID NtfsPrintFile(PNTFS_INDEX_ENTRY IndexEntry) { PWCHAR FileName; @@ -455,7 +455,7 @@ EntryFileName = IndexEntry->FileName.FileName; EntryFileNameLength = IndexEntry->FileName.FileNameLength; -#ifdef DBG +#if DBG NtfsPrintFile(IndexEntry); #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -39,7 +39,7 @@ extern char* g_file; extern int g_line; -#ifdef DBG +#if DBG VOID DbgPrintMask(ULONG Mask, char *format, ...); VOID DebugInit(VOID); @@ -85,6 +85,6 @@ #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_) -#endif // defined DBG +#endif // DBG #endif // defined __DEBUG_H Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -87,7 +87,7 @@ extern ULONG FreePagesInLookupTable; extern ULONG LastFreePageHint; -#ifdef DBG +#if DBG PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type); #endif Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -21,7 +21,7 @@ #include <freeldr.h> #include <debug.h> -#ifdef DBG +#if DBG typedef struct { MEMORY_TYPE Type; @@ -54,13 +54,13 @@ BOOLEAN MmInitializeMemoryManager(VOID) { -#ifdef DBG +#if DBG MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; #endif DPRINTM(DPRINT_MEMORY, "Initializing Memory Manager.\n"); -#ifdef DBG +#if DBG // Dump the system memory map DPRINTM(DPRINT_MEMORY, "System Memory Map (Base Address, Length, Type):\n"); while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) @@ -128,7 +128,7 @@ DPRINTM(DPRINT_MEMORY, "Heap initialized, base 0x%08x, pages %d\n", (HeapStart << MM_PAGE_SHIFT), PagesNeeded); } -#ifdef DBG +#if DBG PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type) { ULONG Index; Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -20,7 +20,7 @@ #include <freeldr.h> #include <debug.h> -#ifdef DBG +#if DBG VOID DumpMemoryAllocMap(VOID); VOID MemAllocTest(VOID); #endif // DBG @@ -69,7 +69,7 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE); -#ifdef DBG +#if DBG DPRINTM(DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd); DPRINTM(DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer); #endif // DBG @@ -169,7 +169,7 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)((ULONG_PTR)StartPageNumber * MM_PAGE_SIZE); -#ifdef DBG +#if DBG DPRINTM(DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, StartPageNumber); DPRINTM(DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer); #endif // DBG @@ -242,7 +242,7 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE); -#ifdef DBG +#if DBG DPRINTM(DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd); DPRINTM(DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer); #endif // DBG @@ -259,7 +259,7 @@ { } -#ifdef DBG +#if DBG VOID DumpMemoryAllocMap(VOID) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -143,7 +143,7 @@ if (!*SourcePath) SourcePath = "\\"; -#ifdef DBG +#if DBG /* Get load options */ if (InfFindFirstLine (InfHandle, "SetupData", Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -20,7 +20,7 @@ #include <freeldr.h> -#ifdef DBG +#if DBG VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line) { Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -614,7 +614,7 @@ DPRINTM(DPRINT_WINDOWS, "Memory Descriptor List prepared, printing PDE\n"); List_PaToVa(&LoaderBlock->MemoryDescriptorListHead); -#ifdef DBG +#if DBG { ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000; int j; Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -28,7 +28,7 @@ ULONG ul_reason_for_call, LPVOID lpReserved); -#if defined(KDBG) || defined(DBG) +#if defined(KDBG) || DBG VOID LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule); #endif Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -427,7 +427,7 @@ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, &NtModule->InInitializationOrderModuleList); -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) LdrpLoadUserModuleSymbols(NtModule); @@ -475,7 +475,7 @@ LdrpInitLoader(); -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) LdrpLoadUserModuleSymbols(ExeModule); Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -69,7 +69,7 @@ /* FUNCTIONS *****************************************************************/ -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) VOID LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule) @@ -2274,7 +2274,7 @@ DPRINT1("LdrFixupImports failed for %wZ, status=%x\n", &(*Module)->BaseDllName, Status); return Status; } -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) LdrpLoadUserModuleSymbols(*Module); #endif /* DBG || KDBG */ RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -162,7 +162,7 @@ } -#ifdef DBG +#if DBG VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line) { Modified: trunk/reactos/dll/win32/iprtprio/iprtprio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iprtprio/iprtpri… ============================================================================== --- trunk/reactos/dll/win32/iprtprio/iprtprio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iprtprio/iprtprio.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -26,7 +26,7 @@ #define EXPORT CALLBACK #endif -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ DWORD DebugTraceLevel = MAX_TRACE; #endif /* DBG */ Modified: trunk/reactos/dll/win32/msafd/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/include/de… ============================================================================== --- trunk/reactos/dll/win32/msafd/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -22,7 +22,7 @@ #undef ASSERT #endif -#ifdef DBG +#if DBG extern DWORD DebugTraceLevel; Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -14,7 +14,7 @@ #include <debug.h> -#ifdef DBG +#if DBG //DWORD DebugTraceLevel = DEBUG_ULTRA; DWORD DebugTraceLevel = 0; #endif /* DBG */ Modified: trunk/reactos/dll/win32/snmpapi/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/debug.h?… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -19,7 +19,7 @@ ULONG DbgPrint(PCH Format,...); -#ifdef DBG +#if DBG extern DWORD DebugTraceLevel; Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -26,7 +26,7 @@ #endif -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ DWORD DebugTraceLevel = MAX_TRACE; Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -22,7 +22,7 @@ #undef ASSERT #endif -#ifdef DBG +#if DBG extern DWORD DebugTraceLevel; Modified: trunk/reactos/dll/win32/ws2_32/misc/catalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/cata… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/catalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/catalog.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -32,7 +32,7 @@ { WS_DbgPrint(MAX_TRACE, ("Provider (0x%X).\n", Provider)); -#ifdef DBG +#if DBG if (Provider->ReferenceCount <= 0) { WS_DbgPrint(MIN_TRACE, ("Provider at 0x%X has invalid reference count (%ld).\n", Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -14,7 +14,7 @@ #include <handle.h> #include <upcall.h> -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ //DWORD DebugTraceLevel = MIN_TRACE; @@ -657,7 +657,7 @@ if ( addr ) { -#ifdef DBG +#if DBG LPSOCKADDR_IN sa = (LPSOCKADDR_IN)addr; WS_DbgPrint(MAX_TRACE,("Returned address: %d %s:%d (len %d)\n", sa->sin_family, Modified: trunk/reactos/dll/win32/ws2help/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/debug.h?… ============================================================================== --- trunk/reactos/dll/win32/ws2help/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -21,7 +21,7 @@ #undef ASSERT #endif -#ifdef DBG +#if DBG extern DWORD DebugTraceLevel; Modified: trunk/reactos/dll/win32/ws2help/ws2help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -10,7 +10,7 @@ #include "ws2help.h" #include <debug.h> -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ DWORD DebugTraceLevel = MAX_TRACE; Modified: trunk/reactos/dll/win32/wshirda/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/debug.h?… ============================================================================== --- trunk/reactos/dll/win32/wshirda/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshirda/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -17,7 +17,7 @@ #define DEBUG_ULTRA 0xFFFFFFFF -#ifdef DBG +#if DBG extern DWORD DebugTraceLevel; Modified: trunk/reactos/dll/win32/wshirda/wshirda.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/wshirda.… ============================================================================== --- trunk/reactos/dll/win32/wshirda/wshirda.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshirda/wshirda.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -11,7 +11,7 @@ #include <debug.h> -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ DWORD DebugTraceLevel = MAX_TRACE; Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -267,7 +267,7 @@ PDEVICE_OBJECT DeviceObject, PFILE_DISPOSITION_INFORMATION DispositionInfo) { -#ifdef DBG +#if DBG PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; #endif Modified: trunk/reactos/drivers/input/i8042prt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/reg… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/registry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/registry.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -42,7 +42,7 @@ /* Default value for CrashOnCtrlScroll depends if we're * running a debug build or a normal build. */ -#ifdef DBG +#if DBG DefaultCrashOnCtrlScroll = 1; #else DefaultCrashOnCtrlScroll = 0; Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -264,7 +264,7 @@ } VOID SocketStateUnlock( PAFD_FCB FCB ) { -#ifdef DBG +#if DBG PVOID CurrentThread = KeGetCurrentThread(); #endif ASSERT(FCB->LockCount > 0); Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -17,7 +17,7 @@ #include "tdiconn.h" #include "debug.h" -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ //DWORD DebugTraceLevel = DEBUG_ULTRA; @@ -349,7 +349,7 @@ { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); NTSTATUS Status = STATUS_SUCCESS; -#ifdef DBG +#if DBG PFILE_OBJECT FileObject = IrpSp->FileObject; #endif Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -13,7 +13,7 @@ #include "tdiconn.h" #include "tdi_proto.h" -#ifdef DBG +#if DBG #if 0 static VOID DisplayBuffer( PVOID Buffer, Modified: trunk/reactos/drivers/network/afd/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -19,7 +19,7 @@ #define DEBUG_IRP 0x00000200 #define DEBUG_ULTRA 0xFFFFFFFF -#ifdef DBG +#if DBG extern DWORD DebugTraceLevel; Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -18,7 +18,7 @@ #define DEBUG_MEMORY 0x00000100 #define DEBUG_ULTRA 0xFFFFFFFF -#ifdef DBG +#if DBG extern ULONG DebugTraceLevel; Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -479,7 +479,7 @@ NdisStallExecution(500); } -#ifdef DBG +#if DBG if (i == 4) NDIS_DbgPrint(MIN_TRACE, ("NIC was not reset after 2ms.\n")); #endif @@ -686,7 +686,7 @@ NdisStallExecution(4); } -#ifdef DBG +#if DBG if (Count == 0xFFFF) NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n")); #endif @@ -741,7 +741,7 @@ NdisStallExecution(4); } -#ifdef DBG +#if DBG if (Count == 0xFFFF) NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n")); #endif @@ -778,7 +778,7 @@ NdisStallExecution(4); } -#ifdef DBG +#if DBG if (Count == 0xFFFF) NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n")); #endif @@ -1184,7 +1184,7 @@ NdisStallExecution(500); } -#ifdef DBG +#if DBG if (i == 4) NDIS_DbgPrint(MIN_TRACE, ("NIC was not reset after 2ms.\n")); #endif Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -19,7 +19,7 @@ PUNICODE_STRING RegistryPath); -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ ULONG DebugTraceLevel = 0; Modified: trunk/reactos/drivers/network/lan/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/includ… ============================================================================== --- trunk/reactos/drivers/network/lan/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/lan/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -33,7 +33,7 @@ #define DEBUG_CPOINT 0x00800000 #define DEBUG_ULTRA 0xFFFFFFFF -#ifdef DBG +#if DBG extern DWORD DebugTraceLevel; Modified: trunk/reactos/drivers/network/ndis/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -19,7 +19,7 @@ #define DEBUG_PACKET 0x00000800 #define DEBUG_ULTRA 0xFFFFFFFF -#ifdef DBG +#if DBG extern ULONG DebugTraceLevel; Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -108,7 +108,7 @@ extern KSPIN_LOCK AdapterListLock; -#ifdef DBG +#if DBG VOID MiniDisplayPacket( PNDIS_PACKET Packet); Modified: trunk/reactos/drivers/network/ndis/ndis/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -14,7 +14,7 @@ #include "ndissys.h" -#ifdef DBG +#if DBG /* See debug.h for debug/trace constants */ ULONG DebugTraceLevel = MIN_TRACE; Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -62,7 +62,7 @@ MiniDisplayPacket( PNDIS_PACKET Packet) { -#ifdef DBG +#if DBG ULONG i, Length; UCHAR Buffer[64]; if ((DebugTraceLevel & DEBUG_PACKET) > 0) { @@ -92,7 +92,7 @@ PVOID LookaheadBuffer, UINT LookaheadBufferSize) { -#ifdef DBG +#if DBG if ((DebugTraceLevel & DEBUG_PACKET) > 0) { ULONG i, Length; PUCHAR p; @@ -520,7 +520,7 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); -#ifdef DBG +#if DBG if(!Adapter) { NDIS_DbgPrint(MID_TRACE, ("Adapter object was null\n")); @@ -1586,7 +1586,7 @@ return NdisStatus; } -#ifdef DBG +#if DBG { /* 802.3 only */ Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -247,7 +247,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); -#ifdef DBG +#if DBG MiniDisplayPacket(Packet); #endif Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -649,7 +649,7 @@ EHeader->EType = ETYPE_IPv6; break; default: -#ifdef DBG +#if DBG /* Should not happen */ TI_DbgPrint(MIN_TRACE, ("Unknown LAN protocol.\n")); Modified: trunk/reactos/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -20,7 +20,7 @@ (IPAddress)->Address.IPv4Address = (RawAddress); \ } -#ifdef DBG +#if DBG PCHAR A2S( PIP_ADDRESS Address); Modified: trunk/reactos/drivers/network/tcpip/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -33,7 +33,7 @@ #define DEBUG_INFO 0x02000000 #define DEBUG_ULTRA 0x7FFFFFFF -#ifdef DBG +#if DBG #define REMOVE_PARENS(...) __VA_ARGS__ #define TI_DbgPrint(_t_, _x_) \ Modified: trunk/reactos/drivers/network/tcpip/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/memtrack.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/memtrack.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -15,7 +15,7 @@ #define AllocatePacketWithBuffer(x,y,z) AllocatePacketWithBufferX(x,y,z,__FILE__,__LINE__) #define FreeNdisPacket(x) FreeNdisPacketX(x,__FILE__,__LINE__) -#ifdef DBG +#if DBG #define MTMARK() TrackDumpFL(__FILE__, __LINE__) #define exAllocatePool(x,y) ExAllocatePoolX(x,y,__FILE__,__LINE__) #define exAllocatePoolWithTag(x,y,z) ExAllocatePoolX(x,y,__FILE__,__LINE__) Modified: trunk/reactos/drivers/network/tcpip/include/routines.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/routines.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/routines.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -58,7 +58,7 @@ PCHAR *DataOut, PUINT Size ); -#ifdef DBG +#if DBG VOID DisplayIPPacket( PIP_PACKET IPPacket); #define DISPLAY_IP_PACKET(x) DisplayIPPacket(x) Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -8,7 +8,7 @@ #define __TITYPES_H -#ifdef DBG +#if DBG #define DEFINE_TAG ULONG Tag; #define INIT_TAG(_Object, _Tag) \ Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -164,7 +164,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; -#ifdef DBG +#if DBG if (!Irp->Cancel) TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be TRUE.\n")); #endif @@ -243,7 +243,7 @@ TI_DbgPrint(DEBUG_IRP, ("IRP at (0x%X).\n", Irp)); -#ifdef DBG +#if DBG if (!Irp->Cancel) TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be TRUE.\n")); #endif Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -622,7 +622,7 @@ * DriverObject = Pointer to driver object created by the system */ { -#ifdef DBG +#if DBG KIRQL OldIrql; TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -126,7 +126,7 @@ UCHAR MediaChangeCountDown; -#ifdef DBG +#if DBG // // Second timer to keep track of how long the media change IRP has been // in use. If this value exceeds the timeout (#defined) then we should @@ -176,7 +176,7 @@ #define CDROM_SRB_LIST_SIZE 4 -#ifdef DBG +#if DBG // // Used to detect the loss of the autorun irp. The driver prints out a message @@ -984,7 +984,7 @@ deviceExtension->MediaChangeNoMedia = TRUE; cddata->MediaChangeIrp = NULL; -#ifdef DBG +#if DBG cddata->MediaChangeIrpTimeInUse = 0; cddata->MediaChangeIrpLost = FALSE; #endif @@ -5746,7 +5746,7 @@ cddata->MediaChangeCountDown--; -#ifdef DBG +#if DBG cddata->MediaChangeIrpTimeInUse = 0; cddata->MediaChangeIrpLost = FALSE; #endif @@ -5833,7 +5833,7 @@ } } else { -#ifdef DBG +#if DBG if(cddata->MediaChangeIrpLost == FALSE) { if(cddata->MediaChangeIrpTimeInUse++ > MEDIA_CHANGE_TIMEOUT_TIME) { Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -3077,7 +3077,7 @@ goto ReturnCallback; } -#ifdef DBG +#if DBG if (!IS_RDP((srb->Cdb[0]))) { KdPrint2((PRINT_PREFIX "AtapiCallBack: Invalid CDB marked as RDP - %#x\n", srb->Cdb[0])); } Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -6060,7 +6060,7 @@ PEHCI_DEV ehci; ULONG status; -#ifdef DBG +#if DBG ULONG urb_count; #endif PLIST_ENTRY pthis, pnext; @@ -6116,7 +6116,7 @@ door_bell_rings = ((status & STS_IAA) != 0); // scan to remove those due -#ifdef DBG +#if DBG urb_count = dbg_count_list(&ehci->urb_list); ehci_dbg_print(DBGLVL_MAXIMUM, ("ehci_isr(): urb# in process is %d\n", urb_count)); #endif Modified: trunk/reactos/include/ddk/mcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mcd.h?rev=4143… ============================================================================== --- trunk/reactos/include/ddk/mcd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/mcd.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -41,7 +41,7 @@ #undef DebugPrint #endif -#ifdef DBG +#if DBG #define DebugPrint(x) ChangerClassDebugPrint x #else #define DebugPrint(x) Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4143… ============================================================================== --- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -33,7 +33,7 @@ #define SCSIPORTAPI DECLSPEC_IMPORT #endif -#ifdef DBG +#if DBG #define DebugPrint(x) ScsiDebugPrint x #else #define DebugPrint(x) @@ -56,7 +56,7 @@ #define MAXIMUM_CDB_SIZE 12 -#ifdef DBG +#if DBG #define SCSI_PORT_SIGNATURE 0x54524f50 #endif Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/storport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/storport.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -404,7 +404,7 @@ IN PSTOR_SYNCHRONIZED_ACCESS SynchronizedAccessRoutine, IN PVOID Context); -#ifdef DBG +#if DBG #define DebugPrint(x) StorPortDebugPrint x #else #define DebugPrint(x) Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=41… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -86,7 +86,7 @@ #undef PAGED_CODE #endif -#ifdef DBG +#if DBG #define PAGED_CODE() \ if (VideoPortGetCurrentIrql() > 1 /* APC_LEVEL */) \ @@ -1540,7 +1540,7 @@ IN PVOID Destination, IN ULONG Length); -#ifdef DBG +#if DBG #define VideoDebugPrint(x) VideoPortDebugPrint x #else #define VideoDebugPrint(x) Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -4256,7 +4256,7 @@ typedef struct _IO_REMOVE_LOCK { IO_REMOVE_LOCK_COMMON_BLOCK Common; -#ifdef DBG +#if DBG IO_REMOVE_LOCK_DBG_BLOCK Dbg; #endif } IO_REMOVE_LOCK, *PIO_REMOVE_LOCK; @@ -5753,7 +5753,7 @@ #define ROUND_TO_PAGES(Size) \ ((ULONG_PTR) (((ULONG_PTR) Size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))) -#ifdef DBG +#if DBG #define ASSERT(exp) \ (VOID)((!(exp)) ? \ @@ -6273,7 +6273,7 @@ #define ExReleaseResourceForThread ExReleaseResourceForThreadLite -#ifdef DBG +#if DBG #define PAGED_CODE() { \ if (KeGetCurrentIrql() > APC_LEVEL) { \ @@ -10267,7 +10267,7 @@ IN ULONG Level, IN BOOLEAN State); -#ifdef DBG +#if DBG #define KdPrint(_x_) DbgPrint _x_ #define KdPrintEx(_x_) DbgPrintEx _x_ Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -78,7 +78,7 @@ /* Print stuff only on Debug Builds*/ #define DPFLTR_DEFAULT_ID -1 -#ifdef DBG +#if DBG /* These are always printed */ #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -179,7 +179,7 @@ TI_DbgPrint(DEBUG_IP, ("Called. BindInfo (0x%X).\n", BindInfo)); -#ifdef DBG +#if DBG if (BindInfo->Address) { PUCHAR A = BindInfo->Address; TI_DbgPrint(DEBUG_IP, ("Interface address (%02X %02X %02X %02X %02X %02X).\n", Modified: trunk/reactos/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/mem… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -2,7 +2,7 @@ #include "precomp.h" -#ifdef DBG +#if DBG #define TRACK_TAG TAG('T','r','C','K') static LIST_ENTRY AllocatedObjectsList; Modified: trunk/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -26,7 +26,7 @@ return RandomNumber; } -#ifdef DBG +#if DBG static VOID DisplayIPHeader( PCHAR Header, UINT Length) @@ -131,7 +131,7 @@ VOID DisplayIPPacket( PIP_PACKET IPPacket) { -#ifdef DBG +#if DBG PCHAR p; UINT Length; PNDIS_BUFFER Buffer; Modified: trunk/reactos/lib/drivers/oskittcp/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/memtrack.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/memtrack.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -8,7 +8,7 @@ #define FBSD_MALLOC FOURCC('d','s','b','f') #define EXALLOC_TAG FOURCC('E','x','A','l') -#ifdef DBG +#if DBG #define MTMARK() TrackDumpFL(__FILE__, __LINE__) #define NdisAllocateBuffer(x,y,z,a,b) { \ NdisAllocateBuffer(x,y,z,a,b); \ Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -35,7 +35,7 @@ #include <oskittypes.h> -#ifdef DBG +#if DBG extern OSK_UINT OskitDebugTraceLevel; Modified: trunk/reactos/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/handle.c?rev=41436… ============================================================================== --- trunk/reactos/lib/rtl/handle.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/handle.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -125,7 +125,7 @@ RtlFreeHandle(PRTL_HANDLE_TABLE HandleTable, PRTL_HANDLE_TABLE_ENTRY Handle) { -#ifdef DBG +#if DBG /* check if handle is valid */ if (!RtlIsValidHandle(HandleTable, Handle)) { Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=41436&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ /* PAGED_CODE equivalent for user-mode RTL */ -#ifdef DBG +#if DBG extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line); #define PAGED_CODE_RTL() CHECK_PAGED_CODE_RTL(__FILE__, __LINE__) #else Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=414… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -79,7 +79,7 @@ #error Unknown compiler for alloca intrinsic stack allocation "function" #endif -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line ) { ++cs->ReferenceCount; @@ -117,7 +117,7 @@ PBCB Bcb, BOOLEAN Trace ) { -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) KIRQL oldirql; PLIST_ENTRY current_entry; PCACHE_SEGMENT current; @@ -596,7 +596,7 @@ current->PageOut = FALSE; current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize); current->Bcb = Bcb; -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) if ( Bcb->Trace ) { DPRINT1("CacheMap 0x%p: new Cache Segment: 0x%p\n", Bcb, current ); @@ -628,7 +628,7 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) if ( Bcb->Trace ) { DPRINT1("CacheMap 0x%p: deleting newly created Cache Segment 0x%p ( found existing one 0x%p )\n", @@ -881,7 +881,7 @@ KIRQL oldIrql; #endif DPRINT("Freeing cache segment 0x%p\n", CacheSeg); -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) if ( CacheSeg->Bcb->Trace ) { DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb, CacheSeg ); @@ -1081,7 +1081,7 @@ } InsertHeadList(&FreeList, &current->BcbSegmentListEntry); } -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) Bcb->Trace = FALSE; #endif KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -461,7 +461,7 @@ /*ULONG *NTAPI - *ExInterlockedExchangeUlong(IN PULONG Taget, + *ExInterlockedExchangeUlong(IN PULONG Target, * IN ULONG Value, * IN PKSPIN_LOCK Lock) */ @@ -529,7 +529,7 @@ /*ULONG *NTAPI - *Exi386InterlockedExchangeUlong(IN PULONG Taget, + *Exi386InterlockedExchangeUlong(IN PULONG Target, * IN ULONG Value, * IN PKSPIN_LOCK Lock) */ Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -182,7 +182,7 @@ /* Sanity check */ ASSERT(!WaitBlock->Signaled); -#ifdef DBG +#if DBG /* We are about to get signaled */ WaitBlock->Signaled = TRUE; #endif Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -18,7 +18,7 @@ #define IsOwnedExclusive(r) (r->Flag & ResourceOwnedExclusive) #define IsBoostAllowed(r) (!(r->Flag & ResourceHasDisabledPriorityBoost)) -#if (!(defined(CONFIG_SMP)) && !(defined(DBG))) +#if (!(defined(CONFIG_SMP)) && !(DBG)) FORCEINLINE VOID Modified: trunk/reactos/ntoskrnl/include/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/config.h?… ============================================================================== --- trunk/reactos/ntoskrnl/include/config.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/config.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -16,7 +16,7 @@ /********** mm/ppool.c **********/ /* Disable Debugging Features */ -#ifndef DBG +#if !DBG /* Enable strict checking of the nonpaged pool on every allocation */ #undef ENABLE_VALIDATE_POOL Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -116,7 +116,7 @@ PVOID LazyWriteContext; KSPIN_LOCK BcbLock; ULONG RefCount; -#if defined(DBG) || defined(KDBG) +#if DBG || defined(KDBG) BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */ #endif } BCB, *PBCB; Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -997,7 +997,7 @@ // @remark // .macro TRAP_EPILOG SystemCall, RestorePreviousMode, RestoreSegments, RestoreVolatiles, RestoreAllRegs -#ifdef DBG +#if DBG /* Assert the flags */ pushfd pop edx @@ -1011,7 +1011,7 @@ /* Assert the trap frame */ #endif 5: -#ifdef DBG +#if DBG sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 jnz 0f @@ -1033,7 +1033,7 @@ /* Get exception list */ mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] -#ifdef DBG +#if DBG /* Assert the saved exception list */ or edx, edx jnz 1f @@ -1048,7 +1048,7 @@ /* Get previous mode */ mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] -#ifdef DBG +#if DBG /* Assert the saved previous mode */ cmp ecx, -1 jnz 1f @@ -1061,7 +1061,7 @@ mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl .else -#ifdef DBG +#if DBG /* Assert the saved previous mode */ mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] cmp ecx, -1 @@ -1304,7 +1304,7 @@ .endif .endm -#ifdef DBG +#if DBG .macro VERIFY_INT Label /* Get the current time and mask it to 192 ticks */ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -66,7 +66,7 @@ /* SYMBOL ROUTINES **********************************************************/ #ifdef __NTOSKRNL__ -#if defined(KDBG) || defined(DBG) +#if defined(KDBG) || DBG VOID KdbSymLoadUserModuleSymbols(IN PLDR_DATA_TABLE_ENTRY LdrModule); @@ -128,7 +128,7 @@ # define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) #endif -#if defined(KDBG) || defined(DBG) +#if defined(KDBG) || DBG # define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) #else # define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -445,7 +445,7 @@ /* Value changed... wait until it's locked */ while (*(volatile KSPIN_LOCK *)SpinLock == 1) { -#ifdef DBG +#if DBG /* On debug builds, we use a much slower but useful routine */ //Kii386SpinOnSpinLock(SpinLock, 5); @@ -459,7 +459,7 @@ } else { -#ifdef DBG +#if DBG /* On debug builds, we OR in the KTHREAD */ *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; #endif @@ -476,7 +476,7 @@ VOID KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) { -#ifdef DBG +#if DBG /* Make sure that the threads match */ if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock) { Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -49,7 +49,7 @@ Result = KdpPrintString(Buffer1, Buffer1Length); break; -#ifdef DBG +#if DBG case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */ { switch ((ULONG)Buffer1) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -694,7 +694,7 @@ LoadSymbols = FALSE; -#ifdef DBG +#if DBG /* Load symbols only if we have 96Mb of RAM or more */ if (MmNumberOfPhysicalPages >= 0x6000) LoadSymbols = TRUE; Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -65,7 +65,7 @@ #ifndef CONFIG_SMP Prcb->BuildType |= PRCB_BUILD_UNIPROCESSOR; #endif -#ifdef DBG +#if DBG Prcb->BuildType |= PRCB_BUILD_DEBUG; #endif Prcb->CurrentThread = InitThread; Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -140,7 +140,7 @@ cmp dword ptr [esp+20], 0 je Return -#ifdef DBG +#if DBG /* Assert Fxsr support */ test byte ptr _KeI386FxsrPresent, 1 jnz AssertOk @@ -167,7 +167,7 @@ cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED jnz DontSave -#ifdef DBG +#if DBG /* We are the NPX Thread with an unloaded NPX State... this isn't normal! */ int 3 #endif @@ -365,7 +365,7 @@ AfterTrace: #ifdef CONFIG_SMP -#ifdef DBG +#if DBG /* Assert that we're on the right CPU */ mov cl, [esi+KTHREAD_NEXT_PROCESSOR] cmp cl, [ebx+KPCR_PROCESSOR_NUMBER] @@ -419,7 +419,7 @@ lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx /* Assert change went ok */ -#ifdef DBG +#if DBG test [ebp+KPROCESS_ACTIVE_PROCESSORS], ecx jz WrongActiveCpu test [eax+KPROCESS_ACTIVE_PROCESSORS], ecx @@ -548,7 +548,7 @@ NewCr0: -#ifdef DBG +#if DBG /* Assert NPX State */ test byte ptr [esi+KTHREAD_NPX_STATE], ~(NPX_STATE_NOT_LOADED) jnz InvalidNpx @@ -589,7 +589,7 @@ push ATTEMPTED_SWITCH_FROM_DPC call _KeBugCheckEx@20 -#ifdef DBG +#if DBG InvalidNpx: int 3 WrongActiveCpu: @@ -836,7 +836,7 @@ lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx /* Sanity check */ -#ifdef DBG +#if DBG test dword ptr [edx+KPROCESS_ACTIVE_PROCESSORS], 0 jz WrongCpu1 test dword ptr [eax+KPROCESS_ACTIVE_PROCESSORS], 0 @@ -871,7 +871,7 @@ /* FIXME: TODO */ int 3 -#ifdef DBG +#if DBG WrongCpu1: int 3 WrongCpu2: Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -351,7 +351,7 @@ #ifndef CONFIG_SMP Pcr->PrcbData.BuildType |= PRCB_BUILD_UNIPROCESSOR; #endif -#ifdef DBG +#if DBG Pcr->PrcbData.BuildType |= PRCB_BUILD_DEBUG; #endif Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -98,7 +98,7 @@ /* At dispatch, increase DPC time */ inc dword ptr [eax+KPCR_PRCB_DPC_TIME] -#ifdef DBG +#if DBG /* Update the DPC time */ inc dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME] Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -200,7 +200,7 @@ /* Increase total syscall count */ inc dword ptr PCR[KPCR_SYSTEM_CALLS] -#ifdef DBG +#if DBG /* Increase per-syscall count */ mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT] jecxz NoCountTable @@ -239,7 +239,7 @@ call ebx AfterSysCall: -#ifdef DBG +#if DBG /* Make sure the user-mode call didn't return at elevated IRQL */ test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK jz SkipCheck @@ -377,7 +377,7 @@ push 0 jmp _KiTrap6 -#ifdef DBG +#if DBG InvalidIrql: /* Save current IRQL */ push PCR[KPCR_IRQL] Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -189,7 +189,7 @@ return FALSE; } -#ifdef DBG +#if DBG /* On debug builds, we OR in the KTHREAD */ *SpinLock = (ULONG_PTR)KeGetCurrentThread() | 1; #endif Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=414… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -24,7 +24,7 @@ struct _MM_RMAP_ENTRY* Next; PEPROCESS Process; PVOID Address; -#ifdef DBG +#if DBG PVOID Caller; #endif } @@ -396,7 +396,7 @@ } new_entry->Address = Address; new_entry->Process = (PEPROCESS)Process; -#ifdef DBG +#if DBG #ifdef __GNUC__ new_entry->Caller = __builtin_return_address(0); #else @@ -416,7 +416,7 @@ ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); new_entry->Next = current_entry; -#ifdef DBG +#if DBG while (current_entry) { if (current_entry->Address == new_entry->Address && current_entry->Process == new_entry->Process) Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rpoolmgr.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rpoolmgr.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -249,7 +249,7 @@ ASSERT ( pool->FirstFree == Item ); pool->FirstFree = Item->NextFree; } -#ifdef DBG +#if DBG Item->NextFree = Item->PrevFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF; #endif//DBG } @@ -290,7 +290,7 @@ #endif//R_FREEMAGIC block->Status = 0; RFreeFillStack ( block ); -#ifdef DBG +#if DBG block->PrevFree = block->NextFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF; #endif//DBG return block; @@ -655,7 +655,7 @@ //ASSERT_SIZE ( Block->Size ); // now add the block to the used block list -#ifdef DBG +#if DBG Block->NextUsed = (PR_USED)(ULONG_PTR)0xDEADBEEF; #endif//R_USED_LIST @@ -673,7 +673,7 @@ Block->UserSize = UserSize; memset ( Addr - R_RZ, R_RZ_LOVALUE, R_RZ ); memset ( Addr + Block->UserSize, R_RZ_HIVALUE, R_RZ ); -#ifdef DBG +#if DBG memset ( Addr, 0xCD, UserSize ); #endif//DBG } Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/debug.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -15,7 +15,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ -#ifdef DBG +#if DBG VOID NTAPI PspDumpThreads(BOOLEAN IncludeSystem) Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -159,7 +159,7 @@ return STATUS_SUCCESS; } -#ifdef DBG +#if DBG VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line) { Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -64,7 +64,7 @@ #ifndef CAB_READ_ONLY #if 0 -#ifdef DBG +#if DBG void DumpBuffer(void* Buffer, ULONG Size) { Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -48,8 +48,6 @@ /* Debugging */ -#define DBG - #define NORMAL_MASK 0x000000FF #define SPECIAL_MASK 0xFFFFFF00 #define MIN_TRACE 0x00000001 @@ -58,7 +56,7 @@ #define DEBUG_MEMORY 0x00000100 -#ifdef DBG +#if DBG extern ULONG DebugTraceLevel; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/main.cxx [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -17,7 +17,7 @@ #include "cabman.h" -#ifdef DBG +#if DBG ULONG DebugTraceLevel = MIN_TRACE; //ULONG DebugTraceLevel = MID_TRACE; Modified: trunk/reactos/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=41436&… ============================================================================== --- trunk/reactos/tools/hpp/hpp.c [iso-8859-1] (original) +++ trunk/reactos/tools/hpp/hpp.c [iso-8859-1] Wed Jun 17 16:44:05 2009 @@ -12,7 +12,7 @@ #include <string.h> #include <ctype.h> -#ifdef DBG +#if DBG #define trace printf #else #define trace if (0) printf

1 0

[cwittich] 41435: some code cleanup
by cwittich＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: cwittich Date: Wed Jun 17 15:52:39 2009 New Revision: 41435 URL: http://svn.reactos.org/svn/reactos?rev=41435&view=rev Log: some code cleanup Modified: trunk/reactos/base/applications/paint/dib.c trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/palette.c trunk/reactos/base/applications/paint/selection.c Modified: trunk/reactos/base/applications/paint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dib.c [iso-8859-1] Wed Jun 17 15:52:39 2009 @@ -14,92 +14,101 @@ HBITMAP CreateDIBWithProperties(int width, int height) { - BITMAPINFO bitmapinfo; - bitmapinfo.bmiHeader.biSize = sizeof (BITMAPINFOHEADER); - bitmapinfo.bmiHeader.biWidth = width; - bitmapinfo.bmiHeader.biHeight = height; - bitmapinfo.bmiHeader.biPlanes = 1; - bitmapinfo.bmiHeader.biBitCount = 24; - bitmapinfo.bmiHeader.biCompression = BI_RGB; - bitmapinfo.bmiHeader.biSizeImage = 0; - bitmapinfo.bmiHeader.biXPelsPerMeter = 0; - bitmapinfo.bmiHeader.biYPelsPerMeter = 0; - bitmapinfo.bmiHeader.biClrUsed = 0; - bitmapinfo.bmiHeader.biClrImportant = 0; - return CreateDIBSection(NULL, &bitmapinfo, DIB_RGB_COLORS, NULL, NULL, 0); + BITMAPINFO bmi; + ZeroMemory(&bmi, sizeof(BITMAPINFO)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = width; + bmi.bmiHeader.biHeight = height; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 24; + bmi.bmiHeader.biCompression = BI_RGB; + return CreateDIBSection(NULL, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); } -int GetDIBWidth(HBITMAP hbm) +int GetDIBWidth(HBITMAP hBitmap) { BITMAP bm; - GetObject(hbm, sizeof(BITMAP), &bm); + GetObject(hBitmap, sizeof(BITMAP), &bm); return bm.bmWidth; } -int GetDIBHeight(HBITMAP hbm) +int GetDIBHeight(HBITMAP hBitmap) { BITMAP bm; - GetObject(hbm, sizeof(BITMAP), &bm); + GetObject(hBitmap, sizeof(BITMAP), &bm); return bm.bmHeight; } -void SaveDIBToFile(HBITMAP hbm, LPTSTR name, HDC hdc) +void SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC) { BITMAP bm; HANDLE hFile; BITMAPFILEHEADER bf; BITMAPINFOHEADER bi; int imgDataSize; - int bytesWritten; + DWORD dwBytesWritten; + char* buffer; - GetObject(hbm, sizeof(BITMAP), &bm); + GetObject(hBitmap, sizeof(BITMAP), &bm); - imgDataSize = bm.bmWidthBytes*bm.bmHeight; - bf.bfType = 0x4d42; - bf.bfSize = imgDataSize+52; - bf.bfReserved1 = 0; - bf.bfReserved2 = 0; + ZeroMemory(&bf, sizeof(BITMAPFILEHEADER)); + ZeroMemory(&bi, sizeof(BITMAPINFOHEADER)); + + imgDataSize = bm.bmWidthBytes * bm.bmHeight; + bf.bfType = 0x4d42; /* BM */ + bf.bfSize = imgDataSize + 52; bf.bfOffBits = 54; - bi.biSize = 40; + bi.biSize = sizeof(BITMAPINFOHEADER); bi.biWidth = bm.bmWidth; bi.biHeight = bm.bmHeight; bi.biPlanes = bm.bmPlanes; bi.biBitCount = bm.bmBitsPixel; bi.biCompression = BI_RGB; - bi.biSizeImage = 0; - bi.biXPelsPerMeter = 0; - bi.biYPelsPerMeter = 0; - bi.biClrUsed = 0; - bi.biClrImportant = 0; - int *buffer = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, imgDataSize); - GetDIBits(hdc, hbm, 0, bm.bmHeight, buffer, (LPBITMAPINFO)&bi, DIB_RGB_COLORS); - hFile = CreateFile(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_SEQUENTIAL_SCAN, NULL); - WriteFile(hFile, &bf, 14, (LPDWORD)&bytesWritten, NULL); - WriteFile(hFile, &bi, 40, (LPDWORD)&bytesWritten, NULL); - WriteFile(hFile, buffer, imgDataSize, (LPDWORD)&bytesWritten, NULL); + + buffer = HeapAlloc(GetProcessHeap(), 0, imgDataSize); + GetDIBits(hDC, hBitmap, 0, bm.bmHeight, buffer, (LPBITMAPINFO)&bi, DIB_RGB_COLORS); + + hFile = CreateFile(FileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_SEQUENTIAL_SCAN, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return; + + WriteFile(hFile, &bf, sizeof(BITMAPFILEHEADER), &dwBytesWritten, NULL); + WriteFile(hFile, &bi, sizeof(BITMAPINFOHEADER), &dwBytesWritten, NULL); + WriteFile(hFile, buffer, imgDataSize, &dwBytesWritten, NULL); + CloseHandle(hFile); HeapFree(GetProcessHeap(), 0, buffer); } HBITMAP LoadDIBFromFile(LPTSTR name) { - HBITMAP bm; + HBITMAP hBitmap; BITMAPFILEHEADER bfh; BITMAPINFO *bi; - VOID *data; - int bytesRead; - HANDLE f = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); - ReadFile(f, &bfh, 14, (LPDWORD)&bytesRead, NULL); - if (bfh.bfType!=0x4d42) + PVOID pvBits; + DWORD dwBytesRead; + HANDLE hFile; + + hFile = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return NULL; + + /* read header and check for 'BM' magic */ + ReadFile(hFile, &bfh, sizeof(BITMAPFILEHEADER), &dwBytesRead, NULL); + if (bfh.bfType != 0x4d42) { - CloseHandle(f); + CloseHandle(hFile); return NULL; } - bi = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, bfh.bfOffBits-14); - ReadFile(f, bi, bfh.bfOffBits-14, (LPDWORD)&bytesRead, NULL); - bm = CreateDIBSection(NULL, bi, DIB_RGB_COLORS, &data, NULL, 0); - ReadFile(f, data, bfh.bfSize-bfh.bfOffBits, (LPDWORD)&bytesRead, NULL); - CloseHandle(f); + + bi = HeapAlloc(GetProcessHeap(), 0, bfh.bfOffBits - sizeof(BITMAPFILEHEADER)); + if (!bi) + return NULL; + + ReadFile(hFile, bi, bfh.bfOffBits - sizeof(BITMAPFILEHEADER), &dwBytesRead, NULL); + hBitmap = CreateDIBSection(NULL, bi, DIB_RGB_COLORS, &pvBits, NULL, 0); + ReadFile(hFile, pvBits, bfh.bfSize - bfh.bfOffBits, &dwBytesRead, NULL); + CloseHandle(hFile); HeapFree(GetProcessHeap(), 0, bi); - return bm; + return hBitmap; } Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Wed Jun 17 15:52:39 2009 @@ -251,10 +251,17 @@ SendMessage(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); for (i=0; i<16; i++) { + TBBUTTON tbbutton; int wrapnow = 0; + if (i % 2 == 1) wrapnow = TBSTATE_WRAP; LoadString(hThisInstance, IDS_TOOLTIP1 + i, tooltips[i], 30); - TBBUTTON tbbutton = { i, ID_FREESEL + i, TBSTATE_ENABLED | wrapnow, TBSTYLE_CHECKGROUP, {0}, 0, (INT_PTR)tooltips[i] }; + ZeroMemory(&tbbutton, sizeof(TBBUTTON)); + tbbutton.iString = (INT_PTR)tooltips[i]; + tbbutton.fsStyle = TBSTYLE_CHECKGROUP; + tbbutton.fsState = TBSTATE_ENABLED | wrapnow; + tbbutton.idCommand = ID_FREESEL + i; + tbbutton.iBitmap = i; SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&tbbutton); } /* SendMessage(hToolbar, TB_SETROWS, MAKEWPARAM(8, FALSE), (LPARAM)NULL); */ @@ -263,9 +270,6 @@ SendMessage(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(25, 25)); /* SendMessage(hToolbar, TB_AUTOSIZE, 0, 0); */ - - - /* creating the tool settings child window */ hToolSettings = CreateWindowEx(0, _T("ToolSettings"), _T(""), WS_CHILD | WS_VISIBLE, 7, 210, 42, 140, hwnd, NULL, hThisInstance, NULL); Modified: trunk/reactos/base/applications/paint/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/pa… ============================================================================== --- trunk/reactos/base/applications/paint/palette.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/palette.c [iso-8859-1] Wed Jun 17 15:52:39 2009 @@ -19,54 +19,49 @@ { case WM_PAINT: { - int i; - long rectang[4] = {0, 0, 31, 32}; - int a; - int b; - HDC hdc = GetDC(hwnd); + RECT rc = {0, 0, 31, 32}; + HDC hDC = GetDC(hwnd); HPEN oldPen; HBRUSH oldBrush; + int i, a, b; DefWindowProc (hwnd, message, wParam, lParam); - for (b=2; b<30; b++) for (a=2; a<29; a++) if ((a+b)%2==1) SetPixel(hdc, a, b, GetSysColor(COLOR_BTNHILIGHT)); - DrawEdge(hdc, (LPRECT)&rectang, EDGE_RAISED, BF_TOPLEFT); - DrawEdge(hdc, (LPRECT)&rectang, BDR_SUNKENOUTER, BF_TOPLEFT|BF_BOTTOMRIGHT); - rectang[0] = 11; - rectang[1] = 12; - rectang[2] = 26; - rectang[3] = 27; - DrawEdge(hdc, (LPRECT)&rectang, BDR_RAISEDINNER, BF_RECT|BF_MIDDLE); - oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); - oldBrush = SelectObject(hdc, CreateSolidBrush(bgColor)); - Rectangle( hdc, rectang[0]+2,rectang[1]+2,rectang[2]-1,rectang[3]-1); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); - rectang[0] = 4; - rectang[1] = 5; - rectang[2] = 19; - rectang[3] = 20; - DrawEdge(hdc, (LPRECT)&rectang, BDR_RAISEDINNER, BF_RECT|BF_MIDDLE); - oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); - oldBrush = SelectObject(hdc, CreateSolidBrush(fgColor)); - Rectangle( hdc, rectang[0]+2,rectang[1]+2,rectang[2]-1,rectang[3]-1); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); + for (b = 2; b < 30; b++) + for (a = 2; a < 29; a++) + if ((a + b) % 2 == 1) + SetPixel(hDC, a, b, GetSysColor(COLOR_BTNHILIGHT)); + + DrawEdge(hDC, &rc, EDGE_RAISED, BF_TOPLEFT); + DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_TOPLEFT|BF_BOTTOMRIGHT); + SetRect(&rc, 11, 12, 26, 27); + DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT|BF_MIDDLE); + oldPen = SelectObject(hDC, CreatePen(PS_NULL, 0, 0)); + oldBrush = SelectObject(hDC, CreateSolidBrush(bgColor)); + Rectangle(hDC, rc.left, rc.top + 2, rc.right -1, rc.bottom - 1); + DeleteObject(SelectObject(hDC, oldBrush)); + SetRect(&rc, 4, 5, 19, 20); + DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT|BF_MIDDLE); + oldBrush = SelectObject(hDC, CreateSolidBrush(fgColor)); + Rectangle( hDC, rc.left + 2,rc.top + 2, rc.right - 1, rc.bottom - 1); + DeleteObject(SelectObject(hDC, oldBrush)); + DeleteObject(SelectObject(hDC, oldPen)); + for (i=0; i<28; i++) { - rectang[0] = 31+(i%14)*16; - rectang[1] = 0+(i/14)*16; - rectang[2] = 16+rectang[0]; - rectang[3] = 16+rectang[1]; - DrawEdge(hdc, (LPRECT)&rectang, EDGE_RAISED, BF_TOPLEFT); - DrawEdge(hdc, (LPRECT)&rectang, BDR_SUNKENOUTER, BF_RECT); - oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); - oldBrush = SelectObject(hdc, CreateSolidBrush(palColors[i])); - Rectangle( hdc, rectang[0]+2,rectang[1]+2,rectang[2]-1,rectang[3]-1); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); + SetRect(&rc, 31 + (i % 14) * 16, + 0 + (i / 14) * 16, + 16 + 31 + (i % 14) * 16, + 16 + 0 + (i / 14) * 16); + DrawEdge(hDC, &rc, EDGE_RAISED, BF_TOPLEFT); + DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_RECT); + oldPen = SelectObject(hDC, CreatePen(PS_NULL, 0, 0)); + oldBrush = SelectObject(hDC, CreateSolidBrush(palColors[i])); + Rectangle(hDC, rc.left + 2,rc.top + 2,rc.right + 1, rc.bottom - 1); + DeleteObject(SelectObject(hDC, oldBrush)); + DeleteObject(SelectObject(hDC, oldPen)); } - ReleaseDC(hwnd, hdc); + ReleaseDC(hwnd, hDC); } break; case WM_LBUTTONDOWN: 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] Wed Jun 17 15:52:39 2009 @@ -28,10 +28,10 @@ { if (!moving) { - HDC hdc=GetDC(hwnd); + HDC hDC = GetDC(hwnd); DefWindowProc (hwnd, message, wParam, lParam); - SelectionFrame(hdc, 1, 1, rectSel_dest[2]*zoom/1000+5, rectSel_dest[3]*zoom/1000+5); - ReleaseDC(hwnd, hdc); + SelectionFrame(hDC, 1, 1, rectSel_dest[2]*zoom/1000+5, rectSel_dest[3]*zoom/1000+5); + ReleaseDC(hwnd, hDC); } } break;

1 0

17 Jun '09

Author: hyperion Date: Wed Jun 17 15:18:51 2009 New Revision: 41434 URL: http://svn.reactos.org/svn/reactos?rev=41434&view=rev Log: modified include/crt/_mingw.h No "restrict" support in Visual C++ (and __restrict isn't the same thing) modified include/crt/stdarg.h Really fix stdarg.h this time modified include/crt/wchar.h modified include/psdk/dde.h modified include/psdk/mmsystem.h modified include/psdk/prsht.h modified include/psdk/rpcndr.h modified include/psdk/shellapi.h modified include/psdk/winbase.h modified include/psdk/wincon.h modified include/psdk/wincrypt.h modified include/psdk/windef.h modified include/psdk/wingdi.h modified include/psdk/winioctl.h modified include/psdk/winnetwk.h modified include/psdk/winnls.h modified include/psdk/winnt.h modified include/psdk/winperf.h modified include/psdk/winsmcrd.h modified include/psdk/winsock2.h modified include/psdk/winspool.h modified include/psdk/winuser.h modified include/psdk/wtypes.idl modified include/reactos/mingw-w64/internal.h modified include/reactos/mingw-w64/oscalls.h Disable some unavoidable warnings in Visual C++ modified include/psdk/poppack.h modified include/psdk/pshpack1.h modified include/psdk/pshpack2.h modified include/psdk/pshpack4.h modified include/psdk/pshpack8.h modified include/psdk/pshpck16.h modified include/psdk/windows.h modified include/psdk/winsock2.h Check that defines are defined before testing their value modified include/psdk/rpcasync.h modified include/psdk/rpcdce.h Visual C++ doesn't support functions without a prototype anymore, and RPC_AUTH_KEY_RETRIEVAL_FN has a documented prototype anyway modified include/psdk/winnt.h WIN32_WINNT -> _WIN32_WINNT Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/stdarg.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/psdk/dde.h trunk/reactos/include/psdk/mmsystem.h trunk/reactos/include/psdk/poppack.h trunk/reactos/include/psdk/prsht.h trunk/reactos/include/psdk/pshpack1.h trunk/reactos/include/psdk/pshpack2.h trunk/reactos/include/psdk/pshpack4.h trunk/reactos/include/psdk/pshpack8.h trunk/reactos/include/psdk/pshpck16.h trunk/reactos/include/psdk/rpcasync.h trunk/reactos/include/psdk/rpcdce.h trunk/reactos/include/psdk/rpcndr.h trunk/reactos/include/psdk/shellapi.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h trunk/reactos/include/psdk/wincrypt.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winioctl.h trunk/reactos/include/psdk/winnetwk.h trunk/reactos/include/psdk/winnls.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winperf.h trunk/reactos/include/psdk/winsmcrd.h trunk/reactos/include/psdk/winsock2.h trunk/reactos/include/psdk/winspool.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/psdk/wtypes.idl trunk/reactos/include/reactos/mingw-w64/internal.h trunk/reactos/include/reactos/mingw-w64/oscalls.h Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -31,6 +31,10 @@ # endif #else # define __attribute__(x) /* nothing */ +#endif + +#ifdef _MSC_VER +#define __restrict__ /* nothing */ #endif #if defined (__GNUC__) && defined (__GNUC_MINOR__) Modified: trunk/reactos/include/crt/stdarg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdarg.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stdarg.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdarg.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -80,6 +80,7 @@ #undef _BSD_VA_LIST #endif +#ifdef __GNUC__ #if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST)) /* SVR4.2 uses _VA_LIST for an internal alias for va_list, so we must avoid testing it and setting it here. @@ -92,9 +93,7 @@ #define _VA_LIST va_list #endif #endif /* __i860__ */ -#ifdef __GNUC__ typedef __gnuc_va_list va_list; -#endif #ifdef _SCO_DS #define __VA_LIST #endif @@ -114,9 +113,7 @@ #ifndef _VA_LIST_T_H /* The macro __va_list__ is used by BeOS. */ #ifndef __va_list__ -#ifdef __GNUC__ typedef __gnuc_va_list va_list; -#endif #endif /* not __va_list__ */ #endif /* not _VA_LIST_T_H */ #endif /* not _VA_LIST */ @@ -141,6 +138,7 @@ #endif /* not __svr4__ */ +#endif /* __GNUC__ */ #endif /* _STDARG_H */ #endif /* not _ANSI_STDARG_H_ */ Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=41… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -15,6 +15,11 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #ifndef WCHAR_MIN @@ -793,6 +798,11 @@ } return (_S); } + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/dde.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dde.h?rev=414… ============================================================================== --- trunk/reactos/include/psdk/dde.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dde.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -26,6 +26,12 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#pragma warning(disable:4820) #endif #define WM_DDE_INITIATE 0x3E0 @@ -82,6 +88,9 @@ BOOL WINAPI FreeDDElParam(UINT,LPARAM); LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR); +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -9,6 +9,12 @@ #ifdef __cplusplus extern "C" { #endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#endif + #define WINMMAPI DECLSPEC_IMPORT #define _loadds #define _huge @@ -2056,6 +2062,11 @@ #define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDA #define mciGetErrorString mciGetErrorStringA #endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/poppack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/poppack.h?rev… ============================================================================== --- trunk/reactos/include/psdk/poppack.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/poppack.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(4) # else # pragma pack(pop) Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/prsht.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,11 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) #endif #ifndef SNDMSG @@ -352,6 +357,11 @@ #define CreatePropertySheetPage CreatePropertySheetPageA #define PropertySheet PropertySheetA #endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/pshpack1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack1.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpack1.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpack1.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(1) # else # pragma pack(push,1) Modified: trunk/reactos/include/psdk/pshpack2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack2.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpack2.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpack2.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(2) # else # pragma pack(push,2) Modified: trunk/reactos/include/psdk/pshpack4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack4.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpack4.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpack4.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(4) # else # pragma pack(push,4) Modified: trunk/reactos/include/psdk/pshpack8.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack8.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpack8.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpack8.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(8) # else # pragma pack(push,8) Modified: trunk/reactos/include/psdk/pshpck16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpck16.h?re… ============================================================================== --- trunk/reactos/include/psdk/pshpck16.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpck16.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(16) # else # pragma pack(push,16) Modified: trunk/reactos/include/psdk/rpcasync.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcasync.h?re… ============================================================================== --- trunk/reactos/include/psdk/rpcasync.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcasync.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -18,6 +18,10 @@ #ifndef __WINE_RPCASYNC_H #define __WINE_RPCASYNC_H +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) +#endif typedef struct tagRPC_ERROR_ENUM_HANDLE { @@ -187,4 +191,8 @@ } #endif +#ifdef _MSC_VER +#pragma warning(pop) #endif + +#endif Modified: trunk/reactos/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -190,7 +190,7 @@ #define RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE 0x10 typedef RPC_STATUS RPC_ENTRY RPC_IF_CALLBACK_FN( RPC_IF_HANDLE InterfaceUuid, void *Context ); -typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(); +typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)( void *Arg, unsigned char *ServerPrincName, unsigned long KeyVer, void **Key, RPC_STATUS *Status ); typedef struct _RPC_POLICY { @@ -305,7 +305,7 @@ RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); - + RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingCopy( RPC_BINDING_HANDLE SourceBinding, RPC_BINDING_HANDLE* DestinationBinding ); Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -29,6 +29,13 @@ #endif #include <basetsd.h> + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4255) +#pragma warning(disable:4820) +#endif #undef CONST_VTBL #ifdef CONST_VTABLE @@ -750,6 +757,10 @@ RPCRTAPI RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo( ULONG *pFlags, ULONG InformationLevel, NDR_USER_MARSHAL_INFO *pMarshalInfo ); +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,10 @@ #ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) #endif #define WINSHELLAPI DECLSPEC_IMPORT #define ABE_LEFT 0 @@ -419,6 +423,9 @@ #define SHEmptyRecycleBin SHEmptyRecycleBinA #define SHGetNewLinkInfo SHGetNewLinkInfoA #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -9,6 +9,13 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4214) +#pragma warning(disable:4820) #endif #define FILE_ENCRYPTABLE 0 @@ -2618,6 +2625,11 @@ #define WriteProfileString WriteProfileStringA #endif #endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,11 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #define FOREGROUND_BLUE 1 @@ -266,6 +271,10 @@ #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -21,12 +21,17 @@ #ifndef __WINE_WINCRYPT_H #define __WINE_WINCRYPT_H +#include <bcrypt.h> +/* FIXME: #include <ncrypt.h> */ + #ifdef __cplusplus extern "C" { #endif -#include <bcrypt.h> -/* FIXME: #include <ncrypt.h> */ +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#endif #ifdef _ADVAPI32_ # define WINADVAPI @@ -87,7 +92,7 @@ BYTE* pbOuterString; DWORD cbOuterString; } HMAC_INFO, *PHMAC_INFO; - + typedef struct _CRYPTOAPI_BLOB { DWORD cbData; BYTE* pbData; @@ -1951,7 +1956,7 @@ #define CRYPT_MODE_OFB 3 #define CRYPT_MODE_CFB 4 -#define CRYPT_ENCRYPT 0x0001 +#define CRYPT_ENCRYPT 0x0001 #define CRYPT_DECRYPT 0x0002 #define CRYPT_EXPORT 0x0004 #define CRYPT_READ 0x0008 @@ -2106,10 +2111,10 @@ #define CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH \ L"Software\\Policies\\Microsoft\\SystemCertificates" #else -static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] = +static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0 }; -static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] = +static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] = {'S','o','f','t','w','a','r','e','\\','P','o','l','i','c','i','e','s','\\', 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r', 't','i','f','i','c','a','t','e','s',0 }; @@ -2366,7 +2371,7 @@ # define CERT_PHYSICAL_STORE_AUTH_ROOT_NAME \ L".AuthRoot" #else -static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] = +static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] = {'.','D','e','f','a','u','l','t','0'}; static const WCHAR CERT_PHYSICAL_STORE_GROUP_POLICY_NAME[] = {'.','G','r','o','u','p','P','o','l','i','c','y',0}; @@ -4446,6 +4451,10 @@ PCRYPT_RETRIEVE_AUX_INFO pAuxInfo); #define CryptRetrieveObjectByUrl WINELIB_NAME_AW(CryptRetrieveObjectByUrl) +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -9,6 +9,11 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4255) #endif #ifndef WINVER @@ -420,6 +425,10 @@ SHORT y; } POINTS,*PPOINTS,*LPPOINTS; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -101,7 +101,7 @@ #endif #ifndef NOGDI #if !defined (__OBJC__) -#if (__GNUC__ >= 3) || defined (__WATCOMC__) +#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) #include <ole2.h> #endif #endif /* __OBJC__ */ Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -4,6 +4,12 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4820) #endif /* Get/SetSystemPaletteUse() values */ @@ -3329,6 +3335,11 @@ #define wglUseFontOutlines wglUseFontOutlinesA #endif #endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -4,6 +4,13 @@ #ifdef __cplusplus extern "C" { #endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4820) +#endif + #define HIST_NO_OF_BUCKETS 24 #define HISTOGRAM_BUCKET_SIZE sizeof(HISTOGRAM_BUCKET) #define DISK_HISTOGRAM_SIZE sizeof(DISK_HISTOGRAM) @@ -551,6 +558,11 @@ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\ ((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\ ((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED)) + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnetwk.h?re… ============================================================================== --- trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,10 @@ #ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #define WNNC_NET_MSNET 0x00010000 #define WNNC_NET_LANMAN 0x00020000 @@ -341,6 +345,9 @@ #define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA #endif #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,11 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #define GEOID_NOT_AVAILABLE (-1) @@ -744,6 +749,11 @@ #endif /* (WINVER >= 0x0500) */ #endif /* UNICODE */ #endif /* RC_INVOKED */ + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -236,6 +236,14 @@ #define NTAPI __stdcall #include <basetsd.h> + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4214) +#pragma warning(disable:4820) +#endif + #define ACE_OBJECT_TYPE_PRESENT 0x00000001 #define ACE_INHERITED_OBJECT_TYPE_PRESENT 0x00000002 #define APPLICATION_ERROR_MASK 0x20000000 @@ -4579,7 +4587,7 @@ typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX; #endif -#if (WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= 0x0500) ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #endif @@ -4978,6 +4986,10 @@ #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #endif /* RC_INVOKED */ #ifdef __cplusplus Modified: trunk/reactos/include/psdk/winperf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winperf.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winperf.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winperf.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,10 @@ #ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #define PERF_DATA_VERSION 1 #define PERF_DATA_REVISION 1 @@ -130,6 +134,9 @@ typedef DWORD(CALLBACK PM_OPEN_PROC)(LPWSTR); typedef DWORD(CALLBACK PM_COLLECT_PROC)(LPWSTR,PVOID*,PDWORD,PDWORD); typedef DWORD(CALLBACK PM_CLOSE_PROC)(void); +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winsmcrd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsmcrd.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -20,6 +20,11 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif typedef struct _SCARD_IO_REQUEST @@ -203,6 +208,10 @@ #define SCARD_ATTR_DEVICE_SYSTEM_NAME SCARD_ATTR_DEVICE_SYSTEM_NAME_A #endif /* UNICODE */ +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock2.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsock2.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsock2.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -26,6 +26,10 @@ #ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif /* Names common to Winsock1.1 and Winsock2 */ #if !defined ( _BSDTYPES_DEFINED ) @@ -102,7 +106,7 @@ #warning "fd_set and associated macros have been defined in sys/types. \ This may cause runtime problems with W32 sockets" #endif /* ndef _SYS_TYPES_FD_SET */ -#if !(defined (__INSIDE_CYGWIN__) || (__INSIDE_MSYS__)) +#if !(defined (__INSIDE_CYGWIN__) || (defined (__INSIDE_MSYS__) && (__INSIDE_MSYS__))) #ifndef _TIMEVAL_DEFINED /* also in sys/time.h */ #define _TIMEVAL_DEFINED @@ -1210,6 +1214,10 @@ #define WSASetService WSASetServiceA #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,10 @@ #ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #define DI_CHANNEL 1 #define DI_CHANNEL_WRITE 2 @@ -1019,6 +1023,9 @@ #define StartDocPrinter StartDocPrinterA #endif #endif /* RC_INVOKED */ +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,12 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4820) #endif #if !defined(_USER32_) @@ -4676,6 +4682,10 @@ #endif /* UNICODE */ #endif /* RC_INVOKED */ +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtypes.idl?re… ============================================================================== --- trunk/reactos/include/psdk/wtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wtypes.idl [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -23,6 +23,12 @@ cpp_quote("#ifndef __wtypes_h__") cpp_quote("#define __wtypes_h__") +cpp_quote("#endif") + +cpp_quote("#ifdef _MSC_VER") +cpp_quote("#pragma warning(push)") +cpp_quote("#pragma warning(disable:4201)") +cpp_quote("#pragma warning(disable:4820)") cpp_quote("#endif") [ @@ -831,3 +837,7 @@ } uCLSSPEC; } /* interface IWinTypes */ + +cpp_quote("#ifdef _MSC_VER") +cpp_quote("#pragma warning(pop)") +cpp_quote("#endif") Modified: trunk/reactos/include/reactos/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -32,6 +32,12 @@ #define __IOINFO_TM_UTF8 1 #define __IOINFO_TM_UTF16LE 2 +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#pragma warning(disable:4820) +#endif + typedef struct { intptr_t osfhnd; char osfile; @@ -42,6 +48,10 @@ char unicode : 1; char pipech2[2]; } ioinfo; + +#ifdef _MSC_VER +#pragma warning(pop) +#endif #define IOINFO_ARRAY_ELTS (1 << 5) @@ -159,7 +169,7 @@ #include <errno.h> void * __cdecl _encode_pointer(void *); - void * __cdecl _encoded_null(); + void * __cdecl _encoded_null(void); void * __cdecl _decode_pointer(void *); BOOL __cdecl _ValidateImageBase (PBYTE pImageBase); Modified: trunk/reactos/include/reactos/mingw-w64/oscalls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -30,6 +30,11 @@ #endif #endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#endif + typedef struct _FTIME { unsigned short twosecs : 5; @@ -46,6 +51,10 @@ unsigned short year : 7; } FDATE; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + typedef FDATE *PFDATE; #endif

1 0

[khornicek] 41433: - correct fix, also free the allocated buffer
by khornicek＠svn.reactos.org 17 Jun '09

17 Jun '09

Author: khornicek Date: Wed Jun 17 15:08:00 2009 New Revision: 41433 URL: http://svn.reactos.org/svn/reactos?rev=41433&view=rev Log: - correct fix, also free the allocated buffer Modified: trunk/reactos/base/services/tftpd/tftpd.cpp Modified: trunk/reactos/base/services/tftpd/tftpd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] Wed Jun 17 15:08:00 2009 @@ -307,8 +307,11 @@ (LPTSTR) &lpMsgBuf, 0, NULL ); - printf("Error: %p\nPress Enter..\n", lpMsgBuf); + _tprintf(_T("Error: %s\nPress Enter..\n"), (LPTSTR)lpMsgBuf); getchar(); + + if(lpMsgBuf) + LocalFree(lpMsgBuf); } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs