Module: wine Branch: master Commit: e9dc02eaa300da4c28612681e86a8a95f75565c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9dc02eaa300da4c28612681e8...
Author: Austin English austinenglish@gmail.com Date: Wed May 2 14:32:14 2012 -0500
kernel32: Move GlobalMemoryStatus(Ex) to a different debug channel.
---
dlls/kernel32/heap.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index d730a8a..34fbb75 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -64,6 +64,7 @@ #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(heap); +WINE_DECLARE_DEBUG_CHANNEL(globalmem);
/* address where we try to map the system heap */ #define SYSTEM_HEAP_BASE ((void*)0x80000000) @@ -1289,7 +1290,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex )
cached_memstatus = *lpmemex;
- TRACE("<-- LPMEMORYSTATUSEX: dwLength %d, dwMemoryLoad %d, ullTotalPhys %s, ullAvailPhys %s," + TRACE_(globalmem)("<-- LPMEMORYSTATUSEX: dwLength %d, dwMemoryLoad %d, ullTotalPhys %s, ullAvailPhys %s," " ullTotalPageFile %s, ullAvailPageFile %s, ullTotalVirtual %s, ullAvailVirtual %s\n", lpmemex->dwLength, lpmemex->dwMemoryLoad, wine_dbgstr_longlong(lpmemex->ullTotalPhys), wine_dbgstr_longlong(lpmemex->ullAvailPhys), wine_dbgstr_longlong(lpmemex->ullTotalPageFile), @@ -1371,7 +1372,7 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) if (lpBuffer->dwAvailPageFile > MAXLONG) lpBuffer->dwAvailPageFile = MAXLONG; }
- TRACE("Length %u, MemoryLoad %u, TotalPhys %lx, AvailPhys %lx," + TRACE_(globalmem)("Length %u, MemoryLoad %u, TotalPhys %lx, AvailPhys %lx," " TotalPageFile %lx, AvailPageFile %lx, TotalVirtual %lx, AvailVirtual %lx\n", lpBuffer->dwLength, lpBuffer->dwMemoryLoad, lpBuffer->dwTotalPhys, lpBuffer->dwAvailPhys, lpBuffer->dwTotalPageFile, lpBuffer->dwAvailPageFile,