Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 57121: [INCLUDE/CRT] - Update mingw_math.h and make use of it
by jgardou＠svn.reactos.org 21 Aug '12

21 Aug '12

Author: jgardou Date: Tue Aug 21 09:15:13 2012 New Revision: 57121 URL: http://svn.reactos.org/svn/reactos?rev=57121&view=rev Log: [INCLUDE/CRT] - Update mingw_math.h and make use of it Modified: trunk/reactos/include/crt/math.h trunk/reactos/include/crt/mingw_math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=571… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Tue Aug 21 09:15:13 2012 @@ -14,6 +14,11 @@ #ifdef __cplusplus extern "C" { +#endif + +#if defined(__GNUC__) +/* Some 3rd party code needs the declaration of C99 functions */ +#include "mingw_math.h" #endif #ifndef _EXCEPTION_DEFINED @@ -260,42 +265,3 @@ #define M_SQRT1_2 0.707106781186547524401 #endif /* _USE_MATH_DEFINES */ - -#ifndef __NO_ISOCEXT -#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ - || !defined __STRICT_ANSI__ || defined __GLIBCPP__ - - /* Inverse hyperbolic trig functions */ - /* 7.12.5.1 */ - extern double __cdecl acosh (double); - extern float __cdecl acoshf (float); - extern long double __cdecl acoshl (long double); - - /* 7.12.5.2 */ - extern double __cdecl asinh (double); - extern float __cdecl asinhf (float); - extern long double __cdecl asinhl (long double); - - /* 7.12.5.3 */ - extern double __cdecl atanh (double); - extern float __cdecl atanhf (float); - extern long double __cdecl atanhl (long double); - - /* 7.12.6.2 */ - extern double __cdecl exp2(double); - extern float __cdecl exp2f(float); - extern long double __cdecl exp2l(long double); - - /* 7.12.6.10 */ - extern double __cdecl log2 (double); - extern float __cdecl log2f (float); - extern long double __cdecl log2l (long double); - - /* 7.12.9.8 */ - /* round towards zero, regardless of fpu control word settings */ - extern double __cdecl trunc (double); - extern float __cdecl truncf (float); - extern long double __cdecl truncl (long double); - -#endif /* __STDC_VERSION__ >= 199901L */ -#endif /* __NO_ISOCEXT */ Modified: trunk/reactos/include/crt/mingw_math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw_math.h?r… ============================================================================== --- trunk/reactos/include/crt/mingw_math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw_math.h [iso-8859-1] Tue Aug 21 09:15:13 2012 @@ -1,104 +1,112 @@ - - float expm1f(float _X); - double expm1(double _X); - +#ifndef __GNUC__ +#error This file should be included only with GCC compiler +#endif #ifndef __NO_ISOCEXT #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ - || !defined __STRICT_ANSI__ || defined __GLIBCPP__ - -#if !defined(_MSC_VER) -#define NAN (0.0F/0.0F) -#define HUGE_VALF (1.0F/0.0F) -#define HUGE_VALL (1.0L/0.0L) -#define INFINITY (1.0F/0.0F) -#endif - - + || !defined __STRICT_ANSI__ || defined __cplusplus + +#if __MINGW_GNUC_PREREQ(3, 3) +#define HUGE_VALF __builtin_huge_valf() +#define HUGE_VALL __builtin_huge_vall() +#define INFINITY __builtin_inf() +#define NAN __builtin_nan("") +#else +extern const float __INFF; +#define HUGE_VALF __INFF +extern const long double __INFL; +#define HUGE_VALL __INFL +#define INFINITY HUGE_VALF +extern const double __QNAN; +#define NAN __QNAN +#endif /* __MINGW_GNUC_PREREQ(3, 3) */ + +/* Use the compiler's builtin define for FLT_EVAL_METHOD to + set float_t and double_t. */ +#if defined(__FLT_EVAL_METHOD__) +# if ( __FLT_EVAL_METHOD__== 0) +typedef float float_t; +typedef double double_t; +# elif (__FLT_EVAL_METHOD__ == 1) +typedef double float_t; +typedef double double_t; +# elif (__FLT_EVAL_METHOD__ == 2) +typedef long double float_t; +typedef long double double_t; +#endif +#else /* ix87 FPU default */ +typedef long double float_t; +typedef long double double_t; +#endif + +/* 7.12.3.1 */ +/* + Return values for fpclassify. + These are based on Intel x87 fpu condition codes + in the high byte of status word and differ from + the return values for MS IEEE 754 extension _fpclass() +*/ #define FP_NAN 0x0100 #define FP_NORMAL 0x0400 #define FP_INFINITE (FP_NAN | FP_NORMAL) #define FP_ZERO 0x4000 #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) - -#ifdef _M_IX86 -#define __fxam(x, sw) \ - __asm { fld [(x)] } \ - __asm { fxam } \ - __asm { wait } \ - __asm { fnstsw [(sw)] } \ - __asm { fstp st(0) } -#else -#define __fxam(x, sw) -#pragma message("WARNING: __fxam is undefined") -#endif - -#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 +/* 0x0200 is signbit mask */ + +/* + We can't inline float or double, because we want to ensure truncation + to semantic type before classification. + (A normal long double value might become subnormal when converted to double, and zero when converted to float.) - */ - +*/ + + extern int __cdecl __fpclassifyl (long double); extern int __cdecl __fpclassifyf (float); extern int __cdecl __fpclassify (double); - __CRT_INLINE int __cdecl __fpclassifyl (long double x){ +#ifndef __CRT__NO_INLINE + __CRT_INLINE int __cdecl __fpclassifyl (long double x) { unsigned short sw; - __fxam(x, sw); + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); } - - __CRT_INLINE int __cdecl __fpclassify (double x){ - return __fpclassifyl((long double)x); - } + __CRT_INLINE int __cdecl __fpclassify (double x) { + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); + } + __CRT_INLINE int __cdecl __fpclassifyf (float x) { + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); + } +#endif #define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ : sizeof (x) == sizeof (double) ? __fpclassify (x) \ : __fpclassifyl (x)) - /* 7.12.3.2 */ +/* 7.12.3.2 */ #define isfinite(x) ((fpclassify(x) & FP_NAN) == 0) - /* 7.12.3.3 */ -/* #define isinf(x) (fpclassify(x) == FP_INFINITE) */ - - /* we don't have fpclassify */ -__CRT_INLINE int isinf (double d) { - int expon = 0; - double val = frexp (d, &expon); - if (expon == 1025) { - if (val == 0.5) { - return 1; - } else if (val == -0.5) { - return -1; - } else { - return 0; - } - } else { - return 0; - } -} - - /* 7.12.3.4 */ - /* We don't need to worry about truncation here: - A NaN stays a NaN. */ - +/* 7.12.3.3 */ +#define isinf(x) (fpclassify(x) == FP_INFINITE) + +/* 7.12.3.4 */ +/* We don't need to worry about truncation here: + A NaN stays a NaN. */ + + extern int __cdecl __isnan (double); + extern int __cdecl __isnanf (float); + extern int __cdecl __isnanl (long double); + +#ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl __isnan (double _x) { unsigned short sw; - __fxam(_x, sw); + __asm__ __volatile__ ("fxam;" + "fstsw %%ax": "=a" (sw) : "t" (_x)); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -106,7 +114,8 @@ __CRT_INLINE int __cdecl __isnanf (float _x) { unsigned short sw; - __fxam(_x, sw); + __asm__ __volatile__ ("fxam;" + "fstsw %%ax": "=a" (sw) : "t" (_x)); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -114,102 +123,153 @@ __CRT_INLINE int __cdecl __isnanl (long double _x) { unsigned short sw; - __fxam(_x, sw); + __asm__ __volatile__ ("fxam;" + "fstsw %%ax": "=a" (sw) : "t" (_x)); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } - +#endif #define isnan(x) (sizeof (x) == sizeof (float) ? __isnanf (x) \ : sizeof (x) == sizeof (double) ? __isnan (x) \ : __isnanl (x)) - /* 7.12.3.5 */ +/* 7.12.3.5 */ #define isnormal(x) (fpclassify(x) == FP_NORMAL) - /* 7.12.3.6 The signbit macro */ +/* 7.12.3.6 The signbit macro */ + extern int __cdecl __signbit (double); + extern int __cdecl __signbitf (float); + extern int __cdecl __signbitl (long double); +#ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl __signbit (double x) { unsigned short stw; - __fxam(x, stw); + __asm__ __volatile__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); return stw & 0x0200; } __CRT_INLINE int __cdecl __signbitf (float x) { unsigned short stw; - __fxam(x, stw); + __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); return stw & 0x0200; } __CRT_INLINE int __cdecl __signbitl (long double x) { unsigned short stw; - __fxam(x, stw); + __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); return stw & 0x0200; } +#endif #define signbit(x) (sizeof (x) == sizeof (float) ? __signbitf (x) \ : sizeof (x) == sizeof (double) ? __signbit (x) \ : __signbitl (x)) +/* 7.12.4 Trigonometric functions: Double in C89 */ + // Already in math.h + +/* 7.12.5 Hyperbolic functions: Double in C89 */ + // Already in math.h + +/* Inverse hyperbolic trig functions */ +/* 7.12.5.1 */ + extern double __cdecl acosh (double); + extern float __cdecl acoshf (float); + extern long double __cdecl acoshl (long double); + +/* 7.12.5.2 */ + extern double __cdecl asinh (double); + extern float __cdecl asinhf (float); + extern long double __cdecl asinhl (long double); + +/* 7.12.5.3 */ + extern double __cdecl atanh (double); + extern float __cdecl atanhf (float); + extern long double __cdecl atanhl (long double); + +/* Exponentials and logarithms */ +/* 7.12.6.1 Double in C89 */ + // exp functions. Already in math.h + +/* 7.12.6.2 */ extern double __cdecl exp2(double); extern float __cdecl exp2f(float); extern long double __cdecl exp2l(long double); +/* 7.12.6.3 The expm1 functions */ +/* TODO: These could be inlined */ + extern double __cdecl expm1(double); + extern float __cdecl expm1f(float); + extern long double __cdecl expm1l(long double); + +/* 7.12.6.4 Double in C89 */ + // frexp functions. Already in math.h + +/* 7.12.6.5 */ #define FP_ILOGB0 ((int)0x80000000) #define FP_ILOGBNAN ((int)0x80000000) extern int __cdecl ilogb (double); extern int __cdecl ilogbf (float); extern int __cdecl ilogbl (long double); +/* 7.12.6.6 Double in C89 */ + // ldexp functions. Already in math.h + +/* 7.12.6.7 Double in C89 */ + // log functions. Already in math.h + +/* 7.12.6.8 Double in C89 */ + // log10 functions. Already in math.h + +/* 7.12.6.9 */ extern double __cdecl log1p(double); extern float __cdecl log1pf(float); extern long double __cdecl log1pl(long double); +/* 7.12.6.10 */ extern double __cdecl log2 (double); extern float __cdecl log2f (float); extern long double __cdecl log2l (long double); - + +/* 7.12.6.11 */ extern double __cdecl logb (double); 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 - +/* Inline versions. GCC-4.0+ can do a better fast-math optimization + with __builtins. */ +#ifndef __CRT__NO_INLINE +#if !(__MINGW_GNUC_PREREQ (4, 0) && defined (__FAST_MATH__)) __CRT_INLINE double __cdecl logb (double x) { - double res; - __fxtract(x, res); + double res = 0.0; + __asm__ __volatile__ ("fxtract\n\t" + "fstp %%st" : "=t" (res) : "0" (x)); return res; } __CRT_INLINE float __cdecl logbf (float x) { - float res; - __fxtract(x, res); + float res = 0.0F; + __asm__ __volatile__ ("fxtract\n\t" + "fstp %%st" : "=t" (res) : "0" (x)); return res; } __CRT_INLINE long double __cdecl logbl (long double x) { - long double res; - __fxtract(x, res); + long double res = 0.0l; + __asm__ __volatile__ ("fxtract\n\t" + "fstp %%st" : "=t" (res) : "0" (x)); return res; } - - /* 7.12.6.13 */ +#endif /* !defined __FAST_MATH__ || !__MINGW_GNUC_PREREQ (4, 0) */ +#endif /* __CRT__NO_INLINE */ + +/* 7.12.6.12 Double in C89 */ + // modf functions. Already in math.h + +/* 7.12.6.13 */ extern double __cdecl scalbn (double, int); extern float __cdecl scalbnf (float, int); extern long double __cdecl scalbnl (long double, int); @@ -218,203 +278,185 @@ extern float __cdecl scalblnf (float, long); extern long double __cdecl scalblnl (long double, long); - /* 7.12.7.1 */ - /* Implementations adapted from Cephes versions */ +/* 7.12.7.1 */ +/* Implementations adapted from Cephes versions */ extern double __cdecl cbrt (double); extern float __cdecl cbrtf (float); extern long double __cdecl cbrtl (long double); - extern long double __cdecl hypotl (long double, long double); - - extern long double __cdecl powl (long double, long double); - extern long double __cdecl expl(long double); - extern long double expm1l(long double); - extern long double __cdecl coshl(long double); - extern long double __cdecl acosl(long double); - extern long double __cdecl asinl(long double); - extern long double __cdecl atanl(long double); - extern long double __cdecl atan2l(long double,long double); - extern long double __cdecl sinhl(long double); - extern long double __cdecl tanhl(long double); - - /* 7.12.8.1 The erf functions */ +/* 7.12.7.2 The fabs functions: Double in C89 */ + // Already in math.h + +/* 7.12.7.3 */ + // hypot functions. Already in math.h + +/* 7.12.7.4 The pow functions. Double in C89 */ + // Already in math.h + +/* 7.12.7.5 The sqrt functions. Double in C89. */ + // Already in math.h + +/* 7.12.8.1 The erf functions */ extern double __cdecl erf (double); extern float __cdecl erff (float); - /* TODO extern long double __cdecl erfl (long double); - */ - - /* 7.12.8.2 The erfc functions */ + +/* 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 */ + +/* 7.12.8.3 The lgamma functions */ extern double __cdecl lgamma (double); extern float __cdecl lgammaf (float); extern long double __cdecl lgammal (long double); - /* 7.12.8.4 The tgamma functions */ +/* 7.12.8.4 The tgamma functions */ extern double __cdecl tgamma (double); extern float __cdecl tgammaf (float); extern long double __cdecl tgammal (long double); - extern long double __cdecl ceill (long double); - extern long double __cdecl floorl (long double); - extern long double __cdecl frexpl(long double,int *); - extern long double __cdecl log10l(long double); - extern long double __cdecl logl(long double); - extern long double __cdecl cosl(long double); - extern long double __cdecl sinl(long double); - extern long double __cdecl tanl(long double); - extern long double sqrtl(long double); - - /* 7.12.9.3 */ +/* 7.12.9.1 Double in C89 */ + // ceil functions. Already in math.h + +/* 7.12.9.2 Double in C89 */ + // floor functions. Already in math.h + +/* 7.12.9.3 */ extern double __cdecl nearbyint ( double); extern float __cdecl nearbyintf (float); extern long double __cdecl nearbyintl (long double); - /* 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 - +/* 7.12.9.4 */ +/* round, using fpu control word settings */ +extern double __cdecl rint (double); +extern float __cdecl rintf (float); +extern long double __cdecl rintl (long double); + +/* 7.12.9.5 */ +extern long __cdecl lrint (double); +extern long __cdecl lrintf (float); +extern long __cdecl lrintl (long double); + +__MINGW_EXTENSION long long __cdecl llrint (double); +__MINGW_EXTENSION long long __cdecl llrintf (float); +__MINGW_EXTENSION long long __cdecl llrintl (long double); + +/* Inline versions of above. + GCC 4.0+ can do a better fast-math job with __builtins. */ + +#ifndef __CRT__NO_INLINE +#if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ ) __CRT_INLINE double __cdecl rint (double x) { - double retval; - __frndint(x, retval); + double retval = 0.0; + __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x)); return retval; } __CRT_INLINE float __cdecl rintf (float x) { - float retval; - __frndint(x, retval); + float retval = 0.0; + __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); return retval; } __CRT_INLINE long double __cdecl rintl (long double x) { - long double retval; - __frndint(x, retval); + long double retval = 0.0l; + __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); return retval; } - /* 7.12.9.5 */ -#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; - __fistpl(x, retval); - return retval; - } - - __CRT_INLINE long __cdecl lrintf (float x) - { - long retval; - __fistpl(x, retval); - return retval; - } - - __CRT_INLINE long __cdecl lrintl (long double x) - { - long retval; - __fistpl(x, retval); - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x) - { - __MINGW_EXTENSION long long retval; - __fistpll(x, retval); - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x) - { - __MINGW_EXTENSION long long retval; - __fistpll(x, retval); - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x) - { - __MINGW_EXTENSION long long retval; - __fistpll(x, retval); - return retval; - } - - /* 7.12.9.6 */ - /* round away from zero, regardless of fpu control word settings */ + __CRT_INLINE long __cdecl lrint (double x) + { + long retval = 0; + __asm__ __volatile__ \ + ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __CRT_INLINE long __cdecl lrintf (float x) + { + long retval = 0; + __asm__ __volatile__ \ + ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __CRT_INLINE long __cdecl lrintl (long double x) + { + long retval = 0; + __asm__ __volatile__ \ + ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x) + { + __MINGW_EXTENSION long long retval = 0ll; + __asm__ __volatile__ \ + ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x) + { + __MINGW_EXTENSION long long retval = 0ll; + __asm__ __volatile__ \ + ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x) + { + __MINGW_EXTENSION long long retval = 0ll; + __asm__ __volatile__ \ + ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } +#endif /* !__FAST_MATH__ || !__MINGW_GNUC_PREREQ (4,0) */ +#endif /* !__CRT__NO_INLINE */ + +/* 7.12.9.6 */ +/* round away from zero, regardless of fpu control word settings */ extern double __cdecl round (double); extern float __cdecl roundf (float); extern long double __cdecl roundl (long double); - - /* 7.12.9.7 */ + +/* 7.12.9.7 */ extern long __cdecl lround (double); extern long __cdecl lroundf (float); extern long __cdecl lroundl (long double); - - __MINGW_EXTENSION extern long long __cdecl llround (double); - __MINGW_EXTENSION extern long long __cdecl llroundf (float); - __MINGW_EXTENSION extern long long __cdecl llroundl (long double); - - /* 7.12.9.8 */ - /* round towards zero, regardless of fpu control word settings */ + __MINGW_EXTENSION long long __cdecl llround (double); + __MINGW_EXTENSION long long __cdecl llroundf (float); + __MINGW_EXTENSION long long __cdecl llroundl (long double); + +/* 7.12.9.8 */ +/* round towards zero, regardless of fpu control word settings */ extern double __cdecl trunc (double); extern float __cdecl truncf (float); extern long double __cdecl truncl (long double); - extern long double __cdecl fmodl (long double, long double); - - /* 7.12.10.2 */ +/* 7.12.10.1 Double in C89 */ + // fmod functions. Already in math.h + +/* 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); - /* 7.12.10.3 */ +/* 7.12.10.3 */ extern double __cdecl remquo(double, double, int *); extern float __cdecl remquof(float, float, int *); extern long double __cdecl remquol(long double, long double, int *); - /* 7.12.11.1 */ +/* 7.12.11.1 */ extern double __cdecl copysign (double, double); /* in libmoldname.a */ extern float __cdecl copysignf (float, float); extern long double __cdecl copysignl (long double, long double); - /* 7.12.11.2 Return a NaN */ +/* 7.12.11.2 Return a NaN */ extern double __cdecl nan(const char *tagp); extern float __cdecl nanf(const char *tagp); extern long double __cdecl nanl(const char *tagp); @@ -425,51 +467,53 @@ #define _nanl() nanl("") #endif - /* 7.12.11.3 */ +/* 7.12.11.3 */ extern double __cdecl nextafter (double, double); /* in libmoldname.a */ extern float __cdecl nextafterf (float, float); extern long double __cdecl nextafterl (long double, long double); - /* 7.12.11.4 The nexttoward functions: TODO */ - - /* 7.12.12.1 */ - /* x > y ? (x - y) : 0.0 */ +/* 7.12.11.4 The nexttoward functions */ + extern double __cdecl nexttoward (double, long double); + extern float __cdecl nexttowardf (float, long double); + extern long double __cdecl nexttowardl (long double, long double); + +/* 7.12.12.1 */ +/* x > y ? (x - y) : 0.0 */ extern double __cdecl fdim (double x, double y); extern float __cdecl fdimf (float x, float y); extern long double __cdecl fdiml (long double x, long double y); - /* fmax and fmin. - NaN arguments are treated as missing data: if one argument is a NaN - and the other numeric, then these functions choose the numeric - value. */ - - /* 7.12.12.2 */ +/* fmax and fmin. + NaN arguments are treated as missing data: if one argument is a NaN + and the other numeric, then these functions choose the numeric + value. */ + +/* 7.12.12.2 */ extern double __cdecl fmax (double, double); extern float __cdecl fmaxf (float, float); extern long double __cdecl fmaxl (long double, long double); - /* 7.12.12.3 */ +/* 7.12.12.3 */ extern double __cdecl fmin (double, double); extern float __cdecl fminf (float, float); extern long double __cdecl fminl (long double, long double); - /* 7.12.13.1 */ - /* return x * y + z as a ternary op */ +/* 7.12.13.1 */ +/* 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, - * which always returns true: yes, (NaN != NaN) is true). - */ - -#if defined(__GNUC__) && __GNUC__ >= 3 +/* 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) @@ -479,56 +523,25 @@ #define isunordered(x, y) __builtin_isunordered(x, y) #else - /* helper */ +/* helper */ +#ifndef __CRT__NO_INLINE __CRT_INLINE int __cdecl __fp_unordered_compare (long double x, long double y){ unsigned short retval; -#if defined(__GNUC__) - __asm__ ("fucom %%st(1);" + __asm__ __volatile__ ("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; - } - -#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 /* __STDC_VERSION__ >= 199901L */ -#endif /* __NO_ISOCEXT */ - -#ifndef __MINGW_FPCLASS_DEFINED -#define __MINGW_FPCLASS_DEFINED 1 -#define _FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ -#define _FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ -#define _FPCLASS_NINF 0x0004 /* Negative Infinity */ -#define _FPCLASS_NN 0x0008 /* Negative Normal */ -#define _FPCLASS_ND 0x0010 /* Negative Denormal */ -#define _FPCLASS_NZ 0x0020 /* Negative Zero */ -#define _FPCLASS_PZ 0x0040 /* Positive Zero */ -#define _FPCLASS_PD 0x0080 /* Positive Denormal */ -#define _FPCLASS_PN 0x0100 /* Positive Normal */ -#define _FPCLASS_PINF 0x0200 /* Positive Infinity */ -#endif /* __MINGW_FPCLASS_DEFINED */ + return retval; + } +#endif + +#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 /* C99 or non strict ANSI or C++ */ +#endif /* __NO_ISOCEXT */

