kernel32: GlobalMemoryStatusEx: return the size of physical memory + swapsize in…

kernel32: GlobalMemoryStatusEx: return the size of physical memory + swapsize in ullTotalPageFile/ullAvailPageFile.

kernel32: GlobalMemoryStatusEx: return the size of physical memory + swapsize in…
e1c6c97f · Fabian Bieler · Alexandre Julliard · 7d1ffb56 · e1c6c97f
Commit e1c6c97f authored Mar 15, 2007 by Fabian Bieler Committed by Alexandre Julliard Mar 15, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

heap.c dlls/kernel32/heap.c +7 -5

No files found.
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -1304,11 +1304,13 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex )
                                  / (lpmemex->ullTotalPhys / 100);
    }

-    /* Project2k refuses to start if it sees less than 1Mb of free swap */
-    if (lpmemex->ullTotalPageFile < lpmemex->ullTotalPhys)
-        lpmemex->ullTotalPageFile = lpmemex->ullTotalPhys;
-    if (lpmemex->ullAvailPageFile < lpmemex->ullAvailPhys)
-        lpmemex->ullAvailPageFile = lpmemex->ullAvailPhys;
+    /* Win98 returns only the swapsize in ullTotalPageFile/ullAvailPageFile,
+       WinXP returns the size of physical memory + swapsize;
+       mimic the behavior of XP.
+       Note: Project2k refuses to start if it sees less than 1Mb of free swap.
+    */
+    lpmemex->ullTotalPageFile += lpmemex->ullTotalPhys;
+    lpmemex->ullAvailPageFile += lpmemex->ullAvailPhys;

    /* FIXME: should do something for other systems */
    GetSystemInfo(&si);