Changeset 70150 in vbox for trunk/src/VBox/Runtime/r0drv/nt

Timestamp:

Dec 15, 2017 2:10:17 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119710

Message:

iprt/r0drv/memobj: Let initterm resolve MmProtectMdlSystemAddress.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• internal-r0drv-nt.h (modified) (1 diff)
• memobj-r0drv-nt.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h

@@ -80 +80 @@
 extern PFNKEREGISTERPROCESSORCHANGECALLBACK    g_pfnrtKeRegisterProcessorChangeCallback;
 extern PFNKEDEREGISTERPROCESSORCHANGECALLBACK  g_pfnrtKeDeregisterProcessorChangeCallback;
+extern decltype(MmProtectMdlSystemAddress)    *g_pfnrtMmProtectMdlSystemAddress;
 extern PFNRTRTLGETVERSION                      g_pfnrtRtlGetVersion;
 #ifndef RT_ARCH_AMD64

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

@@ -78 +78 @@
 } RTR0MEMOBJNT, *PRTR0MEMOBJNT;
 
-
-/*********************************************************************************************************************************
-*   Global Variables                                                                                                             *
-*********************************************************************************************************************************/
-/** Pointer to the MmProtectMdlSystemAddress kernel function if it's available.
- * This API was introduced in XP. */
-static decltype(MmProtectMdlSystemAddress) *g_pfnMmProtectMdlSystemAddress = NULL;
-/** Set if we've resolved the dynamic APIs. */
-static bool volatile g_fResolvedDynamicApis = false;
-static ULONG g_uMajorVersion = 5;
-static ULONG g_uMinorVersion = 1;
-
-
-static void rtR0MemObjNtResolveDynamicApis(void)
-{
-    ULONG uBuildNumber  = 0;
-    PsGetVersion(&g_uMajorVersion, &g_uMinorVersion, &uBuildNumber, NULL);
-
-#ifndef IPRT_TARGET_NT4 /* MmGetSystemRoutineAddress was introduced in w2k. */
-
-    UNICODE_STRING RoutineName;
-    RtlInitUnicodeString(&RoutineName, L"MmProtectMdlSystemAddress");
-    g_pfnMmProtectMdlSystemAddress = (decltype(MmProtectMdlSystemAddress) *)MmGetSystemRoutineAddress(&RoutineName);
-
-#endif
-    ASMCompilerBarrier();
-    g_fResolvedDynamicApis = true;
-}
 
 
@@ -861 +833 @@
     PRTR0MEMOBJNT pMemNt = (PRTR0MEMOBJNT)pMem;
 #endif
-    if (!g_fResolvedDynamicApis)
-        rtR0MemObjNtResolveDynamicApis();
 
     /*
@@ -873 +843 @@
      */
     if (   pMemNt->cMdls
-        && g_pfnMmProtectMdlSystemAddress
-        && (g_uMajorVersion > 6 || (g_uMajorVersion == 6 && g_uMinorVersion >= 1)) /* Windows 7 and later. */
+        && g_pfnrtMmProtectMdlSystemAddress
+        && (g_uRtNtMajorVer > 6 || (g_uRtNtMajorVer == 6 && g_uRtNtMinorVer >= 1)) /* Windows 7 and later. */
         && pMemNt->Core.pv != NULL
         && (   pMemNt->Core.enmType == RTR0MEMOBJTYPE_PAGE
@@ -926 +896 @@
             while (iMdl-- > 0)
             {
-                rcNt = g_pfnMmProtectMdlSystemAddress(pMemNt->apMdls[i], fAccess);
+                rcNt = g_pfnrtMmProtectMdlSystemAddress(pMemNt->apMdls[i], fAccess);
                 if (!NT_SUCCESS(rcNt))
                     break;
@@ -962 +932 @@
                     if (NT_SUCCESS(rcNt))
                     {
-                        rcNt = g_pfnMmProtectMdlSystemAddress(pMdl, fAccess);
+                        rcNt = g_pfnrtMmProtectMdlSystemAddress(pMdl, fAccess);
                         MmUnlockPages(pMdl);
                     }