From 237a23def4f1d862f102adc9e8b4fc54240f8d7d Mon Sep 17 00:00:00 2001
From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Fri, 21 Jul 2023 22:36:48 -0400
Subject: [PATCH] Small tweaks and fixes

---
 .github/workflows/performance-tests.yml |  4 ++--
 .github/workflows/test.yml              | 10 +++++-----
 ci/build-in-all-configs.py              |  2 +-
 src/symbols/symbols_with_dbghelp.cpp    |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/performance-tests.yml b/.github/workflows/performance-tests.yml
index ca1b525..5ac2fd5 100644
--- a/.github/workflows/performance-tests.yml
+++ b/.github/workflows/performance-tests.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
 
 jobs:
-  test-linux:
+  performancetest-linux:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -43,7 +43,7 @@ jobs:
       run: |
            ./speedtest | python3 ../ci/speedtest.py ${{matrix.config}}
   # TODO: For some reason this is slow on github's runner
-  #test-windows:
+  #performancetest-windows:
   #  runs-on: windows-2019
   #  strategy:
   #    fail-fast: false
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 09a4ad9..d83d6c2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ on:
 # TODO: Test statically linked
 
 jobs:
-  build-linux:
+  test-linux:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
@@ -17,7 +17,7 @@ jobs:
       run: |
            pip3 install colorama
            python3 ci/test-all-configs.py
-  build-macos:
+  test-macos:
     runs-on: macos-13
     steps:
     - uses: actions/checkout@v2
@@ -25,7 +25,7 @@ jobs:
       run: |
            pip3 install colorama
            python3 ci/test-all-configs.py
-  build-windows-msvc:
+  test-windows-msvc:
     runs-on: windows-2019
     steps:
     - uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
       run: |
            pip3 install colorama
            python3 ci/test-all-configs.py --msvc-only
-  build-windows-clang:
+  test-windows-clang:
     runs-on: windows-2019
     steps:
     - uses: actions/checkout@v2
@@ -45,7 +45,7 @@ jobs:
       run: |
            pip3 install colorama
            python3 ci/test-all-configs.py --clang-only
-  build-windows-mingw:
+  test-windows-mingw:
     runs-on: windows-2019
     steps:
     - uses: actions/checkout@v2
diff --git a/ci/build-in-all-configs.py b/ci/build-in-all-configs.py
index 1edc16b..dd11cb8 100644
--- a/ci/build-in-all-configs.py
+++ b/ci/build-in-all-configs.py
@@ -77,7 +77,7 @@ def build(matrix):
     print()
 
 def build_full_or_auto(matrix):
-    print(matrix)
+    print(f"{Fore.BLUE}{Style.BRIGHT}{'=' * 10} Running build with config {'<auto>' if matrix['config'] == '' else ', '.join(matrix.values())} {'=' * 10}{Style.RESET_ALL}")
 
     if os.path.exists("build"):
         shutil.rmtree("build")
diff --git a/src/symbols/symbols_with_dbghelp.cpp b/src/symbols/symbols_with_dbghelp.cpp
index 5b8bf0f..87f9eb8 100644
--- a/src/symbols/symbols_with_dbghelp.cpp
+++ b/src/symbols/symbols_with_dbghelp.cpp
@@ -55,7 +55,7 @@ namespace cpptrace {
 
         // SymGetTypeInfo utility
         template<typename T, IMAGEHLP_SYMBOL_TYPE_INFO SymType, bool FAILABLE = false>
-        auto get_info(ULONG type_index, HANDLE proc, ULONG64 modbase) {
+        T get_info(ULONG type_index, HANDLE proc, ULONG64 modbase) {
             T info;
             if(!SymGetTypeInfo(proc, modbase, type_index, static_cast<::IMAGEHLP_SYMBOL_TYPE_INFO>(SymType), &info)) {
                 if(FAILABLE) {
@@ -71,7 +71,7 @@ namespace cpptrace {
         }
 
         template<IMAGEHLP_SYMBOL_TYPE_INFO SymType, bool FAILABLE = false>
-        auto get_info_wchar(ULONG type_index, HANDLE proc, ULONG64 modbase) {
+        std::string get_info_wchar(ULONG type_index, HANDLE proc, ULONG64 modbase) {
             WCHAR* info;
             if(!SymGetTypeInfo(proc, modbase, type_index, static_cast<::IMAGEHLP_SYMBOL_TYPE_INFO>(SymType), &info)) {
                 throw std::logic_error(