Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 50502: [ROSAUTOTEST] - Fix direct submission to Testman after the recent changes and finally change the location to "reactos.org" instead of "localhost". Makes Rosautotest ready for runnin...
by cfinck＠svn.reactos.org 26 Jan '11

26 Jan '11

Author: cfinck Date: Wed Jan 26 21:56:17 2011 New Revision: 50502 URL: http://svn.reactos.org/svn/reactos?rev=50502&view=rev Log: [ROSAUTOTEST] - Fix direct submission to Testman after the recent changes and finally change the location to "reactos.org" instead of "localhost". Makes Rosautotest ready for running tests on our upcoming Windows Server instance. Modified: trunk/rostests/rosautotest/CConfiguration.cpp trunk/rostests/rosautotest/CWebService.cpp Modified: trunk/rostests/rosautotest/CConfiguration.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] Wed Jan 26 21:56:17 2011 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Class for managing all the configuration parameters - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2011 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -183,11 +183,11 @@ EXCEPTION("Missing \"" CONFIGURATION_FILENAMEA "\" configuration file!\n"); /* Get the user name */ - m_AuthenticationRequestString = "&username="; - Value = GetINIValue(L"Login", L"UserName", ConfigFile); + m_AuthenticationRequestString = "&sourceid="; + Value = GetINIValue(L"Login", L"SourceID", ConfigFile); if(Value.empty()) - EXCEPTION("UserName is missing in the configuration file\n"); + EXCEPTION("SourceID is missing in the configuration file\n"); m_AuthenticationRequestString += EscapeString(Value); Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Wed Jan 26 21:56:17 2011 @@ -2,12 +2,12 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Class implementing the interface to the "testman" Web Service - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2011 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" -static const WCHAR szHostname[] = L"localhost"; +static const WCHAR szHostname[] = L"reactos.org"; static const WCHAR szServerFile[] = L"testman/webservice/"; /**

1 0

[tkreuzer] 50501: Fix build of wined3d
by tkreuzer＠svn.reactos.org 26 Jan '11

26 Jan '11

Author: tkreuzer Date: Wed Jan 26 17:43:31 2011 New Revision: 50501 URL: http://svn.reactos.org/svn/reactos?rev=50501&view=rev Log: Fix build of wined3d Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild [iso-8859-1] Wed Jan 26 17:43:31 2011 @@ -5,6 +5,7 @@ <include base="wined3d">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_USE_MATH_DEFINES" /> <define name="USE_WIN32_OPENGL" /> <library>wine</library>

1 0

[tkreuzer] 50500: [CRT] Cleanup math.h from unixism. For now move everything that doesn't belong there into mingw_math.h.
by tkreuzer＠svn.reactos.org 26 Jan '11

26 Jan '11

Author: tkreuzer Date: Wed Jan 26 17:16:07 2011 New Revision: 50500 URL: http://svn.reactos.org/svn/reactos?rev=50500&view=rev Log: [CRT] Cleanup math.h from unixism. For now move everything that doesn't belong there into mingw_math.h. Added: trunk/reactos/include/crt/mingw_math.h (with props) 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=505… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Wed Jan 26 17:16:07 2011 @@ -40,178 +40,166 @@ #define _UNDERFLOW 4 #define _TLOSS 5 #define _PLOSS 6 - #define EDOM 33 #define ERANGE 34 _CRTIMP extern double _HUGE; #define HUGE_VAL _HUGE +#define _matherrl _matherr #ifndef _CRT_ABS_DEFINED #define _CRT_ABS_DEFINED - int __cdecl abs(int _X); - long __cdecl labs(long _X); -#endif - double __cdecl acos(double _X); - double __cdecl asin(double _X); - double __cdecl atan(double _X); - double __cdecl atan2(double _Y,double _X); + int __cdecl abs(int x); + long __cdecl labs(long x); +#endif + double __cdecl acos(double x); + double __cdecl asin(double x); + double __cdecl atan(double x); + double __cdecl atan2(double y, double x); + double __cdecl cos(double x); + double __cdecl cosh(double x); + double __cdecl exp(double x); + double __cdecl fabs(double x); + double __cdecl fmod(double x, double y); + double __cdecl log(double x); + double __cdecl log10(double x); + double __cdecl pow(double x, double y); + double __cdecl sin(double x); + double __cdecl sinh(double x); + double __cdecl sqrt(double x); + double __cdecl tan(double x); + double __cdecl tanh(double x); +#ifndef _CRT_MATHERR_DEFINED +#define _CRT_MATHERR_DEFINED + int __cdecl _matherr(struct _exception *except); +#endif + +#ifndef _CRT_ATOF_DEFINED +#define _CRT_ATOF_DEFINED + _CRTIMP double __cdecl atof(const char *str); + _CRTIMP double __cdecl _atof_l(const char *str ,_locale_t locale); +#endif #ifndef _SIGN_DEFINED #define _SIGN_DEFINED - _CRTIMP double __cdecl _copysign (double _Number,double _Sign); - _CRTIMP double __cdecl _chgsign (double _X); -#endif - double __cdecl cos(double _X); - double __cdecl cosh(double _X); - double __cdecl exp(double _X); - double expm1(double _X); - double __cdecl fabs(double _X); - double __cdecl fmod(double _X,double _Y); - double __cdecl log(double _X); - double __cdecl log10(double _X); - double __cdecl pow(double _X,double _Y); - double __cdecl sin(double _X); - double __cdecl sinh(double _X); - double __cdecl tan(double _X); - double __cdecl tanh(double _X); - double __cdecl sqrt(double _X); -#ifndef _CRT_ATOF_DEFINED -#define _CRT_ATOF_DEFINED - double __cdecl atof(const char *_String); - double __cdecl _atof_l(const char *_String,_locale_t _Locale); -#endif - - _CRTIMP double __cdecl _cabs(struct _complex _ComplexA); - _CRTIMP double __cdecl ceil(double _X); - _CRTIMP double __cdecl floor(double _X); - _CRTIMP double __cdecl frexp(double _X,int *_Y); - _CRTIMP double __cdecl _hypot(double _X,double _Y); - _CRTIMP double __cdecl _j0(double _X); - _CRTIMP double __cdecl _j1(double _X); - _CRTIMP double __cdecl _jn(int _X,double _Y); - _CRTIMP double __cdecl ldexp(double _X,int _Y); -#ifndef _CRT_MATHERR_DEFINED -#define _CRT_MATHERR_DEFINED - int __cdecl _matherr(struct _exception *_Except); -#endif - _CRTIMP double __cdecl modf(double _X,double *_Y); - _CRTIMP double __cdecl _y0(double _X); - _CRTIMP double __cdecl _y1(double _X); - _CRTIMP double __cdecl _yn(int _X,double _Y); + _CRTIMP double __cdecl _copysign(double x,double sgn); + _CRTIMP double __cdecl _chgsign(double x); +#endif + _CRTIMP double __cdecl _cabs(struct _complex a); + _CRTIMP double __cdecl ceil(double x); + _CRTIMP double __cdecl floor(double x); + _CRTIMP double __cdecl frexp(double x, int *y); + _CRTIMP double __cdecl _hypot(double x, double y); + _CRTIMP double __cdecl _j0(double x); + _CRTIMP double __cdecl _j1(double x); + _CRTIMP double __cdecl _jn(int x, double y); + _CRTIMP double __cdecl ldexp(double x, int y); + _CRTIMP double __cdecl modf(double x, double *y); + _CRTIMP double __cdecl _y0(double x); + _CRTIMP double __cdecl _y1(double x); + _CRTIMP double __cdecl _yn(int x, double y); + _CRTIMP float __cdecl _hypotf(float x, float y); #if defined(__i386__) || defined(_M_IX86) - _CRTIMP int __cdecl _set_SSE2_enable(int _Flag); - /* from libmingwex */ - float __cdecl _hypotf(float _X,float _Y); -#endif - - float frexpf(float _X,int *_Y); - float __cdecl ldexpf(float _X,int _Y); - long double __cdecl ldexpl(long double _X,int _Y); - float __cdecl acosf(float _X); - float __cdecl asinf(float _X); - float __cdecl atanf(float _X); - float __cdecl atan2f(float _X,float _Y); - float __cdecl cosf(float _X); - float __cdecl sinf(float _X); - float __cdecl tanf(float _X); - float __cdecl coshf(float _X); - float __cdecl sinhf(float _X); - float __cdecl tanhf(float _X); - float __cdecl expf(float _X); - float expm1f(float _X); - float __cdecl logf(float _X); - float __cdecl log10f(float _X); - float __cdecl modff(float _X,float *_Y); - float __cdecl powf(float _X,float _Y); - float __cdecl sqrtf(float _X); - float __cdecl ceilf(float _X); - float __cdecl floorf(float _X); - float __cdecl fmodf(float _X,float _Y); - float __cdecl _hypotf(float _X,float _Y); - float __cdecl fabsf(float _X); -#if !defined(__ia64__) && !defined(_M_IA64) - /* from libmingwex */ - float __cdecl _copysignf (float _Number,float _Sign); - float __cdecl _chgsignf (float _X); - float __cdecl _logbf(float _X); - float __cdecl _nextafterf(float _X,float _Y); - int __cdecl _finitef(float _X); - int __cdecl _isnanf(float _X); - int __cdecl _fpclassf(float _X); -#endif - -#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; - __fabs(x, res); - return res; + _CRTIMP int __cdecl _set_SSE2_enable(int flag); +#endif + +#if defined(__x86_64) || defined(_M_AMD64) + _CRTIMP float __cdecl _copysignf(float x, float sgn); + _CRTIMP float __cdecl _chgsignf(float x); + _CRTIMP float __cdecl _logbf(float x); + _CRTIMP float __cdecl _nextafterf(float x,float y); + _CRTIMP int __cdecl _finitef(float x); + _CRTIMP int __cdecl _isnanf(float x); + _CRTIMP int __cdecl _fpclassf(float x); +#endif + +#if defined(__ia64__) || defined (_M_IA64) + _CRTIMP float __cdecl fabsf(float x); + _CRTIMP float __cdecl ldexpf(float x, int y); + _CRTIMP long double __cdecl tanl(long double x); +#else + __CRT_INLINE float __cdecl fabsf(float x) { return ((float)fabs((double)x)); } + __CRT_INLINE float __cdecl ldexpf(float x, int expn) { return (float)ldexp (x, expn); } + __CRT_INLINE long double tanl(long double x) { return (tan((double)x)); } +#endif + +#if defined(__x86_64) || defined(_M_AMD64) || \ + defined (__ia64__) || defined (_M_IA64) + _CRTIMP float __cdecl acosf(float x); + _CRTIMP float __cdecl asinf(float x); + _CRTIMP float __cdecl atanf(float x); + _CRTIMP float __cdecl atan2f(float x, float y); + _CRTIMP float __cdecl ceilf(float x); + _CRTIMP float __cdecl cosf(float x); + _CRTIMP float __cdecl coshf(float x); + _CRTIMP float __cdecl expf(float x); + _CRTIMP float __cdecl floorf(float x); + _CRTIMP float __cdecl fmodf(float x, float y); + _CRTIMP float __cdecl logf(float x); + _CRTIMP float __cdecl log10f(float x); + _CRTIMP float __cdecl modff(float x, float *y); + _CRTIMP float __cdecl powf(float b, float e); + _CRTIMP float __cdecl sinf(float x); + _CRTIMP float __cdecl sinhf(float x); + _CRTIMP float __cdecl sqrtf(float x); + _CRTIMP float __cdecl tanf(float x); + _CRTIMP float __cdecl tanhf(float x); +#else + __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)); } + __CRT_INLINE float atan2f(float x,float y) { return ((float)atan2((double)x,(double)y)); } + __CRT_INLINE float ceilf(float x) { return ((float)ceil((double)x)); } + __CRT_INLINE float cosf(float x) { return ((float)cos((double)x)); } + __CRT_INLINE float coshf(float x) { return ((float)cosh((double)x)); } + __CRT_INLINE float expf(float x) { return ((float)exp((double)x)); } + __CRT_INLINE float floorf(float x) { return ((float)floor((double)x)); } + __CRT_INLINE float fmodf(float x,float y) { return ((float)fmod((double)x,(double)y)); } + __CRT_INLINE float logf(float x) { return ((float)log((double)x)); } + __CRT_INLINE float log10f(float x) { return ((float)log10((double)x)); } + __CRT_INLINE float modff(float x,float *y) { + double _Di,_Df = modf((double)x,&_Di); + *y = (float)_Di; + return ((float)_Df); } - + __CRT_INLINE float powf(float x,float y) { return ((float)pow((double)x,(double)y)); } + __CRT_INLINE float sinf(float x) { return ((float)sin((double)x)); } + __CRT_INLINE float sinhf(float x) { return ((float)sinh((double)x)); } + __CRT_INLINE float sqrtf(float x) { return ((float)sqrt((double)x)); } + __CRT_INLINE float tanf(float x) { return ((float)tan((double)x)); } + __CRT_INLINE float tanhf(float x) { return ((float)tanh((double)x)); } +#endif + + __CRT_INLINE long double acosl(long double x) { return (acos((double)x)); } + __CRT_INLINE long double asinl(long double x) { return (asin((double)x)); } + __CRT_INLINE long double atanl(long double x) { return (atan((double)x)); } + __CRT_INLINE long double atan2l(long double y, long double x) { return (atan2((double)y, (double)x)); } + __CRT_INLINE long double ceill(long double x) { return (ceil((double)x)); } + __CRT_INLINE long double cosl(long double x) { return (cos((double)x)); } + __CRT_INLINE long double coshl(long double x) { return (cosh((double)x)); } + __CRT_INLINE long double expl(long double x) { return (exp((double)x)); } + __CRT_INLINE long double floorl(long double x) { return (floor((double)x)); } + __CRT_INLINE long double fmodl(long double x, long double y) { return (fmod((double)x, (double)y)); } + __CRT_INLINE long double frexpl(long double x, int *y) { return (frexp((double)x, y)); } + __CRT_INLINE long double logl(long double x) { return (log((double)x)); } + __CRT_INLINE long double log10l(long double x) { return (log10((double)x)); } + __CRT_INLINE long double powl(long double x, long double y) { return (pow((double)x, (double)y)); } + __CRT_INLINE long double sinl(long double x) { return (sin((double)x)); } + __CRT_INLINE long double sinhl(long double x) { return (sinh((double)x)); } + __CRT_INLINE long double sqrtl(long double x) { return (sqrt((double)x)); } + __CRT_INLINE long double tanhl(long double x) {return (tanh((double)x)); } + __CRT_INLINE long double __cdecl fabsl(long double x) { return fabs((double)x); } __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__) && !defined (_M_IA64) - __CRT_INLINE float __cdecl fabsf (float x) - { - float res; - __fabs(x, res); - return res; - } - - __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); } -#endif - -#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; + __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)); } + __CRT_INLINE long double ldexpl(long double x, int y) { return ldexp((double)x, y); } + __CRT_INLINE long double modfl(long double x,long double *y) { + double _Di,_Df = modf((double)x,&_Di); + *y = (long double)_Di; return (_Df); } - -#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)); } - __CRT_INLINE float atan2f(float _X,float _Y) { return ((float)atan2((double)_X,(double)_Y)); } - __CRT_INLINE float ceilf(float _X) { return ((float)ceil((double)_X)); } - __CRT_INLINE float cosf(float _X) { return ((float)cos((double)_X)); } - __CRT_INLINE float coshf(float _X) { return ((float)cosh((double)_X)); } - __CRT_INLINE float expf(float _X) { return ((float)exp((double)_X)); } - __CRT_INLINE float floorf(float _X) { return ((float)floor((double)_X)); } - __CRT_INLINE float fmodf(float _X,float _Y) { return ((float)fmod((double)_X,(double)_Y)); } - __CRT_INLINE float logf(float _X) { return ((float)log((double)_X)); } - __CRT_INLINE float log10f(float _X) { return ((float)log10((double)_X)); } - __CRT_INLINE float modff(float _X,float *_Y) { - double _Di,_Df = modf((double)_X,&_Di); - *_Y = (float)_Di; - return ((float)_Df); - } - __CRT_INLINE float powf(float _X,float _Y) { return ((float)pow((double)_X,(double)_Y)); } - __CRT_INLINE float sinf(float _X) { return ((float)sin((double)_X)); } - __CRT_INLINE float sinhf(float _X) { return ((float)sinh((double)_X)); } - __CRT_INLINE float sqrtf(float _X) { return ((float)sqrt((double)_X)); } - __CRT_INLINE float tanf(float _X) { return ((float)tan((double)_X)); } - __CRT_INLINE float tanhf(float _X) { return ((float)tanh((double)_X)); } -#endif #ifndef NO_OLDNAMES #define DOMAIN _DOMAIN @@ -221,540 +209,29 @@ #define TLOSS _TLOSS #define PLOSS _PLOSS #define matherr _matherr - -#define HUGE _HUGE - /* double __cdecl cabs(struct _complex _X); */ - double __cdecl hypot(double _X,double _Y); - __CRT_INLINE float __cdecl hypotf (float x, float y) - { return (float) hypot (x, y);} - _CRTIMP double __cdecl j0(double _X); - _CRTIMP double __cdecl j1(double _X); - _CRTIMP double __cdecl jn(int _X,double _Y); - _CRTIMP double __cdecl y0(double _X); - _CRTIMP double __cdecl y1(double _X); - _CRTIMP double __cdecl yn(int _X,double _Y); -#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 - - -#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) - -#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 - converted to double, and zero when converted to float.) - */ - - extern int __cdecl __fpclassifyf (float); - extern int __cdecl __fpclassify (double); - - __CRT_INLINE int __cdecl __fpclassifyl (long double x){ - unsigned short sw; - __fxam(x, sw); - return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); - } - - __CRT_INLINE int __cdecl __fpclassify (double x){ - return __fpclassifyl((long double)x); - } - -#define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ - : sizeof (x) == sizeof (double) ? __fpclassify (x) \ - : __fpclassifyl (x)) - - /* 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. */ - - __CRT_INLINE int __cdecl __isnan (double _x) - { - unsigned short sw; - __fxam(_x, sw); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; - } - - __CRT_INLINE int __cdecl __isnanf (float _x) - { - unsigned short sw; - __fxam(_x, sw); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; - } - - __CRT_INLINE int __cdecl __isnanl (long double _x) - { - unsigned short sw; - __fxam(_x, sw); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; - } - - -#define isnan(x) (sizeof (x) == sizeof (float) ? __isnanf (x) \ - : sizeof (x) == sizeof (double) ? __isnan (x) \ - : __isnanl (x)) - - /* 7.12.3.5 */ -#define isnormal(x) (fpclassify(x) == FP_NORMAL) - - /* 7.12.3.6 The signbit macro */ - __CRT_INLINE int __cdecl __signbit (double x) { - unsigned short stw; - __fxam(x, stw); - return stw & 0x0200; - } - - __CRT_INLINE int __cdecl __signbitf (float x) { - unsigned short stw; - __fxam(x, stw); - return stw & 0x0200; - } - - __CRT_INLINE int __cdecl __signbitl (long double x) { - unsigned short stw; - __fxam(x, stw); - return stw & 0x0200; - } - -#define signbit(x) (sizeof (x) == sizeof (float) ? __signbitf (x) \ - : sizeof (x) == sizeof (double) ? __signbit (x) \ - : __signbitl (x)) - - extern double __cdecl exp2(double); - extern float __cdecl exp2f(float); - extern long double __cdecl exp2l(long double); - -#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); - - extern double __cdecl log1p(double); - extern float __cdecl log1pf(float); - extern long double __cdecl log1pl(long double); - - extern double __cdecl log2 (double); - extern float __cdecl log2f (float); - extern long double __cdecl log2l (long double); - - 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 - - __CRT_INLINE double __cdecl logb (double x) - { - double res; - __fxtract(x, res); - return res; - } - - __CRT_INLINE float __cdecl logbf (float x) - { - float res; - __fxtract(x, res); - return res; - } - - __CRT_INLINE long double __cdecl logbl (long double x) - { - long double res; - __fxtract(x, res); - return res; - } - - /* 7.12.6.13 */ - extern double __cdecl scalbn (double, int); - extern float __cdecl scalbnf (float, int); - extern long double __cdecl scalbnl (long double, int); - - extern double __cdecl scalbln (double, long); - extern float __cdecl scalblnf (float, long); - extern long double __cdecl scalblnl (long double, long); - - /* 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 */ - 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 */ - 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); - extern float __cdecl lgammaf (float); - extern long double __cdecl lgammal (long double); - - /* 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 */ - 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 - - __CRT_INLINE double __cdecl rint (double x) - { - double retval; - __frndint(x, retval); - return retval; - } - - __CRT_INLINE float __cdecl rintf (float x) - { - float retval; - __frndint(x, retval); - return retval; - } - - __CRT_INLINE long double __cdecl rintl (long double x) - { - long double retval; - __frndint(x, retval); - 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 */ - extern double __cdecl round (double); - extern float __cdecl roundf (float); - extern long double __cdecl roundl (long double); - - /* 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 */ - 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 */ - 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 */ - 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 */ - 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 */ - extern double __cdecl nan(const char *tagp); - extern float __cdecl nanf(const char *tagp); - extern long double __cdecl nanl(const char *tagp); - -#ifndef __STRICT_ANSI__ -#define _nan() nan("") -#define _nanf() nanf("") -#define _nanl() nanl("") -#endif - - /* 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 */ - 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 */ - 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 */ - 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 */ - 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 - -#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; -#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; - } - -#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 */ +#define HUGE _HUGE + // _CRTIMP double __cdecl cabs(struct _complex x); + #define cabs _cabs + _CRTIMP double __cdecl hypot(double x,double y); + _CRTIMP double __cdecl j0(double x); + _CRTIMP double __cdecl j1(double x); + _CRTIMP double __cdecl jn(int x,double y); + _CRTIMP double __cdecl y0(double x); + _CRTIMP double __cdecl y1(double x); + _CRTIMP double __cdecl yn(int x,double y); + __CRT_INLINE float __cdecl hypotf(float x, float y) { return (float) hypot (x, y); } +#endif #ifdef __cplusplus } extern "C++" { - template<class _Ty> inline _Ty _Pow_int(_Ty _X,int _Y) { + template<class _Ty> inline _Ty _Pow_int(_Ty x,int y) { unsigned int _N; - if(_Y >= 0) _N = (unsigned int)_Y; - 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(y >= 0) _N = (unsigned int)y; + 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); } } } @@ -762,7 +239,9 @@ #pragma pack(pop) -#if !defined(__STRICT_ANSI__) && !defined(_MATH_DEFINES_DEFINED) +#endif /* !_INC_MATH */ + +#if defined(_USE_MATH_DEFINES) && !defined(_MATH_DEFINES_DEFINED) #define _MATH_DEFINES_DEFINED #define M_E 2.71828182845904523536 @@ -778,20 +257,5 @@ #define M_2_SQRTPI 1.12837916709551257390 #define M_SQRT2 1.41421356237309504880 #define M_SQRT1_2 0.707106781186547524401 -#endif - -#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 */ - -#endif /* !_INC_MATH */ + +#endif /* _USE_MATH_DEFINES */ Added: 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 (added) +++ trunk/reactos/include/crt/mingw_math.h [iso-8859-1] Wed Jan 26 17:16:07 2011 @@ -1,0 +1,534 @@ + + + float expm1f(float _X); + double expm1(double _X); + + +#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 + + +#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 + converted to double, and zero when converted to float.) + */ + + extern int __cdecl __fpclassifyf (float); + extern int __cdecl __fpclassify (double); + + __CRT_INLINE int __cdecl __fpclassifyl (long double x){ + unsigned short sw; + __fxam(x, sw); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); + } + + __CRT_INLINE int __cdecl __fpclassify (double x){ + return __fpclassifyl((long double)x); + } + +#define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ + : sizeof (x) == sizeof (double) ? __fpclassify (x) \ + : __fpclassifyl (x)) + + /* 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. */ + + __CRT_INLINE int __cdecl __isnan (double _x) + { + unsigned short sw; + __fxam(_x, sw); + return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) + == FP_NAN; + } + + __CRT_INLINE int __cdecl __isnanf (float _x) + { + unsigned short sw; + __fxam(_x, sw); + return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) + == FP_NAN; + } + + __CRT_INLINE int __cdecl __isnanl (long double _x) + { + unsigned short sw; + __fxam(_x, sw); + return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) + == FP_NAN; + } + + +#define isnan(x) (sizeof (x) == sizeof (float) ? __isnanf (x) \ + : sizeof (x) == sizeof (double) ? __isnan (x) \ + : __isnanl (x)) + + /* 7.12.3.5 */ +#define isnormal(x) (fpclassify(x) == FP_NORMAL) + + /* 7.12.3.6 The signbit macro */ + __CRT_INLINE int __cdecl __signbit (double x) { + unsigned short stw; + __fxam(x, stw); + return stw & 0x0200; + } + + __CRT_INLINE int __cdecl __signbitf (float x) { + unsigned short stw; + __fxam(x, stw); + return stw & 0x0200; + } + + __CRT_INLINE int __cdecl __signbitl (long double x) { + unsigned short stw; + __fxam(x, stw); + return stw & 0x0200; + } + +#define signbit(x) (sizeof (x) == sizeof (float) ? __signbitf (x) \ + : sizeof (x) == sizeof (double) ? __signbit (x) \ + : __signbitl (x)) + + extern double __cdecl exp2(double); + extern float __cdecl exp2f(float); + extern long double __cdecl exp2l(long double); + +#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); + + extern double __cdecl log1p(double); + extern float __cdecl log1pf(float); + extern long double __cdecl log1pl(long double); + + extern double __cdecl log2 (double); + extern float __cdecl log2f (float); + extern long double __cdecl log2l (long double); + + 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 + + __CRT_INLINE double __cdecl logb (double x) + { + double res; + __fxtract(x, res); + return res; + } + + __CRT_INLINE float __cdecl logbf (float x) + { + float res; + __fxtract(x, res); + return res; + } + + __CRT_INLINE long double __cdecl logbl (long double x) + { + long double res; + __fxtract(x, res); + return res; + } + + /* 7.12.6.13 */ + extern double __cdecl scalbn (double, int); + extern float __cdecl scalbnf (float, int); + extern long double __cdecl scalbnl (long double, int); + + extern double __cdecl scalbln (double, long); + extern float __cdecl scalblnf (float, long); + extern long double __cdecl scalblnl (long double, long); + + /* 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 */ + 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 */ + 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); + extern float __cdecl lgammaf (float); + extern long double __cdecl lgammal (long double); + + /* 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 */ + 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 + + __CRT_INLINE double __cdecl rint (double x) + { + double retval; + __frndint(x, retval); + return retval; + } + + __CRT_INLINE float __cdecl rintf (float x) + { + float retval; + __frndint(x, retval); + return retval; + } + + __CRT_INLINE long double __cdecl rintl (long double x) + { + long double retval; + __frndint(x, retval); + 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 */ + extern double __cdecl round (double); + extern float __cdecl roundf (float); + extern long double __cdecl roundl (long double); + + /* 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 */ + 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 */ + 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 */ + 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 */ + 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 */ + extern double __cdecl nan(const char *tagp); + extern float __cdecl nanf(const char *tagp); + extern long double __cdecl nanl(const char *tagp); + +#ifndef __STRICT_ANSI__ +#define _nan() nan("") +#define _nanf() nanf("") +#define _nanl() nanl("") +#endif + + /* 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 */ + 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 */ + 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 */ + 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 */ + 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 + +#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; +#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; + } + +#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 */ Propchange: trunk/reactos/include/crt/mingw_math.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 50499: [CRT] - Replace isinf with !_finite and isnan with _isnan
by tkreuzer＠svn.reactos.org 26 Jan '11

26 Jan '11

Author: tkreuzer Date: Wed Jan 26 16:28:34 2011 New Revision: 50499 URL: http://svn.reactos.org/svn/reactos?rev=50499&view=rev Log: [CRT] - Replace isinf with !_finite and isnan with _isnan Modified: trunk/reactos/lib/sdk/crt/misc/i10output.c Modified: trunk/reactos/lib/sdk/crt/misc/i10output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/i10output… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/i10output.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/i10output.c [iso-8859-1] Wed Jan 26 16:28:34 2011 @@ -42,7 +42,7 @@ } else data->sign = ' '; - if(isinf(d)) { + if(!_finite(d)) { data->pos = 1; data->len = 5; memcpy(data->str, inf_str, sizeof(inf_str)); @@ -50,7 +50,7 @@ return 0; } - if(isnan(d)) { + if(_isnan(d)) { data->pos = 1; data->len = 6; memcpy(data->str, nan_str, sizeof(nan_str));

1 0

[tkreuzer] 50498: [AVIFIL32] Split utf8 resources into theit own file (MSVC compatibility)
by tkreuzer＠svn.reactos.org 26 Jan '11

26 Jan '11

Author: tkreuzer Date: Wed Jan 26 16:26:42 2011 New Revision: 50498 URL: http://svn.reactos.org/svn/reactos?rev=50498&view=rev Log: [AVIFIL32] Split utf8 resources into theit own file (MSVC compatibility) Added: trunk/reactos/dll/win32/avifil32/rsrc-utf8.rc - copied, changed from r50426, trunk/reactos/dll/win32/avifil32/rsrc.rc Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild trunk/reactos/dll/win32/avifil32/rsrc.rc Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] Wed Jan 26 16:26:42 2011 @@ -20,6 +20,7 @@ <file>tmpfile.c</file> <file>wavfile.c</file> <file>rsrc.rc</file> + <file>rsrc-utf8.rc</file> <library>wine</library> <library>uuid</library> <library>msacm32</library> Copied: trunk/reactos/dll/win32/avifil32/rsrc-utf8.rc (from r50426, trunk/reactos/dll/win32/avifil32/rsrc.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc-ut… ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc-utf8.rc [iso-8859-1] Wed Jan 26 16:26:42 2011 @@ -34,17 +34,6 @@ * Everything specific to any language goes * in one of the specific files. */ -#include "avifile_Cs.rc" -#include "avifile_En.rc" -#include "avifile_Es.rc" -#include "avifile_Hu.rc" -#include "avifile_It.rc" -#include "avifile_Nl.rc" -#include "avifile_No.rc" -#include "avifile_Pl.rc" -#include "avifile_Sv.rc" -#include "avifile_Tr.rc" -#include "avifile_Uk.rc" /* UTF-8 */ #include "avifile_Bg.rc" Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] Wed Jan 26 16:26:42 2011 @@ -46,16 +46,3 @@ #include "avifile_Tr.rc" #include "avifile_Uk.rc" -/* UTF-8 */ -#include "avifile_Bg.rc" -#include "avifile_Da.rc" -#include "avifile_De.rc" -#include "avifile_Fr.rc" -#include "avifile_Ja.rc" -#include "avifile_Ko.rc" -#include "avifile_Lt.rc" -#include "avifile_Pt.rc" -#include "avifile_Ro.rc" -#include "avifile_Ru.rc" -#include "avifile_Si.rc" -#include "avifile_Zh.rc"

1 0

[tkreuzer] 50497: crt header compatibility update: - define _USE_MATH_DEFINES for dsound, gdiplus, jscript and some win32k files - don't define HAVE_LRINT(F) in libsamplerate - Remove M_PI constant...
by tkreuzer＠svn.reactos.org 26 Jan '11

26 Jan '11

Author: tkreuzer Date: Wed Jan 26 16:24:35 2011 New Revision: 50497 URL: http://svn.reactos.org/svn/reactos?rev=50497&view=rev Log: crt header compatibility update: - define _USE_MATH_DEFINES for dsound, gdiplus, jscript and some win32k files - don't define HAVE_LRINT(F) in libsamplerate - Remove M_PI constants from win32k Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild trunk/reactos/dll/win32/jscript/jscript.rbuild trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] Wed Jan 26 16:24:35 2011 @@ -6,6 +6,7 @@ <include base="dsound">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="_WINE" /> + <define name="_USE_MATH_DEFINES" /> <library>wine</library> <library>uuid</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] Wed Jan 26 16:24:35 2011 @@ -6,6 +6,7 @@ <include base="gdiplus">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_USE_MATH_DEFINES" /> <file>brush.c</file> <file>customlinecap.c</file> <file>font.c</file> Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] Wed Jan 26 16:24:35 2011 @@ -8,6 +8,7 @@ <include base="jscript" root="intermediate" compiler="rc">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_USE_MATH_DEFINES" /> <define name="RPC_NO_WINDOWS_H" /> <dependency>jsglobal</dependency> <library>wine</library> Modified: trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild [iso-8859-1] Wed Jan 26 16:24:35 2011 @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="libsamplerate" type="staticlibrary" allowwarnings="true"> - <define name="HAVE_LRINT" /> - <define name="HAVE_LRINTF" /> <include base="libsamplerate">.</include> <file>samplerate.c</file> <file>src_linear.c</file> Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Wed Jan 26 16:24:35 2011 @@ -1,4 +1,6 @@ #include <win32k.h> +#define _USE_MATH_DEFINES +#include <math.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Wed Jan 26 16:24:35 2011 @@ -50,6 +50,8 @@ */ #include <win32k.h> +#define _USE_MATH_DEFINES +#include <math.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Wed Jan 26 16:24:35 2011 @@ -33,7 +33,8 @@ */ #include <win32k.h> -#include "math.h" +#define _USE_MATH_DEFINES +#include <math.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Wed Jan 26 16:24:35 2011 @@ -70,10 +70,6 @@ /* Undocumented stuff */ typedef DRIVEROBJ *PDRIVEROBJ; -#ifndef M_PI -#define M_PI 3.14159265358979323846f -#define M_PI_2 1.57079632679489661923 -#endif /* User heap */ extern HANDLE GlobalUserHeap;

1 0

[tkreuzer] 50496: [FREELDR] Fix compilation on MSVC
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 22:23:10 2011 New Revision: 50496 URL: http://svn.reactos.org/svn/reactos?rev=50496&view=rev Log: [FREELDR] Fix compilation on MSVC Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Jan 25 22:23:10 2011 @@ -39,6 +39,10 @@ extern ULONG LoaderPagesSpanned; extern BOOLEAN AcpiPresent; +extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; +extern BOOLEAN WinLdrTerminalConnected; +extern void WinLdrSetupEms(IN PCHAR BootOptions); + BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, IN PCH DllName, @@ -155,7 +159,7 @@ ArcDiskInfo->ArcName = (PCHAR)PaToVa(ArcDiskInfo->ArcName); /* Mark partition table as valid */ - ArcDiskInfo->ValidPartitionTable = TRUE; + ArcDiskInfo->ValidPartitionTable = TRUE; /* Insert into the list */ InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, @@ -203,11 +207,9 @@ /* See KiRosFrldrLpbToNtLpb for details */ Extension->AcpiTable = (PVOID)1; } - + #ifndef _M_ARM /* Set headless block pointer */ - extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; - extern BOOLEAN WinLdrTerminalConnected; if (WinLdrTerminalConnected) { Extension->HeadlessLoaderBlock = MmHeapAlloc(sizeof(HEADLESS_LOADER_BLOCK)); @@ -535,10 +537,9 @@ /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); - + #ifndef _M_ARM /* Setup redirection support */ - extern void WinLdrSetupEms(IN PCHAR BootOptions); WinLdrSetupEms(BootOptions); #endif /* Detect hardware */

