Changeset 70203 in vbox for trunk/src/VBox/Runtime/r0drv/nt/dbgkrnlinfo-r0drv-nt.cpp

Timestamp:

Dec 18, 2017 2:59:05 PM (7 years ago)

Author:

vboxsync

Message:

IPRT/dbgkrnlinfo-r0drv-nt.cpp: Copy & past bugfix (for r119709).

File:

• trunk/src/VBox/Runtime/r0drv/nt/dbgkrnlinfo-r0drv-nt.cpp (modified) (4 diffs)

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

@@ -617 +617 @@
     RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: pszModule=%s pszSymbol=%s\n", pszModule ? pszModule : "<null>", pszSymbol));
 
+    void  *pvTmpSymbol = NULL;
+    if (!ppvSymbol)
+        ppvSymbol = &pvTmpSymbol;
+
     int rc;
-    uintptr_t uValue = 0;
     if (!pszModule)
     {
         /*
          * Search both ntoskrnl and hal, may use MmGetSystemRoutineAddress as fallback.
+         * Note! MmGetSystemRoutineAddress was buggy in before XP SP2 according to Geoff Chappell.
          */
         if (g_NtOsKrnlInfo.pbImageBase)
@@ -632 +636 @@
             Assert(g_NtOsKrnlInfo.fOkay);
             Assert(g_HalInfo.fOkay);
-            RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: Calling RTR0DbgKrnlInfoQuerySymbol on NT kernel...\n"));
+            //RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: Calling RTR0DbgKrnlInfoQuerySymbol on NT kernel...\n"));
             rc = rtR0DbgKrnlInfoLookupSymbol(&g_NtOsKrnlInfo, pszSymbol, ppvSymbol);
             if (RT_FAILURE(rc))
             {
-                RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: Calling RTR0DbgKrnlInfoQuerySymbol on HAL kernel...\n"));
+                //RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: Calling RTR0DbgKrnlInfoQuerySymbol on HAL kernel...\n"));
                 rc = rtR0DbgKrnlInfoLookupSymbol(&g_HalInfo, pszSymbol, ppvSymbol);
             }
-            RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: returns %d\n", rc));
+            RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: #1 returns %d *ppvSymbol=%p\n", rc, *ppvSymbol));
         }
         else
@@ -668 +672 @@
                         rc = VERR_SYMBOL_NOT_FOUND;
                     RTUtf16Free(pwszSymbol);
+                    RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: #2 returns %d *ppvSymbol=%p\n", rc, *ppvSymbol));
                 }
             }
@@ -730 +735 @@
         }
         if (pModInfo)
+        {
             rc = rtR0DbgKrnlInfoLookupSymbol(pModInfo, pszSymbol, ppvSymbol);
+            RTR0DBG_NT_DEBUG_LOG(("RTR0DbgKrnlInfoQuerySymbol: #3 returns %d *ppvSymbol=%p\n", rc, *ppvSymbol));
+        }
     }
-    if (ppvSymbol)
-        *ppvSymbol = (void *)uValue;
     return rc;
 }