Revert 130716 - Use ScopedProcessInformation and other RAII types in sandbox.

sandbox/src/Wow64.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sandbox/src/wow64.h"
 
 #include <sstream>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/win/scoped_process_information.h"
 #include "base/win/windows_version.h"
 #include "sandbox/src/target_process.h"
 
 namespace {
 
 // Holds the information needed for the interception of NtMapViewOfSection on
 // 64 bits.
 // Warning: do not modify this definition without changing also the code on the
 // 64 bit helper process.
 struct PatchInfo32 {
@@ skipping 128 matching lines @@
 
   std::wstringstream command;
   command << std::hex << std::showbase << L"\"" << path <<
                L"wow_helper.exe\" " << child_->ProcessId() << " " <<
                bit_cast<ULONG>(buffer);
 
   scoped_ptr_malloc<wchar_t> writable_command(_wcsdup(command.str().c_str()));
 
   STARTUPINFO startup_info = {0};
   startup_info.cb = sizeof(startup_info);
-  base::win::ScopedProcessInformation process_info;
+  PROCESS_INFORMATION process_info;
   if (!::CreateProcess(NULL, writable_command.get(), NULL, NULL, FALSE, 0, NULL,
-                       NULL, &startup_info, process_info.Receive()))
+                       NULL, &startup_info, &process_info))
     return false;
 
-  DWORD reason = ::WaitForSingleObject(process_info.process_handle(), INFINITE);
+  DWORD reason = ::WaitForSingleObject(process_info.hProcess, INFINITE);
 
   DWORD code;
-  bool ok =
-      ::GetExitCodeProcess(process_info.process_handle(), &code) ? true : false;
+  bool ok = ::GetExitCodeProcess(process_info.hProcess, &code) ? true : false;
+
+  ::CloseHandle(process_info.hProcess);
+  ::CloseHandle(process_info.hThread);
 
   if (WAIT_TIMEOUT == reason)
     return false;
 
   return ok && (0 == code);
 }
 
 // First we must wake up the child, then wait for dll loads on the child until
 // the one we care is loaded; at that point we must suspend the child again.
 bool Wow64::DllMapped() {
@@ skipping 30 matching lines @@
   SIZE_T read;
   if (!::ReadProcessMemory(child_->Process(), ntdll_, &buffer, kBufferSize,
                            &read))
     return false;
   if (kBufferSize != read)
     return false;
   return true;
 }
 
 }  // namespace sandbox