mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-21 03:24:38 +02:00
7170275: os::print_os_info needs to know about Windows 8
Recognize Windows 8 and Windows Server 2012 Reviewed-by: sla, kvn, azeemj
This commit is contained in:
parent
911dcf0f08
commit
bd06ea72a9
1 changed files with 10 additions and 1 deletions
|
@ -1591,7 +1591,8 @@ void os::win32::print_windows_version(outputStream* st) {
|
|||
case 5001: st->print(" Windows XP"); break;
|
||||
case 5002:
|
||||
case 6000:
|
||||
case 6001: {
|
||||
case 6001:
|
||||
case 6002: {
|
||||
// Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
|
||||
// find out whether we are running on 64 bit processor or not.
|
||||
SYSTEM_INFO si;
|
||||
|
@ -1623,6 +1624,14 @@ void os::win32::print_windows_version(outputStream* st) {
|
|||
}
|
||||
if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
|
||||
st->print(" , 64 bit");
|
||||
} else if (os_vers == 6002) {
|
||||
if (osvi.wProductType == VER_NT_WORKSTATION) {
|
||||
st->print(" Windows 8");
|
||||
} else {
|
||||
st->print(" Windows Server 2012");
|
||||
}
|
||||
if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
|
||||
st->print(" , 64 bit");
|
||||
} else { // future os
|
||||
// Unrecognized windows, print out its major and minor versions
|
||||
st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue