Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[tfaber] 57128: [RTL] - Check the correct return status in RtlCreateUserProcess (CID 715961)
by tfaber＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: tfaber Date: Wed Aug 22 11:35:19 2012 New Revision: 57128 URL: http://svn.reactos.org/svn/reactos?rev=57128&view=rev Log: [RTL] - Check the correct return status in RtlCreateUserProcess (CID 715961) Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/process.c?rev=5712… ============================================================================== --- trunk/reactos/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/process.c [iso-8859-1] Wed Aug 22 11:35:19 2012 @@ -203,7 +203,7 @@ Status = RtlpMapFile(ImageFileName, Attributes, &hSection); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("Could not map process image\n"); return Status; @@ -263,11 +263,11 @@ } /* Get some information about the process */ - ZwQueryInformationProcess(ProcessInfo->ProcessHandle, - ProcessBasicInformation, - &ProcessBasicInfo, - sizeof(ProcessBasicInfo), - NULL); + Status = ZwQueryInformationProcess(ProcessInfo->ProcessHandle, + ProcessBasicInformation, + &ProcessBasicInfo, + sizeof(ProcessBasicInfo), + NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Could not query Process Info\n");

1 0

[tfaber] 57127: [DEVMGR] - Actually fail on error in AllocAndLoadStringsCat (CID 716793/716794) [IPHLPAPI] - Fix a use after free in getNthInterfaceEntity (CID 716795 - partly reverts r53190). Fix ...
by tfaber＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: tfaber Date: Wed Aug 22 09:39:57 2012 New Revision: 57127 URL: http://svn.reactos.org/svn/reactos?rev=57127&view=rev Log: [DEVMGR] - Actually fail on error in AllocAndLoadStringsCat (CID 716793/716794) [IPHLPAPI] - Fix a use after free in getNthInterfaceEntity (CID 716795 - partly reverts r53190). Fix a possible double free in getArpTable (CID 716796). Modified: trunk/reactos/dll/win32/devmgr/misc.c trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c Modified: trunk/reactos/dll/win32/devmgr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/misc.c?re… ============================================================================== --- trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] Wed Aug 22 09:39:57 2012 @@ -130,6 +130,7 @@ if (!(Ret = LoadStringW(hInst, uID[i], s, ln))) { LocalFree((HLOCAL)(*lpTarget)); + return 0; } s += Ret; Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Wed Aug 22 09:39:57 2012 @@ -287,12 +287,12 @@ TRACE("Index %d is entity #%d - %04x:%08x\n", index, i, entitySet[i].tei_entity, entitySet[i].tei_instance ); - tdiFreeThingSet( entitySet ); - if( numInterfaces == index && i < numEntities ) { memcpy( ent, &entitySet[i], sizeof(*ent) ); + tdiFreeThingSet( entitySet ); return STATUS_SUCCESS; } else { + tdiFreeThingSet( entitySet ); return STATUS_UNSUCCESSFUL; } } Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ipstats… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] Wed Aug 22 09:39:57 2012 @@ -582,13 +582,12 @@ (PVOID *)&AdapterArpTable, &returnSize ); - if( status == STATUS_SUCCESS ) { - for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) - IpArpTable->table[CurrIdx] = AdapterArpTable[TmpIdx]; - } - - if( AdapterArpTable ) tdiFreeThingSet( AdapterArpTable ); - } + if( status == STATUS_SUCCESS ) { + for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + IpArpTable->table[CurrIdx] = AdapterArpTable[TmpIdx]; + tdiFreeThingSet( AdapterArpTable ); + } + } } closeTcpFile( tcpFile );

1 0

