Changeset 86159 in vbox for trunk/src/VBox/Debugger

Timestamp:

Sep 17, 2020 5:09:30 PM (4 years ago)

Author:

vboxsync

Message:

DBGF,DBGPlugInWinNt: Extract NtBuildNumber and make it available through the query versions callback

File:

• trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp (modified) (6 diffs)

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

@@ -140 +140 @@
     uint32_t        TimeZoneId;
     uint32_t        LargePageMinimum;
-    uint32_t        Reserved2[7];
+    uint32_t        Reserved2[6];
+    uint32_t        NtBuildNumber;
     uint32_t        NtProductType;
     uint8_t         ProductTypeIsValid;
@@ -215 +216 @@
     /** NTKUSERSHAREDDATA::NtMinorVersion */
     uint32_t            NtMinorVersion;
+    /** NTKUSERSHAREDDATA::NtBuildNumber */
+    uint32_t            NtBuildNumber;
 
     /** The address of the ntoskrnl.exe image. */
@@ -510 +513 @@
  */
 static DECLCALLBACK(int) dbgDiggerWinNtIWinNt_QueryVersion(struct DBGFOSIWINNT *pThis, PUVM pUVM,
-                                                           uint32_t *puVersMajor, uint32_t *puVersMinor)
+                                                           uint32_t *puVersMajor, uint32_t *puVersMinor,
+                                                           uint32_t *puBuildNumber, bool *pf32Bit)
 {
     RT_NOREF(pUVM);
     PDBGDIGGERWINNT pData = RT_FROM_MEMBER(pThis, DBGDIGGERWINNT, IWinNt);
 
-    *puVersMajor = pData->NtMajorVersion;
-    *puVersMinor = pData->NtMinorVersion;
+    if (puVersMajor)
+        *puVersMajor = pData->NtMajorVersion;
+    if (puVersMinor)
+        *puVersMinor = pData->NtMinorVersion;
+    if (puBuildNumber)
+        *puBuildNumber = pData->NtBuildNumber;
+    if (pf32Bit)
+        *pf32Bit = pData->f32Bit;
     return VINF_SUCCESS;
 }
@@ -749 +759 @@
         default:                        pszNtProductType = "";              break;
     }
-    RTStrPrintf(pszVersion, cchVersion, "%u.%u-%s%s", pThis->NtMajorVersion, pThis->NtMinorVersion,
-                pThis->f32Bit ? "x86" : "AMD64", pszNtProductType);
+    RTStrPrintf(pszVersion, cchVersion, "%u.%u-%s%s (BuildNumber %u)", pThis->NtMajorVersion, pThis->NtMinorVersion,
+                pThis->f32Bit ? "x86" : "AMD64", pszNtProductType, pThis->NtBuildNumber);
     return VINF_SUCCESS;
 }
@@ -846 +856 @@
         pThis->NtMajorVersion = u.UserSharedData.NtMajorVersion;
         pThis->NtMinorVersion = u.UserSharedData.NtMinorVersion;
+        pThis->NtBuildNumber  = u.UserSharedData.NtBuildNumber;
     }
     else if (pThis->fNt31)
@@ -852 +863 @@
         pThis->NtMajorVersion = 3;
         pThis->NtMinorVersion = 1;
+        pThis->NtBuildNumber  = 0;
     }
     else