Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1373)

Unified Diff: sandbox/src/target_process.cc

Issue 543058: Prepare the sandbox for integration with NaCl broker for 64-bit Windows. The ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/src/sandbox_policy_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/src/target_process.cc
===================================================================
--- sandbox/src/target_process.cc (revision 36231)
+++ sandbox/src/target_process.cc (working copy)
@@ -184,13 +184,16 @@
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;
}
« no previous file with comments | « sandbox/src/sandbox_policy_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698