[jgardou] 57126: [WIN32K] - Fix complation when using diblib
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 08:33:27 2012 New Revision: 57126 URL: http://svn.reactos.org/svn/reactos?rev=57126&view=rev Log: [WIN32K] - Fix complation when using diblib Modified: trunk/reactos/win32ss/gdi/eng/bitblt_new.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt_new… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] Wed Aug 22 08:33:27 2012 @@ -6,12 +6,13 @@ #define SURFOBJ_flags(pso) (CONTAINING_RECORD(pso, SURFACE, SurfObj)->flags) // FIXME this needs to be updated, once we use the new structure -XCLIPOBJ gxcoTrivial = +extern XCLIPOBJ gxcoTrivial; +/* { {0, {LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX}, DC_TRIVIAL, FC_RECT, TC_RECTANGLES, 0}, 0, 0, 0 }; - +*/ static void

1 0

[jimtabor] 57125: - Fix DestroyCaret, thanks Thomas...
by jimtabor＠svn.reactos.org 21 Aug '12

21 Aug '12

Author: jimtabor Date: Tue Aug 21 23:25:42 2012 New Revision: 57125 URL: http://svn.reactos.org/svn/reactos?rev=57125&view=rev Log: - Fix DestroyCaret, thanks Thomas... Modified: trunk/reactos/win32ss/user/ntuser/caret.c Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Tue Aug 21 23:25:42 2012 @@ -42,15 +42,15 @@ if(!ThreadQueue || !ThreadQueue->CaretInfo) return FALSE; + pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo->hWnd); co_IntHideCaret(ThreadQueue->CaretInfo); ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; ThreadQueue->CaretInfo->hWnd = (HWND)0; ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; ThreadQueue->CaretInfo->Showing = 0; ThreadQueue->CaretInfo->Visible = 0; - if (ThreadQueue->CaretInfo->hWnd) - { - pWnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); + if (pWnd) + { IntNotifyWinEvent(EVENT_OBJECT_DESTROY, pWnd, OBJID_CARET, CHILDID_SELF, 0); } return TRUE;

1 0

[jgardou] 57124: [WINED3D] - MSVC needs INFINITY and NAN from wine/port.h. It can't be included from a header Will be sent upstream
by jgardou＠svn.reactos.org 21 Aug '12

21 Aug '12

Author: jgardou Date: Tue Aug 21 13:38:02 2012 New Revision: 57124 URL: http://svn.reactos.org/svn/reactos?rev=57124&view=rev Log: [WINED3D] - MSVC needs INFINITY and NAN from wine/port.h. It can't be included from a header Will be sent upstream Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -32,6 +32,7 @@ #include <math.h> #include <stdio.h> +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -23,6 +23,7 @@ #include <math.h> #include <stdio.h> +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -24,6 +24,7 @@ #ifdef HAVE_FLOAT_H # include <float.h> #endif +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -29,6 +29,7 @@ #ifdef HAVE_FLOAT_H # include <float.h> #endif +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -23,6 +23,7 @@ #include "config.h" #include <stdio.h> +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -25,6 +25,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/gl_compat.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/gl_compat.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -23,6 +23,7 @@ #ifdef HAVE_FLOAT_H # include <float.h> #endif +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(gl_compat); Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -32,6 +32,7 @@ #include "config.h" #include <limits.h> #include <stdio.h> +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -24,6 +24,7 @@ #include <math.h> #include <stdio.h> +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -24,6 +24,7 @@ #include <string.h> +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -20,6 +20,7 @@ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/shader.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -28,6 +28,7 @@ #include <stdio.h> #include <string.h> +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -30,6 +30,7 @@ #ifdef HAVE_FLOAT_H # include <float.h> #endif +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/stateblock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/stateblock.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/swapchain.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/texture.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -25,6 +25,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/volume.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -25,6 +25,7 @@ #include "config.h" #include "initguid.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Tue Aug 21 13:38:02 2012 @@ -37,7 +37,6 @@ #include "winuser.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "wine/port.h" #include "objbase.h" #include "wine/wined3d.h"

1 0

[jgardou] 57123: [INCLUDE/C++] - Add a draft version of <limits> header - Fix "no return" attribute declaration of some functions
by jgardou＠svn.reactos.org 21 Aug '12

21 Aug '12

