add realloc too

2 files changed, 36 insertions, 3 deletions

diff --git a/loader_launcher_proxy/Memory.cpp b/loader_launcher_proxy/Memory.cpp
index 6c69d80f..bd19502a 100644
--- a/loader_launcher_proxy/Memory.cpp
+++ b/loader_launcher_proxy/Memory.cpp
@@ -14,6 +14,7 @@ void LoadTier0Handle()
 const int STATIC_ALLOC_SIZE = 4096;
 
 size_t g_iStaticAllocated = 0;
+void* g_pLastAllocated = nullptr;
 char pStaticAllocBuf[STATIC_ALLOC_SIZE];
 
 // they should never be used here, except in LibraryLoadError?
@@ -48,6 +49,29 @@ void free(void* p)
         (*g_ppMemAllocSingleton)->m_vtable->Free(*g_ppMemAllocSingleton, 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_ppMemAllocSingleton && *g_ppMemAllocSingleton)
+        return (*g_ppMemAllocSingleton)->m_vtable->Realloc(*g_ppMemAllocSingleton, old_ptr, size);
+}
+
 void* operator new(size_t n)
 {
     return malloc(n);
diff --git a/loader_launcher_proxy/Memory.h b/loader_launcher_proxy/Memory.h
index 928e403c..c983966c 100644
--- a/loader_launcher_proxy/Memory.h
+++ b/loader_launcher_proxy/Memory.h
@@ -5,10 +5,19 @@ class IMemAlloc
 public:
     struct VTable
     {
-        void* unknown[1];
+        void* unknown[1]; // alloc debug
         void* (*Alloc) (IMemAlloc* memAlloc, size_t nSize);
-        void* unknown2[3];
-        void(*Free) (IMemAlloc* memAlloc, void* pMem);
+        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;