Fix calls to FlushInstructionCache

They now operate on the process' handle instead of the hmodule of the main module.
TeamREPENTOGON · Nov 16, 2024 · 142b779 · 142b779
1 parent 902273e
commit 142b779
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/libzhl/ASMPatcher.cpp b/libzhl/ASMPatcher.cpp
@@ -118,7 +118,10 @@ void ASMPatcher::FlatPatch(void* at, const char* with, size_t len, bool nopRest)
 		throw std::runtime_error("Parallel patching is not allowed");
 	}
 
-	FlushInstructionCache(GetModuleHandle(NULL), NULL, 0);
+	BOOL flushOk = FlushInstructionCache(GetCurrentProcess(), NULL, 0);
+	if (!flushOk) {
+		logger.Log("[CRITICAL] ASMPatcher::FlatPatch: FlushInstructionCache failed (%d)\n", GetLastError());
+	}
 }
 
 void* ASMPatcher::Patch(void* at, void* targetPage, const char* with, size_t len) {
@@ -197,7 +200,10 @@ void* ASMPatcher::Patch(void* at, void* targetPage, const char* with, size_t len
 	}
 
 	logger.Log("ASMPatcher::Patch: flushing instruction pipeline\n");
-	FlushInstructionCache(GetModuleHandle(NULL), NULL, 0);
+	BOOL flushOk = FlushInstructionCache(GetCurrentProcess(), NULL, 0);
+	if (!flushOk) {
+		logger.Log("[CRITICAL] ASMPatcher::Patch: FlushInstructionCache failed (%d)\n", GetLastError());
+	}
 
 	return targetPage;
 }

diff --git a/repentogon/dllmain.cpp b/repentogon/dllmain.cpp
@@ -159,7 +159,7 @@ static void FixLuaDump()
 		fprintf(stderr, "VirtualProtect error %d\n", GetLastError());
 	}
 
-	FlushInstructionCache(GetModuleHandle(NULL), NULL, 0);
+	FlushInstructionCache(GetCurrentProcess(), NULL, 0);
 }
 char REPENTOGON::stocktitle[256]="";
 char REPENTOGON::moddedtitle[256] = "";