1 0

[akhaldi] 57120: * Fix build.
by akhaldi＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: akhaldi Date: Mon Aug 20 17:53:44 2012 New Revision: 57120 URL: http://svn.reactos.org/svn/reactos?rev=57120&view=rev Log: * Fix build. Modified: trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt trunk/reactos/lib/sdk/crt/libcntpr.cmake Modified: trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] Mon Aug 20 17:53:44 2012 @@ -8,7 +8,7 @@ isinf.c isnan.c loader.c - ../../sdk/crt/string/wctype.c + ${REACTOS_SOURCE_DIR}/lib/sdk/crt/string/wctype.c register.c # string.c implements _stricmp, already shipped with crt ) Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Mon Aug 20 17:53:44 2012 @@ -52,6 +52,7 @@ string/wcstol.c string/wcstombs_nt.c string/wcstoul.c + string/wctype.c string/wsplitp.c string/wtoi64.c string/wtoi.c

1 0

[fireball] 57119: [CRT] - Use wine's wctype table in CRT for iswctype() function. Previous implementation was returning incorrect information for non-Latin characters. Problem found and fixed by Se...
by fireball＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: fireball Date: Mon Aug 20 17:20:48 2012 New Revision: 57119 URL: http://svn.reactos.org/svn/reactos?rev=57119&view=rev Log: [CRT] - Use wine's wctype table in CRT for iswctype() function. Previous implementation was returning incorrect information for non-Latin characters. Problem found and fixed by Sergey Shamanaev (seven_ro). - Move wctype.c from libwine to lib/sdk/crt instead of making yet another copy of it (currently there is one more in tools/unicode). Suggested by Amine Khaldi. See issue #5090 for more details. Added: trunk/reactos/lib/sdk/crt/string/wctype.c - copied unchanged from r57101, trunk/reactos/lib/3rdparty/libwine/wctype.c Removed: trunk/reactos/lib/3rdparty/libwine/wctype.c Modified: trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/string/ctype.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/CMake… Removed: trunk/reactos/lib/3rdparty/libwine/wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/wctyp… Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c…

