Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 54440: [CRT] Reimplemented _scalb properly. This fixes 19 tests.
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 15:51:45 2011 New Revision: 54440 URL: http://svn.reactos.org/svn/reactos?rev=54440&view=rev Log: [CRT] Reimplemented _scalb properly. This fixes 19 tests. Modified: trunk/reactos/lib/sdk/crt/float/scalb.c Modified: trunk/reactos/lib/sdk/crt/float/scalb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/scalb.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/scalb.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/scalb.c [iso-8859-1] Sat Nov 19 15:51:45 2011 @@ -1,30 +1,17 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown - * PROGRAMER: Unknown - * UPDATE HISTORY: - * 25/11/05: Added license header + * FILE: lib/sdk/crt/float/scalb.c + * PURPOSE: Floating-point number scaling + * PROGRAMER: Pierre Schweitzer (pierre(a)reactos.org) */ #include <precomp.h> -#include <internal/ieee.h> /* * @implemented */ -double _scalb( double __x, long e ) +double _scalb(double x, long exp) { - union - { - double* __x; - double_s* x; - } x; - - x.__x = &__x; - - x.x->exponent += e; - - return __x; + return ldexp(x, exp); }

1 0

[jgardou] 54439: |NTOSKRNL] - fix operands precedence
by jgardou＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: jgardou Date: Sat Nov 19 15:50:53 2011 New Revision: 54439 URL: http://svn.reactos.org/svn/reactos?rev=54439&view=rev Log: |NTOSKRNL] - fix operands precedence Modified: trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sat Nov 19 15:50:53 2011 @@ -312,7 +312,7 @@ IoFlags = FILE_OPEN_FOR_BACKUP_INTENT | FILE_NO_COMPRESSION | FILE_RANDOM_ACCESS | - (NoBuffering) ? FILE_NO_INTERMEDIATE_BUFFERING : 0; + (NoBuffering ? FILE_NO_INTERMEDIATE_BUFFERING : 0); /* Set share and access modes */ if ((CmpMiniNTBoot) && (CmpShareSystemHives))

1 0

[jgardou] 54438: [NTOSKRNL] - do not compare (x & y) with TRUE
by jgardou＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: jgardou Date: Sat Nov 19 15:45:20 2011 New Revision: 54438 URL: http://svn.reactos.org/svn/reactos?rev=54438&view=rev Log: [NTOSKRNL] - do not compare (x & y) with TRUE Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Sat Nov 19 15:45:20 2011 @@ -308,7 +308,7 @@ */ if ((CcCanIWrite(FileObject, Length, Wait, FALSE) == FALSE) || (CcCopyWriteWontFlush(FileObject, FileOffset, Length) == FALSE) || - ((FileObject->Flags & FO_WRITE_THROUGH) == TRUE)) + ((FileObject->Flags & FO_WRITE_THROUGH))) { return FALSE; }

1 0

[pschweitzer] 54437: [MSVCRT_APITEST] Add more tests
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 15:05:26 2011 New Revision: 54437 URL: http://svn.reactos.org/svn/reactos?rev=54437&view=rev Log: [MSVCRT_APITEST] Add more tests Modified: trunk/rostests/apitests/msvcrt/ieee.c Modified: trunk/rostests/apitests/msvcrt/ieee.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/ieee.c?re… ============================================================================== --- trunk/rostests/apitests/msvcrt/ieee.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/ieee.c [iso-8859-1] Sat Nov 19 15:05:26 2011 @@ -199,9 +199,146 @@ ok(_isnan(tested.d) == TRUE, "_isnan = FALSE\n"); } +void test_scalb(void) +{ + ieee_double tested; + ieee_double expected; + ieee_double result; + + expected.l = 0; + + errno = 0xDEADBEEF; + tested.l = 0xFFFFFFFFFFFFFFFFLL; + expected.l = 0xFFFFFFFFFFFFFFFFLL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0xFFF8000000000001LL; + expected.l = 0xFFF8000000000001LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0xFFF8000000000000LL; + expected.l = 0xFFF8000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0xFFF7FFFFFFFFFFFFLL; + expected.l = 0xFFFFFFFFFFFFFFFFLL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0xFFF0000000000001LL; + expected.l = 0xFFF8000000000001LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0xFFF0000000000000LL; + expected.l = 0xFFF0000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0xFFEFFFFFFFFFFFFFLL; + expected.l = 0xFFF0000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == ERANGE, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x8010000000000000LL; + expected.l = 0x8040000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x800FFFFFFFFFFFFFLL; + expected.l = 0x803FFFFFFFFFFFFELL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x8000000000000001LL; + expected.l = 0x8000000000000008LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x8000000000000000LL; + expected.l = 0x8000000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x0000000000000000LL; + expected.l = 0x0000000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x0000000000000001LL; + expected.l = 0x0000000000000008LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x000FFFFFFFFFFFFFLL; + expected.l = 0x003FFFFFFFFFFFFELL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x0010000000000000LL; + expected.l = 0x0040000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x7FEFFFFFFFFFFFFFLL; + expected.l = 0x7FF0000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == ERANGE, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x7FF0000000000000LL; + expected.l = 0x7FF0000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x7FF0000000000001LL; + expected.l = 0x7FF8000000000001LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x7FF7FFFFFFFFFFFFLL; + expected.l = 0x7FFFFFFFFFFFFFFFLL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x7FF8000000000000LL; + expected.l = 0x7FF8000000000000LL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); + errno = 0xDEADBEEF; + tested.l = 0x7FFFFFFFFFFFFFFFLL; + expected.l = 0x7FFFFFFFFFFFFFFFLL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == EDOM, "errno: %d\n", errno); +} + START_TEST(ieee) { test_finite(); test_fpclass(); test_isnan(); -} + test_scalb(); +}

1 0

[akhaldi] 54436: [NTOSKRNL] * Fix a typo.
by akhaldi＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: akhaldi Date: Sat Nov 19 14:18:23 2011 New Revision: 54436 URL: http://svn.reactos.org/svn/reactos?rev=54436&view=rev Log: [NTOSKRNL] * Fix a typo. Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Nov 19 14:18:23 2011 @@ -1208,7 +1208,7 @@ Loaded = TRUE; /* Sanity check */ - ASSERT(DllBase = DllEntry->DllBase); + ASSERT(DllBase == DllEntry->DllBase); /* Call the initialization routines */ Status = MmCallDllInitialize(DllEntry, &PsLoadedModuleList);

1 0

[pschweitzer] 54435: [CRT] Reimplemented _fpclass properly. This fixes all failing _fpclass tests. See: http://babbage.cs.qc.cuny.edu/IEEE-754/References.xhtml Based on OpenAD implementation
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 13:03:17 2011 New Revision: 54435 URL: http://svn.reactos.org/svn/reactos?rev=54435&view=rev Log: [CRT] Reimplemented _fpclass properly. This fixes all failing _fpclass tests. See: http://babbage.cs.qc.cuny.edu/IEEE-754/References.xhtml Based on OpenAD implementation Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpclass.… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] Sat Nov 19 13:03:17 2011 @@ -3,9 +3,8 @@ * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/float/fpclass.c * PURPOSE: Floating-point classes - * PROGRAMER: Unknown - * UPDATE HISTORY: - * 25/11/05: Added license header + * PROGRAMER: Pierre Schweitzer (pierre(a)reactos.org) + * REFERENCE: http://babbage.cs.qc.cuny.edu/IEEE-754/References.xhtml */ #include <precomp.h> @@ -24,29 +23,36 @@ } d; d.__d = &__d; - if ( d.d->exponent == 0 ) { - if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { - if ( d.d->sign == 0 ) - return _FPCLASS_PZ; - else - return _FPCLASS_NZ; - } else { - if ( d.d->sign == 0 ) - return _FPCLASS_PD; - else - return _FPCLASS_ND; - } - } - else if (d.d->exponent == 0x7ff ) { - if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { - if ( d.d->sign == 0 ) - return _FPCLASS_PINF; - else - return _FPCLASS_NINF; - } - else if ( (d.d->mantissah & 0x80000) != 0 ) { - return _FPCLASS_QNAN; - } - } - return _FPCLASS_QNAN; + + /* With 0x7ff, it can only be infinity or NaN */ + if (d.d->exponent == 0x7ff) + { + if (d.d->mantissah == 0 && d.d->mantissal == 0) + { + return (d.d->sign == 0) ? _FPCLASS_PINF : _FPCLASS_NINF; + } + /* Windows will never return Signaling NaN */ + else + { + return _FPCLASS_QNAN; + } + } + + /* With 0, it can only be zero or denormalized number */ + if (d.d->exponent == 0) + { + if (d.d->mantissah == 0 && d.d->mantissal == 0) + { + return (d.d->sign == 0) ? _FPCLASS_PZ : _FPCLASS_NZ; + } + else + { + return (d.d->sign == 0) ? _FPCLASS_PD : _FPCLASS_ND; + } + } + /* Only remain normalized numbers */ + else + { + return (d.d->sign == 0) ? _FPCLASS_PN : _FPCLASS_NN; + } }

