add realloc too

2 files changed, 37 insertions, 4 deletions

diff --git a/NorthstarDedicatedTest/gameutils.h b/NorthstarDedicatedTest/gameutils.h
index 8def57eb..43f387d1 100644
--- a/NorthstarDedicatedTest/gameutils.h
+++ b/NorthstarDedicatedTest/gameutils.h
@@ -7,10 +7,19 @@ class IMemAlloc
 public:
 	struct VTable
 	{
-		void* unknown[1];
-		void* (*Alloc)(IMemAlloc* memAlloc, size_t nSize);
-		void* unknown2[3];
-		void (*Free)(IMemAlloc* memAlloc, void* pMem);
+		void* unknown[1]; // alloc debug
+		void* (*Alloc) (IMemAlloc* memAlloc, size_t nSize);
+		void* unknown2[1]; // realloc debug
+		void* (*Realloc)(IMemAlloc* memAlloc, void* pMem, size_t nSize);
+		void* unknown3[1]; // free #1
+		void (*Free) (IMemAlloc* memAlloc, void* pMem);
+		void* unknown4[2]; // nullsubs, maybe CrtSetDbgFlag
+		size_t(*GetSize) (IMemAlloc* memAlloc, void* pMem);
+		void* unknown5[9]; // they all do literally nothing
+		void (*DumpStats) (IMemAlloc* memAlloc);
+		void (*DumpStatsFileBase) (IMemAlloc* memAlloc, const char* pchFileBase);
+		void* unknown6[4];
+		int (*heapchk) (IMemAlloc* memAlloc);
 	};
 
 	VTable* m_vtable;
diff --git a/NorthstarDedicatedTest/memalloc.cpp b/NorthstarDedicatedTest/memalloc.cpp
index cff0ecac..d301f1fa 100644
--- a/NorthstarDedicatedTest/memalloc.cpp
+++ b/NorthstarDedicatedTest/memalloc.cpp
@@ -15,6 +15,7 @@
 const int STATIC_ALLOC_SIZE = 100000; // alot more than we need, could reduce to 50k or even 25k later potentially
 
 size_t g_iStaticAllocated = 0;
+void* g_pLastAllocated = nullptr;
 char pStaticAllocBuf[STATIC_ALLOC_SIZE];
 
 // TODO: rename to malloc and free after removing statically compiled .libs
@@ -53,6 +54,29 @@ void free_(void* p)
 	g_pMemAllocSingleton->m_vtable->Free(g_pMemAllocSingleton, p);
 }
 
+void* realloc_(void* old_ptr, size_t size) {
+	// it was allocated into the static buffer
+	if (old_ptr >= pStaticAllocBuf && old_ptr <= pStaticAllocBuf + STATIC_ALLOC_SIZE)
+	{
+		if (g_pLastAllocated == old_ptr)
+		{
+			// nothing was allocated after this
+			size_t old_size = g_iStaticAllocated - ((size_t)g_pLastAllocated - (size_t)pStaticAllocBuf);
+			size_t diff = size - old_size;
+			if (diff > 0)
+				g_iStaticAllocated += diff;
+			return old_ptr;
+		}
+		else
+		{
+			return malloc_(size);
+		}
+	}
+
+	if (g_pMemAllocSingleton)
+		return g_pMemAllocSingleton->m_vtable->Realloc(g_pMemAllocSingleton, old_ptr, size);
+}
+
 void* operator new(size_t n)
 {
 	return malloc_(n);