1 0

[cgutman] 57118: [LWIP] - Fix address reuse at the TCP layer
by cgutman＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: cgutman Date: Mon Aug 20 07:49:02 2012 New Revision: 57118 URL: http://svn.reactos.org/svn/reactos?rev=57118&view=rev Log: [LWIP] - Fix address reuse at the TCP layer Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Aug 20 07:49:02 2012 @@ -327,12 +327,8 @@ goto done; } - /* If this address file is shared, set the SOF_REUSEADDR flag in the PCB */ - ASSERT(msg->Input.Bind.Connection->AddressFile != NULL); - if (msg->Input.Bind.Connection->AddressFile->Sharers != 1) - { - pcb->so_options |= SOF_REUSEADDR; - } + /* We're guaranteed that the local address is valid to bind at this point */ + pcb->so_options |= SOF_REUSEADDR; msg->Output.Bind.Error = tcp_bind(pcb, msg->Input.Bind.IpAddress,

1 0

[cgutman] 57117: [LWIP] - Route multicast packets properly with SO_REUSE set
by cgutman＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: cgutman Date: Mon Aug 20 07:29:40 2012 New Revision: 57117 URL: http://svn.reactos.org/svn/reactos?rev=57117&view=rev Log: [LWIP] - Route multicast packets properly with SO_REUSE set Modified: trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h Modified: trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h [iso-8859-1] Mon Aug 20 07:29:40 2012 @@ -53,6 +53,8 @@ #define TCP_QUEUE_OOSEQ 1 #define SO_REUSE 1 + +#define SO_REUSE_RXTOALL 1 /* FIXME: These MSS and TCP Window definitions assume an MTU * of 1500. We need to add some code to lwIP which would allow us