1 0

[fireball] 54434: [RTL/HEAP] - Bring more awesomeness to the heap manager by zefklop's request: * Add support for settable user values and flags in RtlAllocateHeap and RtlReAllocateHeap. * Return e...
by fireball＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: fireball Date: Sat Nov 19 11:02:24 2011 New Revision: 54434 URL: http://svn.reactos.org/svn/reactos?rev=54434&view=rev Log: [RTL/HEAP] - Bring more awesomeness to the heap manager by zefklop's request: * Add support for settable user values and flags in RtlAllocateHeap and RtlReAllocateHeap. * Return error if RtlSetUserValueHeap was unable to set the value. * Fixes remaining 2 failures of the kernel32_winetest alloc test. Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap.h Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=54434&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Nov 19 11:02:24 2011 @@ -1722,15 +1722,31 @@ PHEAP_ENTRY NTAPI RtlpSplitEntry(PHEAP Heap, + ULONG Flags, PHEAP_FREE_ENTRY FreeBlock, SIZE_T AllocationSize, SIZE_T Index, SIZE_T Size) { PHEAP_FREE_ENTRY SplitBlock, SplitBlock2; - UCHAR FreeFlags; + UCHAR FreeFlags, EntryFlags = HEAP_ENTRY_BUSY; PHEAP_ENTRY InUseEntry; SIZE_T FreeSize; + + /* Add extra flags in case of settable user value feature is requested, + or there is a tag (small or normal) or there is a request to + capture stack backtraces */ + if ((Flags & HEAP_EXTRA_FLAGS_MASK) || + Heap->PseudoTagEntries) + { + /* Add flag which means that the entry will have extra stuff attached */ + EntryFlags |= HEAP_ENTRY_EXTRA_PRESENT; + + /* NB! AllocationSize is already adjusted by RtlAllocateHeap */ + } + + /* Add settable user flags, if any */ + EntryFlags |= (Flags & HEAP_SETTABLE_USER_FLAGS) >> 4; /* Save flags, update total free size */ FreeFlags = FreeBlock->Flags; @@ -1738,7 +1754,7 @@ /* Make this block an in-use one */ InUseEntry = (PHEAP_ENTRY)FreeBlock; - InUseEntry->Flags = HEAP_ENTRY_BUSY; + InUseEntry->Flags = EntryFlags; InUseEntry->SmallTagIndex = 0; /* Calculate the extra amount */ @@ -1877,7 +1893,7 @@ RemoveEntryList(&FreeBlock->FreeList); /* Split it */ - InUseEntry = RtlpSplitEntry(Heap, FreeBlock, AllocationSize, Index, Size); + InUseEntry = RtlpSplitEntry(Heap, Flags, FreeBlock, AllocationSize, Index, Size); /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); @@ -1926,7 +1942,7 @@ RemoveEntryList(&FreeBlock->FreeList); /* Split it */ - InUseEntry = RtlpSplitEntry(Heap, FreeBlock, AllocationSize, Index, Size); + InUseEntry = RtlpSplitEntry(Heap, Flags, FreeBlock, AllocationSize, Index, Size); /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); @@ -2003,7 +2019,7 @@ PLIST_ENTRY FreeListHead; PHEAP_ENTRY InUseEntry; PHEAP_FREE_ENTRY FreeBlock; - UCHAR FreeFlags; + UCHAR FreeFlags, EntryFlags = HEAP_ENTRY_BUSY; EXCEPTION_RECORD ExceptionRecord; BOOLEAN HeapLocked = FALSE; PHEAP_VIRTUAL_ALLOC_ENTRY VirtualBlock = NULL; @@ -2039,6 +2055,23 @@ else AllocationSize = 1; AllocationSize = (AllocationSize + Heap->AlignRound) & Heap->AlignMask; + + /* Add extra flags in case of settable user value feature is requested, + or there is a tag (small or normal) or there is a request to + capture stack backtraces */ + if ((Flags & HEAP_EXTRA_FLAGS_MASK) || + Heap->PseudoTagEntries) + { + /* Add flag which means that the entry will have extra stuff attached */ + EntryFlags |= HEAP_ENTRY_EXTRA_PRESENT; + + /* Account for extra stuff size */ + AllocationSize += sizeof(HEAP_ENTRY_EXTRA); + } + + /* Add settable user flags, if any */ + EntryFlags |= (Flags & HEAP_SETTABLE_USER_FLAGS) >> 4; + Index = AllocationSize >> HEAP_ENTRY_SHIFT; /* Acquire the lock if necessary */ @@ -2070,7 +2103,7 @@ /* Initialize this block */ InUseEntry = (PHEAP_ENTRY)FreeBlock; - InUseEntry->Flags = HEAP_ENTRY_BUSY | (FreeFlags & HEAP_ENTRY_LAST_ENTRY); + InUseEntry->Flags = EntryFlags | (FreeFlags & HEAP_ENTRY_LAST_ENTRY); InUseEntry->UnusedBytes = (UCHAR)(AllocationSize - Size); InUseEntry->SmallTagIndex = 0; } @@ -2113,7 +2146,7 @@ RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, FALSE); /* Split it */ - InUseEntry = RtlpSplitEntry(Heap, FreeBlock, AllocationSize, Index, Size); + InUseEntry = RtlpSplitEntry(Heap, Flags, FreeBlock, AllocationSize, Index, Size); } /* Release the lock */ @@ -2175,7 +2208,7 @@ /* Initialize the newly allocated block */ VirtualBlock->BusyBlock.Size = (USHORT)(AllocationSize - Size); - VirtualBlock->BusyBlock.Flags = HEAP_ENTRY_VIRTUAL_ALLOC | HEAP_ENTRY_EXTRA_PRESENT | HEAP_ENTRY_BUSY; + VirtualBlock->BusyBlock.Flags = EntryFlags | HEAP_ENTRY_VIRTUAL_ALLOC | HEAP_ENTRY_EXTRA_PRESENT; VirtualBlock->CommitSize = AllocationSize; VirtualBlock->ReserveSize = AllocationSize; @@ -2536,41 +2569,41 @@ } } + /* Properly "zero out" (and fill!) the space */ + if (Flags & HEAP_ZERO_MEMORY) + { + RtlZeroMemory((PCHAR)(InUseEntry + 1) + PrevSize, Size - PrevSize); + } + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Calculate tail part which we need to fill */ + TailPart = PrevSize & (sizeof(ULONG) - 1); + + /* "Invert" it as usual */ + if (TailPart) TailPart = 4 - TailPart; + + if (Size > (PrevSize + TailPart)) + AddedSize = (Size - (PrevSize + TailPart)) & ~(sizeof(ULONG) - 1); + + if (AddedSize) + { + RtlFillMemoryUlong((PCHAR)(InUseEntry + 1) + PrevSize + TailPart, + AddedSize, + ARENA_INUSE_FILLER); + } + } + + /* Fill the new tail */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, + HEAP_ENTRY_SIZE, + HEAP_TAIL_FILL); + } + /* Copy user settable flags */ InUseEntry->Flags &= ~HEAP_ENTRY_SETTABLE_FLAGS; InUseEntry->Flags |= ((Flags & HEAP_SETTABLE_USER_FLAGS) >> 4); - - /* Properly "zero out" (and fill!) the space */ - if (Flags & HEAP_ZERO_MEMORY) - { - RtlZeroMemory((PCHAR)(InUseEntry + 1) + PrevSize, Size - PrevSize); - } - else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) - { - /* Calculate tail part which we need to fill */ - TailPart = PrevSize & (sizeof(ULONG) - 1); - - /* "Invert" it as usual */ - if (TailPart) TailPart = 4 - TailPart; - - if (Size > (PrevSize + TailPart)) - AddedSize = (Size - (PrevSize + TailPart)) & ~(sizeof(ULONG) - 1); - - if (AddedSize) - { - RtlFillMemoryUlong((PCHAR)(InUseEntry + 1) + PrevSize + TailPart, - AddedSize, - ARENA_INUSE_FILLER); - } - } - - /* Fill the new tail */ - if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) - { - RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, - HEAP_ENTRY_SIZE, - HEAP_TAIL_FILL); - } /* Return success */ return TRUE; @@ -3728,7 +3761,7 @@ PHEAP Heap = (PHEAP)HeapHandle; PHEAP_ENTRY HeapEntry; PHEAP_ENTRY_EXTRA Extra; - BOOLEAN HeapLocked = FALSE; + BOOLEAN HeapLocked = FALSE, ValueSet = FALSE; /* Force flags */ Flags |= Heap->Flags; @@ -3765,13 +3798,16 @@ /* Use extra to store the value */ Extra = RtlpGetExtraStuffPointer(HeapEntry); Extra->Settable = (ULONG_PTR)UserValue; + + /* Indicate that value was set */ + ValueSet = TRUE; } /* Release the heap lock if it was acquired */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); - return TRUE; + return ValueSet; } /* Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=54434&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Sat Nov 19 11:02:24 2011 @@ -31,10 +31,11 @@ #define HEAP_GLOBAL_TAG 0x0800 #define HEAP_PSEUDO_TAG_FLAG 0x8000 #define HEAP_TAG_MASK (HEAP_MAXIMUM_TAG << HEAP_TAG_SHIFT) +#define HEAP_TAGS_MASK (HEAP_TAG_MASK ^ (0xFF << HEAP_TAG_SHIFT)) #define HEAP_EXTRA_FLAGS_MASK (HEAP_CAPTURE_STACK_BACKTRACES | \ HEAP_SETTABLE_USER_VALUE | \ - (HEAP_TAG_MASK ^ (0xFF << HEAP_TAG_SHIFT))) + HEAP_TAGS_MASK) /* Heap entry flags */ #define HEAP_ENTRY_BUSY 0x01

