Changeset 70149 in vbox for trunk/src/VBox/Runtime

Timestamp:

Dec 15, 2017 2:09:47 PM (7 years ago)

Author:

vboxsync

Message:

iprt/r0drv/nt: Use RTR0DbgKrnlInfoOpen and friends for resolving kernel APIs during initialization.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• dbgkrnlinfo-r0drv-nt.cpp (modified) (2 diffs)
• initterm-r0drv-nt.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r0drv/nt/dbgkrnlinfo-r0drv-nt.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Initialization & Termination, R0 Driver, NT.
+ * IPRT - Kernel Debug Information, R0 Driver, NT.
  */
 
@@ -142 +142 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-/** Pointer to MmGetSystemRoutineAddress. */
-#ifdef RT_ARCH_X86
+/** Pointer to MmGetSystemRoutineAddress.
+ * @note Added in NT v5.0. */
+#ifdef IPRT_TARGET_NT4
 static decltype(MmGetSystemRoutineAddress) *g_pfnMmGetSystemRoutineAddress = NULL;
 #else

trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp

@@ -31 +31 @@
 #include "the-nt-kernel.h"
 #include <iprt/asm-amd64-x86.h>
+#include <iprt/dbg.h>
 #include <iprt/err.h>
 #include <iprt/string.h>
@@ -84 +85 @@
 /** KeDeregisterProcessorChangeCallback - Introducted in Windows 7. */
 PFNKEDEREGISTERPROCESSORCHANGECALLBACK  g_pfnrtKeDeregisterProcessorChangeCallback;
+/** Pointer to the MmProtectMdlSystemAddress kernel function if it's available.
+ * This API was introduced in XP. */
+decltype(MmProtectMdlSystemAddress)    *g_pfnrtMmProtectMdlSystemAddress;
 /** RtlGetVersion, introduced in ??. */
 PFNRTRTLGETVERSION                      g_pfnrtRtlGetVersion;
@@ -244 +248 @@
      * Initialize the function pointers.
      */
-#ifdef IPRT_TARGET_NT4
-# define GET_SYSTEM_ROUTINE_EX(a_Prf, a_Name, a_pfnType) do { RT_CONCAT3(g_pfnrt, a_Prf, a_Name) = NULL; } while (0)
-#else
-    UNICODE_STRING RoutineName;
-# define GET_SYSTEM_ROUTINE_EX(a_Prf, a_Name, a_pfnType) \
-    do { \
-        RtlInitUnicodeString(&RoutineName, L#a_Name); \
-        RT_CONCAT3(g_pfnrt, a_Prf, a_Name) = (a_pfnType)MmGetSystemRoutineAddress(&RoutineName); \
-    } while (0)
-#endif
+    RTDBGKRNLINFO hKrnlInfo;
+    int rc = RTR0DbgKrnlInfoOpen(&hKrnlInfo, 0/*fFlags*/);
+    AssertRCReturn(rc, rc);
+
+#define GET_SYSTEM_ROUTINE_EX(a_Prf, a_Name, a_pfnType) \
+    do { RT_CONCAT3(g_pfnrt, a_Prf, a_Name) = (a_pfnType)RTR0DbgKrnlInfoGetSymbol(hKrnlInfo, NULL, #a_Name); } while (0)
 #define GET_SYSTEM_ROUTINE(a_Name)                 GET_SYSTEM_ROUTINE_EX(RT_NOTHING, a_Name, decltype(a_Name) *)
 #define GET_SYSTEM_ROUTINE_PRF(a_Prf,a_Name)       GET_SYSTEM_ROUTINE_EX(a_Prf, a_Name, decltype(a_Name) *)
@@ -276 +276 @@
     GET_SYSTEM_ROUTINE(KeRegisterProcessorChangeCallback);
     GET_SYSTEM_ROUTINE(KeDeregisterProcessorChangeCallback);
+    GET_SYSTEM_ROUTINE(MmProtectMdlSystemAddress);
 
     GET_SYSTEM_ROUTINE_TYPE(RtlGetVersion, PFNRTRTLGETVERSION);
@@ -285 +286 @@
     GET_SYSTEM_ROUTINE_TYPE(KeQuerySystemTimePrecise, PFNRTKEQUERYSYSTEMTIMEPRECISE);
 
-#ifdef IPRT_TARGET_NT4
-    g_pfnrtHalRequestIpiW7Plus = NULL;
-    g_pfnrtHalRequestIpiPreW7 = NULL;
-#else
-    RtlInitUnicodeString(&RoutineName, L"HalRequestIpi");
-    g_pfnrtHalRequestIpiW7Plus = (PFNHALREQUESTIPI_W7PLUS)MmGetSystemRoutineAddress(&RoutineName);
+    g_pfnrtHalRequestIpiW7Plus = (PFNHALREQUESTIPI_W7PLUS)RTR0DbgKrnlInfoGetSymbol(hKrnlInfo, NULL, "HalRequestIpi");
     g_pfnrtHalRequestIpiPreW7 = (PFNHALREQUESTIPI_PRE_W7)g_pfnrtHalRequestIpiW7Plus;
-#endif
+
+    RTR0DbgKrnlInfoRelease(hKrnlInfo);
 
     /*
@@ -432 +429 @@
      * we call rtR0TermNative to do the deregistration on failure.
      */
-    int rc = rtR0MpNtInit(&OsVerInfo);
+    rc = rtR0MpNtInit(&OsVerInfo);
     if (RT_FAILURE(rc))
     {