1 0

[cgutman] 57116: [TCPIP] - Implement support for SO_REUSEADDR
by cgutman＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: cgutman Date: Mon Aug 20 07:26:12 2012 New Revision: 57116 URL: http://svn.reactos.org/svn/reactos?rev=57116&view=rev Log: [TCPIP] - Implement support for SO_REUSEADDR Modified: trunk/reactos/drivers/network/tcpip/include/fileobjs.h trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] Mon Aug 20 07:26:12 2012 @@ -16,6 +16,7 @@ PTDI_REQUEST Request, PTA_IP_ADDRESS AddrList, USHORT Protocol, + BOOLEAN Shared, PVOID Options); NTSTATUS FileCloseAddress( 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] Mon Aug 20 07:26:12 2012 @@ -135,6 +135,7 @@ USHORT Family; /* Address family */ USHORT Protocol; /* Protocol number */ USHORT Port; /* Network port (network byte order) */ + LONG Sharers; /* Number of file objects with this addr file */ UCHAR TTL; /* Time to live stored in packets sent from this address file */ UINT DF; /* Don't fragment */ UINT BCast; /* Receive broadcast packets */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Aug 20 07:26:12 2012 @@ -97,6 +97,40 @@ } return FALSE; +} + +PADDRESS_FILE AddrFindShared( + PIP_ADDRESS BindAddress, + USHORT Port, + USHORT Protocol) +{ + PLIST_ENTRY CurrentEntry; + KIRQL OldIrql; + PADDRESS_FILE Current = NULL; + + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + + CurrentEntry = AddressFileListHead.Flink; + while (CurrentEntry != &AddressFileListHead) { + Current = CONTAINING_RECORD(CurrentEntry, ADDRESS_FILE, ListEntry); + + /* See if this address matches the search criteria */ + if ((Current->Port == Port) && + (Current->Protocol == Protocol)) + { + /* Increase the sharer count */ + ASSERT(Current->Sharers != 0); + InterlockedIncrement(&Current->Sharers); + break; + } + + CurrentEntry = CurrentEntry->Flink; + Current = NULL; + } + + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + + return Current; } /* @@ -254,6 +288,7 @@ * Request = Pointer to TDI request structure for this request * Address = Pointer to address to be opened * Protocol = Protocol on which to open the address + * Shared = Specifies if the address is opened for shared access * Options = Pointer to option buffer * RETURNS: * Status of operation @@ -262,11 +297,23 @@ PTDI_REQUEST Request, PTA_IP_ADDRESS Address, USHORT Protocol, + BOOLEAN Shared, PVOID Options) { PADDRESS_FILE AddrFile; TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); + + /* If it's shared and has a port specified, look for a match */ + if ((Shared != FALSE) && (Address->Address[0].Address[0].sin_port != 0)) + { + AddrFile = AddrFindShared(NULL, Address->Address[0].Address[0].sin_port, Protocol); + if (AddrFile != NULL) + { + Request->Handle.AddressHandle = AddrFile; + return STATUS_SUCCESS; + } + } AddrFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(ADDRESS_FILE), ADDR_FILE_TAG); @@ -279,6 +326,7 @@ AddrFile->RefCount = 1; AddrFile->Free = AddrFileFree; + AddrFile->Sharers = 1; /* Set our default options */ AddrFile->TTL = 128; @@ -431,6 +479,13 @@ LockObject(AddrFile, &OldIrql); + if (InterlockedDecrement(&AddrFile->Sharers) != 0) + { + /* Still other guys have open handles to this, so keep it around */ + UnlockObject(AddrFile, OldIrql); + return STATUS_SUCCESS; + } + /* We have to close this listener because we started it */ if( AddrFile->Listener ) { 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] Mon Aug 20 07:26:12 2012 @@ -113,6 +113,7 @@ PVOID ClientContext; NTSTATUS Status; ULONG Protocol; + BOOLEAN Shared; TI_DbgPrint(DEBUG_IRP, ("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp)); @@ -196,7 +197,9 @@ return STATUS_INVALID_PARAMETER; } - Status = FileOpenAddress(&Request, Address, Protocol, NULL); + Shared = (IrpSp->Parameters.Create.ShareAccess != 0); + + Status = FileOpenAddress(&Request, Address, Protocol, Shared, NULL); if (NT_SUCCESS(Status)) { IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; Modified: trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h [iso-8859-1] Mon Aug 20 07:26:12 2012 @@ -51,6 +51,8 @@ #define LWIP_TCP 1 #define TCP_QUEUE_OOSEQ 1 + +#define SO_REUSE 1 /* FIXME: These MSS and TCP Window definitions assume an MTU * of 1500. We need to add some code to lwIP which would allow us Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Aug 20 07:26:12 2012 @@ -317,6 +317,7 @@ LibTCPBindCallback(void *arg) { struct lwip_callback_msg *msg = arg; + PTCP_PCB pcb = msg->Input.Bind.Connection->SocketContext; ASSERT(msg); @@ -326,7 +327,14 @@ goto done; } - msg->Output.Bind.Error = tcp_bind((PTCP_PCB)msg->Input.Bind.Connection->SocketContext, + /* If this address file is shared, set the SOF_REUSEADDR flag in the PCB */ + ASSERT(msg->Input.Bind.Connection->AddressFile != NULL); + if (msg->Input.Bind.Connection->AddressFile->Sharers != 1) + { + pcb->so_options |= SOF_REUSEADDR; + } + + msg->Output.Bind.Error = tcp_bind(pcb, msg->Input.Bind.IpAddress, ntohs(msg->Input.Bind.Port));

