Alexandre Julliard : kernel32: Moved MemManInfo16 to toolhelp16.c.
Alexandre Julliard
julliard at winehq.org
Tue Sep 29 11:09:04 CDT 2009
Module: wine
Branch: master
Commit: 9bf4de22f466fd2c672365de2b42b371145af252
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf4de22f466fd2c672365de2b42b371145af252
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Sep 28 19:57:28 2009 +0200
kernel32: Moved MemManInfo16 to toolhelp16.c.
---
dlls/kernel32/global16.c | 32 +++-----------------------------
dlls/kernel32/toolhelp16.c | 25 +++++++++++++++++++++++++
2 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c
index 42d4816..e572c3d 100644
--- a/dlls/kernel32/global16.c
+++ b/dlls/kernel32/global16.c
@@ -1063,39 +1063,13 @@ BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule,
/***********************************************************************
- * MemManInfo (TOOLHELP.72)
- */
-BOOL16 WINAPI MemManInfo16( MEMMANINFO *info )
-{
- MEMORYSTATUS status;
-
- /*
- * Not unsurprisingly although the documentation says you
- * _must_ provide the size in the dwSize field, this function
- * (under Windows) always fills the structure and returns true.
- */
- GlobalMemoryStatus( &status );
- info->wPageSize = getpagesize();
- info->dwLargestFreeBlock = status.dwAvailVirtual;
- info->dwMaxPagesAvailable = info->dwLargestFreeBlock / info->wPageSize;
- info->dwMaxPagesLockable = info->dwMaxPagesAvailable;
- info->dwTotalLinearSpace = status.dwTotalVirtual / info->wPageSize;
- info->dwTotalUnlockedPages = info->dwTotalLinearSpace;
- info->dwFreePages = info->dwMaxPagesAvailable;
- info->dwTotalPages = info->dwTotalLinearSpace;
- info->dwFreeLinearSpace = info->dwMaxPagesAvailable;
- info->dwSwapFilePages = status.dwTotalPageFile / info->wPageSize;
- return TRUE;
-}
-
-/***********************************************************************
* GetFreeMemInfo (KERNEL.316)
*/
DWORD WINAPI GetFreeMemInfo16(void)
{
- MEMMANINFO info;
- MemManInfo16( &info );
- return MAKELONG( info.dwTotalLinearSpace, info.dwMaxPagesAvailable );
+ MEMORYSTATUS status;
+ GlobalMemoryStatus( &status );
+ return MAKELONG( status.dwTotalVirtual/getpagesize(), status.dwAvailVirtual/getpagesize() );
}
/***********************************************************************
diff --git a/dlls/kernel32/toolhelp16.c b/dlls/kernel32/toolhelp16.c
index c6931d2..a98971a 100644
--- a/dlls/kernel32/toolhelp16.c
+++ b/dlls/kernel32/toolhelp16.c
@@ -64,6 +64,31 @@ BOOL16 WINAPI TaskFindHandle16( TASKENTRY *lpte, HTASK16 hTask )
return TaskNext16( lpte );
}
+/***********************************************************************
+ * MemManInfo (TOOLHELP.72)
+ */
+BOOL16 WINAPI MemManInfo16( MEMMANINFO *info )
+{
+ MEMORYSTATUS status;
+
+ /*
+ * Not unsurprisingly although the documentation says you
+ * _must_ provide the size in the dwSize field, this function
+ * (under Windows) always fills the structure and returns true.
+ */
+ GlobalMemoryStatus( &status );
+ info->wPageSize = getpagesize();
+ info->dwLargestFreeBlock = status.dwAvailVirtual;
+ info->dwMaxPagesAvailable = info->dwLargestFreeBlock / info->wPageSize;
+ info->dwMaxPagesLockable = info->dwMaxPagesAvailable;
+ info->dwTotalLinearSpace = status.dwTotalVirtual / info->wPageSize;
+ info->dwTotalUnlockedPages = info->dwTotalLinearSpace;
+ info->dwFreePages = info->dwMaxPagesAvailable;
+ info->dwTotalPages = info->dwTotalLinearSpace;
+ info->dwFreeLinearSpace = info->dwMaxPagesAvailable;
+ info->dwSwapFilePages = status.dwTotalPageFile / info->wPageSize;
+ return TRUE;
+}
/***********************************************************************
* NotifyRegister (TOOLHELP.73)
More information about the wine-cvs
mailing list