Add support for correct Windows 10 version enumeration.

chrome_elf/thunk_getter.cc

 // Copyright 2014 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 <stdint.h>
 #include <windows.h>
 
 #include "base/basictypes.h"
 #include "sandbox/win/src/interception_internal.h"
 #include "sandbox/win/src/internal_types.h"
 #include "sandbox/win/src/sandbox_utils.h"
 #include "sandbox/win/src/service_resolver.h"
 
 namespace {
 enum Version {
   VERSION_PRE_XP_SP2 = 0,  // Not supported.
   VERSION_XP_SP2,
   VERSION_SERVER_2003,  // Also includes XP Pro x64 and Server 2003 R2.
   VERSION_VISTA,        // Also includes Windows Server 2008.
   VERSION_WIN7,         // Also includes Windows Server 2008 R2.
   VERSION_WIN8,         // Also includes Windows Server 2012.
   VERSION_WIN8_1,
+  VERSION_WIN10,
   VERSION_WIN_LAST,  // Indicates error condition.
 };
 
 // Whether a process is running under WOW64 (the wrapper that allows 32-bit
 // processes to run on 64-bit versions of Windows).  This will return
 // WOW64_DISABLED for both "32-bit Chrome on 32-bit Windows" and "64-bit
 // Chrome on 64-bit Windows".  WOW64_UNKNOWN means "an error occurred", e.g.
 // the process does not have sufficient access rights to determine this.
 enum WOW64Status { WOW64_DISABLED, WOW64_ENABLED, WOW64_UNKNOWN, };
 
@@ skipping 45 matching lines @@
           version_ = VERSION_WIN7;
           break;
         case 2:
           // Treat Windows Server 2012 the same as Windows 8.
           version_ = VERSION_WIN8;
           break;
         default:
           version_ = VERSION_WIN8_1;
           break;
       }
+    } else if (version_number_.major == 10) {
+      version_ = VERSION_WIN10;
     } else if (version_number_.major > 6) {
       version_ = VERSION_WIN_LAST;
     } else {
       version_ = VERSION_PRE_XP_SP2;
     }
 
     service_pack_.major = version_info.wServicePackMajor;
     service_pack_.minor = version_info.wServicePackMinor;
   }
 
@@ skipping 35 matching lines @@
       thunk = new sandbox::Wow64ResolverThunk(current_process, relaxed);
   } else if (os_info.version() >= VERSION_WIN8) {
     thunk = new sandbox::Win8ResolverThunk(current_process, relaxed);
   } else {
     thunk = new sandbox::ServiceResolverThunk(current_process, relaxed);
   }
 #endif
 
   return thunk;
 }