2010-06-28 Rick Rankin <rrankin1424-mingw@yahoo.com>

        * include/psapi.h (PROCESS_MEMORY_COUNTERS_EX, PERFORMANCE_INFORMATION,
        GetPerformanceInfo): Define.
        * lib/psapi.def (GetPerformanceInfo): Define.
        * include/wincrypt.h (CryptEnumProvidersA, CryptEnumProvidersW,
        CryptEnumProviders): Define.

1 files changed, 32 insertions, 0 deletions

diff --git a/winsup/w32api/include/psapi.h b/winsup/w32api/include/psapi.h
index 398f64a6e..ba08fa02a 100644
--- a/winsup/w32api/include/psapi.h
+++ b/winsup/w32api/include/psapi.h
@@ -50,6 +50,37 @@ typedef struct _PROCESS_MEMORY_COUNTERS {
 	DWORD PeakPagefileUsage;
 } PROCESS_MEMORY_COUNTERS,*PPROCESS_MEMORY_COUNTERS;
 
+typedef struct _PROCESS_MEMORY_COUNTERS_EX {
+	DWORD cb;
+	DWORD PageFaultCount;
+	DWORD PeakWorkingSetSize;
+	DWORD WorkingSetSize;
+	DWORD QuotaPeakPagedPoolUsage;
+	DWORD QuotaPagedPoolUsage;
+	DWORD QuotaPeakNonPagedPoolUsage;
+	DWORD QuotaNonPagedPoolUsage;
+	DWORD PagefileUsage;
+	DWORD PeakPagefileUsage;
+	DWORD PrivateUsage;
+} PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX;
+
+typedef struct _PERFORMANCE_INFORMATION {
+  DWORD cb;
+  DWORD CommitTotal;
+  DWORD CommitLimit;
+  DWORD CommitPeak;
+  DWORD PhysicalTotal;
+  DWORD PhysicalAvailable;
+  DWORD SystemCache;
+  DWORD KernelTotal;
+  DWORD KernelPaged;
+  DWORD KernelNonpaged;
+  DWORD PageSize;
+  DWORD HandleCount;
+  DWORD ProcessCount;
+  DWORD ThreadCount;
+} PERFORMANCE_INFORMATION, *PPERFORMANCE_INFORMATION;
+
 /* Grouped by application,not in alphabetical order. */
 BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *);
 BOOL WINAPI EnumProcessModules(HANDLE,HMODULE *,DWORD,LPDWORD);
@@ -70,6 +101,7 @@ DWORD WINAPI GetDeviceDriverBaseNameW(LPVOID,LPWSTR,DWORD);
 DWORD WINAPI GetDeviceDriverFileNameA(LPVOID,LPSTR,DWORD);
 DWORD WINAPI GetDeviceDriverFileNameW(LPVOID,LPWSTR,DWORD);
 BOOL WINAPI GetProcessMemoryInfo(HANDLE,PPROCESS_MEMORY_COUNTERS,DWORD);
+BOOL WINAPI GetPerformanceInfo(PPERFORMANCE_INFORMATION,DWORD);
 #if (_WIN32_WINNT >= 0x0501)
 DWORD WINAPI GetProcessImageFileNameA(HANDLE,LPSTR,DWORD);
 DWORD WINAPI GetProcessImageFileNameW(HANDLE,LPWSTR,DWORD);