Use MEMORY_BASIC_INFORMATION64 rather than a custom MemoryInfo

util/win/process_info.h

Index: util/win/process_info.h
diff --git a/util/win/process_info.h b/util/win/process_info.h
index 9501f755a1a511993d5ae70870d97451a21a8d93..bfdda398a724a3ee4d0b6b710f814cfeea8dc612 100644
--- a/util/win/process_info.h
+++ b/util/win/process_info.h
@@ -15,8 +15,9 @@
 #ifndef CRASHPAD_UTIL_WIN_PROCESS_INFO_H_
 #define CRASHPAD_UTIL_WIN_PROCESS_INFO_H_
 
-#include <sys/types.h>
 #include <windows.h>
+#include <dbghelp.h>
+#include <sys/types.h>
 
 #include <string>
 #include <vector>
@@ -50,40 +51,6 @@ class ProcessInfo {
     time_t timestamp;
   };
 
-  // \brief Contains information about a range of pages in the virtual address
-  //    space of a process.
-  struct MemoryInfo {
-    explicit MemoryInfo(const MEMORY_BASIC_INFORMATION& mbi);
-    ~MemoryInfo();
-
-    //! \brief The base address of the region of pages.
-    WinVMAddress base_address;
-
-    //! \brief The size of the region beginning at base_address in bytes.
-    WinVMSize region_size;
-
-    //! \brief The base address of a range of pages that was allocated by
-    //!     `VirtualAlloc()`. The page pointed to base_address is within this
-    //!     range of pages.
-    WinVMAddress allocation_base;
-
-    //! \brief The state of the pages, one of `MEM_COMMIT`, `MEM_FREE`, or
-    //!     `MEM_RESERVE`.
-    uint32_t state;
-
-    //! \brief The memory protection option when this page was originally
-    //!     allocated. This will be `PAGE_EXECUTE`, `PAGE_EXECUTE_READ`, etc.
-    uint32_t allocation_protect;
-
-    //! \brief The current memoryprotection state. This will be `PAGE_EXECUTE`,
-    //!   `PAGE_EXECUTE_READ`, etc.
-    uint32_t protect;
-
-    //! \brief The type of the pages. This will be one of `MEM_IMAGE`,
-    //!     `MEM_MAPPED`, or `MEM_PRIVATE`.
-    uint32_t type;
-  };
-
   ProcessInfo();
   ~ProcessInfo();
 
@@ -128,7 +95,7 @@ class ProcessInfo {
   bool Modules(std::vector<Module>* modules) const;
 
   //! \brief Retrieves information about all pages mapped into the process.
-  const std::vector<MemoryInfo>& MemoryInformation() const;
+  const std::vector<MINIDUMP_MEMORY_INFO>& MemoryInfo() const;

[Mark Mentovai, 2015/10/06 20:57:14]

OK, this was what I was missing when reading
https://codereview.chromium.org/1377133006/. I see now.

Should this be MEMORY_BASIC_INFORMATION here? (I think you said that the 64 was
broken, but since we can’t easily equip for 32-reads-64, that should be fine.)
All the way in util, we’re more working with live processes than minidumps. The
structs are functionally equivalent, and it’d probably let you get rid of some
conversiony stuff here at the expense of having to write it somewhere else, but
I think that having the conversion thing happen elsewhere closer to
minidump-land is probably more correct.

[scottmg, 2015/10/06 22:43:26]

Makes sense. I went with MEMORY_BASIC_INFORMATION64 since that one's ULONG64s
for addresses instead of void*, which makes more sense when we're discussing the
memory of a foreign process's address space.

 
   //! \brief Given a range to be read from the target process, returns a vector
   //!     of ranges, representing the readable portions of the original range.
@@ -162,7 +129,7 @@ class ProcessInfo {
   WinVMAddress peb_address_;
   WinVMSize peb_size_;
   std::vector<Module> modules_;
-  std::vector<MemoryInfo> memory_info_;
+  std::vector<MINIDUMP_MEMORY_INFO> memory_info_;
   bool is_64_bit_;
   bool is_wow64_;
   InitializationStateDcheck initialized_;
@@ -178,7 +145,7 @@ class ProcessInfo {
 //! ProcessInfo::GetReadableRanges().
 std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRangesOfMemoryMap(
     const CheckedRange<WinVMAddress, WinVMSize>& range,
-    const std::vector<ProcessInfo::MemoryInfo>& memory_info);
+    const std::vector<MINIDUMP_MEMORY_INFO>& memory_info);
 
 }  // namespace crashpad