From 6263c7100c8d65afe283e3b05fe13f5df7fd9c7c Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 26 May 2025 13:18:49 +0100
Subject: [PATCH] Avoid problems with windows 11 hotpatch DLLs not behaving
 properly

---
 renderdoc/os/win32/win32_hook.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp
index cd48899c8..64d968e8c 100644
--- a/renderdoc/os/win32/win32_hook.cpp
+++ b/renderdoc/os/win32/win32_hook.cpp
@@ -287,6 +287,27 @@ struct CachedHookData
     GetModuleFileNameW(module, modpath, 1023);
     if(modpath[0] == 0)
       return;
+
+    // windows 11 and newer versions have weird hotpatch DLLs that don't act like real DLLs. The
+    // LoadLibraryW below will fail for these DLLs even when using the module path provided.
+    // Only check the path for DLLs that might be a windows-hotpatch but if it matches we'll skip
+    // hooking these to avoid problems
+    if(strstr(lowername, "hotpatch"))
+    {
+      wchar_t lowerpath[1024] = {};
+
+      size_t i = 0;
+      while(modpath[i])
+      {
+        lowerpath[i] = towlower(modpath[i]);
+        i++;
+      }
+      lowerpath[i] = 0;
+
+      if(wcsstr(lowerpath, L"\\windows\\winsxs\\"))
+        return;
+    }
+
     // increment the module reference count, so it doesn't disappear while we're processing it
     // there's a very small race condition here between if GetModuleFileName returns, the module is
     // unloaded then we load it again. The only way around that is inserting very scary locks
@@ -294,6 +315,7 @@ struct CachedHookData
     // and FreeLibrary that I want to avoid. Worst case, we load a dll, hook it, then unload it
     // again.
     HMODULE refcountModHandle = LoadLibraryW(modpath);
+    RDCASSERTEQUAL(refcountModHandle, module);
     byte *baseAddress = (byte *)refcountModHandle;
 
     PIMAGE_DOS_HEADER dosheader = (PIMAGE_DOS_HEADER)baseAddress;