[ros-diffs] [ion] 16171: Build psapi with NDK

Build psapi with NDK
Modified: trunk/reactos/lib/psapi/precomp.h
Modified: trunk/reactos/lib/psapi/psapi.c
  _____

Modified: trunk/reactos/lib/psapi/precomp.h
--- trunk/reactos/lib/psapi/precomp.h	2005-06-20 19:34:39 UTC (rev
16170)
+++ trunk/reactos/lib/psapi/precomp.h	2005-06-20 19:38:25 UTC (rev
16171)
@@ -1,14 +1,11 @@

-#define NTOS_MODE_USER
+
 #include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 #include <psapi.h>
 #include <epsapi.h>
-#include <ntos.h>
+
 #include "internal.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ddk/ntddk.h>
-#include <napi/teb.h>
-#include <ntos/heap.h>
-#include <ntdll/ldr.h>
+
 #include <pseh.h>
  _____

Modified: trunk/reactos/lib/psapi/psapi.c
--- trunk/reactos/lib/psapi/psapi.c	2005-06-20 19:34:39 UTC (rev
16170)
+++ trunk/reactos/lib/psapi/psapi.c	2005-06-20 19:38:25 UTC (rev
16171)
@@ -1129,7 +1129,7 @@

return FALSE;
     }

-    Status = NtQuerySystemInformation(SystemPagefileInformation,
+    Status = NtQuerySystemInformation(SystemPageFileInformation,
                                       Buffer,
                                       BufferSize,
                                       NULL);
@@ -1301,16 +1301,16 @@
    */

pPerformanceInformation->cb = sizeof(PERFORMANCE_INFORMATION);
-  pPerformanceInformation->CommitTotal = spi.TotalCommittedPages;
-  pPerformanceInformation->CommitLimit = spi.TotalCommitLimit;
+  pPerformanceInformation->CommitTotal = spi.CommittedPages;
+  pPerformanceInformation->CommitLimit = spi.CommitLimit;
   pPerformanceInformation->CommitPeak = spi.PeakCommitment;
   pPerformanceInformation->PhysicalTotal = sbi.NumberOfPhysicalPages;
   pPerformanceInformation->PhysicalAvailable = spi.AvailablePages;
   pPerformanceInformation->SystemCache = 0; /* FIXME - where to get
this information from? */
-  pPerformanceInformation->KernelTotal = spi.PagedPoolUsage +
spi.NonPagedPoolUsage;
-  pPerformanceInformation->KernelPaged = spi.PagedPoolUsage;
-  pPerformanceInformation->KernelNonpaged = spi.NonPagedPoolUsage;
-  pPerformanceInformation->PageSize = sbi.PhysicalPageSize;
+  pPerformanceInformation->KernelTotal = spi.PagedPoolPages +
spi.NonPagedPoolPages;
+  pPerformanceInformation->KernelPaged = spi.PagedPoolPages;
+  pPerformanceInformation->KernelNonpaged = spi.NonPagedPoolPages;
+  pPerformanceInformation->PageSize = sbi.PageSize;
   pPerformanceInformation->HandleCount = shi.NumberOfHandles;
   pPerformanceInformation->ProcessCount = ProcessCount;
   pPerformanceInformation->ThreadCount = ThreadCount;