diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2010-06-29 23:17:40 +0000 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2010-06-29 23:17:40 +0000 |
| commit | 5eb491d26e14e7f46f99aabc692322e864fcdd8d (patch) | |
| tree | a8ca9533f7bd70b2e8a3ba475a1db169f0dda542 | |
| parent | 01798d4e59cfb6d263404eb1213331504031f76a (diff) | |
| download | newlib-5eb491d26e14e7f46f99aabc692322e864fcdd8d.zip newlib-5eb491d26e14e7f46f99aabc692322e864fcdd8d.tar.gz newlib-5eb491d26e14e7f46f99aabc692322e864fcdd8d.tar.bz2 | |
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.
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/psapi.h | 32 | ||||
| -rw-r--r-- | winsup/w32api/include/wincrypt.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/lib/psapi.def | 1 |
4 files changed, 45 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 7a4339f..2145e3c 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +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. + 2010-02-17 LRN <lrn1986@gmail.com> * include/shlguid.h (IID_IFolderView): Define. diff --git a/winsup/w32api/include/psapi.h b/winsup/w32api/include/psapi.h index 398f64a..ba08fa0 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); diff --git a/winsup/w32api/include/wincrypt.h b/winsup/w32api/include/wincrypt.h index a89706b..d2a09d5 100644 --- a/winsup/w32api/include/wincrypt.h +++ b/winsup/w32api/include/wincrypt.h @@ -1218,6 +1218,8 @@ WINADVAPI BOOL WINAPI CryptVerifySignatureA(HCRYPTHASH,PBYTE,DWORD,HCRYPTKEY,LPC WINADVAPI BOOL WINAPI CryptVerifySignatureW(HCRYPTHASH,PBYTE,DWORD,HCRYPTKEY,LPCWSTR,DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA(LPCSTR,DWORD); WINADVAPI BOOL WINAPI CryptSetProviderW(LPCWSTR,DWORD); +WINADVAPI BOOL WINAPI CryptEnumProvidersA(DWORD,DWORD*,DWORD,DWORD*,LPTSTR,DWORD*); +WINADVAPI BOOL WINAPI CryptEnumProvidersW(DWORD,DWORD*,DWORD,DWORD*,LPTSTR,DWORD*); #ifdef UNICODE #define CertGetNameString CertGetNameStringW @@ -1231,6 +1233,7 @@ WINADVAPI BOOL WINAPI CryptSetProviderW(LPCWSTR,DWORD); #define CryptSignHash CryptSignHashW #define CryptVerifySignature CryptVerifySignatureW #define CryptSetProvider CryptSetProviderW +#define CryptEnumProviders CryptEnumProvidersW #define CertOpenSystemStore CertOpenSystemStoreW #define CERT_FIND_SUBJECT_STR CERT_FIND_SUBJECT_STR_W #define CERT_FIND_ISSUER_STR CERT_FIND_ISSUER_STR_W @@ -1253,6 +1256,7 @@ WINADVAPI BOOL WINAPI CryptSetProviderW(LPCWSTR,DWORD); #define CryptSignHash CryptSignHashA #define CryptVerifySignature CryptVerifySignatureA #define CryptSetProvider CryptSetProviderA +#define CryptEnumProviders CryptEnumProvidersA #define CertOpenSystemStore CertOpenSystemStoreA #define CERT_FIND_SUBJECT_STR CERT_FIND_SUBJECT_STR_A #define CERT_FIND_ISSUER_STR CERT_FIND_ISSUER_STR_A diff --git a/winsup/w32api/lib/psapi.def b/winsup/w32api/lib/psapi.def index e544f15..7972462 100644 --- a/winsup/w32api/lib/psapi.def +++ b/winsup/w32api/lib/psapi.def @@ -15,6 +15,7 @@ GetModuleBaseNameW@16 GetModuleFileNameExA@16 GetModuleFileNameExW@16 GetModuleInformation@16 +GetPerformanceInfo@8 GetProcessMemoryInfo@12 GetProcessImageFileNameA@12 GetProcessImageFileNameW@12 |