ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

make symbol initialization bulletproof

Browse source
This commit is contained in:
marzent 2024-02-12 20:36:28 +01:00
parent 386e5f245c
commit 4ac8b428c8
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
DalamudCrashHandler/DalamudCrashHandler.cpp
View file

@ -106,6 +106,23 @@ HRESULT throw_if_failed(HRESULT hr, std::initializer_list<HRESULT> acceptables =
throw_hresult(hr, clue); throw_hresult(hr, clue);
} }
bool try_init_symbols(PCWSTR symbol_search_path) {
__try {
return SymInitializeW(g_hProcess, symbol_search_path, true);
}
__except (EXCEPTION_EXECUTE_HANDLER) {
if (!symbol_search_path) return FALSE;
std::wcerr << L"Failed to init symbols with PDB; retrying without workdir" << std::endl;
__try {
return SymInitializeW(g_hProcess, symbol_search_path + 2, true);
}
__except (EXCEPTION_EXECUTE_HANDLER) {
std::wcerr << L"Failed to init symbols with PDB; init without UserSearchPath" << std::endl;
return SymInitializeW(g_hProcess, nullptr, true);
}
}
}
std::wstring describe_module(const std::filesystem::path& path) { std::wstring describe_module(const std::filesystem::path& path) {
DWORD verHandle = 0; DWORD verHandle = 0;
std::vector<uint8_t> block; std::vector<uint8_t> block;
@ -763,14 +780,13 @@ int main() {
{ {
auto symbol_search_path = std::format(L".;{}", (assetDir / "UIRes" / "pdb").wstring()); auto symbol_search_path = std::format(L".;{}", (assetDir / "UIRes" / "pdb").wstring());
g_bSymbolsAvailable = SymInitializeW(g_hProcess, symbol_search_path.c_str(), true); g_bSymbolsAvailable = try_init_symbols(symbol_search_path.c_str());
std::wcout << std::format(L"Init symbols with PDB at {}", symbol_search_path) << std::endl; std::wcout << std::format(L"Init symbols with PDB at {}", symbol_search_path) << std::endl;
SymRefreshModuleList(g_hProcess); SymRefreshModuleList(g_hProcess);
} }
else else
{ {
g_bSymbolsAvailable = SymInitializeW(g_hProcess, nullptr, true); g_bSymbolsAvailable = try_init_symbols(nullptr);
std::cout << "Init symbols without PDB" << std::endl; std::cout << "Init symbols without PDB" << std::endl;
} }