win: Plumb module PDB name through snapshot

snapshot/win/module_snapshot_win.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 11 matching lines @@
 #include "util/win/module_version.h"
 
 namespace crashpad {
 namespace internal {
 
 ModuleSnapshotWin::ModuleSnapshotWin()
     : ModuleSnapshot(),
       name_(),
       timestamp_(0),
       process_reader_(nullptr),
+      uuid_(),
+      age_(0),
+      pdb_name_(),
       initialized_() {
 }
 
 ModuleSnapshotWin::~ModuleSnapshotWin() {
 }
 
 bool ModuleSnapshotWin::Initialize(
     ProcessReaderWin* process_reader,
     const ProcessInfo::Module& process_reader_module) {
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_);
 
   process_reader_ = process_reader;
   name_ = process_reader_module.name;
   timestamp_ = process_reader_module.timestamp;
   pe_image_reader_.reset(new PEImageReader());
   if (!pe_image_reader_->Initialize(process_reader_,
                                     process_reader_module.dll_base,
                                     process_reader_module.size,
                                     base::UTF16ToUTF8(name_))) {
     return false;
   }
 
+  DWORD age_dword;
+  std::string full_pdb_name;
+  if (pe_image_reader_->DebugDirectoryInformation(
+          &uuid_, &age_dword, &full_pdb_name)) {
+    static_assert(sizeof(DWORD) == sizeof(uint32_t), "unexpected age size");
+    age_ = age_dword;
+
+    size_t last_slash = full_pdb_name.find_last_of("/\\");

[Mark Mentovai, 2015/10/28 20:01:11]

I guess this can’t be a BaseName() because this is a rare instance where
Microsoft doesn’t use wchar_t* for a path string.

Consider whether we actually need to do the BaseName() at all. I’d match what
MiniDumpWriteDump() does.

[scottmg, 2015/10/28 20:59:25]

Right on both counts. A quick check against MiniDumpWriteDump() shows it just
uses the name from the RSDS directly.

+    if (last_slash != std::string::npos)
+      pdb_name_ = full_pdb_name.substr(last_slash + 1);
+    else
+      pdb_name_ = full_pdb_name;
+  }
+
   INITIALIZATION_STATE_SET_VALID(initialized_);
   return true;
 }
 
 void ModuleSnapshotWin::GetCrashpadOptions(CrashpadInfoClientOptions* options) {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   if (process_reader_->Is64Bit())
     GetCrashpadOptionsInternal<process_types::internal::Traits64>(options);
   else
     GetCrashpadOptionsInternal<process_types::internal::Traits32>(options);
@@ skipping 66 matching lines @@
     if (ffi.dwFileType == VFT_DLL)
       return ModuleSnapshot::kModuleTypeSharedLibrary;
     if (ffi.dwFileType == VFT_DRV || ffi.dwFileType == VFT_VXD)
       return ModuleSnapshot::kModuleTypeLoadableModule;
   }
   return ModuleSnapshot::kModuleTypeUnknown;
 }
 
 void ModuleSnapshotWin::UUIDAndAge(crashpad::UUID* uuid, uint32_t* age) const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  // TODO(scottmg): Consider passing pdbname through to snapshot.
-  std::string 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;
+  *uuid = uuid_;
+  *age = age_;
+}
+
+std::string ModuleSnapshotWin::PDBName() const {
+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+  return pdb_name_;
 }
 
 std::vector<std::string> ModuleSnapshotWin::AnnotationsVector() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   // These correspond to system-logged things on Mac. We don't currently track
   // any of these on Windows, but could in the future.
   // See https://code.google.com/p/crashpad/issues/detail?id=38.
   return std::vector<std::string>();
 }
 
@@ skipping 19 matching lines @@
       CrashpadInfoClientOptions::TriStateFromCrashpadInfo(
           crashpad_info.crashpad_handler_behavior);
 
   options->system_crash_reporter_forwarding =
       CrashpadInfoClientOptions::TriStateFromCrashpadInfo(
           crashpad_info.system_crash_reporter_forwarding);
 }
 
 }  // namespace internal
 }  // namespace crashpad