Switch to registration-free COM for hookcheck

Author: botder

utils/hookcheck.exe

@@ -159,7 +159,7 @@ int wmain(int argc, wchar_t* argv[])
             using enum PdbAnalyzer::LoadError;
 
             case DiaSdkNotFound:
-                message = L"Failed to create DIA data source. Is DIA SDK installed?";
+                message = L"Failed to create DIA data source";
                 break;
             case PdbNotLoadable:
                 message = L"Failed to load the PDB file";

utils/src/hookcheck/hookcheck.cpp

@@ -20,6 +20,7 @@
 #include <array>
 
 #include <dia2.h>
+#include <diacreate.h>
 
 #pragma comment(lib, "diaguids.lib")
 
@@ -151,7 +152,7 @@ auto PdbAnalyzer::LoadPdb(const std::wstring& pdb) -> std::pair<LoadError, HRESU
 {
     using enum LoadError;
 
-    HRESULT hr = CoCreateInstance(CLSID_DiaSource, nullptr, CLSCTX_INPROC_SERVER, IID_IDiaDataSource, (void**)&m_dataSource);
+    HRESULT hr = NoRegCoCreate(L"" MSDIA_DLL, CLSID_DiaSource, IID_IDiaDataSource, (void**)&m_dataSource);
 
     if (FAILED(hr))
         return std::make_pair(DiaSdkNotFound, hr);

utils/src/hookcheck/pdb-analyzer.cpp

@@ -42,6 +42,9 @@ project "hookcheck"
     if errc ~= 0 then error("DIA SDK not found") end
     print("[+] Using ".. diaSdkRoot)
 
+    includedirs { path.join(diaSdkRoot, "include") }
+    libdirs { path.join(diaSdkRoot, "lib", "amd64") }
+
     -- Copy all *.dll files in <VS>/DIA SDK/bin/amd64 to the build directory
     runtimeDlls = os.matchfiles(path.join(diaSdkRoot, "bin", "amd64", "*.dll"))
     for i = 1, #runtimeDlls do
@@ -51,5 +54,10 @@ project "hookcheck"
         postbuildcommands(runtimeDlls)
     end
 
-    includedirs { path.join(diaSdkRoot, "include") }
-    libdirs { path.join(diaSdkRoot, "lib", "amd64") }
+    -- Make the source code independent of the version inside the DLL name
+    msdiaDll = os.matchfiles(path.join(diaSdkRoot, "bin", "amd64", "msdia*.dll"))
+    msdiaDll = msdiaDll[1]
+    if not msdiaDll then error("msdia*.dll not found") end
+    msdiaDll = path.getname(msdiaDll)
+    defines { "MSDIA_DLL=" .. ("%q"):format(msdiaDll) }
+    print("[+] Using ".. msdiaDll)

utils/src/hookcheck/premake5.lua

@@ -19,32 +19,34 @@ using HRESULT = long;
 
 void Trim(std::wstring& input);
 
-template <typename...Args>
+template <typename... Args>
 void PrintLn(const std::wformat_string<Args...> fmt, Args&&... args)
 {
     std::wcout << std::format(fmt, std::forward<Args>(args)...) << std::endl;
 }
 
-template <typename...Args>
+template <typename... Args>
 void PrintWarningLn(const std::wformat_string<Args...> fmt, Args&&... args)
 {
     std::wcerr << L"Warning: " << std::format(fmt, std::forward<Args>(args)...) << std::endl;
 }
 
-template <typename...Args>
+template <typename... Args>
 void PrintErrorLn(const std::wformat_string<Args...> fmt, Args&&... args)
 {
     std::wcerr << L"Error: " << std::format(fmt, std::forward<Args>(args)...) << std::endl;
 }
 
-template <typename...Args>
+template <typename... Args>
 void PrintWarningLn(const HRESULT hr, const std::wformat_string<Args...> fmt, Args&&... args)
 {
-    std::wcerr << std::format(L"Warning (0x{:08x}): ", hr) << std::format(fmt, std::forward<Args>(args)...) << std::endl;
+    std::wcerr << std::format(L"Warning (0x{:08x}): ", static_cast<unsigned long>(hr))
+               << std::format(fmt, std::forward<Args>(args)...) << std::endl;
 }
 
-template <typename...Args>
+template <typename... Args>
 void PrintErrorLn(const HRESULT hr, const std::wformat_string<Args...> fmt, Args&&... args)
 {
-    std::wcerr << std::format(L"Error (0x{:08x}): ", hr) << std::format(fmt, std::forward<Args>(args)...) << std::endl;
+    std::wcerr << std::format(L"Error (0x{:08x}): ", static_cast<unsigned long>(hr))
+               << std::format(fmt, std::forward<Args>(args)...) << std::endl;
 }