if(UcrDescriptor->Address == Segment->LastValidEntry)
{
FirstEntry->Flags = HEAP_ENTRY_LAST_ENTRY;
+ Segment->LastEntryInSegment = FirstEntry;
}
else
{
FirstEntry->Flags = 0;
+ Segment->LastEntryInSegment = Segment->FirstEntry;
/* Update field of next entry */
ASSERT((FirstEntry + FirstEntry->Size)->PreviousSize == 0);
(FirstEntry + FirstEntry->Size)->PreviousSize = FirstEntry->Size;
else
{
FirstEntry->Flags = HEAP_ENTRY_LAST_ENTRY;
+ Segment->LastEntryInSegment = FirstEntry;
}
/* We're done */
FreeEntry->Flags = HEAP_ENTRY_LAST_ENTRY;
FreeEntry->Size = (USHORT)PrecedingSize;
Heap->TotalFreeSize += PrecedingSize;
+ Segment->LastEntryInSegment = FreeEntry;
/* Insert it into the free list */
RtlpInsertFreeBlockHelper(Heap, FreeEntry, PrecedingSize, FALSE);
{
/* Adjust preceding in use entry */
PrecedingInUseEntry->Flags |= HEAP_ENTRY_LAST_ENTRY;
+ Segment->LastEntryInSegment = PrecedingInUseEntry;
+ }
+ else if ((ULONG_PTR)Segment->LastEntryInSegment >= DecommitBase &&
+ (ULONG_PTR)Segment->LastEntryInSegment < DecommitBase + DecommitSize)
+ {
+ /* Invalidate last entry */
+ Segment->LastEntryInSegment = Segment->FirstEntry;
}
/* Now the next one */
RtlpInsertFreeBlock(Heap, (PHEAP_FREE_ENTRY) HeapEntry, (SegmentCommit >> HEAP_ENTRY_SHIFT) - Segment->Entry.Size);
}
+ /* Always point to a valid entry */
+ Segment->LastEntryInSegment = Segment->FirstEntry;
+
/* Initialise the Heap Segment UnCommitted Range information */
Segment->NumberOfUnCommittedPages = (ULONG)((SegmentReserve - SegmentCommit) >> PAGE_SHIFT);
Segment->NumberOfUnCommittedRanges = 0;
BOOLEAN Remove)
{
PHEAP_FREE_ENTRY CurrentEntry, NextEntry;
+ UCHAR SegmentOffset;
/* Get the previous entry */
CurrentEntry = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)FreeEntry - FreeEntry->PreviousSize);
{
((PHEAP_ENTRY)FreeEntry + *FreeSize)->PreviousSize = (USHORT)(*FreeSize);
}
+ else
+ {
+ SegmentOffset = FreeEntry->SegmentOffset;
+ ASSERT(SegmentOffset < HEAP_SEGMENTS);
+ Heap->Segments[SegmentOffset]->LastEntryInSegment = FreeEntry;
+ }
}
/* Check the next block if it exists */
{
((PHEAP_ENTRY)FreeEntry + *FreeSize)->PreviousSize = (USHORT)(*FreeSize);
}
+ else
+ {
+ SegmentOffset = FreeEntry->SegmentOffset;
+ ASSERT(SegmentOffset < HEAP_SEGMENTS);
+ Heap->Segments[SegmentOffset]->LastEntryInSegment = FreeEntry;
+ }
}
}
return FreeEntry;
UCHAR FreeFlags, EntryFlags = HEAP_ENTRY_BUSY;
PHEAP_ENTRY InUseEntry;
SIZE_T FreeSize;
+ UCHAR SegmentOffset;
/* 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
/* Reset flags of the free entry */
FreeFlags = 0;
+ if (SplitBlock->Flags & HEAP_ENTRY_LAST_ENTRY)
+ {
+ SegmentOffset = SplitBlock->SegmentOffset;
+ ASSERT(SegmentOffset < HEAP_SEGMENTS);
+ Heap->Segments[SegmentOffset]->LastEntryInSegment = SplitBlock;
+ }
}
}
PHEAP_FREE_ENTRY FreeEntry, UnusedEntry, FollowingEntry;
SIZE_T FreeSize, PrevSize, TailPart, AddedSize = 0;
PHEAP_ENTRY_EXTRA OldExtra, NewExtra;
+ UCHAR SegmentOffset;
/* We can't grow beyond specified threshold */
if (Index > Heap->VirtualMemoryThreshold)
InUseEntry->Flags |= RememberFlags & HEAP_ENTRY_LAST_ENTRY;
/* Either update previous size of the next entry or mark it as a last
- entry in the segment*/
+ entry in the segment */
if (!(RememberFlags & HEAP_ENTRY_LAST_ENTRY))
+ {
(InUseEntry + InUseEntry->Size)->PreviousSize = InUseEntry->Size;
+ }
+ else
+ {
+ SegmentOffset = InUseEntry->SegmentOffset;
+ ASSERT(SegmentOffset < HEAP_SEGMENTS);
+ Heap->Segments[SegmentOffset]->LastEntryInSegment = InUseEntry;
+ }
}
else
{
/* Update the following block or set the last entry in the segment */
if (RememberFlags & HEAP_ENTRY_LAST_ENTRY)
{
+ SegmentOffset = UnusedEntry->SegmentOffset;
+ ASSERT(SegmentOffset < HEAP_SEGMENTS);
+ Heap->Segments[SegmentOffset]->LastEntryInSegment = UnusedEntry;
+
/* Set flags and size */
UnusedEntry->Flags = RememberFlags;
UnusedEntry->Size = (USHORT)FreeSize;
UnusedEntry->Size = (USHORT)FreeSize;
if (!(RememberFlags & HEAP_ENTRY_LAST_ENTRY))
+ {
((PHEAP_ENTRY)UnusedEntry + FreeSize)->PreviousSize = (USHORT)FreeSize;
+ }
+ else
+ {
+ SegmentOffset = UnusedEntry->SegmentOffset;
+ ASSERT(SegmentOffset < HEAP_SEGMENTS);
+ Heap->Segments[SegmentOffset]->LastEntryInSegment = UnusedEntry;
+ }
/* Insert it back and update total size */
RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE);
SIZE_T RemainderBytes, ExtraSize;
PHEAP_VIRTUAL_ALLOC_ENTRY VirtualAllocBlock;
EXCEPTION_RECORD ExceptionRecord;
+ UCHAR SegmentOffset;
/* Return success in case of a null pointer */
if (!Ptr)
/* Is that the last entry */
if (FreeFlags & HEAP_ENTRY_LAST_ENTRY)
{
+ SegmentOffset = SplitBlock->SegmentOffset;
+ ASSERT(SegmentOffset < HEAP_SEGMENTS);
+ Heap->Segments[SegmentOffset]->LastEntryInSegment = SplitBlock;
+
/* Set its size and insert it to the list */
SplitBlock->Size = (USHORT)FreeSize;
RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE);
/* Update previous size of the next entry */
((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = (USHORT)FreeSize;
}
+ else
+ {
+ SegmentOffset = SplitBlock->SegmentOffset;
+ ASSERT(SegmentOffset < HEAP_SEGMENTS);
+ Heap->Segments[SegmentOffset]->LastEntryInSegment = SplitBlock;
+ }
/* Insert the new one back and update total size */
RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE);