OLD | NEW |
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 | 150 |
151 std::wstringstream command; | 151 std::wstringstream command; |
152 command << std::hex << std::showbase << L"\"" << path << | 152 command << std::hex << std::showbase << L"\"" << path << |
153 L"wow_helper.exe\" " << child_->ProcessId() << " " << | 153 L"wow_helper.exe\" " << child_->ProcessId() << " " << |
154 bit_cast<ULONG>(buffer); | 154 bit_cast<ULONG>(buffer); |
155 | 155 |
156 scoped_ptr_malloc<wchar_t> writable_command(_wcsdup(command.str().c_str())); | 156 scoped_ptr_malloc<wchar_t> writable_command(_wcsdup(command.str().c_str())); |
157 | 157 |
158 STARTUPINFO startup_info = {0}; | 158 STARTUPINFO startup_info = {0}; |
159 startup_info.cb = sizeof(startup_info); | 159 startup_info.cb = sizeof(startup_info); |
160 base::win::ScopedProcessInformation process_info; | 160 PROCESS_INFORMATION temp_process_info = {}; |
161 if (!::CreateProcess(NULL, writable_command.get(), NULL, NULL, FALSE, 0, NULL, | 161 if (!::CreateProcess(NULL, writable_command.get(), NULL, NULL, FALSE, 0, NULL, |
162 NULL, &startup_info, process_info.Receive())) | 162 NULL, &startup_info, &temp_process_info)) |
163 return false; | 163 return false; |
| 164 base::win::ScopedProcessInformation process_info(temp_process_info); |
164 | 165 |
165 DWORD reason = ::WaitForSingleObject(process_info.process_handle(), INFINITE); | 166 DWORD reason = ::WaitForSingleObject(process_info.process_handle(), INFINITE); |
166 | 167 |
167 DWORD code; | 168 DWORD code; |
168 bool ok = | 169 bool ok = |
169 ::GetExitCodeProcess(process_info.process_handle(), &code) ? true : false; | 170 ::GetExitCodeProcess(process_info.process_handle(), &code) ? true : false; |
170 | 171 |
171 if (WAIT_TIMEOUT == reason) | 172 if (WAIT_TIMEOUT == reason) |
172 return false; | 173 return false; |
173 | 174 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 SIZE_T read; | 211 SIZE_T read; |
211 if (!::ReadProcessMemory(child_->Process(), ntdll_, &buffer, kBufferSize, | 212 if (!::ReadProcessMemory(child_->Process(), ntdll_, &buffer, kBufferSize, |
212 &read)) | 213 &read)) |
213 return false; | 214 return false; |
214 if (kBufferSize != read) | 215 if (kBufferSize != read) |
215 return false; | 216 return false; |
216 return true; | 217 return true; |
217 } | 218 } |
218 | 219 |
219 } // namespace sandbox | 220 } // namespace sandbox |
OLD | NEW |