1 0

[pschweitzer] 54433: [CRT] _fpclass never returns SNaN class, but only QNaN class. This fixes 4 more tests
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 10:49:11 2011 New Revision: 54433 URL: http://svn.reactos.org/svn/reactos?rev=54433&view=rev Log: [CRT] _fpclass never returns SNaN class, but only QNaN class. This fixes 4 more tests Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpclass.… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] Sat Nov 19 10:49:11 2011 @@ -48,5 +48,5 @@ return _FPCLASS_QNAN; } } - return _FPCLASS_SNAN; + return _FPCLASS_QNAN; }

1 0

[pschweitzer] 54432: [CRT] Fix _fpclass prototype Fix headers included Remove internal defines that were useless and even not matching real defines. This fixes 4 tests
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 10:39:58 2011 New Revision: 54432 URL: http://svn.reactos.org/svn/reactos?rev=54432&view=rev Log: [CRT] Fix _fpclass prototype Fix headers included Remove internal defines that were useless and even not matching real defines. This fixes 4 tests Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpclass.… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/fpclass.c [iso-8859-1] Sat Nov 19 10:39:58 2011 @@ -9,43 +9,13 @@ */ #include <precomp.h> -#include <math.h> +#include <float.h> #include <internal/ieee.h> - - -#define _FPCLASS_SNAN 0x0001 /* signaling NaN */ -#define _FPCLASS_QNAN 0x0002 /* quiet NaN */ -#define _FPCLASS_NINF 0x0004 /* negative infinity */ -#define _FPCLASS_NN 0x0008 /* negative normal */ -#define _FPCLASS_ND 0x0010 /* negative denormal */ -#define _FPCLASS_NZ 0x0020 /* -0 */ -#define _FPCLASS_PZ 0x0040 /* +0 */ -#define _FPCLASS_PD 0x0080 /* positive denormal */ -#define _FPCLASS_PN 0x0100 /* positive normal */ -#define _FPCLASS_PINF 0x0200 /* positive infinity */ - - -//#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3 - -#define FP_SNAN 0x0001 // signaling NaN -#define FP_QNAN 0x0002 // quiet NaN -#define FP_NINF 0x0004 // negative infinity -#define FP_PINF 0x0200 // positive infinity -#define FP_NDENORM 0x0008 // negative denormalized non-zero -#define FP_PDENORM 0x0010 // positive denormalized non-zero -#define FP_NZERO 0x0020 // negative zero -#define FP_PZERO 0x0040 // positive zero -#define FP_NNORM 0x0080 // negative normalized non-zero -#define FP_PNORM 0x0100 // positive normalized non-zero - -//#endif - -typedef int fpclass_t; /* * @implemented */ -fpclass_t _fpclass(double __d) +int _fpclass(double __d) { union { @@ -57,26 +27,26 @@ if ( d.d->exponent == 0 ) { if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { if ( d.d->sign == 0 ) - return FP_PZERO; + return _FPCLASS_PZ; else - return FP_NZERO; + return _FPCLASS_NZ; } else { if ( d.d->sign == 0 ) - return FP_PDENORM; + return _FPCLASS_PD; else - return FP_NDENORM; + return _FPCLASS_ND; } } else if (d.d->exponent == 0x7ff ) { if ( d.d->mantissah == 0 && d.d->mantissal == 0 ) { if ( d.d->sign == 0 ) - return FP_PINF; + return _FPCLASS_PINF; else - return FP_NINF; + return _FPCLASS_NINF; } else if ( (d.d->mantissah & 0x80000) != 0 ) { - return FP_QNAN; + return _FPCLASS_QNAN; } } - return FP_SNAN; + return _FPCLASS_SNAN; }

1 0

[pschweitzer] 54431: [CRT] Windows has no _isnanl, _isinfl functions
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 09:46:40 2011 New Revision: 54431 URL: http://svn.reactos.org/svn/reactos?rev=54431&view=rev Log: [CRT] Windows has no _isnanl, _isinfl functions Modified: trunk/reactos/lib/sdk/crt/float/isnan.c Modified: trunk/reactos/lib/sdk/crt/float/isnan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/isnan.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] Sat Nov 19 09:46:40 2011 @@ -19,7 +19,6 @@ #include <precomp.h> - /* * @implemented */ @@ -32,26 +31,6 @@ } x; x.__x = &__x; return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); -} - -int _isnanl(long double __x) -{ - /* Intel's extended format has the normally implicit 1 explicit - present. Sigh! */ - union - { - long double* __x; - long_double_s* x; - } x; - x.__x = &__x; - - - /* IEEE 854 NaN's have the maximum possible - exponent and a nonzero mantissa. */ - - return (( x.x->exponent == 0x7fff) - && ( (x.x->mantissah & 0x80000) != 0) - && ( (x.x->mantissah & (unsigned int)0x7fffffff) != 0 || x.x->mantissal != 0 )); } /* @@ -69,25 +48,3 @@ return ((x.x->exponent & 0x7ff) != 0x7ff); } - -int _isinfl(long double __x) -{ - /* Intel's extended format has the normally implicit 1 explicit - present. Sigh! */ - union - { - long double* __x; - long_double_s* x; - } x; - - x.__x = &__x; - - - /* An IEEE 854 infinity has an exponent with the - maximum possible value and a zero mantissa. */ - - - if ( x.x->exponent == 0x7fff && ( (x.x->mantissah == 0x80000 ) && x.x->mantissal == 0 )) - return x.x->sign ? -1 : 1; - return 0; -}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs