Mercurial > hg > truffle

comparison src/os/windows/vm/os_windows.cpp @ 6126:de909f001528

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7170275: os::print_os_info needs to know about Windows 8 Summary: Recognize Windows 8 and Windows Server 2012 Reviewed-by: sla, kvn, azeemj
author mikael
date Wed, 06 Jun 2012 05:21:56 +0200
parents 7432b9db36ff
children d2a62e0f25eb
comparison
equal deleted inserted replaced
6125:dcfcdd01af4b 6126:de909f001528
1589 case 4000: st->print(" Windows NT 4.0"); break; 1589 case 4000: st->print(" Windows NT 4.0"); break;
1590 case 5000: st->print(" Windows 2000"); break; 1590 case 5000: st->print(" Windows 2000"); break;
1591 case 5001: st->print(" Windows XP"); break; 1591 case 5001: st->print(" Windows XP"); break;
1592 case 5002: 1592 case 5002:
1593 case 6000: 1593 case 6000:
1594 case 6001: { 1594 case 6001:
1595 case 6002: {
1595 // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could 1596 // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
1596 // find out whether we are running on 64 bit processor or not. 1597 // find out whether we are running on 64 bit processor or not.
1597 SYSTEM_INFO si; 1598 SYSTEM_INFO si;
1598 ZeroMemory(&si, sizeof(SYSTEM_INFO)); 1599 ZeroMemory(&si, sizeof(SYSTEM_INFO));
1599 if (!os::Kernel32Dll::GetNativeSystemInfoAvailable()){ 1600 if (!os::Kernel32Dll::GetNativeSystemInfoAvailable()){
1618 if (osvi.wProductType == VER_NT_WORKSTATION) { 1619 if (osvi.wProductType == VER_NT_WORKSTATION) {
1619 st->print(" Windows 7"); 1620 st->print(" Windows 7");
1620 } else { 1621 } else {
1621 // Unrecognized windows, print out its major and minor versions 1622 // Unrecognized windows, print out its major and minor versions
1622 st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion); 1623 st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
1624 }
1625 if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
1626 st->print(" , 64 bit");
1627 } else if (os_vers == 6002) {
1628 if (osvi.wProductType == VER_NT_WORKSTATION) {
1629 st->print(" Windows 8");
1630 } else {
1631 st->print(" Windows Server 2012");
1623 } 1632 }
1624 if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) 1633 if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
1625 st->print(" , 64 bit"); 1634 st->print(" , 64 bit");
1626 } else { // future os 1635 } else { // future os
1627 // Unrecognized windows, print out its major and minor versions 1636 // Unrecognized windows, print out its major and minor versions