diff options
| author | wfh <wfh@chromium.org> | 2015-02-02 15:07:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-02 23:07:43 +0000 |
| commit | 3181ba39ee787e1b40f4aea4be23f4f666ad0945 (patch) | |
| tree | 029682b15d4a70bf4862913c664cc7b15dee24e1 /chrome_elf | |
| parent | 599ca374a484a92a6211a7394c87ce7513421496 (diff) | |
| download | chromium_src-3181ba39ee787e1b40f4aea4be23f4f666ad0945.zip chromium_src-3181ba39ee787e1b40f4aea4be23f4f666ad0945.tar.gz chromium_src-3181ba39ee787e1b40f4aea4be23f4f666ad0945.tar.bz2 | |
Add support for correct Windows 10 version enumeration.
BUG=454018
Review URL: https://codereview.chromium.org/891813003
Cr-Commit-Position: refs/heads/master@{#314213}
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/thunk_getter.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome_elf/thunk_getter.cc b/chrome_elf/thunk_getter.cc index 8421e5e..649fb0c 100644 --- a/chrome_elf/thunk_getter.cc +++ b/chrome_elf/thunk_getter.cc @@ -20,6 +20,7 @@ enum Version { 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. }; @@ -85,6 +86,8 @@ class OSInfo { 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 { |