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

Print this page

        

*** 715,724 **** --- 715,725 ---- * 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) {
*** 771,787 **** * * "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; otherwise, it is Windows * Server 2008." */ ! if (ver.wProductType == VER_NT_WORKSTATION) ! sprops.os_name = "Windows Vista"; ! else sprops.os_name = "Windows Server 2008"; } else { sprops.os_name = "Windows NT (unknown)"; } break; default: --- 772,793 ---- * * "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: