Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:05:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BOOTLIB] Fix 64 bit issues (#433)

Browse source
This commit is contained in:
Timo Kreuzer 2018-03-18 16:10:41 +01:00 • committed by GitHub
parent 8bbbab534a
commit 3be4081607
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 85 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boot/environ/lib/mm/blkalloc.c
View file

@ -48,7 +48,7 @@ MmBapCompareBlockAllocatorTableEntry (
)
{
PBL_BLOCK_DESCRIPTOR BlockInfo = (PBL_BLOCK_DESCRIPTOR)Entry;
ULONG BlockId = (ULONG)Argument1;
ULONG BlockId = PtrToUlong(Argument1);
/* Check if the block ID matches */
return BlockInfo->BlockId == BlockId;
@ -67,7 +67,7 @@ MmBapFindBlockInformation (
MmBlockAllocatorTableEntries,
&EntryId,
MmBapCompareBlockAllocatorTableEntry,
(PVOID)EntryId,
UlongToPtr(EntryId),
NULL,
NULL,
NULL);

6
boot/environ/lib/mm/heapalloc.c
View file

@ -567,7 +567,7 @@ MmHaInitialize (
PVOID
BlMmAllocateHeap (
_In_ ULONG Size
_In_ SIZE_T Size
)
{
ULONG BufferSize;
@ -581,8 +581,8 @@ BlMmAllocateHeap (
}
/* Align the buffer size to the minimum size required */
BufferSize = ALIGN_UP(Size + FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer),
FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer));
BufferSize = ALIGN_UP_BY(Size + FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer),
FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer));
/* Watch out for overflow */
if (BufferSize <= Size)

4
boot/environ/lib/mm/pagealloc.c
View file

@ -865,7 +865,7 @@ MmPapAllocatePagesInRange (
Type);
/* Return the allocated address */
*PhysicalAddress = (PVOID)BaseAddress.LowPart;
*PhysicalAddress = PhysicalAddressToPtr(BaseAddress);
}
Exit:
@ -1639,7 +1639,7 @@ MmSelectMappingAddress (
if (MmTranslationType == BlNone)
{
/* Just return the physical address as the mapping address */
PreferredAddress = (PVOID)PhysicalAddress.LowPart;
PreferredAddress = PhysicalAddressToPtr(PhysicalAddress);
goto Success;
}