Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 02:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]

Browse source 
* Use the FrLdr prefix with the heap functions to avoid any ambiguities.

svn path=/trunk/; revision=60654
This commit is contained in:
Amine Khaldi 2013-10-13 23:14:40 +00:00
parent cdb62c6244
commit 48f8139061
6 changed files with 52 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/boot/freeldr/freeldr/fs/ext2.c
View file

@ -866,7 +866,9 @@ BOOLEAN Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Leng
TRACE("Ext2ReadPartialBlock() BlockNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", BlockNumber, StartingOffset, Length, Buffer); TRACE("Ext2ReadPartialBlock() BlockNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", BlockNumber, StartingOffset, Length, Buffer);
TempBuffer = HeapAllocate(FrLdrTempHeap, Ext2BlockSizeInBytes, '2TXE'); TempBuffer = FrLdrHeapAllocate(FrLdrTempHeap,
Ext2BlockSizeInBytes,
'2TXE');
if (!Ext2ReadBlock(BlockNumber, TempBuffer)) if (!Ext2ReadBlock(BlockNumber, TempBuffer))
{ {
@ -875,7 +877,7 @@ BOOLEAN Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Leng
memcpy(Buffer, ((PUCHAR)TempBuffer + StartingOffset), Length); memcpy(Buffer, ((PUCHAR)TempBuffer + StartingOffset), Length);
HeapFree(FrLdrTempHeap, TempBuffer, '2TXE'); FrLdrHeapFree(FrLdrTempHeap, TempBuffer, '2TXE');
return TRUE; return TRUE;
} }
@ -1098,9 +1100,9 @@ BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInLis
BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG);
BlockBuffer = HeapAllocate(FrLdrTempHeap, BlockBuffer = FrLdrHeapAllocate(FrLdrTempHeap,
Ext2BlockSizeInBytes, Ext2BlockSizeInBytes,
'2TXE'); '2TXE');
if (!BlockBuffer) if (!BlockBuffer)
{ {
return FALSE; return FALSE;
@ -1117,7 +1119,7 @@ BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInLis
(*CurrentBlockInList)++; (*CurrentBlockInList)++;
} }
HeapFree(FrLdrTempHeap, BlockBuffer, '2TXE'); FrLdrHeapFree(FrLdrTempHeap, BlockBuffer, '2TXE');
return TRUE; return TRUE;
} }

10
reactos/boot/freeldr/freeldr/fs/fat.c
View file

@ -911,7 +911,9 @@ BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPoi
//TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); //TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster);
// We need a buffer for 2 secors // We need a buffer for 2 secors
ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector, 'xTAF'); ReadBuffer = FrLdrHeapAllocate(FrLdrTempHeap,
2 * Volume->BytesPerSector,
'xTAF');
if (!ReadBuffer) if (!ReadBuffer)
{ {
return FALSE; return FALSE;
@ -997,7 +999,7 @@ BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPoi
//TRACE("FAT entry is 0x%x.\n", fat); //TRACE("FAT entry is 0x%x.\n", fat);
HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); FrLdrHeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF');
*ClusterPointer = fat; *ClusterPointer = fat;
@ -1181,7 +1183,7 @@ BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULON
// Calculate rounded up read size // Calculate rounded up read size
ReadSize = SectorCount * Volume->BytesPerSector; ReadSize = SectorCount * Volume->BytesPerSector;
ReadBuffer = HeapAllocate(FrLdrTempHeap, ReadSize, 'xTAF'); ReadBuffer = FrLdrHeapAllocate(FrLdrTempHeap, ReadSize, 'xTAF');
if (!ReadBuffer) if (!ReadBuffer)
{ {
return FALSE; return FALSE;
@ -1193,7 +1195,7 @@ BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULON
status = TRUE; status = TRUE;
} }
HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); FrLdrHeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF');
return status; return status;
} }

15
reactos/boot/freeldr/freeldr/include/mm.h
View file

