CoCreateInstance fix

ThirteenAG · Oct 26, 2023 · 0ed6a6e · 0ed6a6e
1 parent d124a34
commit 0ed6a6e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/funding.yml b/.github/workflows/funding.yml
@@ -0,0 +1,4 @@
+github: ThirteenAG
+ko_fi: thirteenag
+patreon: ThirteenAG
+custom: [https://paypal.me/SergeyP13, https://boosty.to/thirteenag/donate]
diff --git a/source/dllmain.cpp b/source/dllmain.cpp
@@ -899,7 +899,7 @@ HRESULT WINAPI CustomCoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWOR
     else if (rclsid == CLSID_WinInet)
         hDll = ::LoadLibrary(L"wininet.dll");
 
-    if (hDll == NULL)
+    if (hDll == NULL || GetProcAddress(hDll, "IsUltimateASILoader") != NULL)
         return ::CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv);
 
     typedef HRESULT(__stdcall *pDllGetClassObject)(IN REFCLSID rclsid, IN REFIID riid, OUT LPVOID FAR* ppv);
@@ -1157,6 +1157,9 @@ bool HookKernel32IAT(HMODULE mod, bool exe)
 
     auto PatchCoCreateInstance = [&](size_t start, size_t end, size_t exe_end)
     {
+        if (iequals(GetSelfName(), L"dinput8.dll") || iequals(GetSelfName(), L"dinput.dll") || iequals(GetSelfName(), L"wininet.dll"))
+            return;
+
         for (size_t i = 0; i < nNumImports; i++)
         {
             if (hExecutableInstance + (pImports + i)->FirstThunk > start && !(end && hExecutableInstance + (pImports + i)->FirstThunk > end))