Fix [https://github.com/fancycode/MemoryModule/pull/91|Added x64 exce…

…ption handling]
tcltk · Nov 27, 2024 · 0cdf923 · 0cdf923
1 parent f9e1f7c
commit 0cdf923
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/win/MemoryModule.c b/win/MemoryModule.c
@@ -441,6 +441,17 @@ PerformBaseRelocation(PMEMORYMODULE module, ptrdiff_t delta)
     return TRUE;
 }
 
+#ifdef _WIN64
+static BOOL
+RegisterExceptionHandling(PMEMORYMODULE module)
+{
+    PIMAGE_DATA_DIRECTORY pDir = GET_HEADER_DICTIONARY(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION);
+    PRUNTIME_FUNCTION pEntry = (PRUNTIME_FUNCTION)(module->codeBase + pDir->VirtualAddress);
+    UINT count = (pDir->Size / sizeof(IMAGE_RUNTIME_FUNCTION_ENTRY)) - 1;
+    return RtlAddFunctionTable(pEntry, count, (DWORD64)module->codeBase);
+}
+#endif
+
 static BOOL
 BuildImportTable(PMEMORYMODULE module)
 {
@@ -729,6 +740,12 @@ HMEMORYMODULE MemoryLoadLibraryEx(const void *data, size_t size,
         goto error;
     }
 
+#ifdef _WIN64
+    if (!RegisterExceptionHandling(result)) {
+        goto error;
+    }
+#endif
+
     // mark memory pages depending on section headers and release
     // sections that are marked as "discardable"
     if (!FinalizeSections(result)) {