ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1205 from jagotu/master 

QueryMemory reports host allocated memory
This commit is contained in:
Luke Usher 2018-05-25 22:01:06 +01:00 committed by GitHub
parent aaf6579c45 006b49937c
commit 3457c6b185
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/CxbxKrnl/VMManager.cpp
View File

@ -2105,6 +2105,28 @@ xboxkrnl::NTSTATUS VMManager::XbVirtualMemoryStatistics(VAddr addr, xboxkrnl::PM
return STATUS_INVALID_PARAMETER;
}
// If it's not in the XBE, report actual host allocations
// The game will see allocations it didn't make, but at least it has a chance to
// not try to allocate memory our emulator already occupied.
if (addr > XBE_IMAGE_BASE + ROUND_UP_4K(CxbxKrnl_Xbe->m_Header.dwSizeofImage))
{
MEMORY_BASIC_INFORMATION info;
if (VirtualQuery((void*)addr, &info, sizeof(info)))
{
memory_statistics->AllocationBase = info.AllocationBase;
memory_statistics->AllocationProtect = info.AllocationProtect;
memory_statistics->BaseAddress = info.BaseAddress;
memory_statistics->Protect = info.Protect;
memory_statistics->RegionSize = info.RegionSize;
memory_statistics->State = info.State;
memory_statistics->Type = info.Type;
return STATUS_SUCCESS;
}
else {
return STATUS_INVALID_PARAMETER;
}
}
Lock();
// Locate the vma containing the supplied address