- Timestamp:
- Sep 17, 2020 5:09:30 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/include/VBox/vmm/dbgf.h ¶
r86102 r86159 2379 2379 * @param pThis Pointer to the interface structure. 2380 2380 * @param pUVM The user mode VM handle. 2381 * @param puVersMajor Where to store the major version part. 2382 * @param puVersMinor Where to store the minor version part. 2381 * @param puVersMajor Where to store the major version part, optional. 2382 * @param puVersMinor Where to store the minor version part, optional. 2383 * @param puBuildNumber Where to store the build number, optional. 2384 * @param pf32Bit Where to store the flag whether this is a 32bit Windows NT, optional. 2383 2385 */ 2384 2386 DECLCALLBACKMEMBER(int, pfnQueryVersion,(struct DBGFOSIWINNT *pThis, PUVM pUVM, 2385 uint32_t *puVersMajor, uint32_t *puVersMinor)); 2387 uint32_t *puVersMajor, uint32_t *puVersMinor, 2388 uint32_t *puBuildNumber, bool *pf32Bit)); 2386 2389 2387 2390 /** -
TabularUnified trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp ¶
r86111 r86159 140 140 uint32_t TimeZoneId; 141 141 uint32_t LargePageMinimum; 142 uint32_t Reserved2[7]; 142 uint32_t Reserved2[6]; 143 uint32_t NtBuildNumber; 143 144 uint32_t NtProductType; 144 145 uint8_t ProductTypeIsValid; … … 215 216 /** NTKUSERSHAREDDATA::NtMinorVersion */ 216 217 uint32_t NtMinorVersion; 218 /** NTKUSERSHAREDDATA::NtBuildNumber */ 219 uint32_t NtBuildNumber; 217 220 218 221 /** The address of the ntoskrnl.exe image. */ … … 510 513 */ 511 514 static DECLCALLBACK(int) dbgDiggerWinNtIWinNt_QueryVersion(struct DBGFOSIWINNT *pThis, PUVM pUVM, 512 uint32_t *puVersMajor, uint32_t *puVersMinor) 515 uint32_t *puVersMajor, uint32_t *puVersMinor, 516 uint32_t *puBuildNumber, bool *pf32Bit) 513 517 { 514 518 RT_NOREF(pUVM); 515 519 PDBGDIGGERWINNT pData = RT_FROM_MEMBER(pThis, DBGDIGGERWINNT, IWinNt); 516 520 517 *puVersMajor = pData->NtMajorVersion; 518 *puVersMinor = pData->NtMinorVersion; 521 if (puVersMajor) 522 *puVersMajor = pData->NtMajorVersion; 523 if (puVersMinor) 524 *puVersMinor = pData->NtMinorVersion; 525 if (puBuildNumber) 526 *puBuildNumber = pData->NtBuildNumber; 527 if (pf32Bit) 528 *pf32Bit = pData->f32Bit; 519 529 return VINF_SUCCESS; 520 530 } … … 749 759 default: pszNtProductType = ""; break; 750 760 } 751 RTStrPrintf(pszVersion, cchVersion, "%u.%u-%s%s ", pThis->NtMajorVersion, pThis->NtMinorVersion,752 pThis->f32Bit ? "x86" : "AMD64", pszNtProductType );761 RTStrPrintf(pszVersion, cchVersion, "%u.%u-%s%s (BuildNumber %u)", pThis->NtMajorVersion, pThis->NtMinorVersion, 762 pThis->f32Bit ? "x86" : "AMD64", pszNtProductType, pThis->NtBuildNumber); 753 763 return VINF_SUCCESS; 754 764 } … … 846 856 pThis->NtMajorVersion = u.UserSharedData.NtMajorVersion; 847 857 pThis->NtMinorVersion = u.UserSharedData.NtMinorVersion; 858 pThis->NtBuildNumber = u.UserSharedData.NtBuildNumber; 848 859 } 849 860 else if (pThis->fNt31) … … 852 863 pThis->NtMajorVersion = 3; 853 864 pThis->NtMinorVersion = 1; 865 pThis->NtBuildNumber = 0; 854 866 } 855 867 else -
TabularUnified trunk/src/VBox/VMM/VMMR3/DBGFOS.cpp ¶
r86112 r86159 538 538 * @interface_method_impl{DBGFOSIWINNT,pfnQueryVersion, Generic EMT wrapper.} 539 539 */ 540 static DECLCALLBACK(int) dbgfR3OSEmtIWinNt_QueryVersion(PDBGFOSIWINNT pThis, PUVM pUVM, uint32_t *puVersMajor, uint32_t *puVersMinor) 540 static DECLCALLBACK(int) dbgfR3OSEmtIWinNt_QueryVersion(PDBGFOSIWINNT pThis, PUVM pUVM, uint32_t *puVersMajor, uint32_t *puVersMinor, 541 uint32_t *puBuildNumber, bool *pf32Bit) 541 542 { 542 543 PDBGFOSEMTWRAPPER pWrapper = RT_FROM_MEMBER(pThis, DBGFOSEMTWRAPPER, uWrapper.WinNt); … … 545 546 546 547 return VMR3ReqPriorityCallWaitU(pWrapper->pUVM, 0 /*idDstCpu*/, 547 (PFNRT)pWrapper->uDigger.pWinNt->pfnQueryVersion, 4, 548 pWrapper->uDigger.pWinNt, pUVM, puVersMajor, puVersMinor); 548 (PFNRT)pWrapper->uDigger.pWinNt->pfnQueryVersion, 6, 549 pWrapper->uDigger.pWinNt, pUVM, puVersMajor, puVersMinor, 550 puBuildNumber, pf32Bit); 549 551 } 550 552
Note:
See TracChangeset
for help on using the changeset viewer.