Merge e8ede7a into 1fb0905

heim-rs · Apr 8, 2021 · a68257f · a68257f
2 parents 1fb0905 + e8ede7a
commit a68257f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/heim-memory/src/sys/windows/mod.rs b/heim-memory/src/sys/windows/mod.rs
@@ -1,3 +1,4 @@
+use std::cmp;
 /// https://docs.microsoft.com/en-US/windows/desktop/api/sysinfoapi/ns-sysinfoapi-_memorystatusex
 use std::fmt;
 use std::mem;
@@ -40,15 +41,18 @@ pub struct Swap(sysinfoapi::MEMORYSTATUSEX);
 
 impl Swap {
     pub fn total(&self) -> Information {
-        Information::new::<information::byte>(self.0.ullTotalPageFile)
+        Information::new::<information::byte>(self.0.ullTotalPageFile - self.0.ullTotalPhys)
     }
 
     pub fn used(&self) -> Information {
         self.total() - self.free()
     }
 
     pub fn free(&self) -> Information {
-        Information::new::<information::byte>(self.0.ullAvailPageFile)
+        cmp::min(
+            Information::new::<information::byte>(self.0.ullAvailPageFile - self.0.ullAvailPhys),
+            self.total(),
+        )
     }
 }