1 0

[tkreuzer] 50495: [CRT] Fix copy pasta. Spotted by rs on irc.
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 20:56:14 2011 New Revision: 50495 URL: http://svn.reactos.org/svn/reactos?rev=50495&view=rev Log: [CRT] Fix copy pasta. Spotted by rs on irc. Modified: branches/cmake-bringup/lib/sdk/crt/math/labs.c Modified: branches/cmake-bringup/lib/sdk/crt/math/labs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/labs.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/labs.c [iso-8859-1] Tue Jan 25 20:56:14 2011 @@ -2,7 +2,7 @@ #ifdef _MSC_VER #pragma warning(disable: 4164) -#pragma function(abs) +#pragma function(labs) #endif /*

1 0

[tkreuzer] 50494: [CRT] On MSVC mark abs, labs and strcmp as intrinsics (needed when compiling with /O2+) and disable a warning that they are not intrinsics (when compiled with /O1)
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 20:48:56 2011 New Revision: 50494 URL: http://svn.reactos.org/svn/reactos?rev=50494&view=rev Log: [CRT] On MSVC mark abs, labs and strcmp as intrinsics (needed when compiling with /O2+) and disable a warning that they are not intrinsics (when compiled with /O1) Modified: branches/cmake-bringup/lib/sdk/crt/math/abs.c branches/cmake-bringup/lib/sdk/crt/math/labs.c branches/cmake-bringup/lib/sdk/crt/mem/memcmp.c branches/cmake-bringup/lib/sdk/crt/string/scanf.h branches/cmake-bringup/lib/sdk/crt/string/strset.c Modified: branches/cmake-bringup/lib/sdk/crt/math/abs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/abs.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/abs.c [iso-8859-1] Tue Jan 25 20:48:56 2011 @@ -1,4 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(abs) +#endif /* * @implemented Modified: branches/cmake-bringup/lib/sdk/crt/math/labs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/labs.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/labs.c [iso-8859-1] Tue Jan 25 20:48:56 2011 @@ -1,4 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(abs) +#endif /* * @implemented Modified: branches/cmake-bringup/lib/sdk/crt/mem/memcmp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/mem/m… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/mem/memcmp.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/mem/memcmp.c [iso-8859-1] Tue Jan 25 20:48:56 2011 @@ -3,6 +3,11 @@ */ #include <string.h> + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(memcmp) +#endif int memcmp(const void *s1, const void *s2, size_t n) { Modified: branches/cmake-bringup/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/scanf.h [iso-8859-1] Tue Jan 25 20:48:56 2011 @@ -460,7 +460,7 @@ if ((*(format - 1)) < *(format + 1)) RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); else - RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); + RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); format++; } else RtlSetBits(&bitMask, *format, 1); Modified: branches/cmake-bringup/lib/sdk/crt/string/strset.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/string/strset.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/string/strset.c [iso-8859-1] Tue Jan 25 20:48:56 2011 @@ -11,6 +11,7 @@ #if defined(__GNUC__) && !defined(__clang__) #define __int64 long long #elif defined(_MSC_VER) +#pragma warning(disable: 4164) #pragma function(_strset) #endif

1 0

[tkreuzer] 50493: [CMAKE] Link smss to msvcsup on MSVC builds
by tkreuzer＠svn.reactos.org 25 Jan '11

25 Jan '11

Author: tkreuzer Date: Tue Jan 25 19:19:02 2011 New Revision: 50493 URL: http://svn.reactos.org/svn/reactos?rev=50493&view=rev Log: [CMAKE] Link smss to msvcsup on MSVC builds Modified: branches/cmake-bringup/base/system/smss/CMakeLists.txt Modified: branches/cmake-bringup/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/smss/… ============================================================================== --- branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] Tue Jan 25 19:19:02 2011 @@ -26,6 +26,9 @@ add_executable(smss WIN32 ${CMAKE_CURRENT_BINARY_DIR}/smss_smss.h.gch ${SOURCE}) target_link_libraries(smss mingw_common nt smlib) +if(MSVC) + target_link_libraries(smss msvcsup) +endif() add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE})

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