diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-17 10:18:53 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-17 10:18:53 +0000 |
| commit | 7fd9f2a37792d9105e26a5e233cf8f911efd51f9 (patch) | |
| tree | ead731f6ae10131e780e8ac76504fe5cb62c271c /sandbox/src/target_process.cc | |
| parent | 382abc2bc90652b921c092e3342e8920f0603b17 (diff) | |
| download | chromium_src-7fd9f2a37792d9105e26a5e233cf8f911efd51f9.zip chromium_src-7fd9f2a37792d9105e26a5e233cf8f911efd51f9.tar.gz chromium_src-7fd9f2a37792d9105e26a5e233cf8f911efd51f9.tar.bz2 | |
Prepare the sandbox for integration with NaCl broker for 64-bit Windows. The broker currently launches with --no-sandbox, so the 64-bit version of the sandbox library is there only to allow successful build.
BUG=27218
TEST=none
Review URL: http://codereview.chromium.org/543058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/target_process.cc')
| -rw-r--r-- | sandbox/src/target_process.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sandbox/src/target_process.cc b/sandbox/src/target_process.cc index fd65fea..1ba1885 100644 --- a/sandbox/src/target_process.cc +++ b/sandbox/src/target_process.cc @@ -184,13 +184,16 @@ DWORD TargetProcess::Create(const wchar_t* exe_path, sandbox_thread_ = process_info.hThread; sandbox_process_id_ = process_info.dwProcessId; +#ifndef _WIN64 // TODO(gregoryd): This code does not build for Win64. + // It is safe to disable it since base_address_ is used for + // interception that is not supported on Win64 yet. #pragma warning(push) #pragma warning(disable: 4312) // This cast generates a warning because it is 32 bit specific. void* entry_point = reinterpret_cast<void*>(context.Eax); #pragma warning(pop) base_address_ = GetBaseAddress(exe_path, entry_point); - +#endif // _WIN64 *target_info = process_info; return win_result; } |