Changeset 3347 in kBuild

Timestamp:

May 23, 2020 8:28:25 AM (5 years ago)

Author:

bird

Message:

kWorker: Don't complain about not finding mscoree.dll. The CRT exit code checks for it to allow it before doing ExitProcess, so that mscoree.dll can do ExitProcess if present.

File:

• trunk/src/kWorker/kWorker.c (modified) (5 diffs)

trunk/src/kWorker/kWorker.c

@@ -1204 +1204 @@
 static int kwLdrModuleResolveAndLookup(const char *pszName, PKWMODULE pExe, PKWMODULE pImporter,
                                        const char *pszSearchPath, PKWMODULE *ppMod);
-static PKWMODULE kwLdrModuleForLoadedNative(const char *pszName, KBOOL fEnsureCrtSlot);
+static PKWMODULE kwLdrModuleForLoadedNative(const char *pszName, KBOOL fEnsureCrtSlot, KBOOL fAlwaysPresent);
 static char *kwSandboxDoGetEnvA(PKWSANDBOX pSandbox, const char *pchVar, KSIZE cchVar);
 static KBOOL kwSandboxHandleTableEnter(PKWSANDBOX pSandbox, PKWHANDLE pHandle, HANDLE hHandle);
@@ -2033 +2033 @@
                                     if (!pImportMod)
                                     {
-                                        pImportMod = kwLdrModuleForLoadedNative(pszImport, K_TRUE /*fEnsureCrtSlot*/);
+                                        pImportMod = kwLdrModuleForLoadedNative(pszImport, K_TRUE /*fEnsureCrtSlot*/,
+                                                                                K_TRUE /*fAlwaysPresent*/);
                                         if (!pImportMod)
                                         {
@@ -3056 +3057 @@
  * @param   pszName         The name of the module.
  * @param   fEnsureCrtSlot  Whether to ensure that it has a valid CRT slot.
+ * @param   fAlwaysPresent  Whether the module is expected to always be present,
+ *                          or not.  If not, complain less.
  */
-static PKWMODULE kwLdrModuleForLoadedNative(const char *pszName, KBOOL fEnsureCrtSlot)
+static PKWMODULE kwLdrModuleForLoadedNative(const char *pszName, KBOOL fEnsureCrtSlot, KBOOL fAlwaysPresent)
 {
     /*
@@ -3132 +3135 @@
             kwErrPrintf("GetModuleFileNameA failed for '%s': %u!\n", pszName, GetLastError());
     }
-    else
-        kwErrPrintf("Module '%s' was not found by GetModuleHandleA!\n", pszName);
+    else if (fAlwaysPresent)
+        kwErrPrintf("Module '%s' was not found by GetModuleHandleA/W!\n", pszName);
     return NULL;
 }
@@ -5400 +5403 @@
          * module list to for it to work.
          */
-        PKWMODULE pMod = kwLdrModuleForLoadedNative(g_aGetModuleHandleCache[i].pszName, K_FALSE);
+        PKWMODULE pMod = kwLdrModuleForLoadedNative(g_aGetModuleHandleCache[i].pszName, K_FALSE,
+                                                    g_aGetModuleHandleCache[i].fAlwaysPresent);
         if (pMod)
         {