< prev index next >

src/os/windows/vm/os_windows.cpp

Print this page
rev 10297 : 8150490: Update OS detection code to recognize Windows Server 2016
Reviewed-by:


1651   case 6002:
1652     if (is_workstation) {
1653       st->print("8");
1654     } else {
1655       st->print("Server 2012");
1656     }
1657     break;
1658 
1659   case 6003:
1660     if (is_workstation) {
1661       st->print("8.1");
1662     } else {
1663       st->print("Server 2012 R2");
1664     }
1665     break;
1666 
1667   case 10000:
1668     if (is_workstation) {
1669       st->print("10");
1670     } else {
1671       // The server version name of Windows 10 is not known at this time
1672       st->print("%d.%d", major_version, minor_version);
1673     }
1674     break;
1675 
1676   default:
1677     // Unrecognized windows, print out its major and minor versions
1678     st->print("%d.%d", major_version, minor_version);
1679     break;
1680   }
1681 
1682   // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
1683   // find out whether we are running on 64 bit processor or not
1684   SYSTEM_INFO si;
1685   ZeroMemory(&si, sizeof(SYSTEM_INFO));
1686   GetNativeSystemInfo(&si);
1687   if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
1688     st->print(" , 64 bit");
1689   }
1690 
1691   st->print(" Build %d", build_number);
1692   st->print(" (%d.%d.%d.%d)", major_version, minor_version, build_number, build_minor);




1651   case 6002:
1652     if (is_workstation) {
1653       st->print("8");
1654     } else {
1655       st->print("Server 2012");
1656     }
1657     break;
1658 
1659   case 6003:
1660     if (is_workstation) {
1661       st->print("8.1");
1662     } else {
1663       st->print("Server 2012 R2");
1664     }
1665     break;
1666 
1667   case 10000:
1668     if (is_workstation) {
1669       st->print("10");
1670     } else {
1671       st->print("Server 2016");

1672     }
1673     break;
1674 
1675   default:
1676     // Unrecognized windows, print out its major and minor versions
1677     st->print("%d.%d", major_version, minor_version);
1678     break;
1679   }
1680 
1681   // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
1682   // find out whether we are running on 64 bit processor or not
1683   SYSTEM_INFO si;
1684   ZeroMemory(&si, sizeof(SYSTEM_INFO));
1685   GetNativeSystemInfo(&si);
1686   if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
1687     st->print(" , 64 bit");
1688   }
1689 
1690   st->print(" Build %d", build_number);
1691   st->print(" (%d.%d.%d.%d)", major_version, minor_version, build_number, build_minor);


< prev index next >