3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use MEMORY_BASIC_INFORMATION64 rather than a custom MemoryInfo

Browse Source 
We already use all the shared constants for page protection and type,
so rather than making various incompatible structures, just use
the MEMORY_BASIC_INFORMATION64 one directly, so that it can be directly
used.

R=mark@chromium.org
BUG=crashpad:20, crashpad:46

Review URL: https://codereview.chromium.org/1375313005 .
This commit is contained in:
Scott Graham 2015-10-07 12:23:08 -07:00
parent 1f11ddc785
commit d3bdb23ffe
3 changed files with 110 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
util/win/process_info.cc
View File

@ -21,6 +21,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/template_util.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "util/numeric/safe_assignment.h" #include "util/numeric/safe_assignment.h"
#include "util/win/ntstatus_logging.h" #include "util/win/ntstatus_logging.h"
@ -107,10 +108,23 @@ bool ReadStruct(HANDLE process, WinVMAddress at, T* into) {
return true; return true;
} }
bool RegionIsAccessible(const ProcessInfo::MemoryInfo& memory_info) { bool RegionIsAccessible(const MEMORY_BASIC_INFORMATION64& memory_info) {
return memory_info.state == MEM_COMMIT && return memory_info.State == MEM_COMMIT &&
(memory_info.protect & PAGE_NOACCESS) == 0 && (memory_info.Protect & PAGE_NOACCESS) == 0 &&
(memory_info.protect & PAGE_GUARD) == 0; (memory_info.Protect & PAGE_GUARD) == 0;
}
MEMORY_BASIC_INFORMATION64 MemoryBasicInformationToMemoryBasicInformation64(
const MEMORY_BASIC_INFORMATION& mbi) {
MEMORY_BASIC_INFORMATION64 mbi64 = {0};
mbi64.BaseAddress = reinterpret_cast<ULONGLONG>(mbi.BaseAddress);
mbi64.AllocationBase = reinterpret_cast<ULONGLONG>(mbi.AllocationBase);
mbi64.AllocationProtect = mbi.AllocationProtect;
mbi64.RegionSize = mbi.RegionSize;
mbi64.State = mbi.State;
mbi64.Protect = mbi.Protect;
mbi64.Type = mbi.Type;
return mbi64;
} }
} // namespace } // namespace
@ -288,7 +302,8 @@ bool ReadMemoryInfo(HANDLE process, bool is_64_bit, ProcessInfo* process_info) {
} }
process_info->memory_info_.push_back( process_info->memory_info_.push_back(
ProcessInfo::MemoryInfo(memory_basic_information)); MemoryBasicInformationToMemoryBasicInformation64(
memory_basic_information));
if (memory_basic_information.RegionSize == 0) { if (memory_basic_information.RegionSize == 0) {
LOG(ERROR) << "RegionSize == 0"; LOG(ERROR) << "RegionSize == 0";
@ -305,19 +320,6 @@ ProcessInfo::Module::Module() : name(), dll_base(0), size(0), timestamp() {
ProcessInfo::Module::~Module() { ProcessInfo::Module::~Module() {
} }
ProcessInfo::MemoryInfo::MemoryInfo(const MEMORY_BASIC_INFORMATION& mbi)
: base_address(reinterpret_cast<WinVMAddress>(mbi.BaseAddress)),
region_size(mbi.RegionSize),
allocation_base(reinterpret_cast<WinVMAddress>(mbi.AllocationBase)),
state(mbi.State),
allocation_protect(mbi.AllocationProtect),
protect(mbi.Protect),
type(mbi.Type) {
}
ProcessInfo::MemoryInfo::~MemoryInfo() {
}
ProcessInfo::ProcessInfo() ProcessInfo::ProcessInfo()
: process_id_(), : process_id_(),
inherited_from_process_id_(), inherited_from_process_id_(),
@ -426,8 +428,7 @@ bool ProcessInfo::Modules(std::vector<Module>* modules) const {
return true; return true;
} }
const std::vector<ProcessInfo::MemoryInfo>& ProcessInfo::MemoryInformation() const std::vector<MEMORY_BASIC_INFORMATION64>& ProcessInfo::MemoryInfo() const {
const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_); INITIALIZATION_STATE_DCHECK_VALID(initialized_);
return memory_info_; return memory_info_;
} }
@ -435,39 +436,43 @@ const std::vector<ProcessInfo::MemoryInfo>& ProcessInfo::MemoryInformation()
std::vector<CheckedRange<WinVMAddress, WinVMSize>> std::vector<CheckedRange<WinVMAddress, WinVMSize>>
ProcessInfo::GetReadableRanges( ProcessInfo::GetReadableRanges(
const CheckedRange<WinVMAddress, WinVMSize>& range) const { const CheckedRange<WinVMAddress, WinVMSize>& range) const {
return GetReadableRangesOfMemoryMap(range, MemoryInformation()); return GetReadableRangesOfMemoryMap(range, MemoryInfo());
} }
std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRangesOfMemoryMap( std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRangesOfMemoryMap(
const CheckedRange<WinVMAddress, WinVMSize>& range, const CheckedRange<WinVMAddress, WinVMSize>& range,
const std::vector<ProcessInfo::MemoryInfo>& memory_info) { const std::vector<MEMORY_BASIC_INFORMATION64>& memory_info) {
using Range = CheckedRange<WinVMAddress, WinVMSize>; using Range = CheckedRange<WinVMAddress, WinVMSize>;
// Find all the ranges that overlap the target range, maintaining their order. // Find all the ranges that overlap the target range, maintaining their order.
std::vector<ProcessInfo::MemoryInfo> overlapping; std::vector<MEMORY_BASIC_INFORMATION64> overlapping;
for (const auto& mi : memory_info) { for (const auto& mi : memory_info) {
if (range.OverlapsRange(Range(mi.base_address, mi.region_size))) static_assert(base::is_same<decltype(mi.BaseAddress), WinVMAddress>::value,
"expected range address to be WinVMAddress");
static_assert(base::is_same<decltype(mi.RegionSize), WinVMSize>::value,
"expected range size to be WinVMSize");
if (range.OverlapsRange(Range(mi.BaseAddress, mi.RegionSize)))
overlapping.push_back(mi); overlapping.push_back(mi);
} }
if (overlapping.empty()) if (overlapping.empty())
return std::vector<Range>(); return std::vector<Range>();
// For the first and last, trim to the boundary of the incoming range. // For the first and last, trim to the boundary of the incoming range.
ProcessInfo::MemoryInfo& front = overlapping.front(); MEMORY_BASIC_INFORMATION64& front = overlapping.front();
WinVMAddress original_front_base_address = front.base_address; WinVMAddress original_front_base_address = front.BaseAddress;
front.base_address = std::max(front.base_address, range.base()); front.BaseAddress = std::max(front.BaseAddress, range.base());
front.region_size = front.RegionSize =
(original_front_base_address + front.region_size) - front.base_address; (original_front_base_address + front.RegionSize) - front.BaseAddress;
ProcessInfo::MemoryInfo& back = overlapping.back(); MEMORY_BASIC_INFORMATION64& back = overlapping.back();
WinVMAddress back_end = back.base_address + back.region_size; WinVMAddress back_end = back.BaseAddress + back.RegionSize;
back.region_size = std::min(range.end(), back_end) - back.base_address; back.RegionSize = std::min(range.end(), back_end) - back.BaseAddress;
// Discard all non-accessible. // Discard all non-accessible.
overlapping.erase(std::remove_if(overlapping.begin(), overlapping.erase(std::remove_if(overlapping.begin(),
overlapping.end(), overlapping.end(),
[](const ProcessInfo::MemoryInfo& mi) { [](const MEMORY_BASIC_INFORMATION64& mbi) {
return !RegionIsAccessible(mi); return !RegionIsAccessible(mbi);
}), }),
overlapping.end()); overlapping.end());
if (overlapping.empty()) if (overlapping.empty())
@ -476,7 +481,7 @@ std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRangesOfMemoryMap(
// Convert to return type. // Convert to return type.
std::vector<Range> as_ranges; std::vector<Range> as_ranges;
for (const auto& mi : overlapping) { for (const auto& mi : overlapping) {
as_ranges.push_back(Range(mi.base_address, mi.region_size)); as_ranges.push_back(Range(mi.BaseAddress, mi.RegionSize));
DCHECK(as_ranges.back().IsValid()); DCHECK(as_ranges.back().IsValid());
} }

40
util/win/process_info.h
View File

@ -50,40 +50,6 @@ class ProcessInfo {
time_t timestamp; 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();
~ProcessInfo(); ~ProcessInfo();
@ -128,7 +94,7 @@ class ProcessInfo {
bool Modules(std::vector<Module>* modules) const; bool Modules(std::vector<Module>* modules) const;
//! \brief Retrieves information about all pages mapped into the process. //! \brief Retrieves information about all pages mapped into the process.
const std::vector<MemoryInfo>& MemoryInformation() const; const std::vector<MEMORY_BASIC_INFORMATION64>& MemoryInfo() const;
//! \brief Given a range to be read from the target process, returns a vector //! \brief Given a range to be read from the target process, returns a vector
//! of ranges, representing the readable portions of the original range. //! of ranges, representing the readable portions of the original range.
@ -162,7 +128,7 @@ class ProcessInfo {
WinVMAddress peb_address_; WinVMAddress peb_address_;
WinVMSize peb_size_; WinVMSize peb_size_;
std::vector<Module> modules_; std::vector<Module> modules_;
std::vector<MemoryInfo> memory_info_; std::vector<MEMORY_BASIC_INFORMATION64> memory_info_;
bool is_64_bit_; bool is_64_bit_;
bool is_wow64_; bool is_wow64_;
InitializationStateDcheck initialized_; InitializationStateDcheck initialized_;
@ -178,7 +144,7 @@ class ProcessInfo {
//! ProcessInfo::GetReadableRanges(). //! ProcessInfo::GetReadableRanges().
std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRangesOfMemoryMap( std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRangesOfMemoryMap(
const CheckedRange<WinVMAddress, WinVMSize>& range, const CheckedRange<WinVMAddress, WinVMSize>& range,
const std::vector<ProcessInfo::MemoryInfo>& memory_info); const std::vector<MEMORY_BASIC_INFORMATION64>& memory_info);
} // namespace crashpad } // namespace crashpad

143
util/win/process_info_test.cc
View File

@ -14,7 +14,7 @@
#include "util/win/process_info.h" #include "util/win/process_info.h"
#include <imagehlp.h> #include <dbghelp.h>
#include <intrin.h> #include <intrin.h>
#include <wchar.h> #include <wchar.h>
@ -34,15 +34,6 @@ namespace {
const wchar_t kNtdllName[] = L"\\ntdll.dll"; const wchar_t kNtdllName[] = L"\\ntdll.dll";
time_t GetTimestampForModule(HMODULE module) {
char filename[MAX_PATH];
// `char` and GetModuleFileNameA because ImageLoad is ANSI only.
if (!GetModuleFileNameA(module, filename, arraysize(filename)))
return 0;
LOADED_IMAGE* loaded_image = ImageLoad(filename, nullptr);
return loaded_image->FileHeader->FileHeader.TimeDateStamp;
}
bool IsProcessWow64(HANDLE process_handle) { bool IsProcessWow64(HANDLE process_handle) {
static decltype(IsWow64Process)* is_wow64_process = static decltype(IsWow64Process)* is_wow64_process =
reinterpret_cast<decltype(IsWow64Process)*>( reinterpret_cast<decltype(IsWow64Process)*>(
@ -61,15 +52,15 @@ void VerifyAddressInInCodePage(const ProcessInfo& process_info,
WinVMAddress code_address) { WinVMAddress code_address) {
// Make sure the child code address is an code page address with the right // Make sure the child code address is an code page address with the right
// information. // information.
const std::vector<ProcessInfo::MemoryInfo>& memory_info = const std::vector<MEMORY_BASIC_INFORMATION64>& memory_info =
process_info.MemoryInformation(); process_info.MemoryInfo();
bool found_region = false; bool found_region = false;
for (const auto& mi : memory_info) { for (const auto& mi : memory_info) {
if (mi.base_address <= code_address && if (mi.BaseAddress <= code_address &&
mi.base_address + mi.region_size > code_address) { mi.BaseAddress + mi.RegionSize > code_address) {
EXPECT_EQ(MEM_COMMIT, mi.state); EXPECT_EQ(MEM_COMMIT, mi.State);
EXPECT_EQ(PAGE_EXECUTE_READ, mi.protect); EXPECT_EQ(PAGE_EXECUTE_READ, mi.Protect);
EXPECT_EQ(MEM_IMAGE, mi.type); EXPECT_EQ(MEM_IMAGE, mi.Type);
EXPECT_FALSE(found_region); EXPECT_FALSE(found_region);
found_region = true; found_region = true;
} }
@ -110,16 +101,16 @@ TEST(ProcessInfo, Self) {
kNtdllName, kNtdllName,
modules[1].name.substr(modules[1].name.size() - wcslen(kNtdllName))); modules[1].name.substr(modules[1].name.size() - wcslen(kNtdllName)));
EXPECT_EQ(modules[0].dll_base, EXPECT_EQ(reinterpret_cast<uintptr_t>(GetModuleHandle(nullptr)),
reinterpret_cast<uintptr_t>(GetModuleHandle(nullptr))); modules[0].dll_base);
EXPECT_EQ(modules[1].dll_base, EXPECT_EQ(reinterpret_cast<uintptr_t>(GetModuleHandle(L"ntdll.dll")),
reinterpret_cast<uintptr_t>(GetModuleHandle(L"ntdll.dll"))); modules[1].dll_base);
EXPECT_GT(modules[0].size, 0); EXPECT_GT(modules[0].size, 0);
EXPECT_GT(modules[1].size, 0); EXPECT_GT(modules[1].size, 0);
EXPECT_EQ(modules[0].timestamp, EXPECT_EQ(GetTimestampForLoadedLibrary(GetModuleHandle(nullptr)),
GetTimestampForModule(GetModuleHandle(nullptr))); modules[0].timestamp);
// System modules are forced to particular stamps and the file header values // System modules are forced to particular stamps and the file header values
// don't match the on-disk times. Just make sure we got some data here. // don't match the on-disk times. Just make sure we got some data here.
EXPECT_GT(modules[1].timestamp, 0); EXPECT_GT(modules[1].timestamp, 0);
@ -201,13 +192,13 @@ TEST(ProcessInfo, OtherProcessWOW64) {
#endif // ARCH_CPU_64_BITS #endif // ARCH_CPU_64_BITS
TEST(ProcessInfo, AccessibleRangesNone) { TEST(ProcessInfo, AccessibleRangesNone) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_FREE; mbi.State = MEM_FREE;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(2, 4), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(2, 4),
@ -217,13 +208,13 @@ TEST(ProcessInfo, AccessibleRangesNone) {
} }
TEST(ProcessInfo, AccessibleRangesOneInside) { TEST(ProcessInfo, AccessibleRangesOneInside) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(2, 4), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(2, 4),
@ -235,18 +226,18 @@ TEST(ProcessInfo, AccessibleRangesOneInside) {
} }
TEST(ProcessInfo, AccessibleRangesOneTruncatedSize) { TEST(ProcessInfo, AccessibleRangesOneTruncatedSize) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 20; mbi.RegionSize = 20;
mbi.State = MEM_FREE; mbi.State = MEM_FREE;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10),
@ -258,18 +249,18 @@ TEST(ProcessInfo, AccessibleRangesOneTruncatedSize) {
} }
TEST(ProcessInfo, AccessibleRangesOneMovedStart) { TEST(ProcessInfo, AccessibleRangesOneMovedStart) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_FREE; mbi.State = MEM_FREE;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 20; mbi.RegionSize = 20;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10),
@ -281,18 +272,18 @@ TEST(ProcessInfo, AccessibleRangesOneMovedStart) {
} }
TEST(ProcessInfo, ReserveIsInaccessible) { TEST(ProcessInfo, ReserveIsInaccessible) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_RESERVE; mbi.State = MEM_RESERVE;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 20; mbi.RegionSize = 20;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10),
@ -304,20 +295,20 @@ TEST(ProcessInfo, ReserveIsInaccessible) {
} }
TEST(ProcessInfo, PageGuardIsInaccessible) { TEST(ProcessInfo, PageGuardIsInaccessible) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
mbi.Protect = PAGE_GUARD; mbi.Protect = PAGE_GUARD;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 20; mbi.RegionSize = 20;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
mbi.Protect = 0; mbi.Protect = 0;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10),
@ -329,20 +320,20 @@ TEST(ProcessInfo, PageGuardIsInaccessible) {
} }
TEST(ProcessInfo, PageNoAccessIsInaccessible) { TEST(ProcessInfo, PageNoAccessIsInaccessible) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
mbi.Protect = PAGE_NOACCESS; mbi.Protect = PAGE_NOACCESS;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 20; mbi.RegionSize = 20;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
mbi.Protect = 0; mbi.Protect = 0;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10),
@ -354,23 +345,23 @@ TEST(ProcessInfo, PageNoAccessIsInaccessible) {
} }
TEST(ProcessInfo, AccessibleRangesCoalesced) { TEST(ProcessInfo, AccessibleRangesCoalesced) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_FREE; mbi.State = MEM_FREE;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 2; mbi.RegionSize = 2;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(12); mbi.BaseAddress = 12;
mbi.RegionSize = 5; mbi.RegionSize = 5;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(11, 4), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(11, 4),
@ -382,23 +373,23 @@ TEST(ProcessInfo, AccessibleRangesCoalesced) {
} }
TEST(ProcessInfo, AccessibleRangesMiddleUnavailable) { TEST(ProcessInfo, AccessibleRangesMiddleUnavailable) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = 0; mbi.BaseAddress = 0;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 5; mbi.RegionSize = 5;
mbi.State = MEM_FREE; mbi.State = MEM_FREE;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
mbi.BaseAddress = reinterpret_cast<void*>(15); mbi.BaseAddress = 15;
mbi.RegionSize = 100; mbi.RegionSize = 100;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 45), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 45),
@ -412,13 +403,13 @@ TEST(ProcessInfo, AccessibleRangesMiddleUnavailable) {
} }
TEST(ProcessInfo, RequestedBeforeMap) { TEST(ProcessInfo, RequestedBeforeMap) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10), GetReadableRangesOfMemoryMap(CheckedRange<WinVMAddress, WinVMSize>(5, 10),
@ -430,13 +421,13 @@ TEST(ProcessInfo, RequestedBeforeMap) {
} }
TEST(ProcessInfo, RequestedAfterMap) { TEST(ProcessInfo, RequestedAfterMap) {
std::vector<ProcessInfo::MemoryInfo> memory_info; std::vector<MEMORY_BASIC_INFORMATION64> memory_info;
MEMORY_BASIC_INFORMATION mbi = {0}; MEMORY_BASIC_INFORMATION64 mbi = {0};
mbi.BaseAddress = reinterpret_cast<void*>(10); mbi.BaseAddress = 10;
mbi.RegionSize = 10; mbi.RegionSize = 10;
mbi.State = MEM_COMMIT; mbi.State = MEM_COMMIT;
memory_info.push_back(ProcessInfo::MemoryInfo(mbi)); memory_info.push_back(mbi);
std::vector<CheckedRange<WinVMAddress, WinVMSize>> result = std::vector<CheckedRange<WinVMAddress, WinVMSize>> result =
GetReadableRangesOfMemoryMap( GetReadableRangesOfMemoryMap(