1 0

[cgutman] 57115: [MSAFD] - Add support for getting and setting SO_EXCLUSIVEADDRUSE - Add support for setting SO_REUSEADDR [AFD] - Implement proper TDI way of indicating a reusable address file - Mo...
by cgutman＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: cgutman Date: Mon Aug 20 05:48:52 2012 New Revision: 57115 URL: http://svn.reactos.org/svn/reactos?rev=57115&view=rev Log: [MSAFD] - Add support for getting and setting SO_EXCLUSIVEADDRUSE - Add support for setting SO_REUSEADDR [AFD] - Implement proper TDI way of indicating a reusable address file - More work remains in TCP/IP to support this Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h 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] Mon Aug 20 05:48:52 2012 @@ -2140,6 +2140,12 @@ BufferSize = sizeof(BOOL); break; + case SO_EXCLUSIVEADDRUSE: + BoolBuffer = (Socket->SharedData.ExclusiveAddressUse != 0); + Buffer = &BoolBuffer; + BufferSize = sizeof(BOOL); + break; + case SO_ERROR: /* HACK: This needs to be properly tracked */ IntBuffer = 0; @@ -2228,6 +2234,24 @@ return SOCKET_ERROR; } Socket->SharedData.LingerData.l_onoff = (*optval != 0) ? 0 : 1; + return 0; + + case SO_REUSEADDR: + if (optlen < sizeof(BOOL)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + Socket->SharedData.ReuseAddresses = (*optval != 0) ? 1 : 0; + return 0; + + case SO_EXCLUSIVEADDRUSE: + if (optlen < sizeof(BOOL)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + Socket->SharedData.ExclusiveAddressUse = (*optval != 0) ? 1 : 0; return 0; case SO_LINGER: Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Mon Aug 20 05:48:52 2012 @@ -10,7 +10,7 @@ #include "afd.h" -NTSTATUS WarmSocketForBind( PAFD_FCB FCB ) { +NTSTATUS WarmSocketForBind( PAFD_FCB FCB, ULONG ShareType ) { NTSTATUS Status; AFD_DbgPrint(MID_TRACE,("Called (AF %d)\n", @@ -27,6 +27,7 @@ Status = TdiOpenAddressFile(&FCB->TdiDeviceName, FCB->LocalAddress, + ShareType, &FCB->AddressFile.Handle, &FCB->AddressFile.Object ); if (!NT_SUCCESS(Status)) @@ -92,7 +93,7 @@ FCB->LocalAddress ); if( NT_SUCCESS(Status) ) - Status = WarmSocketForBind( FCB ); + Status = WarmSocketForBind( FCB, BindReq->ShareType ); AFD_DbgPrint(MID_TRACE,("FCB->Flags %x\n", FCB->Flags)); if (NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Mon Aug 20 05:48:52 2012 @@ -445,7 +445,7 @@ TaBuildNullTransportAddress( ConnectReq->RemoteAddress.Address[0].AddressType ); if( FCB->LocalAddress ) { - Status = WarmSocketForBind( FCB ); + Status = WarmSocketForBind( FCB, AFD_SHARE_WILDCARD ); if( NT_SUCCESS(Status) ) FCB->State = SOCKET_STATE_BOUND; 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] Mon Aug 20 05:48:52 2012 @@ -89,6 +89,7 @@ PUNICODE_STRING DeviceName, ULONG EaLength, PFILE_FULL_EA_INFORMATION EaInfo, + ULONG ShareType, PHANDLE Handle, PFILE_OBJECT *Object) /* @@ -106,8 +107,21 @@ OBJECT_ATTRIBUTES Attr; IO_STATUS_BLOCK Iosb; NTSTATUS Status; - - AFD_DbgPrint(MAX_TRACE, ("Called. DeviceName (%wZ)\n", DeviceName)); + ULONG ShareAccess; + + AFD_DbgPrint(MAX_TRACE, ("Called. DeviceName (%wZ, %d)\n", DeviceName, ShareType)); + + /* Determine the share access */ + if (ShareType != AFD_SHARE_REUSE) + { + /* Exclusive access */ + ShareAccess = 0; + } + else + { + /* Shared access */ + ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE; + } InitializeObjectAttributes(&Attr, /* Attribute buffer */ DeviceName, /* Device name */ @@ -122,7 +136,7 @@ &Iosb, /* IO status */ 0, /* Initial allocation size */ FILE_ATTRIBUTE_NORMAL, /* File attributes */ - 0, /* Share access */ + ShareAccess, /* Share access */ FILE_OPEN_IF, /* Create disposition */ 0, /* Create options */ EaInfo, /* EA buffer */ @@ -156,6 +170,7 @@ NTSTATUS TdiOpenAddressFile( PUNICODE_STRING DeviceName, PTRANSPORT_ADDRESS Name, + ULONG ShareType, PHANDLE AddressHandle, PFILE_OBJECT *AddressObject) /* @@ -199,6 +214,7 @@ Status = TdiOpenDevice(DeviceName, EaLength, EaInfo, + ShareType, AddressHandle, AddressObject); ExFreePool(EaInfo); @@ -300,6 +316,7 @@ Status = TdiOpenDevice(DeviceName, EaLength, EaInfo, + AFD_SHARE_UNIQUE, ConnectionHandle, ConnectionObject); ExFreePool(EaInfo); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Mon Aug 20 05:48:52 2012 @@ -527,7 +527,7 @@ Address[0].AddressType ); if( FCB->LocalAddress ) { - Status = WarmSocketForBind( FCB ); + Status = WarmSocketForBind( FCB, AFD_SHARE_WILDCARD ); if( NT_SUCCESS(Status) ) FCB->State = SOCKET_STATE_BOUND; Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon Aug 20 05:48:52 2012 @@ -223,7 +223,7 @@ /* bind.c */ -NTSTATUS WarmSocketForBind( PAFD_FCB FCB ); +NTSTATUS WarmSocketForBind( PAFD_FCB FCB, ULONG ShareType ); NTSTATUS NTAPI AfdBindSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); @@ -367,6 +367,7 @@ NTSTATUS TdiOpenAddressFile( PUNICODE_STRING DeviceName, PTRANSPORT_ADDRESS Name, + ULONG ShareType, PHANDLE AddressHandle, PFILE_OBJECT *AddressObject);

