mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with work - minor fixes

Browse Source 
This was SVN commit r10770.
This commit is contained in:
janwas
2011-12-19 11:55:30 +00:00
parent 36f3d2f0de
commit 2bc2666e4e
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/lib/debug.cpp
+2 -1
View File
@@ -146,7 +146,8 @@ void debug_printf(const wchar_t* fmt, ...)
va_list ap;
va_start(ap, fmt);
const int numChars = vswprintf_s(buf, ARRAY_SIZE(buf), fmt, ap);
ENSURE(numChars >= 0);
if(numChars < 0)
debug_break(); // poor man's assert - avoid infinite loop because ENSURE also uses debug_printf
va_end(ap);
if(debug_filter_allows(buf))
source/lib/path.h
+2
View File
@@ -43,6 +43,8 @@
#include <cstring>
#include "lib/posix/posix.h" // wcscasecmp
namespace ERR
{
const Status PATH_CHARACTER_ILLEGAL = -100300;
source/lib/sysdep/os/win/wvm.cpp
+5 -4
View File
@@ -241,9 +241,8 @@ static void* AllocateLargeOrSmallPages(uintptr_t address, size_t size, DWORD all
else
{
MEMORY_BASIC_INFORMATION mbi = {0};
SIZE_T ret = VirtualQuery(LPCVOID(address), &mbi, sizeof(mbi));
debug_printf(L"Allocation failed. VirtualQuery returned %d\n", ret);
debug_printf(L"base=%p allocBase=%p allocProt=%d size=%d state=%d prot=%d type=%d\n", mbi.BaseAddress, mbi.AllocationBase, mbi.AllocationProtect, mbi.RegionSize, mbi.State, mbi.Protect, mbi.Type);
(void)VirtualQuery(LPCVOID(address), &mbi, sizeof(mbi)); // return value is #bytes written in mbi
debug_printf(L"Allocation failed: base=%p allocBase=%p allocProt=%d size=%d state=%d prot=%d type=%d\n", mbi.BaseAddress, mbi.AllocationBase, mbi.AllocationProtect, mbi.RegionSize, mbi.State, mbi.Protect, mbi.Type);
}
return 0;
@@ -465,6 +464,8 @@ void Free(void* p, size_t UNUSED(size))
//-----------------------------------------------------------------------------
// on-demand commit
// NB: avoid using debug_printf here because OutputDebugString has been
// observed to generate vectored exceptions when running outside the IDE.
static LONG CALLBACK VectoredHandler(const PEXCEPTION_POINTERS ep)
{
const PEXCEPTION_RECORD er = ep->ExceptionRecord;
@@ -485,7 +486,7 @@ static LONG CALLBACK VectoredHandler(const PEXCEPTION_POINTERS ep)
// if unknown (e.g. access violation in kernel address space or
// violation of alignment requirements), we don't want to handle it.
if(address == ~uintptr_t(0))
if(address == ~uintptr_t(0))
return EXCEPTION_CONTINUE_SEARCH;
// the address space must have been allocated by ReserveAddressSpace