X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=585c10396d03db32e726ccaef168d1eb32b52043;hb=047d1c8e5064dbe8fe67ee0f2983eb004de1fbe5;hp=e90df30bff1283333b035af9e8cea2f007c527b4;hpb=36bcd3b371a113ce5cf3e91f7143e18672fe9c93;p=xonotic%2Fdarkplaces.git

diff --git a/zone.c b/zone.c
index e90df30b..585c1039 100644
--- a/zone.c
+++ b/zone.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifdef WIN32
 #include <windows.h>
+#include <winbase.h>
 #else
 #include <unistd.h>
 #endif
@@ -843,8 +844,10 @@ void MemStats_f(void)
 char* Mem_strdup (mempool_t *pool, const char* s)
 {
 	char* p;
-	size_t sz = strlen (s) + 1;
-	if (s == NULL) return NULL;
+	size_t sz;
+	if (s == NULL)
+		return NULL;
+	sz = strlen (s) + 1;
 	p = (char*)Mem_Alloc (pool, sz);
 	strlcpy (p, s, sz);
 	return p;
@@ -883,18 +886,31 @@ void Memory_Init_Commands (void)
 	Cvar_RegisterVariable (&sys_memsize_virtual);
 
 #if defined(WIN32)
+#ifdef _WIN64
 	{
 		MEMORYSTATUSEX status;
 		// first guess
-		Cvar_SetQuick(&sys_memsize_virtual, (sizeof(void*) == 4) ? 2048 : 8388608);
+		Cvar_SetValueQuick(&sys_memsize_virtual, 8388608);
 		// then improve
 		status.dwLength = sizeof(status);
-		if(!GlobalMemoryStatusEx(&status))
+		if(GlobalMemoryStatusEx(&status))
 		{
 			Cvar_SetValueQuick(&sys_memsize_physical, status.ullTotalPhys / 1048576.0);
 			Cvar_SetValueQuick(&sys_memsize_virtual, min(sys_memsize_virtual.value, status.ullTotalVirtual / 1048576.0));
 		}
 	}
+#else
+	{
+		MEMORYSTATUS status;
+		// first guess
+		Cvar_SetValueQuick(&sys_memsize_virtual, 2048);
+		// then improve
+		status.dwLength = sizeof(status);
+		GlobalMemoryStatus(&status);
+		Cvar_SetValueQuick(&sys_memsize_physical, status.dwTotalPhys / 1048576.0);
+		Cvar_SetValueQuick(&sys_memsize_virtual, min(sys_memsize_virtual.value, status.dwTotalVirtual / 1048576.0));
+	}
+#endif
 #else
 	{
 		// first guess