win: make CrashpadInfo retrievable

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,
@@ skipping 31 matching lines @@
 #else
   EXPECT_FALSE(process_info.Is64Bit());
   // Assume we won't be running these tests on a 32 bit host OS.
   EXPECT_TRUE(process_info.IsWow64());
 #endif
 
   std::wstring command_line;
   EXPECT_TRUE(process_info.CommandLine(&command_line));
   EXPECT_EQ(std::wstring(GetCommandLine()), command_line);
 
-  std::vector<std::wstring> modules;
+  std::vector<ProcessInfo::Module> modules;
   EXPECT_TRUE(process_info.Modules(&modules));
   ASSERT_GE(modules.size(), 2u);
   const wchar_t kSelfName[] = L"\\crashpad_util_test.exe";
-  ASSERT_GE(modules[0].size(), wcslen(kSelfName));
+  ASSERT_GE(modules[0].name.size(), wcslen(kSelfName));
   EXPECT_EQ(kSelfName,
-            modules[0].substr(modules[0].size() - wcslen(kSelfName)));
-  ASSERT_GE(modules[1].size(), wcslen(kNtdllName));
-  EXPECT_EQ(kNtdllName,
-            modules[1].substr(modules[1].size() - wcslen(kNtdllName)));
+            modules[0].name.substr(modules[0].name.size() - wcslen(kSelfName)));
+  ASSERT_GE(modules[1].name.size(), wcslen(kNtdllName));
+  EXPECT_EQ(
+      kNtdllName,
+      modules[1].name.substr(modules[1].name.size() - wcslen(kNtdllName)));

[Mark Mentovai, 2015/04/29 19:37:16]

Verify the sanity of the two other fields in ProcessInfo::Module too.

[scottmg, 2015/04/30 03:31:32]

Done.

 }
 
 void TestOtherProcess(const std::wstring& child_name_suffix) {
   ProcessInfo process_info;
 
   ::UUID system_uuid;
   ASSERT_EQ(RPC_S_OK, UuidCreate(&system_uuid));
   UUID started_uuid(reinterpret_cast<const uint8_t*>(&system_uuid.Data1));
   ASSERT_EQ(RPC_S_OK, UuidCreate(&system_uuid));
   UUID done_uuid(reinterpret_cast<const uint8_t*>(&system_uuid.Data1));
@@ skipping 31 matching lines @@
   ScopedKernelHANDLE process_handle(process_information.hProcess);
 
   // Wait until the test has completed initialization.
   ASSERT_EQ(WaitForSingleObject(started.get(), INFINITE), WAIT_OBJECT_0);
 
   ASSERT_TRUE(process_info.Initialize(process_information.hProcess));
 
   // Tell the test it's OK to shut down now that we've read our data.
   SetEvent(done.get());
 
-  std::vector<std::wstring> modules;
+  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_" +
                             child_name_suffix + L".exe";
-  ASSERT_GE(modules[0].size(), child_name.size());
+  ASSERT_GE(modules[0].name.size(), child_name.size());
   EXPECT_EQ(child_name,
-            modules[0].substr(modules[0].size() - child_name.size()));
-  ASSERT_GE(modules[1].size(), wcslen(kNtdllName));
-  EXPECT_EQ(kNtdllName,
-            modules[1].substr(modules[1].size() - wcslen(kNtdllName)));
+            modules[0].name.substr(modules[0].name.size() - child_name.size()));
+  ASSERT_GE(modules[1].name.size(), wcslen(kNtdllName));
+  EXPECT_EQ(
+      kNtdllName,
+      modules[1].name.substr(modules[1].name.size() - wcslen(kNtdllName)));
   // lz32.dll is an uncommonly-used-but-always-available module that the test
   // binary manually loads.
   const wchar_t kLz32dllName[] = L"\\lz32.dll";
-  ASSERT_GE(modules.back().size(), wcslen(kLz32dllName));
-  EXPECT_EQ(
-      kLz32dllName,
-      modules.back().substr(modules.back().size() - wcslen(kLz32dllName)));
+  ASSERT_GE(modules.back().name.size(), wcslen(kLz32dllName));
+  EXPECT_EQ(kLz32dllName,
+            modules.back().name.substr(modules.back().name.size() -
+                                       wcslen(kLz32dllName)));
 }
 
 TEST(ProcessInfo, OtherProcessX64) {
   TestOtherProcess(L"x64");
 }
 
 TEST(ProcessInfo, OtherProcessX86) {
   TestOtherProcess(L"x86");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad