m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32: Memory_free() uses GlobalMemoryStatusEx() when available

Browse Source
This commit is contained in:
Thomas Bernard 2019-05-28 14:24:34 +02:00
parent bf51f0d382
commit c46dbe9132
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/misc.c
View File

@ -756,10 +756,29 @@ unsigned long Memory_free(void)
// ever becomes full and you're still saying there are 10MB free here, the
// program will crash without saving any picture backup ! You've been warned...
#if defined(WIN32)
#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
// GlobalMemoryStatusEx() is supported since Windows 2000
MEMORYSTATUSEX mstt;
mstt.dwLength = sizeof(mstt);
if (GlobalMemoryStatusEx(&mstt))
{
GFX2_Log(GFX2_DEBUG, "Phys %lu / %luMB, Page %lu / %luMB, Virtual %lu / %luMB\n",
(unsigned long)(mstt.ullAvailPhys >> 20), (unsigned long)(mstt.ullTotalPhys >> 20),
(unsigned long)(mstt.ullAvailPageFile >> 20), (unsigned long)(mstt.ullTotalPageFile >> 20),
(unsigned long)(mstt.ullAvailVirtual >> 20), (unsigned long)(mstt.ullTotalVirtual >> 20));
return mstt.ullAvailPhys;
}
else
{
GFX2_Log(GFX2_ERROR, "GlobalMemoryStatusEx() failed\n");
return 10*1024*1024;
}
#else
MEMORYSTATUS mstt;
mstt.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&mstt);
return mstt.dwAvailPhys;
#endif
#elif defined(__macosx__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
int mib[2];
int maxmem;