[sserapion] 45208: - commctrl.h: revert a change from 45098 which is incorrect. - make some floating point math available on x64 - build fixes.
Author: sserapion Date: Sat Jan 23 05:18:57 2010 New Revision: 45208
URL: http://svn.reactos.org/svn/reactos?rev=45208&view=rev Log: - commctrl.h: revert a change from 45098 which is incorrect. - make some floating point math available on x64 - build fixes.
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c branches/ros-amd64-bringup/reactos/include/crt/math.h branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.vcproj
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -21,11 +21,6 @@ ULONG_PTR KernelBase;
/***************************************************************************/ - -VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts) -{ - UNIMPLEMENTED; -}
VOID HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock)
Modified: branches/ros-amd64-bringup/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/math.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/math.h [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -106,40 +106,40 @@ 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); + extern float frexpf(float _X,int *_Y); + extern float __cdecl ldexpf(float _X,int _Y); + extern long double __cdecl ldexpl(long double _X,int _Y); + extern float __cdecl acosf(float _X); + extern float __cdecl asinf(float _X); + extern float __cdecl atanf(float _X); + extern float __cdecl atan2f(float _X,float _Y); + extern float __cdecl cosf(float _X); + extern float __cdecl sinf(float _X); + extern float __cdecl tanf(float _X); + extern float __cdecl coshf(float _X); + extern float __cdecl sinhf(float _X); + extern float __cdecl tanhf(float _X); + extern float __cdecl expf(float _X); + extern float expm1f(float _X); + extern float __cdecl logf(float _X); + extern float __cdecl log10f(float _X); + extern float __cdecl modff(float _X,float *_Y); + extern float __cdecl powf(float _X,float _Y); + extern float __cdecl sqrtf(float _X); + extern float __cdecl ceilf(float _X); + extern float __cdecl floorf(float _X); + extern float __cdecl fmodf(float _X,float _Y); + extern float __cdecl _hypotf(float _X,float _Y); + extern 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); + extern float __cdecl _copysignf (float _Number,float _Sign); + extern float __cdecl _chgsignf (float _X); + extern float __cdecl _logbf(float _X); + extern float __cdecl _nextafterf(float _X,float _Y); + extern int __cdecl _finitef(float _X); + extern int __cdecl _isnanf(float _X); + extern int __cdecl _fpclassf(float _X); #endif
#if defined(__GNUC__) @@ -237,14 +237,22 @@
#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("") +#elif !defined(_MSC_VER) +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) */
#define FP_NAN 0x0100 @@ -320,6 +328,9 @@ /* 7.12.3.4 */ /* We don't need to worry about truncation here: A NaN stays a NaN. */ + extern int __cdecl __isnan (double) __MINGW_ATTRIB_PURE; + extern int __cdecl __isnanf (float) __MINGW_ATTRIB_PURE; + extern int __cdecl __isnanl (long double) __MINGW_ATTRIB_PURE;
__CRT_INLINE int __cdecl __isnan (double _x) { @@ -354,6 +365,9 @@ #define isnormal(x) (fpclassify(x) == FP_NORMAL)
/* 7.12.3.6 The signbit macro */ + extern int __cdecl __signbit (double) __MINGW_ATTRIB_PURE; + extern int __cdecl __signbitf (float) __MINGW_ATTRIB_PURE; + extern int __cdecl __signbitl (long double) __MINGW_ATTRIB_PURE; __CRT_INLINE int __cdecl __signbit (double x) { unsigned short stw; __fxam(x, stw);
Modified: branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -2809,7 +2809,7 @@ (LPARAM)(HTREEITEM)(hitem))
#define TreeView_EnsureVisible(hwnd, hitem) \ - (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem)) + (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(hitem))
#define TreeView_SortChildrenCB(hwnd, psort, recurse) \ (BOOL)SNDMSG((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -16,7 +16,7 @@
#include "../ARM3/miarm.h"
-#ifndef KDBG +#ifdef _WINKD_ extern PMMPTE MmDebugPte; #endif
@@ -448,7 +448,7 @@ MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; MmLastReservedMappingPte = MiAddressToPte((PVOID)MI_MAPPING_RANGE_END);
-#ifndef KDBG +#ifdef _WINKD_ /* Setup debug mapping PTE */ MmDebugPte = MxGetPte(MI_DEBUG_MAPPING); #endif
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -137,6 +137,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="true" + OpenMP="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/rbuild.pch" AssemblerListingLocation=".\Debug/"
-
sserapion＠svn.reactos.org