Changeset 3376 in kBuild for trunk/src

Timestamp:

Jun 10, 2020 9:09:15 PM (5 years ago)

Author:

bird

Message:

kWorker: The missing SetDllDirectoryW hack (for the tool/exe). Better error reporting should an .exe import fail to load. Shut up weird assertion on changing back an .idata page from readwrite to readonly, failed with NOACCESS on a 17763 build box.

File:

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

trunk/src/kWorker/kWorker.c

@@ -2172 +2172 @@
                                     {
                                         fRc = VirtualProtect(pbProtRange, cbProtRange, fOldProt, NULL /*pfOldProt*/);
-                                        kHlpAssert(fRc);
+                                        kHlpAssert(fRc || GetLastError() == ERROR_NOACCESS /*tinderwin2*/);
                                         fOldProt = 0;
                                     }
@@ -2886 +2886 @@
             default:
                 rc = KERR_GENERAL_FAILURE;
+                kwErrPrintf("kwLdrModuleCreateNonNative: Unsupported module type %d (%s)!\n", pLdrMod->enmType, pszPath);
                 break;
         }
@@ -2987 +2988 @@
                                         continue;
                                 }
+                                kwErrPrintf("Error getting import '%s' for '%s': %d\n", szName, pMod->pszPath);
                                 break;
                             }
@@ -3044 +3046 @@
                                         return pMod;
                                     }
+                                    kwErrPrintf("kwLdrModuleCreateNonNativeSetupTls failed with %d for %s\n", rc, pMod->pszPath);
                                 }
                                 else
@@ -3062 +3065 @@
                         kwErrPrintf("Failed to allocate %#x bytes\n", pMod->cbImage);
                 }
-            }
+                else
+                    kwErrPrintf("kwLdrModuleCreateNonNative: out of memory!\n");
+            }
+            else
+                kwErrPrintf("kwLdrModuleCreateNonNative: kLdrModNumberOfImports failed for '%s'\n", pszPath);
         }
         kLdrModClose(pLdrMod);
@@ -4086 +4093 @@
     {
         KBOOL fRc;
+        wchar_t wcSaved;
+        wchar_t *pwcEnd;
         pTool->pwszPath = (wchar_t const *)(pTool + 1);
         fRc = kFsCacheObjGetFullPathW(pToolFsObj, (wchar_t *)pTool->pwszPath, cwcPath, '\\');
@@ -4094 +4103 @@
         kHlpAssert(fRc);
 
+        /* HACK ALERT! This is to help the loader search the application directory. */
+        pwcEnd = (wchar_t *)&pTool->pwszPath[pToolFsObj->cwcParent];
+        wcSaved = *pwcEnd;
+        *pwcEnd = '\0';
+        if (!SetDllDirectoryW(pTool->pwszPath))
+            kwErrPrintf("SetDllDirectoryW(tool) failed: %u\n", GetLastError());
+        *pwcEnd = wcSaved;
+
         pTool->enmType = KWTOOLTYPE_SANDBOXED;
         pTool->u.Sandboxed.pExe = kwLdrModuleCreateNonNative(pTool->pszPath, kwStrHash(pTool->pszPath), K_TRUE /*fExe*/,
-                                                             NULL /*pEexeMod*/, pszSearchPath);
+                                                             NULL /*pExeMod*/, pszSearchPath);
         if (pTool->u.Sandboxed.pExe)
         {
@@ -4119 +4136 @@
         }
         else
+        {
+            kwErrPrintf("kwLdrModuleCreateNonNative failed!\n");
             pTool->enmType = KWTOOLTYPE_EXEC;
+        }
 
         kFsCacheObjRelease(g_pFsCache, pToolFsObj);
@@ -4125 +4145 @@
         return pTool;
     }
+    kwErrPrintf("kFsCacheObjAddUserData failed!\n");
     kFsCacheObjRelease(g_pFsCache, pToolFsObj);
     return NULL;