@ -125,34 +125,33 @@ extern PVOID FrLdrDefaultHeap;
extern PVOID FrLdrTempHeap; extern PVOID FrLdrTempHeap;
PVOID PVOID
HeapCreate( FrLdrHeapCreate(
SIZE_T MaximumSize, SIZE_T MaximumSize,
TYPE_OF_MEMORY MemoryType); TYPE_OF_MEMORY MemoryType);
VOID VOID
HeapDestroy( FrLdrHeapDestroy(
PVOID HeapHandle); PVOID HeapHandle);
VOID VOID
HeapRelease( FrLdrHeapRelease(
PVOID HeapHandle); PVOID HeapHandle);
VOID VOID
HeapVerify( FrLdrHeapVerify(
PVOID HeapHandle); PVOID HeapHandle);
VOID VOID
HeapCleanupAll(VOID); FrLdrHeapCleanupAll(VOID);
PVOID PVOID
HeapAllocate( FrLdrHeapAllocate(
PVOID HeapHandle, PVOID HeapHandle,
SIZE_T ByteSize, SIZE_T ByteSize,
ULONG Tag); ULONG Tag);
VOID VOID
HeapFree( FrLdrHeapFree(
PVOID HeapHandle, PVOID HeapHandle,
PVOID Pointer, PVOID Pointer,
ULONG Tag); ULONG Tag);

55
reactos/boot/freeldr/freeldr/mm/heap.c
View file

