win: Make reading CrashpadInfo work across bitness

snapshot/win/pe_image_reader.h

 // 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.
 
 #ifndef CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_READER_H_
 #define CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_READER_H_
 
 #include <windows.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "util/misc/initialization_state_dcheck.h"
 #include "util/misc/uuid.h"
 #include "util/win/address_types.h"
 #include "util/win/checked_win_address_range.h"
+#include "util/win/process_structs.h"
 
 namespace crashpad {
 
 class ProcessReaderWin;
 
 namespace process_types {
 
-// TODO(scottmg): Genericize and/or? move process_types out of mac/.
+template <class Traits>
 struct CrashpadInfo {
   uint32_t signature;
   uint32_t size;
   uint32_t version;
   uint8_t crashpad_handler_behavior;  // TriState.
   uint8_t system_crash_reporter_forwarding;  // TriState.
   uint16_t padding_0;
-  uint64_t simple_annotations;  // TODO(scottmg): x86/64.
-};
-
-struct Section {
+  typename Traits::Pointer simple_annotations;
 };
 
 }  // namespace process_types
 
 //! \brief A reader for PE images mapped into another process.
 //!
 //! This class is capable of reading both 32-bit and 64-bit images based on the
 //! bitness of the remote process.
 //!
 //! \sa PEImageAnnotationsReader
@@ skipping 29 matching lines @@
   //! \brief Returns the image's size.
   //!
   //! This is the value passed as \a size to Initialize().
   WinVMSize Size() const { return module_range_.Size(); }
 
   //! \brief Obtains the module's CrashpadInfo structure.
   //!
   //! \return `true` on success, `false` on failure. If the module does not have
   //!     a `CPADinfo` section, this will return `false` without logging any
   //!     messages. Other failures will result in messages being logged.
-  bool GetCrashpadInfo(process_types::CrashpadInfo* crashpad_info) const;
+  template <class Traits>
+  bool GetCrashpadInfo(
+      process_types::CrashpadInfo<Traits>* crashpad_info) const;
 
   //! \brief Obtains information from the module's debug directory, if any.
   //!
   //! \param[out] uuid The unique identifier of the executable/PDB.
   //! \param[out] age The age field for the pdb (the number of times it's been
   //!     relinked).
   //! \param[out] pdbname Name of the pdb file.
   //! \return `true` on success, or `false` if the module has no debug directory
   //!     entry.
   bool DebugDirectoryInformation(UUID* uuid,
@@ skipping 31 matching lines @@
   CheckedWinAddressRange module_range_;
   std::string module_name_;
   InitializationStateDcheck initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(PEImageReader);
 };
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_READER_H_