Author: jgardou Date: Tue Aug 21 09:49:58 2012 New Revision: 57123 URL: http://svn.reactos.org/svn/reactos?rev=57123&view=rev Log: [INCLUDE/C++] - Add a draft version of <limits> header - Fix "no return" attribute declaration of some functions Added: trunk/reactos/include/c++/limits (with props) Modified: trunk/reactos/include/c++/exception Modified: trunk/reactos/include/c++/exception URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/exception?… ============================================================================== --- trunk/reactos/include/c++/exception [iso-8859-1] (original) +++ trunk/reactos/include/c++/exception [iso-8859-1] Tue Aug 21 09:49:58 2012 @@ -50,7 +50,7 @@ unexpected_handler set_unexpected(unexpected_handler) throw(); - DECLSPEC_NORETURN void unexpected(); + __MINGW_ATTRIB_NORETURN void unexpected(); bool uncaught_exception() throw(); @@ -59,7 +59,7 @@ typedef void (*terminate_handler) (); terminate_handler set_terminate(terminate_handler) throw(); -DECLSPEC_NORETURN void terminate() throw(); +__MINGW_ATTRIB_NORETURN void terminate() throw(); } // extern "C++" Added: trunk/reactos/include/c++/limits URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/limits?rev… ============================================================================== --- trunk/reactos/include/c++/limits (added) +++ trunk/reactos/include/c++/limits [iso-8859-1] Tue Aug 21 09:49:58 2012 @@ -1,0 +1,1118 @@ +// Numerical limits for C++ + +#include <climits> +#include <cwchar> +#include <cfloat> +#include <ymath.h> + +namespace std +{ + // Rounding style for floating point numbers + enum float_round_style { + round_indeterminate = -1, + round_toward_zero = 0, + round_to_nearest = 1, + round_toward_infinity = 2, + round_toward_neg_infinity = 3 + }; + + // How to represent denormalized values + enum float_denorm_style { + denorm_indeterminate = -1, + denorm_absent = 0, + denorm_present = 1 + }; + + template<class Type> class numeric_limits + { + public: + // Not specialized by default + static const bool is_specialized = false; + + // Bounding + static const bool is_bounded = false; + static Type lowest() throw(); + static Type max( ) throw( ); + static Type min( ) throw( ); + + // infinity + static const bool has_infinity = false; + static Type infinity( ) throw( ); + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static Type denorm_min( ) throw( ); + + // Digits + static const int digits = 0; + static const int digits10 = 0; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static Type quiet_NaN( ) throw( ); + static Type signaling_NaN( ) throw( ); + + // Information + static const bool is_exact = false; + static const bool is_iec559 = false; + static const bool is_integer = false; + static const bool is_modulo = false; + static const bool is_signed = false; + + // misc + static Type epsilon( ) throw( ); + static const int max_digits10 = 0; + static const int radix = 0; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static Type round_error( ) throw( ); + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<wchar_t> + { + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static wchar_t lowest() throw() + {return WCHAR_MIN;} + static wchar_t max( ) throw() + {return WCHAR_MAX;} + static wchar_t min( ) throw() + {return WCHAR_MIN;} + + // infinity + static const bool has_infinity = false; + static wchar_t infinity( ) throw() + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static wchar_t denorm_min( ) throw() + {return 0;} + + // Digits + static const bool is_signed = WCHAR_MIN != 0; + static const int digits = sizeof(wchar_t) * CHAR_BIT - (is_signed ? 1 : 0); + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int digits10 = digits * 643 / 2136; + + // NaN + static wchar_t quiet_NaN( ) throw() + {return 0;} + static wchar_t signaling_NaN( ) throw() + {return 0;} + + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + + // misc + static wchar_t epsilon( ) throw() + {return 0;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static wchar_t round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<bool> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static bool lowest() throw() + {return false;} + static bool max( ) throw( ) + {return true;} + static bool min( ) throw( ) + {return false;} + + // infinity + static const bool has_infinity = false; + static bool infinity( ) throw( ) + {return false;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static bool denorm_min( ) throw( ) + {return false;} + + // Digits + static const int digits = 1; + static const int digits10 = 0; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static bool quiet_NaN( ) throw( ) + {return false;} + static bool signaling_NaN( ) throw( ) + {return false;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = false; + static const bool is_signed = false; + + // misc + static bool epsilon( ) throw( ) + {return false;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static bool round_error( ) throw( ) + {return false;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<char> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static char lowest() throw() + {return CHAR_MIN;} + static char max( ) throw( ) + {return CHAR_MAX;} + static char min( ) throw( ) + {return CHAR_MIN;} + + // infinity + static const bool has_infinity = false; + static char infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static char denorm_min( ) throw( ) + {return 0;} + + // Digits + static const bool is_signed = CHAR_MIN != 0; + static const int digits = sizeof(char) * CHAR_BIT - (is_signed ? 1 : 0); + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static char quiet_NaN( ) throw( ) + {return 0;} + static char signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + + // misc + static char epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static char round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<signed char> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static signed char lowest() throw() + {return SCHAR_MIN;} + static signed char max( ) throw( ) + {return SCHAR_MAX;} + static signed char min( ) throw( ) + {return SCHAR_MIN;} + + // infinity + static const bool has_infinity = false; + static signed char infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static signed char denorm_min( ) throw( ) + {return 0;} + + // Digits + static const int digits = sizeof(signed char) * CHAR_BIT - 1; + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static signed char quiet_NaN( ) throw( ) + {return 0;} + static signed char signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + static const bool is_signed = true; + + // misc + static signed char epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static signed char round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<unsigned char> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static unsigned char lowest() throw() + {return 0;} + static unsigned char max( ) throw( ) + {return UCHAR_MAX;} + static unsigned char min( ) throw( ) + {return 0;} + + // infinity + static const bool has_infinity = false; + static unsigned char infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static unsigned char denorm_min( ) throw( ) + {return 0;} + + // Digits + static const int digits = sizeof(unsigned char) * CHAR_BIT; + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static unsigned char quiet_NaN( ) throw( ) + {return 0;} + static unsigned char signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + static const bool is_signed = false; + + // misc + static unsigned char epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static unsigned char round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<short> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static short lowest() throw() + {return SHRT_MIN;} + static short max( ) throw( ) + {return SHRT_MAX;} + static short min( ) throw( ) + {return SHRT_MIN;} + + // infinity + static const bool has_infinity = false; + static short infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static short denorm_min( ) throw( ) + {return 0;} + + // Digits + static const bool is_signed = SHRT_MIN != 0; + static const int digits = sizeof(short) * CHAR_BIT - (is_signed ? 1 : 0); + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static short quiet_NaN( ) throw( ) + {return 0;} + static short signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + + // misc + static short epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static short round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<unsigned short> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static unsigned short lowest() throw() + {return 0;} + static unsigned short max( ) throw( ) + {return USHRT_MAX;} + static unsigned short min( ) throw( ) + {return 0;} + + // infinity + static const bool has_infinity = false; + static unsigned short infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static unsigned short denorm_min( ) throw( ) + {return 0;} + + // Digits + static const int digits = sizeof(unsigned short) * CHAR_BIT; + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static unsigned short quiet_NaN( ) throw( ) + {return 0;} + static unsigned short signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + static const bool is_signed = false; + + // misc + static unsigned short epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static unsigned short round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<int> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static int lowest() throw() + {return INT_MIN;} + static int max( ) throw( ) + {return INT_MAX;} + static int min( ) throw( ) + {return INT_MIN;} + + // infinity + static const bool has_infinity = false; + static int infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static int denorm_min( ) throw( ) + {return 0;} + + // Digits + static const bool is_signed = INT_MIN != 0; + static const int digits = sizeof(int) * CHAR_BIT - (is_signed ? 1 : 0); + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static int quiet_NaN( ) throw( ) + {return 0;} + static int signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + + // misc + static int epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static int round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<unsigned int> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static unsigned int lowest() throw() + {return 0;} + static unsigned int max( ) throw( ) + {return UINT_MAX;} + static unsigned int min( ) throw( ) + {return 0;} + + // infinity + static const bool has_infinity = false; + static unsigned int infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static unsigned int denorm_min( ) throw( ) + {return 0;} + + // Digits + static const int digits = sizeof(unsigned int) * CHAR_BIT; + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static unsigned int quiet_NaN( ) throw( ) + {return 0;} + static unsigned int signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + static const bool is_signed = false; + + // misc + static unsigned int epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const int radix = 2; + static const bool traps = false; + + // exponent + static const int max_exponent = 0; + static const int max_exponent10 = 0; + static const int min_exponent = 0; + static const int min_exponent10 = 0; + + // rounding + static unsigned int round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<long> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static long lowest() throw() + {return LONG_MIN;} + static long max( ) throw( ) + {return LONG_MAX;} + static long min( ) throw( ) + {return LONG_MIN;} + + // infinity + static const bool has_infinity = false; + static long infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static long denorm_min( ) throw( ) + {return 0;} + + // Digits + static const bool is_signed = LONG_MIN != 0; + static const long digits = sizeof(long) * CHAR_BIT - (is_signed ? 1 : 0); + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const long digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static long quiet_NaN( ) throw( ) + {return 0;} + static long signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_longeger = true; + static const bool is_modulo = true; + + // misc + static long epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const long radix = 2; + static const bool traps = false; + + // exponent + static const long max_exponent = 0; + static const long max_exponent10 = 0; + static const long min_exponent = 0; + static const long min_exponent10 = 0; + + // rounding + static long round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<unsigned long> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static unsigned long lowest() throw() + {return 0;} + static unsigned long max( ) throw( ) + {return ULONG_MAX;} + static unsigned long min( ) throw( ) + {return 0;} + + // infinity + static const bool has_infinity = false; + static unsigned long infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static unsigned long denorm_min( ) throw( ) + {return 0;} + + // Digits + static const long digits = sizeof(unsigned long) * CHAR_BIT; + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const long digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static unsigned long quiet_NaN( ) throw( ) + {return 0;} + static unsigned long signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_longeger = true; + static const bool is_modulo = true; + static const bool is_signed = false; + + // misc + static unsigned long epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const long radix = 2; + static const bool traps = false; + + // exponent + static const long max_exponent = 0; + static const long max_exponent10 = 0; + static const long min_exponent = 0; + static const long min_exponent10 = 0; + + // rounding + static unsigned long round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<long long> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static long long lowest() throw() + {return LLONG_MIN;} + static long long max( ) throw( ) + {return LLONG_MAX;} + static long long min( ) throw( ) + {return LLONG_MIN;} + + // infinity + static const bool has_infinity = false; + static long long infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static long long denorm_min( ) throw( ) + {return 0;} + + // Digits + static const long long digits = sizeof(long long) * CHAR_BIT - (LLONG_MIN != 0 ? 1 : 0); + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const long long digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static long long quiet_NaN( ) throw( ) + {return 0;} + static long long signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + static const bool is_signed = LLONG_MIN != 0; + + // misc + static long long epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const long long radix = 2; + static const bool traps = false; + + // exponent + static const long long max_exponent = 0; + static const long long max_exponent10 = 0; + static const long long min_exponent = 0; + static const long long min_exponent10 = 0; + + // rounding + static long long round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<unsigned long long> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static unsigned long long lowest() throw() + {return 0;} + static unsigned long long max( ) throw( ) + {return ULLONG_MAX;} + static unsigned long long min( ) throw( ) + {return 0;} + + // infinity + static const bool has_infinity = false; + static unsigned long long infinity( ) throw( ) + {return 0;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_absent; + static const bool has_denorm_loss = false; + static unsigned long long denorm_min( ) throw( ) + {return 0;} + + // Digits + static const long long digits = sizeof(unsigned long long) * CHAR_BIT; + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const long long digits10 = digits * 643 / 2136; + + // NaN + static const bool has_quiet_NaN = false; + static const bool has_signaling_NaN = false; + static unsigned long long quiet_NaN( ) throw( ) + {return 0;} + static unsigned long long signaling_NaN( ) throw( ) + {return 0;} + + // Information + static const bool is_exact = true; + static const bool is_iec559 = false; + static const bool is_integer = true; + static const bool is_modulo = true; + static const bool is_signed = false; + + // misc + static unsigned long long epsilon( ) throw( ) + {return 0;} + static const int max_digits10 = 0; + static const long long radix = 2; + static const bool traps = false; + + // exponent + static const long long max_exponent = 0; + static const long long max_exponent10 = 0; + static const long long min_exponent = 0; + static const long long min_exponent10 = 0; + + // rounding + static unsigned long long round_error( ) throw( ) + {return 0;} + static const float_round_style round_style = round_toward_zero; + static const bool tinyness_before = false; + }; + + template<> class numeric_limits<float> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static float lowest() throw() + {return -FLT_MAX;} + static float max( ) throw( ) + {return FLT_MAX;} + static float min( ) throw( ) + {return FLT_MIN;} + + // infinity + static const bool has_infinity = true; + static float infinity( ) throw( ) + {return _FInf._Float;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_present; + static const bool has_denorm_loss = true; + static float denorm_min( ) throw( ) + {return _FDenorm._Float;} + + // Digits + static const int digits = FLT_MANT_DIG; + static const int digits10 = FLT_DIG; + + // NaN + static const bool has_quiet_NaN = true; + static const bool has_signaling_NaN = true; + static float quiet_NaN( ) throw( ) + {return _FNan._Float;} + static float signaling_NaN( ) throw( ) + {return _FSnan._Float;} + + // Information + static const bool is_exact = false; + static const bool is_iec559 = true; + static const bool is_integer = false; + static const bool is_modulo = false; + static const bool is_signed = true; + + // misc + static float epsilon( ) throw( ) + {return FLT_EPSILON;} + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int max_digits10 = FLT_MANT_DIG * 643 / 2136; + static const int radix = FLT_RADIX; + static const bool traps = true; + + // exponent + static const int max_exponent = FLT_MAX_EXP; + static const int max_exponent10 = FLT_MAX_10_EXP; + static const int min_exponent = FLT_MIN_EXP; + static const int min_exponent10 = FLT_MIN_10_EXP; + + // rounding + static float round_error( ) throw( ) + {return 0.5f;} + static const float_round_style round_style = round_to_nearest; + static const bool tinyness_before = true; + }; + + template<> class numeric_limits<double> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static double lowest() throw() + {return -DBL_MAX;} + static double max( ) throw( ) + {return DBL_MAX;} + static double min( ) throw( ) + {return DBL_MIN;} + + // infinity + static const bool has_infinity = true; + static double infinity( ) throw( ) + {return _Inf._Double;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_present; + static const bool has_denorm_loss = true; + static double denorm_min( ) throw( ) + {return _Denorm._Double;} + + // Digits + static const int digits = DBL_MANT_DIG; + static const int digits10 = DBL_DIG; + + // NaN + static const bool has_quiet_NaN = true; + static const bool has_signaling_NaN = true; + static double quiet_NaN( ) throw( ) + {return _Nan._Double;} + static double signaling_NaN( ) throw( ) + {return _Snan._Double;} + + // Information + static const bool is_exact = false; + static const bool is_iec559 = true; + static const bool is_integer = false; + static const bool is_modulo = false; + static const bool is_signed = true; + + // misc + static double epsilon( ) throw( ) + {return DBL_EPSILON;} + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int max_digits10 = DBL_MANT_DIG * 643 / 2136; + static const int radix = FLT_RADIX; + static const bool traps = true; + + // exponent + static const int max_exponent = DBL_MAX_EXP; + static const int max_exponent10 = DBL_MAX_10_EXP; + static const int min_exponent = DBL_MIN_EXP; + static const int min_exponent10 = DBL_MIN_10_EXP; + + // rounding + static double round_error( ) throw( ) + {return 0.5f;} + static const float_round_style round_style = round_to_nearest; + static const bool tinyness_before = true; + }; + + template<> class numeric_limits<long double> + { + public: + static const bool is_specialized = true; + + // Bounding + static const bool is_bounded = true; + static long double lowest() throw() + {return -LDBL_MAX;} + static long double max( ) throw( ) + {return LDBL_MAX;} + static long double min( ) throw( ) + {return DBL_MIN;} + + // infinity + static const bool has_infinity = true; + static long double infinity( ) throw( ) + {return _LInf._Long_double;} + + // Denormalization + static const float_denorm_style has_denorm = denorm_present; + static const bool has_denorm_loss = true; + static long double denorm_min( ) throw( ) + {return _LDenorm._Long_double;} + + // Digits + static const int digits = LDBL_MANT_DIG; + static const int digits10 = LDBL_DIG; + + // NaN + static const bool has_quiet_NaN = true; + static const bool has_signaling_NaN = true; + static long double quiet_NaN( ) throw( ) + {return _LNan._Long_double;} + static long double signaling_NaN( ) throw( ) + {return _LSnan._Long_double;} + + // Information + static const bool is_exact = false; + static const bool is_iec559 = true; + static const bool is_integer = false; + static const bool is_modulo = false; + static const bool is_signed = true; + + // misc + static long double epsilon( ) throw( ) + {return LDBL_EPSILON;} + // The fraction 643/2136 approximates log10(2) to 7 significant digits. + static const int max_digits10 = FLT_MANT_DIG * 643 / 2136; + static const int radix = FLT_RADIX; + static const bool traps = true; + + // exponent + static const int max_exponent = LDBL_MAX_EXP; + static const int max_exponent10 = LDBL_MAX_10_EXP; + static const int min_exponent = LDBL_MIN_EXP; + static const int min_exponent10 = LDBL_MIN_10_EXP; + + // rounding + static long double round_error( ) throw( ) + {return 0.5f;} + static const float_round_style round_style = round_to_nearest; + static const bool tinyness_before = true; + }; +} Propchange: trunk/reactos/include/c++/limits ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 57122: [INCLUDES] - Move NAN and INFINITY definition from wine/math.h to wine/port.h - Delete wine/math.h - Fix build
by jgardou＠svn.reactos.org 21 Aug '12

21 Aug '12

Author: jgardou Date: Tue Aug 21 09:29:11 2012 New Revision: 57122 URL: http://svn.reactos.org/svn/reactos?rev=57122&view=rev Log: [INCLUDES] - Move NAN and INFINITY definition from wine/math.h to wine/port.h - Delete wine/math.h - Fix build Removed: trunk/reactos/include/reactos/wine/math.h Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/port.h Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Tue Aug 21 09:29:11 2012 @@ -37,6 +37,7 @@ #include "winuser.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/port.h" #include "objbase.h" #include "wine/wined3d.h" Removed: trunk/reactos/include/reactos/wine/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/math.… ============================================================================== --- trunk/reactos/include/reactos/wine/math.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/math.h (removed) @@ -1,26 +1,0 @@ -#ifndef __WINE_MATH_H_ -#define __WINE_MATH_H_ - -#include <crt/math.h> - -#ifdef _MSC_VER -__forceinline float _NaN() -{ - unsigned long NaN = 0x7fc00000; - return *(float*)&NaN; -} -#define NAN _NaN() - -__forceinline float _Infinity() -{ - unsigned long Infinity = 0x7f800000; - return *(float*)&Infinity; -} -#define INFINITY _Infinity() - -#else -#define NAN (0.0f / 0.0f) -#define INFINITY (1.0F/0.0F) -#endif - -#endif /* __WINE_MATH_H_ */ Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/port.h [iso-8859-1] Tue Aug 21 09:29:11 2012 @@ -149,6 +149,24 @@ #ifndef M_PI_4 #define M_PI_4 0.785398163397448309616 +#endif + +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif + +#ifndef NAN +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() #endif /* Constructor functions */

1 0

[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

← Newer
1
...
6
7
8
9
10
11
12
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2012