Skip to content

W
wine-winehq
Commit 887c1c58 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

taskmgr: Fix a string resource so its format placeholders can be reordered.

Also the numbers we format are actually unsigned.
parent e057be7d
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 51 deletions
po/ar.po
View file @ 887c1c58
......@@ -10593,7 +10593,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/bg.po
View file @ 887c1c58
......@@ -10756,7 +10756,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/ca.po
View file @ 887c1c58
......@@ -11187,7 +11187,8 @@ msgid "Processes: %d"
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
......
po/cs.po
View file @ 887c1c58
......@@ -11201,7 +11201,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/da.po
View file @ 887c1c58
......@@ -11257,7 +11257,8 @@ msgid "Processes: %d"
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
......
po/de.po
View file @ 887c1c58
......@@ -11098,7 +11098,8 @@ msgid "Processes: %d"
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
......
po/el.po
View file @ 887c1c58
......@@ -10597,7 +10597,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/en.po
View file @ 887c1c58
......@@ -10814,7 +10814,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/en_US.po
View file @ 887c1c58
......@@ -10999,8 +10999,8 @@ msgid "Processes: %d"
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"
......
po/eo.po
View file @ 887c1c58
......@@ -10793,7 +10793,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/es.po
View file @ 887c1c58
......@@ -11479,7 +11479,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/fa.po
View file @ 887c1c58
......@@ -10596,7 +10596,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/fi.po
View file @ 887c1c58
......@@ -10902,7 +10902,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/fr.po
View file @ 887c1c58
......@@ -11136,7 +11136,8 @@ msgid "Processes: %d"
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
......
po/he.po
View file @ 887c1c58
......@@ -11083,7 +11083,8 @@ msgid "Processes: %d"
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
......
po/hi.po
View file @ 887c1c58
......@@ -10448,7 +10448,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/hu.po
View file @ 887c1c58
......@@ -11137,7 +11137,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/it.po
View file @ 887c1c58
......@@ -11074,7 +11074,8 @@ msgid "Processes: %d"
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
......
po/ja.po
View file @ 887c1c58
......@@ -11030,7 +11030,8 @@ msgid "Processes: %d"
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
......
po/ko.po
View file @ 887c1c58
......@@ -10966,7 +10966,8 @@ msgid "Processes: %d"
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
......
po/lt.po
View file @ 887c1c58
......@@ -11040,7 +11040,8 @@ msgid "Processes: %d"
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
......
po/ml.po
View file @ 887c1c58
......@@ -10448,7 +10448,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/nb_NO.po
View file @ 887c1c58
......@@ -11295,7 +11295,8 @@ msgid "Processes: %d"
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
......
po/nl.po
View file @ 887c1c58
......@@ -11165,7 +11165,8 @@ msgid "Processes: %d"
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
......
po/or.po
View file @ 887c1c58
......@@ -10448,7 +10448,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/pa.po
View file @ 887c1c58
......@@ -10448,7 +10448,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/pl.po
View file @ 887c1c58
......@@ -11060,7 +11060,8 @@ msgid "Processes: %d"
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
......
po/pt_BR.po
View file @ 887c1c58
......@@ -11373,7 +11373,8 @@ msgid "Processes: %d"
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
......
po/pt_PT.po
View file @ 887c1c58
......@@ -11391,7 +11391,8 @@ msgid "Processes: %d"
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
......
po/rm.po
View file @ 887c1c58
......@@ -10509,7 +10509,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/ro.po
View file @ 887c1c58
......@@ -11612,7 +11612,8 @@ msgid "Processes: %d"
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
......
po/ru.po
View file @ 887c1c58
......@@ -11033,7 +11033,8 @@ msgid "Processes: %d"
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
......
po/sk.po
View file @ 887c1c58
......@@ -10637,7 +10637,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/sl.po
View file @ 887c1c58
......@@ -11067,7 +11067,8 @@ msgid "Processes: %d"
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
......
po/sr_RS@cyrillic.po
View file @ 887c1c58
......@@ -10989,7 +10989,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/sr_RS@latin.po
View file @ 887c1c58
......@@ -11073,7 +11073,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/sv.po
View file @ 887c1c58
......@@ -11006,7 +11006,8 @@ msgid "Processes: %d"
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
......
po/te.po
View file @ 887c1c58
......@@ -10448,7 +10448,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/th.po
View file @ 887c1c58
......@@ -10625,7 +10625,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/tr.po
View file @ 887c1c58
......@@ -11296,7 +11296,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/uk.po
View file @ 887c1c58
......@@ -10994,7 +10994,8 @@ msgid "Processes: %d"
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
......
po/wa.po
View file @ 887c1c58
......@@ -10572,7 +10572,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/wine.pot
View file @ 887c1c58
......@@ -10414,7 +10414,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/zh_CN.po
View file @ 887c1c58
......@@ -10890,7 +10890,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
po/zh_TW.po
View file @ 887c1c58
......@@ -10928,7 +10928,7 @@ msgid "Processes: %d"
msgstr ""
#: taskmgr.rc:267
msgid "Mem Usage: %dK / %dK"
msgid "Mem Usage: %1!u!kB / %2!u!kB"
msgstr ""
#: taskmgr.rc:272
......
programs/taskmgr/perfpage.c
View file @ 887c1c58
......@@ -140,7 +140,7 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
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 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
{
ULONG CpuUsage;
ULONG CpuKernelUsage;
int nBarsUsed1;
int nBarsUsed2;
int nBarsUsed1, nBarsUsed2;
DWORD_PTR args[2];
/* Reset our event */
ResetEvent(hPerformancePageEvent);
......@@ -185,8 +185,14 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
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);
/*
......
programs/taskmgr/taskmgr.rc
View file @ 887c1c58
......@@ -263,7 +263,7 @@ BEGIN
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
......
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