1 0

[jimtabor] 57114: [NtUser] - Fix screensave access hangs but it was recoverable and did not crash. The new ATI points seem to kick in so disabling them for now and leaving error prints. See bug 722...
by jimtabor＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: jimtabor Date: Mon Aug 20 05:19:50 2012 New Revision: 57114 URL: http://svn.reactos.org/svn/reactos?rev=57114&view=rev Log: [NtUser] - Fix screensave access hangs but it was recoverable and did not crash. The new ATI points seem to kick in so disabling them for now and leaving error prints. See bug 7225, need to separate the message queue. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Mon Aug 20 05:19:50 2012 @@ -1090,7 +1090,8 @@ Wnd->head.pti == WndNewOwner->head.pti || WndOldOwner->head.pti != WndNewOwner->head.pti ) { - UserAttachThreadInput(Wnd->head.pti, WndOldOwner->head.pti, FALSE); + ERR("ProcessOwnerSwap Old out.\n"); + //UserAttachThreadInput(Wnd->head.pti, WndOldOwner->head.pti, FALSE); } } } @@ -1101,7 +1102,8 @@ if (!WndOldOwner || WndOldOwner->head.pti != WndNewOwner->head.pti ) { - UserAttachThreadInput(Wnd->head.pti, WndNewOwner->head.pti, TRUE); + ERR("ProcessOwnerSwap New in.\n"); + //UserAttachThreadInput(Wnd->head.pti, WndNewOwner->head.pti, TRUE); } } } @@ -1243,14 +1245,16 @@ { if (Wnd->head.pti != WndOldParent->head.pti) { - UserAttachThreadInput(Wnd->head.pti, WndOldParent->head.pti, FALSE); + ERR("SetParent Old out.\n"); + //UserAttachThreadInput(Wnd->head.pti, WndOldParent->head.pti, FALSE); } } if ( WndNewParent != co_GetDesktopWindow(Wnd)) { if (Wnd->head.pti != WndNewParent->head.pti) { - UserAttachThreadInput(Wnd->head.pti, WndNewParent->head.pti, TRUE); + ERR("SetParent New in.\n"); + //UserAttachThreadInput(Wnd->head.pti, WndNewParent->head.pti, TRUE); } } } @@ -1938,7 +1942,8 @@ Class->atomClassName != gpsi->atomSysClass[ICLS_IME] && pti != pWnd->spwndOwner->head.pti) { - UserAttachThreadInput(pti, pWnd->spwndOwner->head.pti, TRUE); + ERR("CreateWindow Owner in.\n"); + //UserAttachThreadInput(pti, pWnd->spwndOwner->head.pti, TRUE); } } @@ -2221,7 +2226,8 @@ { if (pti != Window->spwndParent->head.pti) { - UserAttachThreadInput(pti, Window->spwndParent->head.pti, TRUE); + ERR("CreateWindow Parent in.\n"); + //UserAttachThreadInput(pti, Window->spwndParent->head.pti, TRUE); } } } @@ -2558,7 +2564,8 @@ { if (Window->spwndOwner) { - UserAttachThreadInput(Window->head.pti, Window->spwndOwner->head.pti, FALSE); + ERR("DestroyWindow Owner out.\n"); + //UserAttachThreadInput(Window->head.pti, Window->spwndOwner->head.pti, FALSE); } } } @@ -2596,7 +2603,8 @@ { if (!IntIsTopLevelWindow(Window)) { - UserAttachThreadInput(Window->head.pti, Window->spwndParent->head.pti, FALSE); + ERR("DestroyWindow Parent out.\n"); + //UserAttachThreadInput(Window->head.pti, Window->spwndParent->head.pti, FALSE); } } }

