Changeset 52204 in vbox for trunk/src/VBox/Runtime/common/ldr/ldrEx.cpp

Timestamp:

Jul 26, 2014 11:22:44 AM (10 years ago)

Author:

vboxsync

Message:

SUP,LDR: Changed RTLdrGetBits to allow not resolving imports. Combined the memory and image purification code with the process validation code, adding a validation kind/mode parameter. The process verfication code now checks that code sections are unmodified. Had to add a self purification run before hooking NtCreateSection to undo a weird kernel32 change that avast made (making GetBinaryTypeW specify write thru when opening a file). So, VM startup is now even slower thanks to avast.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrEx.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrEx.cpp

@@ -221 +221 @@
  * @param   BaseAddress     The base address.
  * @param   pfnGetImport    Callback function for resolving imports one by one.
+ *                          If this is NULL, imports will not be resolved.
  * @param   pvUser          User argument for the callback.
  * @remark  Not supported for RTLdrLoad() images.
@@ -233 +234 @@
      */
     AssertMsgReturn(rtldrIsValid(hLdrMod), ("hLdrMod=%p\n", hLdrMod), VERR_INVALID_HANDLE);
-    AssertMsgReturn(VALID_PTR(pvBits), ("pvBits=%p\n", pvBits), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(VALID_PTR(pfnGetImport), ("pfnGetImport=%p\n", pfnGetImport), VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pvBits, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(pfnGetImport, VERR_INVALID_POINTER);
     PRTLDRMODINTERNAL pMod = (PRTLDRMODINTERNAL)hLdrMod;
     AssertMsgReturn(pMod->eState == LDR_STATE_OPENED, ("eState=%d\n", pMod->eState), VERR_WRONG_ORDER);