Changeset 3384 in kBuild for trunk/src/kWorker

Timestamp:

Jun 17, 2020 8:22:04 PM (4 years ago)

Author:

bird

Message:

kWorker: Hack for older windows versions where api-ms-win-crt-*.dll resolve to actual forwarder DLLs. We need to link them to ucrtbase.dll so we can patch it. Forwarder DLLs cannot be patched.

File:

• trunk/src/kWorker/kWorker.c (modified) (1 diff)

trunk/src/kWorker/kWorker.c

@@ -2476 +2476 @@
         }
         else
+        {
             KWLDR_LOG(("kwLdrModuleTryLoadVirtualDll: %s -> %s - A real DLL!\n", pszName, pMod->pszPath));
+            /* HACK ALERT! If api-ms-win-crt-* find ucrtbase.dll and attach it as the
+                           real module as we cannot make replacements in the virtual
+                           API set forward DLLs. */
+            /** @todo Find a way of scanning the exports and collect forwarder DLLs and
+             *        imported DLLs. kLdrModEnumSymbols()? */
+            if (   pMod->pVirtualApiMod == NULL
+                && kHlpStrNICompAscii(pszName, TUPLE("api-ms-win-crt-")) == 0)
+            {
+                HMODULE hModReal = GetModuleHandleW(L"ucrtbase.dll");
+                if (hModReal)
+                {
+                    PKWMODULE pRealMod = kwLdrModuleForLoadedNativeByHandle(hModReal, K_TRUE /*fEnsureCrtSlot*/, "ucrtbase.dll");
+                    if (pRealMod)
+                    {
+                        KWLDR_LOG(("kwLdrModuleTryLoadVirtualDll: Linking %s to '%s'.\n", pszName, pRealMod->pszPath));
+                        pMod->pVirtualApiMod = pRealMod;
+                    }
+                    else
+                        KWLDR_LOG(("kwLdrModuleTryLoadVirtualDll: kwLdrModuleForLoadedNativeByHandle failed for ucrtbase.dll/%s!\n", pszName));
+                }
+                else
+                    KWLDR_LOG(("kwLdrModuleTryLoadVirtualDll: no ucrtbase.dll found for %s!\n", pszName));
+            }
+        }
     }