Print this page


Split Close
Expand all
Collapse all
          --- old/src/windows/native/java/lang/java_props_md.c
          +++ new/src/windows/native/java/lang/java_props_md.c
↓ open down ↓ 381 lines elided ↑ open up ↑
 382  382           * Windows 2000                 5               0
 383  383           * Windows XP 32 bit            5               1
 384  384           * Windows Server 2003 family   5               2
 385  385           * Windows XP 64 bit            5               2
 386  386           *       where ((&ver.wServicePackMinor) + 2) = 1
 387  387           *       and  si.wProcessorArchitecture = 9
 388  388           * Windows Vista family         6               0  (VER_NT_WORKSTATION)
 389  389           * Windows Server 2008          6               0  (!VER_NT_WORKSTATION)
 390  390           * Windows 7                    6               1  (VER_NT_WORKSTATION)
 391  391           * Windows Server 2008 R2       6               1  (!VER_NT_WORKSTATION)
      392 +         * Windows 8                    6               2  (VER_NT_WORKSTATION)
 392  393           *
 393  394           * This mapping will presumably be augmented as new Windows
 394  395           * versions are released.
 395  396           */
 396  397          switch (ver.dwPlatformId) {
 397  398          case VER_PLATFORM_WIN32s:
 398  399              sprops.os_name = "Windows 3.1";
 399  400              break;
 400  401          case VER_PLATFORM_WIN32_WINDOWS:
 401  402             if (ver.dwMajorVersion == 4) {
↓ open down ↓ 36 lines elided ↑ open up ↑
 438  439                  default: sprops.os_name = "Windows NT (unknown)"; break;
 439  440                  }
 440  441              } else if (ver.dwMajorVersion == 6) {
 441  442                  /*
 442  443                   * See table in MSDN OSVERSIONINFOEX documentation.
 443  444                   */
 444  445                  if (ver.wProductType == VER_NT_WORKSTATION) {
 445  446                      switch (ver.dwMinorVersion) {
 446  447                      case  0: sprops.os_name = "Windows Vista";        break;
 447  448                      case  1: sprops.os_name = "Windows 7";            break;
      449 +                    case  2: sprops.os_name = "Windows 8";            break;
 448  450                      default: sprops.os_name = "Windows NT (unknown)";
 449  451                      }
 450  452                  } else {
 451  453                      switch (ver.dwMinorVersion) {
 452  454                      case  0: sprops.os_name = "Windows Server 2008";    break;
 453  455                      case  1: sprops.os_name = "Windows Server 2008 R2"; break;
 454  456                      default: sprops.os_name = "Windows NT (unknown)";
 455  457                      }
 456  458                  }
 457  459              } else {
↓ open down ↓ 186 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX