Merge pull request #2 from airbus-cert/issue_1

Allow passing DLL paths (fix #1)
airbus-cert · Oct 7, 2022 · 1578ba6 · 1578ba6
2 parents dc1ee10 + 1eaca8d
commit 1578ba6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/TTD/TTD.cpp b/TTD/TTD.cpp
@@ -100,7 +100,7 @@ namespace TTD {
 		return this->cursor->ICursor->GetModuleList(cursor);
 	}
 
-	ReplayEngine::ReplayEngine() {
+	ReplayEngine::ReplayEngine(const wchar_t* ttdReplayPath, const wchar_t* ttdReplayCpuPath) {
 		HINSTANCE hinstLib;
 		PROC_Initiate InitiateReplayEngineHandshake;
 		PROC_Create CreateReplayEngineWithHandshake;
@@ -109,7 +109,12 @@ namespace TTD {
 		SHA256_CTX ctx;
 		BYTE sha[32];
 
-		hinstLib = LoadLibrary(TEXT("TTDReplay.dll"));
+		hinstLib = LoadLibraryW(ttdReplayCpuPath);
+		if (hinstLib == NULL) {
+			throw std::exception("Unable to find TTDReplayCPU.dll");
+		}
+
+		hinstLib = LoadLibraryW(ttdReplayPath);
 		if (hinstLib == NULL) {
 			throw std::exception("Unable to find TTDReplay.dll");
 		}

diff --git a/TTD/TTD.hpp b/TTD/TTD.hpp
@@ -494,7 +494,7 @@ namespace TTD {
 		TTD_Replay_ReplayEngine* engine;
 
 	public:
-		ReplayEngine();
+		ReplayEngine(const wchar_t* ttdReplayPath=L"TTDReplay.dll", const wchar_t* ttdReplayCpuPath=L"TTDReplayCPU.dll");
 
 		/**** Wrapping around the vftable ****/
 		bool Initialize(const wchar_t* trace_filename);