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

Side by Side Diff: sandbox/win/src/Wow64.cc

Issue 821693003: replace COMPILE_ASSERT with static_assert in sandbox/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 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 unified diff | Download patch
« no previous file with comments | « sandbox/linux/tests/scoped_temporary_file.cc ('k') | sandbox/win/src/crosscall_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sandbox/win/src/wow64.h" 5 #include "sandbox/win/src/wow64.h"
6 6
7 #include <sstream> 7 #include <sstream>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 // The child is intercepted on 64 bit, go on and wait for our event. 131 // The child is intercepted on 64 bit, go on and wait for our event.
132 if (!DllMapped()) 132 if (!DllMapped())
133 return false; 133 return false;
134 134
135 // The 32 bit version is available, cleanup the child. 135 // The 32 bit version is available, cleanup the child.
136 return Restore64Code(child_->Process(), patch_info); 136 return Restore64Code(child_->Process(), patch_info);
137 } 137 }
138 138
139 bool Wow64::RunWowHelper(void* buffer) { 139 bool Wow64::RunWowHelper(void* buffer) {
140 COMPILE_ASSERT(sizeof(buffer) <= sizeof(DWORD), unsupported_64_bits); 140 static_assert(sizeof(buffer) <= sizeof(DWORD), "unsupported 64 bits");
141 141
142 // Get the path to the helper (beside the exe). 142 // Get the path to the helper (beside the exe).
143 wchar_t prog_name[MAX_PATH]; 143 wchar_t prog_name[MAX_PATH];
144 GetModuleFileNameW(NULL, prog_name, MAX_PATH); 144 GetModuleFileNameW(NULL, prog_name, MAX_PATH);
145 base::string16 path(prog_name); 145 base::string16 path(prog_name);
146 size_t name_pos = path.find_last_of(L"\\"); 146 size_t name_pos = path.find_last_of(L"\\");
147 if (base::string16::npos == name_pos) 147 if (base::string16::npos == name_pos)
148 return false; 148 return false;
149 path.resize(name_pos + 1); 149 path.resize(name_pos + 1);
150 150
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 SIZE_T read; 212 SIZE_T read;
213 if (!::ReadProcessMemory(child_->Process(), ntdll_, &buffer, kBufferSize, 213 if (!::ReadProcessMemory(child_->Process(), ntdll_, &buffer, kBufferSize,
214 &read)) 214 &read))
215 return false; 215 return false;
216 if (kBufferSize != read) 216 if (kBufferSize != read)
217 return false; 217 return false;
218 return true; 218 return true;
219 } 219 }
220 220
221 } // namespace sandbox 221 } // namespace sandbox
OLDNEW
« no previous file with comments | « sandbox/linux/tests/scoped_temporary_file.cc ('k') | sandbox/win/src/crosscall_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698