From 8bed1c726717d968f90ba505d2fdd05b54399ae9 Mon Sep 17 00:00:00 2001
From: Jupeyy <jupjopjap@gmail.com>
Date: Wed, 23 Feb 2022 21:10:45 +0100
Subject: [PATCH] Add module offset

---
 scripts/parse_drmingw.sh | 29 +++++++++++++++++++++++++++++
 src/base/system.cpp      | 13 +++++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100755 scripts/parse_drmingw.sh

diff --git a/scripts/parse_drmingw.sh b/scripts/parse_drmingw.sh
new file mode 100755
index 000000000..7a3712229
--- /dev/null
+++ b/scripts/parse_drmingw.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [ -z ${1+x} ]; then
+    printf "\e[31m%s\e[30m\n" "Did not pass executable file (full path)"
+    printf "\e[31m%s\e[30m\n" "Usage: ./parse_drmingw.sh <executable> <crash_log>"
+    exit 1
+fi
+
+if [ -z ${2+x} ]; then
+    printf "\e[31m%s\e[30m\n" "Did not pass crash log file (full path)"
+    printf "\e[31m%s\e[30m\n" "Usage: ./parse_drmingw.sh <executable> <crash_log>"
+    exit 1
+fi
+
+TMP_OFFSET=$(cat "$2" | grep -E -o "\(with offset [0-9A-F]*\)" | grep -E -o "[A-F0-9]*")
+
+ADDR_PC_REGEX='[0-9A-F]+ [0-9A-F]+ [0-9A-F]+ [0-9A-F]+'
+while read -r line
+do
+    if [[ $line =~ $ADDR_PC_REGEX ]]
+    then
+		TMP_ADDR=$(echo "$line" | grep -E -o -m 1 "[A-F0-9]+ " | head -1)
+		ADDR_BASE=$(winedump -f "$1" | grep -E -o "image base[ ]*0x[0-9A-Fa-f]*" | grep -E -o "[0-9A-Fa-f]+" | tail -1)
+		REAL_ADDR=$(printf '%X\n' "$(((0x$TMP_ADDR-0x$TMP_OFFSET)+0x$ADDR_BASE))")
+		echo "Parsing address: $REAL_ADDR (img base: $ADDR_BASE)"
+		addr2line -e "$1" "$REAL_ADDR"
+    fi
+done < "$2"
+
diff --git a/src/base/system.cpp b/src/base/system.cpp
index b861256c5..d4852f629 100644
--- a/src/base/system.cpp
+++ b/src/base/system.cpp
@@ -4072,8 +4072,17 @@ void init_exception_handler()
 	gs_ExceptionHandlingModule = LoadLibraryA("exchndl.dll");
 	if(gs_ExceptionHandlingModule != nullptr)
 	{
-		auto pfnExcHndlInit = (void APIENTRY (*)())GetProcAddress(gs_ExceptionHandlingModule, "ExcHndlInit");
-		pfnExcHndlInit();
+		// Intentional
+#ifdef __MINGW32__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-function-type"
+#endif
+		auto pfnExcHndlInit = (void APIENTRY (*)(void *))GetProcAddress(gs_ExceptionHandlingModule, "ExcHndlInit");
+#ifdef __MINGW32__
+#pragma clang diagnostic pop
+#endif
+		void *pExceptionHandlingOffset = (void *)GetModuleHandle(NULL);
+		pfnExcHndlInit(pExceptionHandlingOffset);
 	}
 #else
 #error exception handling not implemented