@ -66,7 +66,7 @@ typedef struct _HEAP
} HEAP, *PHEAP; } HEAP, *PHEAP;
PVOID PVOID
HeapCreate( FrLdrHeapCreate(
SIZE_T MaximumSize, SIZE_T MaximumSize,
TYPE_OF_MEMORY MemoryType) TYPE_OF_MEMORY MemoryType)
{ {
@ -137,7 +137,7 @@ HeapCreate(
} }
VOID VOID
HeapDestroy( FrLdrHeapDestroy(
PVOID HeapHandle) PVOID HeapHandle)
{ {
PHEAP Heap = HeapHandle; PHEAP Heap = HeapHandle;
@ -151,7 +151,7 @@ HeapDestroy(
#ifdef FREELDR_HEAP_VERIFIER #ifdef FREELDR_HEAP_VERIFIER
VOID VOID
HeapVerify( FrLdrHeapVerify(
PVOID HeapHandle) PVOID HeapHandle)
{ {
PHEAP Heap = HeapHandle; PHEAP Heap = HeapHandle;
@ -176,7 +176,7 @@ HeapVerify(
#endif /* FREELDR_HEAP_VERIFIER */ #endif /* FREELDR_HEAP_VERIFIER */
VOID VOID
HeapRelease( FrLdrHeapRelease(
PVOID HeapHandle) PVOID HeapHandle)
{ {
PHEAP Heap = HeapHandle; PHEAP Heap = HeapHandle;
@ -242,7 +242,7 @@ HeapRelease(
} }
VOID VOID
HeapCleanupAll(VOID) FrLdrHeapCleanupAll(VOID)
{ {
PHEAP Heap; PHEAP Heap;
@ -257,7 +257,7 @@ HeapCleanupAll(VOID)
/* Release fre pages */ /* Release fre pages */
HeapRelease(FrLdrDefaultHeap); FrLdrHeapRelease(FrLdrDefaultHeap);
Heap = FrLdrTempHeap; Heap = FrLdrTempHeap;
TRACE("Heap statistics for temp heap:\n" TRACE("Heap statistics for temp heap:\n"
@ -267,11 +267,11 @@ HeapCleanupAll(VOID)
Heap->NumAllocs, Heap->NumFrees); Heap->NumAllocs, Heap->NumFrees);
/* Destroy the heap */ /* Destroy the heap */
HeapDestroy(FrLdrTempHeap); FrLdrHeapDestroy(FrLdrTempHeap);
} }
static VOID static VOID
HeapRemoveFreeList( FrLdrHeapRemoveFreeList(
PHEAP Heap, PHEAP Heap,
PHEAP_BLOCK Block) PHEAP_BLOCK Block)
{ {
@ -289,7 +289,7 @@ HeapRemoveFreeList(
} }
static VOID static VOID
HeapInsertFreeList( FrLdrHeapInsertFreeList(
PHEAP Heap, PHEAP Heap,
PHEAP_BLOCK FreeBlock) PHEAP_BLOCK FreeBlock)
{ {
@ -311,7 +311,7 @@ HeapInsertFreeList(
} }
PVOID PVOID
HeapAllocate( FrLdrHeapAllocate(
PVOID HeapHandle, PVOID HeapHandle,
SIZE_T ByteSize, SIZE_T ByteSize,
ULONG Tag) ULONG Tag)
@ -323,7 +323,7 @@ HeapAllocate(
#ifdef FREELDR_HEAP_VERIFIER #ifdef FREELDR_HEAP_VERIFIER
/* Verify the heap */ /* Verify the heap */
HeapVerify(HeapHandle); FrLdrHeapVerify(HeapHandle);
/* Add space for a size field and 2 redzones */ /* Add space for a size field and 2 redzones */
ByteSize += REDZONE_ALLOCATION; ByteSize += REDZONE_ALLOCATION;
@ -357,7 +357,7 @@ HeapAllocate(
Block->Tag = Tag; Block->Tag = Tag;
/* Remove this entry from the free list */ /* Remove this entry from the free list */
HeapRemoveFreeList(Heap, Block); FrLdrHeapRemoveFreeList(Heap, Block);
/* Calculate the remaining size */ /* Calculate the remaining size */
Remaining = Block->Size - BlockSize; Remaining = Block->Size - BlockSize;
@ -376,7 +376,7 @@ HeapAllocate(
NextBlock->Size = Remaining - 1; NextBlock->Size = Remaining - 1;
NextBlock->PreviousSize = BlockSize; NextBlock->PreviousSize = BlockSize;
BlockSize = NextBlock->Size; BlockSize = NextBlock->Size;
HeapInsertFreeList(Heap, NextBlock); FrLdrHeapInsertFreeList(Heap, NextBlock);
/* Advance to the next block */ /* Advance to the next block */
NextBlock = NextBlock + 1 + BlockSize; NextBlock = NextBlock + 1 + BlockSize;
@ -426,7 +426,7 @@ HeapAllocate(
} }
VOID VOID
HeapFree( FrLdrHeapFree(
PVOID HeapHandle, PVOID HeapHandle,
PVOID Pointer, PVOID Pointer,
ULONG Tag) ULONG Tag)
@ -439,7 +439,7 @@ HeapFree(
#ifdef FREELDR_HEAP_VERIFIER #ifdef FREELDR_HEAP_VERIFIER
/* Verify the heap */ /* Verify the heap */
HeapVerify(HeapHandle); FrLdrHeapVerify(HeapHandle);
#endif #endif
/* Check if the block is really inside this heap */ /* Check if the block is really inside this heap */
@ -485,7 +485,7 @@ HeapFree(
{ {
/* Merge next block into current */ /* Merge next block into current */
Block->Size += NextBlock->Size + 1; Block->Size += NextBlock->Size + 1;
HeapRemoveFreeList(Heap, NextBlock); FrLdrHeapRemoveFreeList(Heap, NextBlock);
NextBlock = Block + Block->Size + 1; NextBlock = Block + Block->Size + 1;
} }
@ -501,7 +501,7 @@ HeapFree(
else else
{ {
/* Insert the entry into the free list */ /* Insert the entry into the free list */
HeapInsertFreeList(Heap, Block); FrLdrHeapInsertFreeList(Heap, Block);
} }
/* Update the next block's back link */ /* Update the next block's back link */
@ -519,11 +519,11 @@ MmInitializeHeap(PVOID PageLookupTable)
TRACE("MmInitializeHeap()\n"); TRACE("MmInitializeHeap()\n");
/* Create the default heap */ /* Create the default heap */
FrLdrDefaultHeap = HeapCreate(DEFAULT_HEAP_SIZE, LoaderOsloaderHeap); FrLdrDefaultHeap = FrLdrHeapCreate(DEFAULT_HEAP_SIZE, LoaderOsloaderHeap);
ASSERT(FrLdrDefaultHeap); ASSERT(FrLdrDefaultHeap);
/* Create a temporary heap */ /* Create a temporary heap */
FrLdrTempHeap = HeapCreate(TEMP_HEAP_SIZE, LoaderFirmwareTemporary); FrLdrTempHeap = FrLdrHeapCreate(TEMP_HEAP_SIZE, LoaderFirmwareTemporary);
ASSERT(FrLdrTempHeap); ASSERT(FrLdrTempHeap);
TRACE("MmInitializeHeap() done, default heap %p, temp heap %p\n", TRACE("MmInitializeHeap() done, default heap %p, temp heap %p\n",
@ -533,13 +533,13 @@ MmInitializeHeap(PVOID PageLookupTable)
PVOID PVOID
MmHeapAlloc(SIZE_T MemorySize) MmHeapAlloc(SIZE_T MemorySize)
{ {
return HeapAllocate(FrLdrDefaultHeap, MemorySize, 'pHmM'); return FrLdrHeapAllocate(FrLdrDefaultHeap, MemorySize, 'pHmM');
} }
VOID VOID
MmHeapFree(PVOID MemoryPointer) MmHeapFree(PVOID MemoryPointer)
{ {
HeapFree(FrLdrDefaultHeap, MemoryPointer, 'pHmM'); FrLdrHeapFree(FrLdrDefaultHeap, MemoryPointer, 'pHmM');
} }
PVOID PVOID
@ -549,7 +549,7 @@ ExAllocatePoolWithTag(
IN SIZE_T NumberOfBytes, IN SIZE_T NumberOfBytes,
IN ULONG Tag) IN ULONG Tag)
{ {
return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, Tag); return FrLdrHeapAllocate(FrLdrDefaultHeap, NumberOfBytes, Tag);
} }
PVOID PVOID
@ -558,7 +558,7 @@ ExAllocatePool(
IN POOL_TYPE PoolType, IN POOL_TYPE PoolType,
IN SIZE_T NumberOfBytes) IN SIZE_T NumberOfBytes)
{ {
return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, 0); return FrLdrHeapAllocate(FrLdrDefaultHeap, NumberOfBytes, 0);
} }
VOID VOID
@ -566,7 +566,7 @@ NTAPI
ExFreePool( ExFreePool(
IN PVOID P) IN PVOID P)
{ {
HeapFree(FrLdrDefaultHeap, P, 0); FrLdrHeapFree(FrLdrDefaultHeap, P, 0);
} }
VOID VOID
@ -575,7 +575,7 @@ ExFreePoolWithTag(
IN PVOID P, IN PVOID P,
IN ULONG Tag) IN ULONG Tag)
{ {
HeapFree(FrLdrDefaultHeap, P, Tag); FrLdrHeapFree(FrLdrDefaultHeap, P, Tag);
} }
PVOID PVOID
@ -587,7 +587,7 @@ RtlAllocateHeap(
{ {
PVOID ptr; PVOID ptr;
ptr = HeapAllocate(FrLdrDefaultHeap, Size, ' ltR'); ptr = FrLdrHeapAllocate(FrLdrDefaultHeap, Size, ' ltR');
if (ptr && (Flags & HEAP_ZERO_MEMORY)) if (ptr && (Flags & HEAP_ZERO_MEMORY))
{ {
RtlZeroMemory(ptr, Size); RtlZeroMemory(ptr, Size);
@ -603,7 +603,6 @@ RtlFreeHeap(
IN ULONG Flags, IN ULONG Flags,
IN PVOID HeapBase) IN PVOID HeapBase)
{ {
HeapFree(FrLdrDefaultHeap, HeapBase, ' ltR'); FrLdrHeapFree(FrLdrDefaultHeap, HeapBase, ' ltR');
return TRUE; return TRUE;
} }

6
reactos/boot/freeldr/freeldr/windows/winldr.c
View file

@ -144,9 +144,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
PARC_DISK_SIGNATURE_EX ArcDiskSig; PARC_DISK_SIGNATURE_EX ArcDiskSig;
/* Allocate the ARC structure */ /* Allocate the ARC structure */
ArcDiskSig = HeapAllocate(FrLdrDefaultHeap, ArcDiskSig = FrLdrHeapAllocate(FrLdrDefaultHeap,
sizeof(ARC_DISK_SIGNATURE_EX), sizeof(ARC_DISK_SIGNATURE_EX),
'giSD'); 'giSD');
/* Copy the data over */ /* Copy the data over */
ArcDiskSig->DiskSignature.Signature = reactos_arc_disk_info[i].Signature; ArcDiskSig->DiskSignature.Signature = reactos_arc_disk_info[i].Signature;

2
reactos/boot/freeldr/freeldr/windows/wlmemory.c
View file

@ -188,7 +188,7 @@ WinLdrSetupMemoryLayout(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock)
//BOOLEAN Status; //BOOLEAN Status;
/* Cleanup heap */ /* Cleanup heap */
HeapCleanupAll(); FrLdrHeapCleanupAll();
// //
// Creating a suitable memory map for Windows can be tricky, so let's // Creating a suitable memory map for Windows can be tricky, so let's