Add code to be able to detect windows7 in GetWinVersion.

base/win_util.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/win_util.h"
 
 #include <map>
 #include <sddl.h>
 
 #include "base/logging.h"
@@ skipping 21 matching lines @@
   const bool success = !!SystemParametersInfo(SPI_GETNONCLIENTMETRICS,
                                               SIZEOF_NONCLIENTMETRICS, metrics,
                                               0);
   DCHECK(success);
 }
 
 WinVersion GetWinVersion() {
   static bool checked_version = false;
   static WinVersion win_version = WINVERSION_PRE_2000;
   if (!checked_version) {
-    OSVERSIONINFO version_info;
+    OSVERSIONINFOEX version_info;
     version_info.dwOSVersionInfoSize = sizeof version_info;
-    GetVersionEx(&version_info);
+    GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info));
     if (version_info.dwMajorVersion == 5) {
       switch (version_info.dwMinorVersion) {
         case 0:
           win_version = WINVERSION_2000;
           break;
         case 1:
           win_version = WINVERSION_XP;
           break;
         case 2:
         default:
           win_version = WINVERSION_SERVER_2003;
           break;
       }
-    } else if (version_info.dwMajorVersion >= 6) {
-      win_version = WINVERSION_VISTA;
+    } else if (version_info.dwMajorVersion == 6) {
+      if (version_info.wProductType != VER_NT_WORKSTATION) {
+        // 2008 is 6.0, and 2008 R2 is 6.1.
+        win_version = WINVERSION_2008;
+      } else {
+        if (version_info.dwMinorVersion == 0) {
+          win_version = WINVERSION_VISTA;
+        } else {
+          win_version = WINVERSION_WIN7;
+        }
+      }
+    } else if (version_info.dwMajorVersion > 6) {
+      win_version = WINVERSION_WIN7;
     }
     checked_version = true;
   }
   return win_version;
 }
 
 void GetServicePackLevel(int* major, int* minor) {
   DCHECK(major && minor);
   static bool checked_version = false;
   static int service_pack_major = -1;
@@ skipping 370 matching lines @@
 
 #ifndef COPY_FILE_COPY_SYMLINK
 #error You must install the Windows 2008 or Vista Software Development Kit and \
 set it as your default include path to build this library. You can grab it by \
 searching for "download windows sdk 2008" in your favorite web search engine.  \
 Also make sure you register the SDK with Visual Studio, by selecting \
 "Integrate Windows SDK with Visual Studio 2005" from the Windows SDK \
 menu (see Start - All Programs - Microsoft Windows SDK - \
 Visual Studio Registration).
 #endif