win: Make reading NT_IMAGE_HEADERS work cross-bitness

util/win/process_info_test.cc

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "util/win/process_info.h"
 
 #include <imagehlp.h>
 #include <rpc.h>
 #include <wchar.h>
 
 #include "base/files/file_path.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/paths.h"
+#include "test/win/child_launcher.h"
 #include "util/file/file_io.h"
 #include "util/misc/uuid.h"
 #include "util/win/scoped_handle.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 const wchar_t kNtdllName[] = L"\\ntdll.dll";
 
@@ skipping 86 matching lines @@
 
   base::FilePath test_executable = Paths::Executable();
 
   std::wstring child_test_executable =
       test_executable.DirName()
           .Append(directory_modification)
           .Append(test_executable.BaseName().RemoveFinalExtension().value() +
                   L"_process_info_test_child.exe")
           .value();
   // TODO(scottmg): Command line escaping utility.
-  std::wstring command_line = child_test_executable + L" " +
-                              started_uuid.ToString16() + L" " +
-                              done_uuid.ToString16();
-  STARTUPINFO startup_info = {0};
-  startup_info.cb = sizeof(startup_info);
-  PROCESS_INFORMATION process_information;
-  ASSERT_TRUE(CreateProcess(child_test_executable.c_str(),
-                            &command_line[0],
-                            nullptr,
-                            nullptr,
-                            false,
-                            0,
-                            nullptr,
-                            nullptr,
-                            &startup_info,
-                            &process_information));
-  // Take ownership of the two process handles returned.
-  ScopedKernelHANDLE process_main_thread_handle(process_information.hThread);
-  ScopedKernelHANDLE process_handle(process_information.hProcess);
+  ChildLauncher child(
+      child_test_executable,
+      started_uuid.ToString16() + L" " + done_uuid.ToString16());
+  child.Start();
 
   // Wait until the test has completed initialization.
   ASSERT_EQ(WaitForSingleObject(started.get(), INFINITE), WAIT_OBJECT_0);
 
-  ASSERT_TRUE(process_info.Initialize(process_information.hProcess));
+  ASSERT_TRUE(process_info.Initialize(child.process_handle()));
 
   // Tell the test it's OK to shut down now that we've read our data.
   SetEvent(done.get());
 
   std::vector<ProcessInfo::Module> modules;
   EXPECT_TRUE(process_info.Modules(&modules));
   ASSERT_GE(modules.size(), 3u);
   std::wstring child_name = L"\\crashpad_util_test_process_info_test_child.exe";
   ASSERT_GE(modules[0].name.size(), child_name.size());
   EXPECT_EQ(child_name,
@@ skipping 21 matching lines @@
   TestOtherProcess(FILE_PATH_LITERAL("..\\..\\out\\Debug"));
 #else
   TestOtherProcess(FILE_PATH_LITERAL("..\\..\\out\\Release"));
 #endif
 }
 #endif  // ARCH_CPU_64_BITS
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad