MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix windows typos

develop
jj 2012-11-16 20:49:30 +01:00
parent 342badac98
commit 2b087a7081
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/Process-windows.cpp
Unescape Escape View File

@ -484,28 +484,28 @@ void* Process::memAlloc(const int length)
return ret; return ret;
} }
int Process::memDealloc(const void *ptr, const int length) int Process::memDealloc(void *ptr, const int length)
{ {
// can only free the whole region at once // can only free the whole region at once
// vfree returns 0 on error // vfree returns 0 on error
return !VirtualFree(ptr, 0, MEM_RELEASE) return !VirtualFree(ptr, 0, MEM_RELEASE);
} }
int Process::memProtect(const void *ptr, const int length, const int prot) int Process::memProtect(void *ptr, const int length, const int prot)
{ {
int prot_native = 0; int prot_native = 0;
int old_prot = 0; DWORD old_prot = 0;
// only support a few constant combinations // only support a few constant combinations
if (prot == 0) if (prot == 0)
prot_native = PAGE_NOACCESS; prot_native = PAGE_NOACCESS;
else if (prot == Process::MemProt::READ) else if (prot == Process::MemProt::READ)
prot_native = PAGE_READONLY; prot_native = PAGE_READONLY;
else if (prot == Process::MemProt::READ | Process::MemProt::WRITE) else if (prot == (Process::MemProt::READ | Process::MemProt::WRITE))
prot_native = PAGE_READWRITE; prot_native = PAGE_READWRITE;
else if (prot == Process::MemProt::READ | Process::MemProt::WRITE | Process::MemProt::EXECUTE) else if (prot == (Process::MemProt::READ | Process::MemProt::WRITE | Process::MemProt::EXEC))
prot_native = PAGE_EXECUTE_READWRITE; prot_native = PAGE_EXECUTE_READWRITE;
else if (prot == Process::MemProt::READ | Process::MemProt::EXECUTE) else if (prot == (Process::MemProt::READ | Process::MemProt::EXEC))
prot_native = PAGE_EXECUTE_READ; prot_native = PAGE_EXECUTE_READ;
else else
return -1; return -1;