src/windows/native/java/lang/java_props_md.c

Print this page

        

*** 712,725 **** * Windows XP 32 bit 5 1 * Windows Server 2003 family 5 2 * Windows XP 64 bit 5 2 * where ((&ver.wServicePackMinor) + 2) = 1 * and si.wProcessorArchitecture = 9 ! * Windows Vista family 6 0 ! * Windows 2008 6 0 ! * where ((&ver.wServicePackMinor) + 2) = 1 ! * Windows 7 6 1 * * This mapping will presumably be augmented as new Windows * versions are released. */ switch (ver.dwPlatformId) { --- 712,725 ---- * Windows XP 32 bit 5 1 * Windows Server 2003 family 5 2 * Windows XP 64 bit 5 2 * where ((&ver.wServicePackMinor) + 2) = 1 * and si.wProcessorArchitecture = 9 ! * Windows Vista family 6 0 (VER_NT_WORKSTATION) ! * Windows Server 2008 6 0 (!VER_NT_WORKSTATION) ! * Windows 7 6 1 (VER_NT_WORKSTATION) ! * Windows Server 2008 R2 6 1 (!VER_NT_WORKSTATION) * * This mapping will presumably be augmented as new Windows * versions are released. */ switch (ver.dwPlatformId) {
*** 766,793 **** break; default: sprops.os_name = "Windows NT (unknown)"; break; } } else if (ver.dwMajorVersion == 6) { /* ! * From MSDN OSVERSIONINFOEX documentation: ! * ! * "Because the version numbers for Windows Server 2008 ! * and Windows Vista are identical, you must also test ! * whether the wProductType member is VER_NT_WORKSTATION. ! * If wProductType is VER_NT_WORKSTATION, the operating ! * system is Windows Vista or 7; otherwise, it is Windows ! * Server 2008." */ if (ver.wProductType == VER_NT_WORKSTATION) { switch (ver.dwMinorVersion) { case 0: sprops.os_name = "Windows Vista"; break; case 1: sprops.os_name = "Windows 7"; break; default: sprops.os_name = "Windows NT (unknown)"; } } else { ! sprops.os_name = "Windows Server 2008"; } } else { sprops.os_name = "Windows NT (unknown)"; } break; default: --- 766,790 ---- break; default: sprops.os_name = "Windows NT (unknown)"; break; } } else if (ver.dwMajorVersion == 6) { /* ! * See table in MSDN OSVERSIONINFOEX documentation. */ if (ver.wProductType == VER_NT_WORKSTATION) { switch (ver.dwMinorVersion) { case 0: sprops.os_name = "Windows Vista"; break; case 1: sprops.os_name = "Windows 7"; break; default: sprops.os_name = "Windows NT (unknown)"; } } else { ! switch (ver.dwMinorVersion) { ! case 0: sprops.os_name = "Windows Server 2008"; break; ! case 1: sprops.os_name = "Windows Server 2008 R2"; break; ! default: sprops.os_name = "Windows NT (unknown)"; } + } } else { sprops.os_name = "Windows NT (unknown)"; } break; default: