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

Default page protection for contiguous memory shouldn't include EXECUTE rights 

Also added a TODO for future research
This commit is contained in:
patrickvl 2018-01-07 17:21:59 +01:00 committed by PatrickvL
parent 0fbb9057a0
commit 6b94381cac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -8526,7 +8526,7 @@ XTL::X_D3DPalette * WINAPI XTL::EMUPATCH(D3DDevice_CreatePalette2)
X_D3DPalette *pPalette = EmuNewD3DPalette();
pPalette->Common |= (Size << X_D3DPALETTE_COMMON_PALETTESIZE_SHIFT);
pPalette->Data = (DWORD)g_VMManager.Allocate(XboxD3DPaletteSizeToBytes(Size), 0, (~((::ULONG_PTR)0)), PAGE_SIZE, PAGE_EXECUTE_READWRITE, true);
pPalette->Data = (DWORD)g_VMManager.Allocate(XboxD3DPaletteSizeToBytes(Size), 0, (~((::ULONG_PTR)0)), PAGE_SIZE, PAGE_READWRITE, true); // TODO : Can't we use MmAllocateContiguousMemory here?
pPalette->Lock = X_D3DRESOURCE_LOCK_PALETTE; // emulated reference count for palettes
// TODO: Should't we register the palette with a call to

2
src/CxbxKrnl/VMManager.cpp
View File

@ -638,7 +638,7 @@ VAddr VMManager::MapMemoryBlock(size_t* size, PAddr low_addr, PAddr high_addr, U
VirtualMemoryArea& final_vma = vma_handle->second;
final_vma.type = VMAType::Allocated;
final_vma.permissions = PAGE_EXECUTE_READWRITE;
final_vma.permissions = bContiguous ? PAGE_READWRITE : PAGE_EXECUTE_READWRITE;
final_vma.backing_block = offset;
UpdatePageTableForVMA(final_vma);