Improve exception handling in hookcheck program

Author: botder

utils/hookcheck.exe

@@ -8,7 +8,7 @@ pause
 exit /b 1
 
 :FindVisualStudio
-for /f "usebackq tokens=*" %%i in (`call "%VSWHERE%" -latest -requires Microsoft.Component.MSBuild -find "**\VsDevCmd.bat"`) do (
+for /f "usebackq tokens=*" %%i in (`call "%VSWHERE%" -products * -latest -requires Microsoft.Component.MSBuild -find "**\VsDevCmd.bat"`) do (
     set VSDEVCMD=%%i
 )
 

utils/src/gen_language_list/build-solution.bat

@@ -8,7 +8,7 @@ pause
 exit /b 1
 
 :FindVisualStudio
-for /f "usebackq tokens=*" %%i in (`call "%VSWHERE%" -latest -requires Microsoft.Component.MSBuild -find "**\VsDevCmd.bat"`) do (
+for /f "usebackq tokens=*" %%i in (`call "%VSWHERE%" -products * -latest -requires Microsoft.Component.MSBuild -find "**\VsDevCmd.bat"`) do (
     set VSDEVCMD=%%i
 )
 

utils/src/hookcheck/build-solution.bat

@@ -15,14 +15,11 @@
 
 #include <string>
 #include <cstddef>
-#include <filesystem>
 
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
-namespace fs = std::filesystem;
-
 static const std::string EmptyString;
 
 struct CV_INFO_PDB70

utils/src/hookcheck/dll-analyzer.cpp

@@ -35,6 +35,7 @@
 namespace fs = std::filesystem;
 
 int wmain(int argc, wchar_t* argv[])
+try
 {
     SetConsoleOutputCP(CP_UTF8);
 
@@ -102,10 +103,12 @@ int wmain(int argc, wchar_t* argv[])
         return 1;
     }
 
-    const fs::path dllFilePath = fs::absolute(arguments.dll.value());
+    std::error_code ec{};
+
+    const fs::path dllFilePath = fs::absolute(arguments.dll.value(), ec);
     std::wstring   labelName = arguments.label.value_or(L"" DEFAULT_LABEL);
 
-    if (!fs::exists(dllFilePath) || !fs::is_regular_file(dllFilePath))
+    if (!fs::exists(dllFilePath, ec) || !fs::is_regular_file(dllFilePath, ec))
     {
         PrintErrorLn(L"DLL file '{}' does not exist or is not readable", dllFilePath.wstring());
         return 1;
@@ -175,7 +178,7 @@ int wmain(int argc, wchar_t* argv[])
     }
     else
     {
-        pdbFilePath = fs::absolute(filePath);
+        pdbFilePath = fs::absolute(filePath, ec);
     }
 
 #ifdef MTA_DEBUG
@@ -188,7 +191,7 @@ int wmain(int argc, wchar_t* argv[])
         PrintLn(L"[~] Ignore: '{}'", ignore);
 #endif
 
-    if (!fs::exists(pdbFilePath) || !fs::is_regular_file(pdbFilePath))
+    if (!fs::exists(pdbFilePath, ec) || !fs::is_regular_file(pdbFilePath, ec))
     {
         PrintErrorLn(L"{} is not a regular file", pdbFilePath.wstring());
         return 1;
@@ -281,7 +284,7 @@ int wmain(int argc, wchar_t* argv[])
 
         std::vector<std::wstring> problems;
 
-        if (!hasLabel && !fs::is_regular_file(function.SourceFile))
+        if (!hasLabel && !fs::is_regular_file(function.SourceFile, ec))
             continue;
 
         if (function.Name.starts_with(L"std::") || function.Name.starts_with(L'_'))
@@ -336,3 +339,27 @@ int wmain(int argc, wchar_t* argv[])
 
     return exitCode;
 }
+catch (const fs::filesystem_error& ex)
+{
+    HRESULT hr = S_OK;
+
+    if (ex.code())
+    {
+        if (ex.code().category() == std::system_category())
+        {
+            hr = HRESULT_FROM_WIN32(ex.code().value());
+        }
+        else
+        {
+            hr = E_FAIL;
+        }
+    }
+
+    PrintErrorLn(hr, L"A filesystem exception was thrown: {}", ToWideString(ex.what()));
+    return -1;
+}
+catch (const std::exception& ex)
+{
+    PrintErrorLn(L"An exception was thrown: {}", ToWideString(ex.what()));
+    return -1;
+}

utils/src/hookcheck/hookcheck.cpp

@@ -5,7 +5,7 @@ if exist "%VSWHERE%" goto :FindVisualStudio
 exit /b 1
 
 :FindVisualStudio
-for /f "usebackq tokens=*" %%i in (`call "%VSWHERE%" -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
+for /f "usebackq tokens=*" %%i in (`call "%VSWHERE%" -products * -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
     set VSDIR=%%i
 )
 

utils/src/hookcheck/locate-dia-sdk.bat

@@ -12,6 +12,10 @@
 #include "utility.h"
 #include <filesystem>
 
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
 void Trim(std::wstring& input)
 {
     if (input.empty())
@@ -36,3 +40,12 @@ void NormalizePath(std::wstring& input)
 
     std::replace(input.begin(), input.end(), L'/', L'\\');
 }
+
+auto ToWideString(const char* input) -> std::wstring
+{
+    int length = MultiByteToWideChar(CP_UTF8, 0, input, -1, nullptr, 0);
+    std::wstring wide(length, L'\0');
+    MultiByteToWideChar(CP_UTF8, 0, input, -1, &wide[0], length);
+    Trim(wide);
+    return wide;
+}

utils/src/hookcheck/utility.cpp

@@ -21,6 +21,9 @@ void Trim(std::wstring& input);
 
 void NormalizePath(std::wstring& input);
 
+[[nodiscard]]
+auto ToWideString(const char* input) -> std::wstring;
+
 template <typename... Args>
 void PrintLn(const std::wformat_string<Args...> fmt, Args&&... args)
 {