Merge 146054 - Bring back VERSION_SERVER_2003 to distinguish Server 2003 and XP Pro x64 from regula…

base/win/windows_version.cc

 // Copyright (c) 2012 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/windows_version.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 
@@ skipping 19 matching lines @@
 OSInfo::OSInfo()
     : version_(VERSION_PRE_XP),
       architecture_(OTHER_ARCHITECTURE),
       wow64_status_(GetWOW64StatusForProcess(GetCurrentProcess())) {
   OSVERSIONINFOEX version_info = { sizeof version_info };
   GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info));
   version_number_.major = version_info.dwMajorVersion;
   version_number_.minor = version_info.dwMinorVersion;
   version_number_.build = version_info.dwBuildNumber;
   if ((version_number_.major == 5) && (version_number_.minor > 0)) {
-    // Treat XP Pro x64, Server 2003, Home Server, and Server 2003 R2 as XP.
-    version_ = VERSION_XP;
+    // Treat XP Pro x64, Home Server, and Server 2003 R2 as Server 2003.
+    version_ = (version_number_.minor == 1) ? VERSION_XP : VERSION_SERVER_2003;
   } else if (version_number_.major == 6) {
     switch (version_number_.minor) {
       case 0:
         // Treat Windows Server 2008 the same as Windows Vista.
         version_ = VERSION_VISTA;
         break;
       case 1:
         // Treat Windows Server 2008 R2 the same as Windows 7.
         version_ = VERSION_WIN7;
         break;
@@ skipping 36 matching lines @@
     return WOW64_UNKNOWN;
   return is_wow64 ? WOW64_ENABLED : WOW64_DISABLED;
 }
 
 Version GetVersion() {
   return OSInfo::GetInstance()->version();
 }
 
 }  // namespace win
 }  // namespace base