diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-02-22 13:16:22 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-02-22 13:16:22 +0300 |
| commit | dffcc5d324b0d2a4db3b813917b3fe777c9ad42d (patch) | |
| tree | 6c8753224e29ff2b74eef1bd4489fe9243ae9a52 | |
| parent | ab664f2d536c3d0932921ea2660210a72b6cc830 (diff) | |
* include/winbase.h (MEMORYSTATUSEX): Add structure.
(GlobalMemoryStatusEx): Add prototype.
* lib/kernel32.def (GlobalMemoryStatusEx): Add stub.
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/winbase.h | 16 | ||||
| -rw-r--r-- | winsup/w32api/lib/kernel32.def | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 7721a0861..87c40aa4b 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2003-02-22 Danny Smith <dannysmith@users.sourceforge.net> + + * include/winbase.h (MEMORYSTATUSEX): Add structure. + (GlobalMemoryStatusEx): Add prototype. + * lib/kernel32.def (GlobalMemoryStatusEx): Add stub. + 2003-02-17 Vaclav Haisman <V.Haisman@sh.cvut.cz> * include/winioctl.h (FSCTL_SET_SPARSE): Define. diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index db1a27c38..692f51037 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -859,6 +859,19 @@ typedef struct _MEMORYSTATUS { DWORD dwTotalVirtual; DWORD dwAvailVirtual; } MEMORYSTATUS,*LPMEMORYSTATUS; +#if (_WIN32_WINNT >= 0x0500) +typedef struct _MEMORYSTATUSEX { + DWORD dwLength; + DWORD dwMemoryLoad; + DWORDLONG ullTotalPhys; + DWORDLONG ullAvailPhys; + DWORDLONG ullTotalPageFile; + DWORDLONG ullAvailPageFile; + DWORDLONG ullTotalVirtual; + DWORDLONG ullAvailVirtual; + DWORDLONG ullAvailExtendedVirtual; +} MEMORYSTATUSEX, *LPMEMORYSTATUSEX; +#endif typedef struct _LDT_ENTRY { WORD LimitLow; WORD BaseLow; @@ -1293,6 +1306,9 @@ UINT WINAPI GlobalGetAtomNameW(ATOM,LPWSTR,int); HGLOBAL WINAPI GlobalHandle(PCVOID); LPVOID WINAPI GlobalLock(HGLOBAL); VOID WINAPI GlobalMemoryStatus(LPMEMORYSTATUS); +#if (_WIN32_WINNT >= 0x0500) +BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX); +#endif HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT); DWORD WINAPI GlobalSize(HGLOBAL); VOID WINAPI GlobalUnfix(HGLOBAL); diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def index 06a8563ac..9a5c6f95e 100644 --- a/winsup/w32api/lib/kernel32.def +++ b/winsup/w32api/lib/kernel32.def @@ -406,6 +406,7 @@ GlobalGetAtomNameW@12 GlobalHandle@4 GlobalLock@4 GlobalMemoryStatus@4 +GlobalMemoryStatusEx@4 GlobalMemoryStatusVlm@4 GlobalReAlloc@12 GlobalSize@4 |