Chromium Code Reviews| Index: snapshot/win/module_snapshot_win.cc |
| diff --git a/snapshot/win/module_snapshot_win.cc b/snapshot/win/module_snapshot_win.cc |
| index 6c583092a27a12875d967dc6fbe5892ba9d044a6..3af2f21cda05d4b1fe2c846e3e363aeb87e37c8a 100644 |
| --- a/snapshot/win/module_snapshot_win.cc |
| +++ b/snapshot/win/module_snapshot_win.cc |
| @@ -135,13 +135,17 @@ ModuleSnapshot::ModuleType ModuleSnapshotWin::GetModuleType() const { |
| return ModuleSnapshot::kModuleTypeUnknown; |
| } |
| -void ModuleSnapshotWin::UUID(crashpad::UUID* uuid) const { |
| +void ModuleSnapshotWin::UUIDAndAge(crashpad::UUID* uuid, uint32_t* age) const { |
| INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| - // TODO(scottmg): Also pass the age and pdbname through to snapshot? |
|
Mark Mentovai
2015/10/27 20:02:27
You’re still dropping pdbname (but probably should
scottmg
2015/10/27 20:06:12
Done.
|
| - DWORD age; |
| std::string pdbname; |
| - if (!pe_image_reader_->DebugDirectoryInformation(uuid, &age, &pdbname)) |
| + DWORD age_dword; |
| + if (!pe_image_reader_->DebugDirectoryInformation( |
| + uuid, &age_dword, &pdbname)) { |
| *uuid = crashpad::UUID(); |
| + *age = 0; |
| + } |
| + static_assert(sizeof(DWORD) == sizeof(uint32_t), "unexpected age size"); |
| + *age = age_dword; |
| } |
| std::vector<std::string> ModuleSnapshotWin::AnnotationsVector() const { |