Refactor and fix of various issues, add run_northstar.txt support

4 files changed, 108 insertions, 30 deletions

diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDedicatedTest/dllmain.cpp
index 1aa4bd3b..dfc3afe1 100644
--- a/NorthstarDedicatedTest/dllmain.cpp
+++ b/NorthstarDedicatedTest/dllmain.cpp
@@ -70,7 +70,7 @@ bool InitialiseNorthstar()
 {
     if (initialised)
     {
-        fprintf(stderr, "[WARN] Called InitialiseNorthstar more than once!\n");
+        fprintf(stderr, "[info] Called InitialiseNorthstar more than once!\n");
         return false;
     }
     initialised = true;
@@ -81,8 +81,7 @@ bool InitialiseNorthstar()
     InstallInitialHooks();
     InitialiseInterfaceCreationHooks();
 
-    // adding a callback to tier0 won't work for some reason
-    AddDllLoadCallback("launcher.org.dll", InitialiseTier0GameUtilFunctions);
+    AddDllLoadCallback("tier0.dll", InitialiseTier0GameUtilFunctions);
     AddDllLoadCallback("engine.dll", WaitForDebugger);
     AddDllLoadCallback("engine.dll", InitialiseEngineGameUtilFunctions);
     AddDllLoadCallback("server.dll", InitialiseServerGameUtilFunctions);
@@ -91,7 +90,7 @@ bool InitialiseNorthstar()
     // dedi patches
     {
         AddDllLoadCallback("engine.dll", InitialiseDedicated);
-        AddDllLoadCallback("launcher.org.dll", InitialiseDedicatedOrigin);
+        AddDllLoadCallback("tier0.dll", InitialiseDedicatedOrigin);
         AddDllLoadCallback("server.dll", InitialiseDedicatedServerGameDLL);
         AddDllLoadCallback("materialsystem_dx11.dll", InitialiseDedicatedMaterialSystem);
         // this fucking sucks, but seemingly we somehow load after rtech_game???? unsure how, but because of this we have to apply patches here, not on rtech_game load
diff --git a/NorthstarDedicatedTest/gameutils.cpp b/NorthstarDedicatedTest/gameutils.cpp
index 97011059..3e62037c 100644
--- a/NorthstarDedicatedTest/gameutils.cpp
+++ b/NorthstarDedicatedTest/gameutils.cpp
@@ -78,16 +78,25 @@ void InitialiseServerGameUtilFunctions(HMODULE baseAddress)
 
 void InitialiseTier0GameUtilFunctions(HMODULE baseAddress)
 {
-	baseAddress = GetModuleHandleA("tier0.dll");
-	if (!baseAddress)
-		throw "tier0.dll is not loaded";
-
 	CreateGlobalMemAlloc = reinterpret_cast<CreateGlobalMemAllocType>(GetProcAddress(baseAddress, "CreateGlobalMemAlloc"));
 	IMemAlloc** ppMemAllocSingleton = reinterpret_cast<IMemAlloc**>(GetProcAddress(baseAddress, "g_pMemAllocSingleton"));
-	if (!ppMemAllocSingleton || !*ppMemAllocSingleton)
+	if (!ppMemAllocSingleton)
+	{
+		spdlog::critical("Address of g_pMemAllocSingleton is a null pointer, this should never happen");
+		throw "Address of g_pMemAllocSingleton is a null pointer, this should never happen";
+	}
+	if (!*ppMemAllocSingleton)
+	{
 		g_pMemAllocSingleton = CreateGlobalMemAlloc();
+		*ppMemAllocSingleton = g_pMemAllocSingleton;
+		spdlog::warn("Created new g_pMemAllocSingleton");
+	}
 	else
+	{
 		g_pMemAllocSingleton = *ppMemAllocSingleton;
+		extern size_t g_iStaticAllocated;
+		spdlog::info("Using existing g_pMemAllocSingleton for memory allocations, preallocated {} bytes beforehand", g_iStaticAllocated);
+	}
 
 	Error = reinterpret_cast<ErrorType>(GetProcAddress(baseAddress, "Error"));
 	CommandLine = reinterpret_cast<CommandLineType>(GetProcAddress(baseAddress, "CommandLine"));
diff --git a/NorthstarDedicatedTest/hooks.cpp b/NorthstarDedicatedTest/hooks.cpp
index 3de8d483..9d2be61c 100644
--- a/NorthstarDedicatedTest/hooks.cpp
+++ b/NorthstarDedicatedTest/hooks.cpp
@@ -6,14 +6,24 @@
 #include <iostream>
 #include <vector>
 
+// note that these load library callbacks only support explicitly loaded dynamic libraries
+
 typedef HMODULE(*LoadLibraryExAType)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
 HMODULE LoadLibraryExAHook(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
 
+typedef HMODULE(*LoadLibraryAType)(LPCSTR lpLibFileName);
+HMODULE LoadLibraryAHook(LPCSTR lpLibFileName);
+
 typedef HMODULE(*LoadLibraryExWType)(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
 HMODULE LoadLibraryExWHook(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
 
+typedef HMODULE(*LoadLibraryWType)(LPCWSTR lpLibFileName);
+HMODULE LoadLibraryWHook(LPCWSTR lpLibFileName);
+
 LoadLibraryExAType LoadLibraryExAOriginal;
+LoadLibraryAType LoadLibraryAOriginal;
 LoadLibraryExWType LoadLibraryExWOriginal;
+LoadLibraryWType LoadLibraryWOriginal;
 
 void InstallInitialHooks()
 {
@@ -22,7 +32,9 @@ void InstallInitialHooks()
 	
 	HookEnabler hook;
 	ENABLER_CREATEHOOK(hook, &LoadLibraryExA, &LoadLibraryExAHook, reinterpret_cast<LPVOID*>(&LoadLibraryExAOriginal));
+	ENABLER_CREATEHOOK(hook, &LoadLibraryA, &LoadLibraryAHook, reinterpret_cast<LPVOID*>(&LoadLibraryAOriginal));
 	ENABLER_CREATEHOOK(hook, &LoadLibraryExW, &LoadLibraryExWHook, reinterpret_cast<LPVOID*>(&LoadLibraryExWOriginal));
+	ENABLER_CREATEHOOK(hook, &LoadLibraryW, &LoadLibraryWHook, reinterpret_cast<LPVOID*>(&LoadLibraryWOriginal));
 }
 
 // dll load callback stuff
@@ -46,20 +58,51 @@ void AddDllLoadCallback(std::string dll, DllLoadCallbackFuncType callback)
 	dllLoadCallbacks.push_back(callbackStruct);
 }
 
+void CallLoadLibraryACallbacks(LPCSTR lpLibFileName, HMODULE moduleAddress)
+{
+	for (auto& callbackStruct : dllLoadCallbacks)
+	{
+		if (!callbackStruct->called && strstr(lpLibFileName + (strlen(lpLibFileName) - strlen(callbackStruct->dll.c_str())), callbackStruct->dll.c_str()) != nullptr)
+		{
+			callbackStruct->callback(moduleAddress);
+			callbackStruct->called = true;
+		}
+	}
+}
+
+void CallLoadLibraryWCallbacks(LPCWSTR lpLibFileName, HMODULE moduleAddress)
+{
+	for (auto& callbackStruct : dllLoadCallbacks)
+	{
+		std::wstring wcharStrDll = std::wstring(callbackStruct->dll.begin(), callbackStruct->dll.end());
+		const wchar_t* callbackDll = wcharStrDll.c_str();
+		if (!callbackStruct->called && wcsstr(lpLibFileName + (wcslen(lpLibFileName) - wcslen(callbackDll)), callbackDll) != nullptr)
+		{
+			callbackStruct->callback(moduleAddress);
+			callbackStruct->called = true;
+		}
+	}
+}
+
 HMODULE LoadLibraryExAHook(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags)
 {
 	HMODULE moduleAddress = LoadLibraryExAOriginal(lpLibFileName, hFile, dwFlags);
 	
 	if (moduleAddress)
 	{
-		for (auto& callbackStruct : dllLoadCallbacks)
-		{
-			if (!callbackStruct->called && strstr(lpLibFileName + (strlen(lpLibFileName) - strlen(callbackStruct->dll.c_str())), callbackStruct->dll.c_str()) != nullptr)
-			{
-				callbackStruct->callback(moduleAddress);
-				callbackStruct->called = true;
-			}
-		}
+		CallLoadLibraryACallbacks(lpLibFileName, moduleAddress);
+	}
+
+	return moduleAddress;
+}
+
+HMODULE LoadLibraryAHook(LPCSTR lpLibFileName)
+{
+	HMODULE moduleAddress = LoadLibraryAOriginal(lpLibFileName);
+
+	if (moduleAddress)
+	{
+		CallLoadLibraryACallbacks(lpLibFileName, moduleAddress);
 	}
 
 	return moduleAddress;
@@ -71,16 +114,19 @@ HMODULE LoadLibraryExWHook(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags)
 
 	if (moduleAddress)
 	{
-		for (auto& callbackStruct : dllLoadCallbacks)
-		{
-			std::wstring wcharStrDll = std::wstring(callbackStruct->dll.begin(), callbackStruct->dll.end());
-			const wchar_t* callbackDll = wcharStrDll.c_str();
-			if (!callbackStruct->called && wcsstr(lpLibFileName + (wcslen(lpLibFileName) - wcslen(callbackDll)), callbackDll) != nullptr)
-			{
-				callbackStruct->callback(moduleAddress);
-				callbackStruct->called = true;
-			}
-		}
+		CallLoadLibraryWCallbacks(lpLibFileName, moduleAddress);
+	}
+
+	return moduleAddress;
+}
+
+HMODULE LoadLibraryWHook(LPCWSTR lpLibFileName)
+{
+	HMODULE moduleAddress = LoadLibraryWOriginal(lpLibFileName);
+
+	if (moduleAddress)
+	{
+		CallLoadLibraryWCallbacks(lpLibFileName, moduleAddress);
 	}
 
 	return moduleAddress;
diff --git a/NorthstarDedicatedTest/memalloc.cpp b/NorthstarDedicatedTest/memalloc.cpp
index 113f56b9..cff0ecac 100644
--- a/NorthstarDedicatedTest/memalloc.cpp
+++ b/NorthstarDedicatedTest/memalloc.cpp
@@ -17,24 +17,48 @@ const int STATIC_ALLOC_SIZE = 100000; // alot more than we need, could reduce to
 size_t g_iStaticAllocated = 0;
 char pStaticAllocBuf[STATIC_ALLOC_SIZE];
 
-void* operator new(size_t n)
+// TODO: rename to malloc and free after removing statically compiled .libs
+
+void* malloc_(size_t n)
 {
 	// allocate into static buffer if g_pMemAllocSingleton isn't initialised
 	if (g_pMemAllocSingleton)
+	{
+		//printf("Northstar malloc (g_pMemAllocSingleton): %llu\n", n);
 		return g_pMemAllocSingleton->m_vtable->Alloc(g_pMemAllocSingleton, n);
+	}
 	else
 	{
+		if (g_iStaticAllocated + n > STATIC_ALLOC_SIZE)
+		{
+			throw "Ran out of prealloc space"; // we could log, but spdlog probably does use allocations as well...
+		}
+		//printf("Northstar malloc (prealloc): %llu\n", n);
 		void* ret = pStaticAllocBuf + g_iStaticAllocated;
 		g_iStaticAllocated += n;
 		return ret;
-	}	
+	}
 }
 
-void operator delete(void* p)
+void free_(void* p)
 {
 	// if it was allocated into the static buffer, just do nothing, safest way to deal with it
 	if (p >= pStaticAllocBuf && p <= pStaticAllocBuf + STATIC_ALLOC_SIZE)
+	{
+		//printf("Northstar free (prealloc): %p\n", p);
 		return;
+	}
 
+	//printf("Northstar free (g_pMemAllocSingleton): %p\n", p);
 	g_pMemAllocSingleton->m_vtable->Free(g_pMemAllocSingleton, p);
+}
+
+void* operator new(size_t n)
+{
+	return malloc_(n);
+}
+
+void operator delete(void* p)
+{
+	free_(p);
 }
\ No newline at end of file