taskmgr: Make status bar text translatable.
diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc
index a36503e..cda848f 100644
--- a/programs/taskmgr/En.rc
+++ b/programs/taskmgr/En.rc
@@ -500,4 +500,7 @@
IDS_APPLICATIONS "Applications"
IDS_PROCESSES "Processes"
IDS_PERFORMANCE "Performance"
+ IDS_STATUS_BAR_CPU_USAGE "CPU Usage: %3d%%"
+ IDS_STATUS_BAR_PROCESSES "Processes: %d"
+ IDS_STATUS_BAR_MEMORY_USAGE "Mem Usage: %dK / %dK"
END
diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c
index e5f1435..b61fe05 100644
--- a/programs/taskmgr/perfpage.c
+++ b/programs/taskmgr/perfpage.c
@@ -141,8 +141,9 @@
WCHAR Text[256];
static const WCHAR wszFormatDigit[] = {'%','d',0};
- static const WCHAR wszMemUsage[] = {'M','e','m',' ','U','s','a','g','e',':',' ',
- '%','d','K',' ','/',' ','%','d','K',0};
+ WCHAR wszMemUsage[255];
+
+ LoadStringW(hInst, IDS_STATUS_BAR_MEMORY_USAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR));
/* Create the event */
hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c
index adbf469..4cc02f1 100644
--- a/programs/taskmgr/procpage.c
+++ b/programs/taskmgr/procpage.c
@@ -386,6 +386,12 @@
ULONG OldProcessorUsage = 0;
ULONG OldProcessCount = 0;
+ WCHAR wszCPU_Usage[255];
+ WCHAR wszProcesses[255];
+
+ LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR));
+ LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR));
+
/* Create the event */
hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
@@ -405,7 +411,7 @@
return 0;
if (dwWaitVal == WAIT_OBJECT_0) {
- TCHAR text[260];
+ WCHAR text[256];
/* Reset our event */
ResetEvent(hProcessPageEvent);
@@ -418,13 +424,13 @@
if (OldProcessorUsage != PerfDataGetProcessorUsage()) {
OldProcessorUsage = PerfDataGetProcessorUsage();
- wsprintf(text, _T("CPU Usage: %3d%%"), OldProcessorUsage);
- SendMessage(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text);
+ wsprintfW(text, wszCPU_Usage, OldProcessorUsage);
+ SendMessageW(hStatusWnd, SB_SETTEXTW, 1, (LPARAM)text);
}
if (OldProcessCount != PerfDataGetProcessCount()) {
OldProcessCount = PerfDataGetProcessCount();
- wsprintf(text, _T("Processes: %d"), OldProcessCount);
- SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text);
+ wsprintfW(text, wszProcesses, OldProcessCount);
+ SendMessageW(hStatusWnd, SB_SETTEXTW, 0, (LPARAM)text);
}
}
}
diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h
index 959efdb..d8b69e0 100644
--- a/programs/taskmgr/resource.h
+++ b/programs/taskmgr/resource.h
@@ -195,6 +195,9 @@
#define IDS_APPLICATIONS 32826
#define IDS_PROCESSES 32827
#define IDS_PERFORMANCE 32828
+#define IDS_STATUS_BAR_CPU_USAGE 32829
+#define IDS_STATUS_BAR_PROCESSES 32830
+#define IDS_STATUS_BAR_MEMORY_USAGE 32831
#define IDC_STATIC -1
/*
diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c
index 8393623..01c6926 100644
--- a/programs/taskmgr/taskmgr.c
+++ b/programs/taskmgr/taskmgr.c
@@ -527,8 +527,11 @@
int nParts[3];
WCHAR text[256];
- static const WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','3','d','%','%',0};
- static const WCHAR wszProcesses[] = {'P','r','o','c','e','s','s','e','s',':',' ','%','d',0};
+ WCHAR wszCPU_Usage[255];
+ WCHAR wszProcesses[255];
+
+ LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR));
+ LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR));
bInMenuLoop = FALSE;
/* Update the status bar pane sizes */