1 0

[jimtabor] 57113: [NtUser] - Fix API SetActiveWindow test, get it back.
by jimtabor＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: jimtabor Date: Mon Aug 20 03:59:24 2012 New Revision: 57113 URL: http://svn.reactos.org/svn/reactos?rev=57113&view=rev Log: [NtUser] - Fix API SetActiveWindow test, get it back. Modified: trunk/reactos/win32ss/user/ntuser/focus.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Mon Aug 20 03:59:24 2012 @@ -591,13 +591,14 @@ if (bFocus && !(ThreadQueue->QF_flags & QF_FOCUSNULLSINCEACTIVE)) { /* Do not change focus if the window is no longer active */ - if ( !Wnd || IntGetNonChildAncestor(ThreadQueue->spwndFocus) != ThreadQueue->spwndActive) - { - PWND pWndTemp = Wnd; - if (ThreadQueue->spwndActive && ThreadQueue->spwndActive->style & WS_MINIMIZE) - pWndTemp = NULL; - TRACE("SAW is setting Focus! 0x%p Temp 0x%p\n",Wnd, pWndTemp); - IntSendFocusMessages(pti, pWndTemp); + if (ThreadQueue->spwndActive == Wnd) + { + if (!ThreadQueue->spwndFocus || + !Wnd || + UserGetAncestor(ThreadQueue->spwndFocus, GA_ROOT) != Wnd) + { + co_UserSetFocus(Wnd); + } } }

1 0

[jimtabor] 57112: - Fix build.
by jimtabor＠svn.reactos.org 20 Aug '12

20 Aug '12

Author: jimtabor Date: Mon Aug 20 00:30:54 2012 New Revision: 57112 URL: http://svn.reactos.org/svn/reactos?rev=57112&view=rev Log: - Fix build. Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Aug 20 00:30:54 2012 @@ -1158,8 +1158,8 @@ return wparam; } -+LRESULT -+WINAPI +LRESULT +WINAPI DesktopWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { LRESULT Result;

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