# HG changeset patch
# User trims
# Date 1259181806 28800
# Node ID c5cb255ec7a3438d192caf05b5adff84c322d35b
# Parent  938b86f7a7fc6a6b3c4adb9b66cd4222425ec4d3
6821003: Update hotspot windows os_win32 for windows 7
Summary: add support for Windows 7
Reviewed-by: xlu

diff -r 938b86f7a7fc -r c5cb255ec7a3 src/os/windows/vm/os_windows.cpp
--- a/src/os/windows/vm/os_windows.cpp	Tue Nov 24 15:52:43 2009 -0800
+++ b/src/os/windows/vm/os_windows.cpp	Wed Nov 25 12:43:26 2009 -0800
@@ -1526,7 +1526,8 @@
     case 5000: st->print(" Windows 2000"); break;
     case 5001: st->print(" Windows XP"); break;
     case 5002:
-    case 6000: {
+    case 6000:
+    case 6001: {
       // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
       // find out whether we are running on 64 bit processor or not.
       SYSTEM_INFO si;
@@ -1549,13 +1550,22 @@
           st->print(" Windows XP x64 Edition");
         else
             st->print(" Windows Server 2003 family");
-      } else { // os_vers == 6000
+      } else if (os_vers == 6000) {
         if (osvi.wProductType == VER_NT_WORKSTATION)
             st->print(" Windows Vista");
         else
             st->print(" Windows Server 2008");
         if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
             st->print(" , 64 bit");
+      } else { // os_vers == 6001
+        if (osvi.wProductType == VER_NT_WORKSTATION) {
+            st->print(" Windows 7");
+        } else {
+            // Unrecognized windows, print out its major and minor versions
+            st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);
+        }
+        if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+            st->print(" , 64 bit");
       }
       break;
     }