taskmgr: Fix a string resource so its format placeholders can be reordered.
Also the numbers we format are actually unsigned.
diff --git a/po/ar.po b/po/ar.po
index 936bddc..2d4c344 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10593,7 +10593,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/bg.po b/po/bg.po
index f71bc5e..f1dce3e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10756,7 +10756,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/ca.po b/po/ca.po
index f86191c..a2df81c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11187,7 +11187,8 @@
msgstr "Processos: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Ús de Memòria: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/cs.po b/po/cs.po
index a24617e..133b596 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11201,7 +11201,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/da.po b/po/da.po
index 05e8517..56ac9fc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11257,7 +11257,8 @@
msgstr "Processer: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Hukommelses Forbrug: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/de.po b/po/de.po
index 4bf354c..d2762d4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11098,7 +11098,8 @@
msgstr "Prozesse: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Speicherauslastung: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/el.po b/po/el.po
index 8f7eddb..21acc30 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10597,7 +10597,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/en.po b/po/en.po
index 64594c7..ec87f03 100644
--- a/po/en.po
+++ b/po/en.po
@@ -10814,7 +10814,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/en_US.po b/po/en_US.po
index d27c5d1..27ac649 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -10999,8 +10999,8 @@
msgstr "Processes: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
-msgstr "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
+msgstr "Mem Usage: %1!u!kB / %2!u!kB"
#: taskmgr.rc:272
msgid "Image Name"
diff --git a/po/eo.po b/po/eo.po
index d7c7700..9293b00 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10793,7 +10793,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/es.po b/po/es.po
index dbea963..7452e1a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11479,7 +11479,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/fa.po b/po/fa.po
index 550d65b..e4a5774 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10596,7 +10596,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/fi.po b/po/fi.po
index ec757e7..c41af2d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10902,7 +10902,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/fr.po b/po/fr.po
index 884ea0a..955fa16 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11136,7 +11136,8 @@
msgstr "Processus : %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Utilisation mémoire : %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/he.po b/po/he.po
index 559c751..fa91846 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11083,7 +11083,8 @@
msgstr "תהליכים: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "שימוש בזיכרון: %d ק׳ / %d ק׳"
#: taskmgr.rc:272
diff --git a/po/hi.po b/po/hi.po
index fa8ee30..c338ca6 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10448,7 +10448,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/hu.po b/po/hu.po
index b1e7fe7..29ec228 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11137,7 +11137,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/it.po b/po/it.po
index 2c10abc..efaaec7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11074,7 +11074,8 @@
msgstr "Processi: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Uso della Memoria: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/ja.po b/po/ja.po
index 0f6acd5..9bb0f4a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11030,7 +11030,8 @@
msgstr "プロセス数: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "メモリ使用量: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/ko.po b/po/ko.po
index f91890a..dcec9c9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -10966,7 +10966,8 @@
msgstr "프로세스: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "메모리 사용량: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/lt.po b/po/lt.po
index 02ead21..f26013a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11040,7 +11040,8 @@
msgstr "Procesai: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Atminties naudojimas: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/ml.po b/po/ml.po
index 149eec2..2b332ea 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -10448,7 +10448,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/nb_NO.po b/po/nb_NO.po
index d7794a9..63763f3 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -11295,7 +11295,8 @@
msgstr "Prosesser: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Minnebruk: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/nl.po b/po/nl.po
index 437bfc7..8fedce1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11165,7 +11165,8 @@
msgstr "Processen: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Geheugengebruik: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/or.po b/po/or.po
index 3ef2d39d..1b323be 100644
--- a/po/or.po
+++ b/po/or.po
@@ -10448,7 +10448,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/pa.po b/po/pa.po
index f4ff9c6..fdf927b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10448,7 +10448,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/pl.po b/po/pl.po
index 1b1d521..0bf8d1c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11060,7 +11060,8 @@
msgstr "Procesy: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Pam. zadeklar.: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f2ef029..b531a86 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11373,7 +11373,8 @@
msgstr "Processos: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Utilização da memória: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/pt_PT.po b/po/pt_PT.po
index d7ec094..8b2f3f1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -11391,7 +11391,8 @@
msgstr "Processos: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Utilização da memória: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/rm.po b/po/rm.po
index 8a73a90..d064204 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -10509,7 +10509,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/ro.po b/po/ro.po
index f75139b..342720d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -11612,7 +11612,8 @@
msgstr "Procese: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Utilizare memorie: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/ru.po b/po/ru.po
index 41047d7..188f3f3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11033,7 +11033,8 @@
msgstr "Процессов: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Выделение памяти: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/sk.po b/po/sk.po
index f1a7894..beff156 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10637,7 +10637,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/sl.po b/po/sl.po
index 7e9d5fd..48f67da 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11067,7 +11067,8 @@
msgstr "Opravila: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Uporaba pomnilnika: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index b09330c..c473ef0 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -10989,7 +10989,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index aa4d6e2..f8d2234 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -11073,7 +11073,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/sv.po b/po/sv.po
index b1221c7..65cf241 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11006,7 +11006,8 @@
msgstr "Processer: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Minne använt: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/te.po b/po/te.po
index bed8061..716a723 100644
--- a/po/te.po
+++ b/po/te.po
@@ -10448,7 +10448,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/th.po b/po/th.po
index 8d66f42..fb85107 100644
--- a/po/th.po
+++ b/po/th.po
@@ -10625,7 +10625,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/tr.po b/po/tr.po
index 4fa20ba..aafd8c7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11296,7 +11296,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/uk.po b/po/uk.po
index 17116d0..4dff7a2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10994,7 +10994,8 @@
msgstr "Процесів: %d"
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+#, fuzzy
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr "Використання пам'яті: %dK / %dK"
#: taskmgr.rc:272
diff --git a/po/wa.po b/po/wa.po
index 0c23715..a63b48c 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10572,7 +10572,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/wine.pot b/po/wine.pot
index 2125d60..fb50eeb 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -10414,7 +10414,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 31dd2d2..f1d3ee9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10890,7 +10890,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 10d7fac..85b9463 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10928,7 +10928,7 @@
msgstr ""
#: taskmgr.rc:267
-msgid "Mem Usage: %dK / %dK"
+msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c
index 06f91a4..13f7e92 100644
--- a/programs/taskmgr/perfpage.c
+++ b/programs/taskmgr/perfpage.c
@@ -140,7 +140,7 @@
WCHAR Text[256];
- static const WCHAR wszFormatDigit[] = {'%','d',0};
+ static const WCHAR wszFormatDigit[] = {'%','u',0};
WCHAR wszMemUsage[255];
LoadStringW(hInst, IDS_STATUS_BAR_MEMORY_USAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR));
@@ -168,8 +168,8 @@
{
ULONG CpuUsage;
ULONG CpuKernelUsage;
- int nBarsUsed1;
- int nBarsUsed2;
+ int nBarsUsed1, nBarsUsed2;
+ DWORD_PTR args[2];
/* Reset our event */
ResetEvent(hPerformancePageEvent);
@@ -185,8 +185,14 @@
wsprintfW(Text, wszFormatDigit, CommitChargeLimit);
SetWindowTextW(hPerformancePageCommitChargeLimitEdit, Text);
wsprintfW(Text, wszFormatDigit, CommitChargePeak);
+
SetWindowTextW(hPerformancePageCommitChargePeakEdit, Text);
- wsprintfW(Text, wszMemUsage, CommitChargeTotal, CommitChargeLimit);
+
+ args[0] = CommitChargeTotal;
+ args[1] = CommitChargeLimit;
+ FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+ wszMemUsage, 0, 0, Text,
+ sizeof(Text)/sizeof(*Text), (__ms_va_list*)args);
SendMessageW(hStatusWnd, SB_SETTEXTW, 2, (LPARAM)Text);
/*
diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc
index 99a8f33..d583125 100644
--- a/programs/taskmgr/taskmgr.rc
+++ b/programs/taskmgr/taskmgr.rc
@@ -263,7 +263,7 @@
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"
+ IDS_STATUS_BAR_MEMORY_USAGE "Mem Usage: %1!u!kB / %2!u!kB"
END
STRINGTABLE
