Commit 17056908 authored by Vijay Kiran Kamuju's avatar Vijay Kiran Kamuju Committed by Alexandre Julliard

taskmgr: Use StrFormatKBSizeW/StrFormatByteSizeW to show memory usage.

parent f0db9c4b
MODULE = taskmgr.exe MODULE = taskmgr.exe
APPMODE = -mwindows -mno-cygwin APPMODE = -mwindows -mno-cygwin
IMPORTS = shell32 comctl32 user32 gdi32 advapi32 IMPORTS = shell32 shlwapi comctl32 user32 gdi32 advapi32
C_SRCS = \ C_SRCS = \
about.c \ about.c \
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <windows.h> #include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#include <shlwapi.h>
#include <winnt.h> #include <winnt.h>
#include "taskmgr.h" #include "taskmgr.h"
...@@ -239,8 +240,6 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) ...@@ -239,8 +240,6 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
/* Top bars that are "unused", i.e. are dark green, representing free memory */ /* Top bars that are "unused", i.e. are dark green, representing free memory */
int i; int i;
static const WCHAR wszFormat[] = {'%','d','K',0};
/* /*
* Get the client area rectangle * Get the client area rectangle
*/ */
...@@ -257,7 +256,10 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) ...@@ -257,7 +256,10 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK();
CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK();
swprintf(Text, wszFormat, (int)CommitChargeTotal); if (CommitChargeTotal < 1024)
StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text));
else
StrFormatByteSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text));
/* /*
* Draw the font text onto the graph * Draw the font text onto the graph
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment