Mercurial > hg > openjdk > aarch64-port > jdk
changeset 1018:bccdcd761796
6819886: System.getProperty("os.name") reports Vista on Windows 7
Reviewed-by: sherman
author | alanb |
---|---|
date | Tue, 24 Mar 2009 14:03:46 +0000 |
parents | 8306f3df15ff |
children | 4c3f752993a5 |
files | src/windows/native/java/lang/java_props_md.c |
diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/native/java/lang/java_props_md.c Mon Mar 23 17:57:43 2009 -0700 +++ b/src/windows/native/java/lang/java_props_md.c Tue Mar 24 14:03:46 2009 +0000 @@ -717,6 +717,7 @@ * 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. @@ -773,13 +774,18 @@ * 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 + * system is Windows Vista or 7; otherwise, it is Windows * Server 2008." */ - if (ver.wProductType == VER_NT_WORKSTATION) - sprops.os_name = "Windows Vista"; - else + 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)"; }