diff options
| author | Kenix3 <kenixwhisperwind@gmail.com> | 2022-09-08 22:51:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-08 22:51:56 -0400 |
| commit | 674bc4cc3e9bc2f4a09af5bc234c3928ce440042 (patch) | |
| tree | e0d7d355cfb07616d3ecf0ea38999bcf5eed4cbc | |
| parent | 3223331e76d9852b1277a0cf16123dc33b199c29 (diff) | |
Fixes crash handler. (#1446)3.0.2
We need to include the PDB with the distributable.
| -rw-r--r-- | Jenkinsfile | 5 | ||||
| -rw-r--r-- | libultraship/libultraship/CrashHandler.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index f9ac7e7c8..278458899 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,14 +57,17 @@ pipeline { "${env.CMAKE}" --build . --config Release cd "..\\..\\" + + mkdir debug move "soh\\x64\\Release\\soh.exe" ".\\" + move "soh\\x64\\Release\\soh.pdb" ".\\debug\\" move "OTRGui\\build\\assets" ".\\" move ".\\OTRExporter\\x64\\Release\\ZAPD.exe" ".\\assets\\extractor\\" move ".\\OTRGui\\build\\Release\\OTRGui.exe" ".\\" rename README.md readme.txt - "${env.ZIP}" a soh.7z soh.exe OTRGui.exe assets readme.txt + "${env.ZIP}" a soh.7z soh.exe OTRGui.exe assets debug readme.txt """ archiveArtifacts artifacts: 'soh.7z', followSymlinks: false, onlyIfSuccessful: true diff --git a/libultraship/libultraship/CrashHandler.cpp b/libultraship/libultraship/CrashHandler.cpp index a01a82e67..ea0fb9d15 100644 --- a/libultraship/libultraship/CrashHandler.cpp +++ b/libultraship/libultraship/CrashHandler.cpp @@ -288,8 +288,9 @@ static void printStack(CONTEXT* ctx) { process = GetCurrentProcess(); thread = GetCurrentThread(); - SymInitialize(process, nullptr, true); + SymSetOptions(SYMOPT_NO_IMAGE_SEARCH | SYMOPT_IGNORE_IMAGEDIR); + SymInitialize(process, "debug", true); constexpr DWORD machineType = #if defined(_M_AMD64) |