From 1d5a5558ab49c844a4f8b94bb3ea715c6bcbbbb6 Mon Sep 17 00:00:00 2001
From: Alexandre Vicenzi <vicenzi.alexandre@gmail.com>
Date: Tue, 17 Jan 2017 10:11:27 -0200
Subject: [PATCH] libobs: Log correct amount of memory on 32bit (windows)

Closes jp9000/obs-studio#764
---
 libobs/obs-windows.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libobs/obs-windows.c b/libobs/obs-windows.c
index ec8e8e954..e2c19c8eb 100644
--- a/libobs/obs-windows.c
+++ b/libobs/obs-windows.c
@@ -157,18 +157,20 @@ static void log_processor_cores(void)
 
 static void log_available_memory(void)
 {
-	MEMORYSTATUS ms;
-	GlobalMemoryStatus(&ms);
+	MEMORYSTATUSEX ms;
+	ms.dwLength = sizeof(ms);
+
+	GlobalMemoryStatusEx(&ms);
 
 #ifdef _WIN64
 	const char *note = "";
 #else
-	const char *note = " (NOTE: 2 or 4 gigs max is normal for 32bit programs)";
+	const char *note = " (NOTE: 32bit programs cannot use more than 3gb)";
 #endif
 
 	blog(LOG_INFO, "Physical Memory: %luMB Total, %luMB Free%s",
-			(DWORD)(ms.dwTotalPhys / 1048576),
-			(DWORD)(ms.dwAvailPhys / 1048576),
+			(DWORD)(ms.ullTotalPhys / 1048576),
+			(DWORD)(ms.ullAvailPhys / 1048576),
 			note);
 }