diff options
| author | drbasic <drbasic@yandex-team.ru> | 2015-10-21 09:20:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 16:21:26 +0000 |
| commit | c53588a4352302998686cb1a893029b1950b9dba (patch) | |
| tree | 280e425724b1c5ee689f3c17c7905aa2d53853ef /chrome_elf | |
| parent | 53ab90724aca77dcd6ad912d023c282cdf4df117 (diff) | |
| download | chromium_src-c53588a4352302998686cb1a893029b1950b9dba.zip chromium_src-c53588a4352302998686cb1a893029b1950b9dba.tar.gz chromium_src-c53588a4352302998686cb1a893029b1950b9dba.tar.bz2 | |
Fix IsFunctionAService() for Windows 10 WOW64
Windows 10 WOW64 has different thunk than Windows 8.
Test ServiceResolverTest.PatchesServices from sbox_unittests failed.
Library blacklist from src\chrome_elf\blacklist\blacklist.cc does not
work.
BUG=
R=cpu@chromium.org
R=jschuh@chromium.org
TEST=sbox_unittests on Win 10
Review URL: https://codereview.chromium.org/1407103003
Cr-Commit-Position: refs/heads/master@{#355307}
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/thunk_getter.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome_elf/thunk_getter.cc b/chrome_elf/thunk_getter.cc index c249762..32da059 100644 --- a/chrome_elf/thunk_getter.cc +++ b/chrome_elf/thunk_getter.cc @@ -132,7 +132,9 @@ sandbox::ServiceResolverThunk* GetThunk(bool relaxed) { thunk = new sandbox::ServiceResolverThunk(current_process, relaxed); #else if (GetWOW64StatusForCurrentProcess() == WOW64_ENABLED) { - if (os_info.version() >= VERSION_WIN8) + if (os_info.version() >= VERSION_WIN10) + thunk = new sandbox::Wow64W10ResolverThunk(current_process, relaxed); + else if (os_info.version() >= VERSION_WIN8) thunk = new sandbox::Wow64W8ResolverThunk(current_process, relaxed); else thunk = new sandbox::Wow64ResolverThunk(current_process, relaxed); |