This commit is contained in:
2026-06-11 05:38:45 +02:00
parent ef9ec5de2a
commit 0a582ffebc
3 changed files with 15 additions and 15 deletions

View File

@@ -137,13 +137,13 @@ void* MIHP_Allocate(MIHP_Heap* heap, size_t size);
void* MIHP_Reallocate(MIHP_Heap* heap, void* ptr, size_t newSize);
bool MIHP_Free(MIHP_Heap* heap, void* ptr);
bool MIHP_SetCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMetadata metadata);
bool MIHP_GetCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMetadata* outMetadata);
bool MIHP_SetPointerCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMetadata metadata);
bool MIHP_GetPointerCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMetadata* outMetadata);
bool MIHP_MergeHeaps(MIHP_Heap* sourceHeap, MIHP_Heap* heapToAbsorb);
bool MIHP_IsPointerInHeap(MIHP_Heap* heap, void* ptr);
size_t MIHP_GetPtrAllocationSize(MIHP_Heap* heap, void* ptr);
bool MIHP_IsAddressInHeap(MIHP_Heap* heap, void* ptr);
size_t MIHP_GetPointerAllocationSize(MIHP_Heap* heap, void* ptr);
bool MIHP_ValidateHeap(MIHP_Heap* heap);
typedef void(MIHP_WalkHeapCallbackFn)(const MIHP_Heap* heap, const MIHP_HeapMemoryAreaHeader* area, const MIHP_HeapSegmentHeader* segment);

View File

@@ -231,7 +231,7 @@ void* MIHP_Reallocate(MIHP_Heap* heap, void* ptr, size_t newSize)
if (ptr == NULL)
return MIHP_Allocate(heap, newSize);
if (!MIHP_IsPointerInHeap(heap, ptr))
if (!MIHP_IsAddressInHeap(heap, ptr))
return NULL;
MIHP_LockHeap(heap);
@@ -299,7 +299,7 @@ void* MIHP_Reallocate(MIHP_Heap* heap, void* ptr, size_t newSize)
bool MIHP_Free(MIHP_Heap* heap, void* ptr)
{
if (!MIHP_IsPointerInHeap(heap, ptr))
if (!MIHP_IsAddressInHeap(heap, ptr))
return false;
MIHP_LockHeap(heap);
@@ -378,9 +378,9 @@ bool MIHP_Free(MIHP_Heap* heap, void* ptr)
return true;
}
bool MIHP_SetCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMetadata metadata)
bool MIHP_SetPointerCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMetadata metadata)
{
if (!MIHP_IsPointerInHeap(heap, ptr))
if (!MIHP_IsAddressInHeap(heap, ptr))
return false;
MIHP_HeapSegmentHeader* segment = MIHP_GetSegmentHeaderPtr(heap, ptr);
@@ -389,12 +389,12 @@ bool MIHP_SetCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMet
return true;
}
bool MIHP_GetCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMetadata* outMetadata)
bool MIHP_GetPointerCustomMetadata(MIHP_Heap* heap, void* ptr, MIHP_AllocationCustomMetadata* outMetadata)
{
if (outMetadata == NULL)
return false;
if (!MIHP_IsPointerInHeap(heap, ptr))
if (!MIHP_IsAddressInHeap(heap, ptr))
return false;
MIHP_HeapSegmentHeader* segment = MIHP_GetSegmentHeaderPtr(heap, ptr);
@@ -458,7 +458,7 @@ bool MIHP_MergeHeaps(MIHP_Heap* sourceHeap, MIHP_Heap* heapToAbsorb)
return true;
}
bool MIHP_IsPointerInHeap(MIHP_Heap* heap, void* ptr)
bool MIHP_IsAddressInHeap(MIHP_Heap* heap, void* ptr)
{
if (!MIHP_IsHeapInitialized(heap))
return false;
@@ -488,9 +488,9 @@ bool MIHP_IsPointerInHeap(MIHP_Heap* heap, void* ptr)
return false;
}
size_t MIHP_GetPtrAllocationSize(MIHP_Heap* heap, void* ptr)
size_t MIHP_GetPointerAllocationSize(MIHP_Heap* heap, void* ptr)
{
if (!MIHP_IsPointerInHeap(heap, ptr))
if (!MIHP_IsAddressInHeap(heap, ptr))
return 0;
MIHP_LockHeap(heap);

View File

@@ -64,11 +64,11 @@ int main()
void* ptr = GetThisAddress();
memcpy(&metadata.data, &ptr, sizeof(void*));
MIHP_SetCustomMetadata(&myHeap, myptrs[i], metadata);
MIHP_SetPointerCustomMetadata(&myHeap, myptrs[i], metadata);
MIHP_ValidateHeap(&myHeap);
MIHP_AllocationCustomMetadata outMetadata = { 0 };
MIHP_GetCustomMetadata(&myHeap, myptrs[i], &outMetadata);
MIHP_GetPointerCustomMetadata(&myHeap, myptrs[i], &outMetadata);
void* returnPtr;
memcpy(&returnPtr, &outMetadata.data, sizeof(void*));