From abe27891c3ed07bf7be73bc7f19221945108afcc Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Thu, 12 Feb 2026 20:45:23 +0100 Subject: [PATCH] Tidy tidy --- DalamudCrashHandler/DalamudCrashHandler.cpp | 32 +++++---------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/DalamudCrashHandler/DalamudCrashHandler.cpp b/DalamudCrashHandler/DalamudCrashHandler.cpp index 165cce26d..81b37992b 100644 --- a/DalamudCrashHandler/DalamudCrashHandler.cpp +++ b/DalamudCrashHandler/DalamudCrashHandler.cpp @@ -473,20 +473,17 @@ void open_folder_and_select_items(HWND hwndOpener, const std::wstring& path) { ILFree(piid); } -std::vector EnumerateAdapters(void) +std::vector enum_dxgi_adapters() { - IDXGIAdapter1* pAdapter; - std::vector vAdapters; + std::vector vAdapters; + IDXGIFactory1* pFactory = NULL; - - - // Create a DXGIFactory object. if (FAILED(CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&pFactory))) { return vAdapters; } - + IDXGIAdapter1* pAdapter; for (UINT i = 0; pFactory->EnumAdapters1(i, &pAdapter) != DXGI_ERROR_NOT_FOUND; ++i) @@ -501,7 +498,6 @@ std::vector EnumerateAdapters(void) } return vAdapters; - } void export_tspack(HWND hWndParent, const std::filesystem::path& logDir, const std::string& crashLog, const std::string& troubleshootingPackData) { @@ -1057,26 +1053,12 @@ int main() { log << std::format(L"CPU Vendor: {}", vendor) << std::endl; log << std::format(L"CPU Brand: {}", brand) << std::endl; - std::vector availableAdapters = EnumerateAdapters(); - - for (int i = 0; i < availableAdapters.size(); i++) { - auto& myAdapter = *availableAdapters[i]; - auto adapterDescription = DXGI_ADAPTER_DESC1(); - myAdapter.GetDesc1(&adapterDescription); - // Print description to console here + for (IDXGIAdapter1* adapter : enum_dxgi_adapters()) { + DXGI_ADAPTER_DESC1 adapterDescription{}; + myAdapter->GetDesc1(&adapterDescription); log << std::format(L"GPU Desc: {}", adapterDescription.Description) << std::endl; } - /* - for_each(availableAdapters.begin(), availableAdapters.end(), [](IDXGIAdapter1* adapter, , std::wostream log) { - auto& myAdapter = *adapter; - auto adapterDescription = DXGI_ADAPTER_DESC1(); - myAdapter.GetDesc1(&adapterDescription); - // Print description to console here - log << std::format(L"GPU Desc: {}", adapterDescription.Description) << std::endl; - }); - */ - log << L"\n" << stackTrace << std::endl; if (pProgressDialog)