diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 17:29:08 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 17:29:08 +0000 |
| commit | 057ba83b6241e01efcd02e7f162b7dc4e8deff08 (patch) | |
| tree | 3c8968189ca4d5efe8d231b5c6c50ad843f3111a /sandbox | |
| parent | 45066d589d6cfef0a8bf3a60d3fdb9549deb6c7d (diff) | |
| download | chromium_src-057ba83b6241e01efcd02e7f162b7dc4e8deff08.zip chromium_src-057ba83b6241e01efcd02e7f162b7dc4e8deff08.tar.gz chromium_src-057ba83b6241e01efcd02e7f162b7dc4e8deff08.tar.bz2 | |
Avoid the use of wow_helper for Windows7
In Windows7 64-bit the wow subsystem maps the 32 bit ntdll from the
get go, so there is no need to use wow_helper at all.
This also should speed process creation for chrome.
BUG=60854
TEST=existing validation and integration tests suffice.
Review URL: http://codereview.chromium.org/4185004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/src/interception.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sandbox/src/interception.cc b/sandbox/src/interception.cc index 003ebd8..6636cc3 100644 --- a/sandbox/src/interception.cc +++ b/sandbox/src/interception.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/win/pe_image.h" +#include "base/win/windows_version.h" #include "sandbox/src/interception_internal.h" #include "sandbox/src/interceptors.h" #include "sandbox/src/sandbox.h" @@ -424,8 +425,10 @@ bool InterceptionManager::PatchClientFunctions(DllInterceptionData* thunks, } Wow64 WowHelper(child_, ntdll_base); - if (!WowHelper.WaitForNtdll(INFINITE)) - return false; + if (base::win::GetVersion() <= base::win::VERSION_VISTA) { + if (!WowHelper.WaitForNtdll(INFINITE)) + return false; + } char* interceptor_base = NULL; |