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

1 files changed, 64 insertions, 18 deletions

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;