[PATCH v5 0/4] MR2688: tasklist: Add basic functionality.

[Zhiyi Zhang (＠zhiyi)]

Company of Heroes: Battle of Crete needs a functioning tasklist.exe to exit properly.

--
  v5: tasklist: Partially support '/fi' option.
      tasklist: Support '/fo' option.
      tasklist: Support '/nh' option.
      tasklist: Add basic functionality.

https://gitlab.winehq.org/wine/wine/-/merge_requests/2688

[PATCH v5 1/4] tasklist: Add basic functionality.

[Zhiyi Zhang]

From: Zhiyi Zhang

Company of Heroes: Battle of Crete needs a functioning tasklist.exe to exit properly.
---
 configure                                     |   1 +
 configure.ac                                  |   1 +
 po/ar.po                                      |  52 +++--
 po/ast.po                                     |  52 +++--
 po/bg.po                                      |  49 +++--
 po/ca.po                                      |  52 +++--
 po/cs.po                                      |  52 +++--
 po/da.po                                      |  52 +++--
 po/de.po                                      |  52 +++--
 po/el.po                                      |  45 +++--
 po/en.po                                      |  44 +++--
 po/en_US.po                                   |  44 +++--
 po/eo.po                                      |  52 +++--
 po/es.po                                      |  52 +++--
 po/fa.po                                      |  47 +++--
 po/fi.po                                      |  52 +++--
 po/fr.po                                      |  52 +++--
 po/he.po                                      |  52 +++--
 po/hi.po                                      |  44 +++--
 po/hr.po                                      |  52 +++--
 po/hu.po                                      |  52 +++--
 po/it.po                                      |  52 +++--
 po/ja.po                                      |  52 +++--
 po/ko.po                                      |  52 +++--
 po/lt.po                                      |  52 +++--
 po/ml.po                                      |  48 +++--
 po/nb_NO.po                                   |  52 +++--
 po/nl.po                                      |  52 +++--
 po/or.po                                      |  44 +++--
 po/pa.po                                      |  44 +++--
 po/pl.po                                      |  52 +++--
 po/pt_BR.po                                   |  52 +++--
 po/pt_PT.po                                   |  52 +++--
 po/rm.po                                      |  46 +++--
 po/ro.po                                      |  52 +++--
 po/ru.po                                      |  52 +++--
 po/si.po                                      |  52 +++--
 po/sk.po                                      |  49 +++--
 po/sl.po                                      |  52 +++--
 po/[e-mail]                          |  53 +++--
 po/[e-mail]                             |  53 +++--
 po/sv.po                                      |  52 +++--
 po/ta.po                                      |  50 +++--
 po/te.po                                      |  44 +++--
 po/th.po                                      |  47 +++--
 po/tr.po                                      |  52 +++--
 po/uk.po                                      |  52 +++--
 po/wa.po                                      |  46 +++--
 po/wine.pot                                   |  44 +++--
 po/zh_CN.po                                   |  52 +++--
 po/zh_TW.po                                   |  52 +++--
 programs/tasklist/Makefile.in                 |   3 +-
 programs/tasklist/tasklist.c                  | 186 +++++++++++++++++-
 programs/tasklist/tasklist.h                  |  38 ++++
 programs/tasklist/{version.rc => tasklist.rc} |  18 ++
 programs/tasklist/tests/Makefile.in           |   4 +
 programs/tasklist/tests/tasklist.c            | 120 +++++++++++
 57 files changed, 2229 insertions(+), 595 deletions(-)
 create mode 100644 programs/tasklist/tasklist.h
 rename programs/tasklist/{version.rc => tasklist.rc} (69%)
 create mode 100644 programs/tasklist/tests/Makefile.in
 create mode 100644 programs/tasklist/tests/tasklist.c

diff --git a/configure b/configure
index 31e76114233..1d110a8b70d 100755
--- a/configure
+++ b/configure
@@ -22150,6 +22150,7 @@ wine_fn_config_makefile programs/svchost enable_svchost
 wine_fn_config_makefile programs/systeminfo enable_systeminfo
 wine_fn_config_makefile programs/taskkill enable_taskkill
 wine_fn_config_makefile programs/tasklist enable_tasklist
+wine_fn_config_makefile programs/tasklist/tests enable_tests
 wine_fn_config_makefile programs/taskmgr enable_taskmgr
 wine_fn_config_makefile programs/termsv enable_termsv
 wine_fn_config_makefile programs/uninstaller enable_uninstaller
diff --git a/configure.ac b/configure.ac
index e96131953c4..32c9d433a4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3388,6 +3388,7 @@ WINE_CONFIG_MAKEFILE(programs/svchost)
 WINE_CONFIG_MAKEFILE(programs/systeminfo)
 WINE_CONFIG_MAKEFILE(programs/taskkill)
 WINE_CONFIG_MAKEFILE(programs/tasklist)
+WINE_CONFIG_MAKEFILE(programs/tasklist/tests)
 WINE_CONFIG_MAKEFILE(programs/taskmgr)
 WINE_CONFIG_MAKEFILE(programs/termsv)
 WINE_CONFIG_MAKEFILE(programs/uninstaller)
diff --git a/po/ar.po b/po/ar.po
index 166808ba089..7035033cd20 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -18483,6 +18483,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "قائمة لسان الصفحة"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "اسم الصورة"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "معرف العملية"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "معرف الجلسة"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "معرف الجلسة"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "استخدام الذاكرة"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "حسنًا"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "م&همة جديدة (تشغيل)..."
@@ -19142,14 +19182,6 @@ msgstr "العمليات : %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "استخدام الذاكرة :  %1!u!كب / %2!u!كب"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "اسم الصورة"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "معرف العملية"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "المعالج"
@@ -19158,10 +19190,6 @@ msgstr "المعالج"
 msgid "CPU Time"
 msgstr "زمن المعالج"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "استخدام الذاكرة"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "الذاكرة الرباعية"
diff --git a/po/ast.po b/po/ast.po
index 20b953b3898..8404c993672 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -17124,6 +17124,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "Wine &license"
+msgid "Wine tasklist"
+msgstr "&Llicencia de Wine"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Common Name"
+msgid "Session Name"
+msgstr "Nome común"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Version"
+msgid "Session#"
+msgstr "Versión"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "Aceutar"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17782,14 +17822,6 @@ msgstr "Procesos: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17798,10 +17830,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 11c7b76ae80..231012e141b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -17127,6 +17127,42 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+#, fuzzy
+msgid "Image Name"
+msgstr "Image"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+msgid "Session Name"
+msgstr "Отвори файл.\n"
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17798,15 +17834,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-#, fuzzy
-msgid "Image Name"
-msgstr "Image"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17815,10 +17842,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index d4aca05233a..e62f86697a9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -17403,6 +17403,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "llista de tabuladors de pàgina"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Nom d'imatge"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID de sessió"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID de sessió"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Ús de memòria"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "D'acord"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Tasca nova (executa...)"
@@ -18071,14 +18111,6 @@ msgstr "Processos: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Ús de la memòria: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Nom d'imatge"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -18087,10 +18119,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "Temps de CPU"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Ús de memòria"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Delta de memòria"
diff --git a/po/cs.po b/po/cs.po
index 0ca7621e678..d90da4216b9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17887,6 +17887,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "Wine &license"
+msgid "Wine tasklist"
+msgstr "&licence Wine"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Název obrázku"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "Identifikátor procesu"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Identifikátor relace"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Identifikátor relace"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Využití paměti"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nová úloha (Spustit...)"
@@ -18549,14 +18589,6 @@ msgstr "Procesy: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Využití paměti: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Název obrázku"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "Identifikátor procesu"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "Procesor"
@@ -18565,10 +18597,6 @@ msgstr "Procesor"
 msgid "CPU Time"
 msgstr "Procesorový čas"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Využití paměti"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Změna ve využití paměti"
diff --git a/po/da.po b/po/da.po
index 105bdf780ce..4698f307985 100644
--- a/po/da.po
+++ b/po/da.po
@@ -18394,6 +18394,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "Sidefane liste"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Procesnavn"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Sessions ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Sessions ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Hukommelse forbrug"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny opgave (Kør...)"
@@ -19055,14 +19095,6 @@ msgstr "Processer: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Hukommelses forbrug: %1!u!KB / %2!u!KB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Procesnavn"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -19071,10 +19103,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU-tid"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Hukommelse forbrug"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Hukommelse delta"
diff --git a/po/de.po b/po/de.po
index 91ecbdedb52..9e9dddf7643 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17370,6 +17370,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "Register"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Name"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID (Prozess-ID)"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Sitzungs-ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Sitzungs-ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Speicherauslastung"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Neuer Task (Ausführen...)"
@@ -18039,14 +18079,6 @@ msgstr "Prozesse: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Speicherauslastung: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Name"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID (Prozess-ID)"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU-Auslastung"
@@ -18055,10 +18087,6 @@ msgstr "CPU-Auslastung"
 msgid "CPU Time"
 msgstr "CPU-Zeit"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Speicherauslastung"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Veränd. der Speicherauslastung"
diff --git a/po/el.po b/po/el.po
index d7815573215..7993118c808 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16765,6 +16765,39 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+msgid "Session Name"
+msgstr "Άνοιγμα Αρχείου.\n"
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17425,14 +17458,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17441,10 +17466,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index 8e7eb1f8743..a4521ab2f01 100644
--- a/po/en.po
+++ b/po/en.po
@@ -17262,6 +17262,38 @@ msgid ""
 msgstr ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr "Wine tasklist"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr "Usage: tasklist [/?]\n"
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Image Name"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr "Session Name"
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr "Session#"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Mem Usage"
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr "K"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&New Task (Run...)"
@@ -17923,14 +17955,6 @@ msgstr "Processes: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Mem Usage: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Image Name"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17939,10 +17963,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU Time"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Mem Usage"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Mem Delta"
diff --git a/po/en_US.po b/po/en_US.po
index 81f54728fac..78b1634ae25 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -17262,6 +17262,38 @@ msgid ""
 msgstr ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr "Wine tasklist"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr "Usage: tasklist [/?]\n"
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Image Name"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr "Session Name"
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr "Session#"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Mem Usage"
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr "K"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&New Task (Run...)"
@@ -17923,14 +17955,6 @@ msgstr "Processes: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Mem Usage: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Image Name"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17939,10 +17963,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU Time"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Mem Usage"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Mem Delta"
diff --git a/po/eo.po b/po/eo.po
index 86a9394dd96..d8c30468e2c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -17446,6 +17446,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "Wine &license"
+msgid "Wine tasklist"
+msgstr "Wine-&permesilo"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session canceled.\n"
+msgid "Session Name"
+msgstr "Seanco nuligita.\n"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Version"
+msgid "Session#"
+msgstr "Eldono"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "Bone"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -18104,14 +18144,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -18120,10 +18152,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index ef4861ec0ab..d74ad29837f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17728,6 +17728,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "lista de pestañas"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Nombre de la Imagen"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID de Sesión"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID de Sesión"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Uso de Mem"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "Aceptar"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nueva Tarea (Ejecutar...)"
@@ -18395,14 +18435,6 @@ msgstr "Procesos: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Uso de Memoria: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Nombre de la Imagen"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -18411,10 +18443,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "Tiempo de CPU"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Uso de Mem"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Delta de Mem"
diff --git a/po/fa.po b/po/fa.po
index d62013e42e8..5aaa8e719f3 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -16957,6 +16957,41 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+msgid "Session Name"
+msgstr "&پرونده.\n"
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "قبول"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17624,14 +17659,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17640,10 +17667,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index f6a80fc2816..126ea2af390 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17227,6 +17227,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "välilehtilista"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Kuvan nimi"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Istunnon ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Istunnon ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Muistin käyttö"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Uusi tehtävä (Suorita...)"
@@ -17890,14 +17930,6 @@ msgstr "Prosessit: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Muistin käyttö: %1!u! kt / %2!u! kt"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Kuvan nimi"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "Suoritin"
@@ -17906,10 +17938,6 @@ msgstr "Suoritin"
 msgid "CPU Time"
 msgstr "Suoritinaika"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Muistin käyttö"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Muistin käytön muutos"
diff --git a/po/fr.po b/po/fr.po
index aa9f12a9b40..220f6721bfb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17969,6 +17969,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "liste d'onglets de pages"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Nom d'image"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID session"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID session"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Mémoire"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nouvelle tâche (Exécuter...)"
@@ -18638,14 +18678,6 @@ msgstr "Processus : %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Utilisation mémoire : %1!u! ko / %2!u! ko"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Nom d'image"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -18654,10 +18686,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "Temps CPU"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Mémoire"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Écart util. mémoire"
diff --git a/po/he.po b/po/he.po
index a9d568d1add..eb9d560b82f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -17900,6 +17900,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "Wine &license"
+msgid "Wine tasklist"
+msgstr "ה&רישיון של Wine"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "שם התמונה"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "מזהה התהליך"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "מזהה הפעלה"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "מזהה הפעלה"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "שימוש בזיכרון"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "אישור"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "משימה &חדשה (הפעלה...)"
@@ -18568,14 +18608,6 @@ msgstr "תהליכים: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "שימוש בזיכרון: %d ק׳ / %d ק׳"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "שם התמונה"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "מזהה התהליך"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "שימוש במעבד"
@@ -18584,10 +18616,6 @@ msgstr "שימוש במעבד"
 msgid "CPU Time"
 msgstr "זמן מעבד"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "שימוש בזיכרון"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "שינוי השימוש בזיכרון"
diff --git a/po/hi.po b/po/hi.po
index e357abe8a11..ad827af1540 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -16435,6 +16435,38 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17093,14 +17125,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17109,10 +17133,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 2905a42c8b7..ebe8fb237c0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -17854,6 +17854,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "popis kartica"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Naziv slike"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID sjednice"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID sjednice"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Mem uporaba"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "U redu"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Novi zadatak (Pokreni...)"
@@ -18512,14 +18552,6 @@ msgstr "Procesi: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Mem uporaba: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Naziv slike"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -18528,10 +18560,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU vrijeme"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Mem uporaba"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Mem delta"
diff --git a/po/hu.po b/po/hu.po
index b7784aeb433..88022e96319 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -18385,6 +18385,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "oldal fül lista"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Név"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Munkamenet-azonosító"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Munkamenet-azonosító"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Memória - (Személyes munkakészlet)"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "Új feladat (f&uttatás...)"
@@ -19047,14 +19087,6 @@ msgstr "Folyamatok: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Fizikai memória: %1!u!KB / %2!u!KB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Név"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -19063,10 +19095,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU-idő"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Memória - (Személyes munkakészlet)"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Memória (Munkakészlet változása)"
diff --git a/po/it.po b/po/it.po
index 6287ff7145f..0b8202cf7be 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18472,6 +18472,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "lista delle linguette di pagina"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Nome dell'immagine"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID sessione"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID sessione"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Uso della memoria"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "Ok"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nuovo processo (Esegui...)"
@@ -19140,14 +19180,6 @@ msgstr "Processi: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Uso della Memoria: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Nome dell'immagine"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -19156,10 +19188,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "Tempo CPU"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Uso della memoria"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Delta della memoria"
diff --git a/po/ja.po b/po/ja.po
index 79c05ea4dff..d7afcaf7748 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -17264,6 +17264,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "ページ タブ リスト"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "イメージ名"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "セッション ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "セッション ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "メモリ使用量"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "新しいタスクの実行(&N)..."
@@ -17925,14 +17965,6 @@ msgstr "プロセス数: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "メモリ使用量: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "イメージ名"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17941,10 +17973,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU 時間"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "メモリ使用量"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "メモリ使用量 デルタ"
diff --git a/po/ko.po b/po/ko.po
index fc7043ec797..38cb26195f8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -17204,6 +17204,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "페이지 탭 목록"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "이미지 이름"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "세션 ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "세션 ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "메모리 사용량"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "확인"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "새 작업(&N) (실행...)"
@@ -17862,14 +17902,6 @@ msgstr "프로세스: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "메모리 사용량: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "이미지 이름"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17878,10 +17910,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU 시간"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "메모리 사용량"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "메모리 변화량"
diff --git a/po/lt.po b/po/lt.po
index d6f9eb04340..4bce29753e7 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -17279,6 +17279,46 @@ msgstr ""
 "Nusiųstas priverstinio nutraukimo signalas procesui su PID %1!u!, pavaldžiam "
 "PID %2!u!.\n"

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "kortelių sąrašas"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Proceso vardas"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Seanso ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Seanso ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Atm naudojimas"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "Gerai"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nauja užduotis (vykdyti...)"
@@ -17946,14 +17986,6 @@ msgstr "Procesai: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Atminties naudojimas: %1!u! kB / %2!u! kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Proceso vardas"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CP"
@@ -17962,10 +17994,6 @@ msgstr "CP"
 msgid "CPU Time"
 msgstr "CP laikas"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Atm naudojimas"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Atm pokytis"
diff --git a/po/ml.po b/po/ml.po
index da18dd79633..de2441ff6dd 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -16434,6 +16434,42 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Version"
+msgid "Session#"
+msgstr "പതിപ്പ്"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "ശരി"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17092,14 +17128,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17108,10 +17136,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 4c7622d0302..f891ec370d9 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -17949,6 +17949,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "faneliste"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Bildenavn"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Økt-ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Økt-ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Minnebruk"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny oppgave (Kjør...)"
@@ -18611,14 +18651,6 @@ msgstr "Prosesser: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Minnebruk: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Bildenavn"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -18627,10 +18659,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU-tid"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Minnebruk"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Minnedelta"
diff --git a/po/nl.po b/po/nl.po
index 65ece551b05..3842d96a81e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -17344,6 +17344,46 @@ msgid ""
 msgstr ""
 "Signaal verzonden om PID %1!u!, onderdeel van PID %2!u!, af te sluiten.\n"

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "paginatablijst"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Procesnaam"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "Proces-ID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Sessie-ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Sessie-ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Geheugengebruik"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nieuwe taak (uitvoeren...)"
@@ -18009,14 +18049,6 @@ msgstr "Processen: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Geheugengebruik: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Procesnaam"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "Proces-ID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU-gebruik"
@@ -18025,10 +18057,6 @@ msgstr "CPU-gebruik"
 msgid "CPU Time"
 msgstr "CPU-tijd"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Geheugengebruik"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Delta in geheugengebruik"
diff --git a/po/or.po b/po/or.po
index 6cfb4d40d2e..32187fc37ba 100644
--- a/po/or.po
+++ b/po/or.po
@@ -16420,6 +16420,38 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17078,14 +17110,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17094,10 +17118,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 714932059b3..49d7381fda7 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -16420,6 +16420,38 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17078,14 +17110,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17094,10 +17118,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index d457e82ab7e..e4e8a254be2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17484,6 +17484,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "lista kart stron"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Nazwa obrazu"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID (identyfikator procesu)"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Identyfikator sesji"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Identyfikator sesji"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Użycie pamięci"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nowe zadanie (Uruchom...)"
@@ -18149,14 +18189,6 @@ msgstr "Procesy: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Wyk. pamięci: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Nazwa obrazu"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID (identyfikator procesu)"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "Użycie procesora CPU"
@@ -18165,10 +18197,6 @@ msgstr "Użycie procesora CPU"
 msgid "CPU Time"
 msgstr "Czas procesora CPU"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Użycie pamięci"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Zmiana użycia pamięci"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a6bbc430c2e..3b150a48ee4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17546,6 +17546,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "lista de guias de página"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Nome da Imagem"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID da Sessão"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID da Sessão"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Uso de Memória"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nova Tarefa (Executar...)"
@@ -18214,14 +18254,6 @@ msgstr "Processos: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Uso da memória: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Nome da Imagem"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -18230,10 +18262,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "Tempo de CPU"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Uso de Memória"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Delta de Memória"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 462c86fa66e..4c09c2954aa 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -18120,6 +18120,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "lista de separadores de página"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Nome da Imagem"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID da Sessão"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID da Sessão"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Utilização de Memória"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nova Tarefa (Executar...)"
@@ -18787,14 +18827,6 @@ msgstr "Processos: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Utilização da memória: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Nome da Imagem"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -18803,10 +18835,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "Tempo de CPU"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Utilização de Memória"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Intervalo de Memória"
diff --git a/po/rm.po b/po/rm.po
index 325d35878d3..88ef5972eec 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -16549,6 +16549,40 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+msgid "Wine tasklist"
+msgstr "Wine ag�d"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+msgid "Session Name"
+msgstr "Wine ag�d.\n"
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17208,14 +17242,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17224,10 +17250,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 5b993d73c00..b16265bec07 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -18149,6 +18149,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "listă de file"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Nume imagine"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID sesiune"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID sesiune"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Utilizare memorie"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "Sarcină &nouă (executare...)"
@@ -18818,14 +18858,6 @@ msgstr "Procese: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Utilizare memorie: %1!u!ko / %2!u!ko"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Nume imagine"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "Procesor"
@@ -18834,10 +18866,6 @@ msgstr "Procesor"
 msgid "CPU Time"
 msgstr "Timp procesor"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Utilizare memorie"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Delta memorie"
diff --git a/po/ru.po b/po/ru.po
index e9b88b57b11..07e75ce067a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17513,6 +17513,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "список вкладок страницы"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Имя образа"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Код сеанса"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Код сеанса"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Память"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "ОК"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Новая задача (Выполнить...)"
@@ -18175,14 +18215,6 @@ msgstr "Процессов: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Выделение памяти: %1!u!K / %2!u!K"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Имя образа"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "ЦП"
@@ -18191,10 +18223,6 @@ msgstr "ЦП"
 msgid "CPU Time"
 msgstr "Время ЦП"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Память"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Память (изм)"
diff --git a/po/si.po b/po/si.po
index 562987d18c3..b635b1a607a 100644
--- a/po/si.po
+++ b/po/si.po
@@ -17177,6 +17177,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "පිටු ටැබ ලැයිස්තුව"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "සැසියෙ හැඳුනුම්පත"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "සැසියෙ හැඳුනුම්පත"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "මතක භාවිතය"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "හරි"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "අලුත් කාර්යයක් (ධාවන කරන්න...) (&N)"
@@ -17836,14 +17876,6 @@ msgstr "ක්‍රියාවලියන්: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "මතකය භාවිතය: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17852,10 +17884,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU කාලය"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "මතක භාවිතය"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "මතක ඩෙල්ටා"
diff --git a/po/sk.po b/po/sk.po
index 89a785431b6..d571eb4e482 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -17626,6 +17626,43 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+msgid "Session Name"
+msgstr "Otvoriť súbor.\n"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Version"
+msgid "Session#"
+msgstr "Verzia"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nová úloha (Spusti...)"
@@ -18290,14 +18327,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -18306,10 +18335,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 207c07e4969..f15b2a92f4a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -18409,6 +18409,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "seznam zavihkov strani"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Ime odtisa"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "ID seje"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "ID seje"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Uporaba pomnilnika"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "V redu"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Novo opravilo (Zaženi ...)"
@@ -19072,14 +19112,6 @@ msgstr "Opravila: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Uporaba pomnilnika: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Ime odtisa"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPE"
@@ -19088,10 +19120,6 @@ msgstr "CPE"
 msgid "CPU Time"
 msgstr "Čas CPU"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Uporaba pomnilnika"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Razlika pomnilnika"
diff --git a/po/[e-mail] b/po/[e-mail]
index 4aa170508d3..1975f5de999 100644
--- a/po/[e-mail]
+++ b/po/[e-mail]
@@ -17699,6 +17699,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "списак листова"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+#, fuzzy
+msgid "Image Name"
+msgstr "Слика"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+msgid "Session Name"
+msgstr "Корисник је отказан.\n"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Version"
+msgid "Session#"
+msgstr "Издање"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "У реду"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -18378,15 +18418,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-#, fuzzy
-msgid "Image Name"
-msgstr "Слика"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -18395,10 +18426,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/[e-mail] b/po/[e-mail]
index cd444e21d46..b163b31492f 100644
--- a/po/[e-mail]
+++ b/po/[e-mail]
@@ -17894,6 +17894,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "spisak listova"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+#, fuzzy
+msgid "Image Name"
+msgstr "Slika"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+msgid "Session Name"
+msgstr "Korisnik je otkazan.\n"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Version"
+msgid "Session#"
+msgstr "Izdanje"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "U redu"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -18575,15 +18615,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-#, fuzzy
-msgid "Image Name"
-msgstr "Slika"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -18592,10 +18623,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index ab18d9f03a5..3140f8971ee 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18081,6 +18081,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "bladflikslista"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Bildnamn"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Sessions-ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Sessions-ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Minnesanvändning"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny aktivitet (Kör...)"
@@ -18742,14 +18782,6 @@ msgstr "Processer: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Minne använt: %1!u! kB / %2!u! kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Bildnamn"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU-användning"
@@ -18758,10 +18790,6 @@ msgstr "CPU-användning"
 msgid "CPU Time"
 msgstr "CPU-tid"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Minnesanvändning"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Minnesdelta"
diff --git a/po/ta.po b/po/ta.po
index 67ad543646d..269c196679d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -16398,6 +16398,44 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Given Name"
+msgid "Session Name"
+msgstr "கொடுக்கப்பட்ட பெயர்"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Version"
+msgid "Session#"
+msgstr "பதிப்பு"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "சரி"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17056,14 +17094,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17072,10 +17102,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index a58ca762376..612eb530426 100644
--- a/po/te.po
+++ b/po/te.po
@@ -16420,6 +16420,38 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17078,14 +17110,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17094,10 +17118,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 0a8e435f7c2..428e98e52d1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -17067,6 +17067,41 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+msgid "Session Name"
+msgstr "แฟ้ม.\n"
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "ตกลง"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17731,14 +17766,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17747,10 +17774,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index ce2b735e91f..b0059097ce1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17310,6 +17310,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "sayfa sekme listesi"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Görüntü Adı"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Oturum Kimliği"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Oturum Kimliği"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Bellek Kullanımı"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "Tamam"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Yeni Görev (Çalıştır...)"
@@ -17971,14 +18011,6 @@ msgstr "İşlemler: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Bellek Kullanımı: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Görüntü Adı"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17987,10 +18019,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU Zamanı"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Bellek Kullanımı"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Bellek Farkı"
diff --git a/po/uk.po b/po/uk.po
index 70bf6155f8d..6a5fd71c2c0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -17367,6 +17367,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "список закладок сторінки"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "Ім'я образу"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "Код сеансу"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "Код сеансу"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "Пам'ять"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "OK"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Нове завдання (Виконати...)"
@@ -18031,14 +18071,6 @@ msgstr "Процесів: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "Використання пам'яті: %1!u!кБ / %2!u!кБ"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "Ім'я образу"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "ЦП"
@@ -18047,10 +18079,6 @@ msgstr "ЦП"
 msgid "CPU Time"
 msgstr "Час ЦП"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "Пам'ять"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "Пам'ять (змін)"
diff --git a/po/wa.po b/po/wa.po
index dee991681c3..1c90c18b6ed 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -16920,6 +16920,40 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "I Va"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -17585,14 +17619,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17601,10 +17627,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index 9699d880c8f..ba468e297cc 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -16327,6 +16327,38 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+msgid "Wine tasklist"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:32
+msgid "Session Name"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:33
+msgid "Session#"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:35
+msgid "K"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
@@ -16985,14 +17017,6 @@ msgstr ""
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr ""
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr ""
@@ -17001,10 +17025,6 @@ msgstr ""
 msgid "CPU Time"
 msgstr ""

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr ""
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ab5a9cbd72..c5386615d58 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17023,6 +17023,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "标签页列表"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "映像名字"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "会话 ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "会话 ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "内存占用"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "确定"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "新任务(&N)..."
@@ -17681,14 +17721,6 @@ msgstr "进程数: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "内存占用: %1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "映像名字"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17697,10 +17729,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU 耗时"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "内存占用"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "内存占用差值"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0f249a196c9..9ca2f3c80e2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17088,6 +17088,46 @@ msgid ""
 "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n"
 msgstr ""

+#: include/wine/wine_common_ver.rc:138
+#, fuzzy
+#| msgid "page tab list"
+msgid "Wine tasklist"
+msgstr "索引標籤清單"
+
+#: programs/tasklist/tasklist.rc:29
+msgid "Usage: tasklist [/?]\n"
+msgstr ""
+
+#: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272
+msgid "Image Name"
+msgstr "影像名稱"
+
+#: programs/tasklist/tasklist.rc:31 programs/taskmgr/taskmgr.rc:273
+msgid "PID"
+msgstr "PID"
+
+#: programs/tasklist/tasklist.rc:32
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session Name"
+msgstr "工作階段 ID"
+
+#: programs/tasklist/tasklist.rc:33
+#, fuzzy
+#| msgid "Session ID"
+msgid "Session#"
+msgstr "工作階段 ID"
+
+#: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276
+msgid "Mem Usage"
+msgstr "記憶體使用量"
+
+#: programs/tasklist/tasklist.rc:35
+#, fuzzy
+#| msgid "OK"
+msgid "K"
+msgstr "確定"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "執行新工作(&N)..."
@@ -17746,14 +17786,6 @@ msgstr "處理程序: %d"
 msgid "Mem Usage: %1!u!kB / %2!u!kB"
 msgstr "記憶體使用率：%1!u!kB / %2!u!kB"

-#: programs/taskmgr/taskmgr.rc:272
-msgid "Image Name"
-msgstr "影像名稱"
-
-#: programs/taskmgr/taskmgr.rc:273
-msgid "PID"
-msgstr "PID"
-
 #: programs/taskmgr/taskmgr.rc:274
 msgid "CPU"
 msgstr "CPU"
@@ -17762,10 +17794,6 @@ msgstr "CPU"
 msgid "CPU Time"
 msgstr "CPU 時間"

-#: programs/taskmgr/taskmgr.rc:276
-msgid "Mem Usage"
-msgstr "記憶體使用量"
-
 #: programs/taskmgr/taskmgr.rc:277
 msgid "Mem Delta"
 msgstr "記憶體差異"
diff --git a/programs/tasklist/Makefile.in b/programs/tasklist/Makefile.in
index 2163ca5ce76..8b1c206fe0e 100644
--- a/programs/tasklist/Makefile.in
+++ b/programs/tasklist/Makefile.in
@@ -1,7 +1,8 @@
 MODULE    = tasklist.exe
+IMPORTS   = user32

EXTRADLLFLAGS = -mconsole -municode

C_SRCS = tasklist.c

-RC_SRCS = version.rc
+RC_SRCS = tasklist.rc
diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c
index fd03f50dae6..687b8bf6985 100644
--- a/programs/tasklist/tasklist.c
+++ b/programs/tasklist/tasklist.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Austin English
+ * Copyright 2023 Zhiyi Zhang for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,18 +17,197 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#include <windows.h>
+#include <psapi.h>
+#include <tlhelp32.h>
+#include "tasklist.h"
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(tasklist);

+static int tasklist_message(int msg)
+{
+    WCHAR msg_buffer[MAXSTRING];
+
+    LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
+    return wprintf(msg_buffer);
+}
+
+static PROCESSENTRY32W *enumerate_processes(DWORD *process_count)
+{
+    unsigned int alloc_count = 128;
+    PROCESSENTRY32W *process_list;
+    void *realloc_list;
+    HANDLE snapshot;
+
+    *process_count = 0;
+
+    snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (snapshot == INVALID_HANDLE_VALUE)
+        return NULL;
+
+    process_list = malloc(alloc_count * sizeof(*process_list));
+    if (!process_list)
+    {
+        CloseHandle(snapshot);
+        return NULL;
+    }
+
+    process_list[0].dwSize = sizeof(*process_list);
+    if (!Process32FirstW(snapshot, &process_list[0]))
+    {
+        CloseHandle(snapshot);
+        free(process_list);
+        return NULL;
+    }
+
+    do
+    {
+        (*process_count)++;
+        if (*process_count == alloc_count)
+        {
+            alloc_count *= 2;
+            realloc_list = realloc(process_list, alloc_count * sizeof(*process_list));
+            if (!realloc_list)
+            {
+                CloseHandle(snapshot);
+                free(process_list);
+                return NULL;
+            }
+            process_list = realloc_list;
+        }
+        process_list[*process_count].dwSize = sizeof(*process_list);
+    } while (Process32NextW(snapshot, &process_list[*process_count]));
+    CloseHandle(snapshot);
+    return process_list;
+}
+
+static NUMBERFMTW *tasklist_get_memory_format(void)
+{
+    static NUMBERFMTW format = {0, 0, 0, NULL, NULL, 1};
+    static WCHAR grouping[3], decimal[2], thousand[2];
+    static BOOL initialized;
+
+    if (initialized)
+        return &format;
+
+    if (!GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO | LOCALE_RETURN_NUMBER,
+                        (WCHAR *)&format.LeadingZero, 2))
+        format.LeadingZero = 0;
+
+    if (!GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, ARRAY_SIZE(grouping)))
+        format.Grouping = 3;
+    else
+        format.Grouping = (grouping[2] == '2' ? 32 : grouping[0] - '0');
+
+    if (!GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, ARRAY_SIZE(decimal)))
+        wcscpy(decimal, L".");
+
+    if (!GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand, ARRAY_SIZE(thousand)))
+        wcscpy(thousand, L",");
+
+    format.lpDecimalSep = decimal;
+    format.lpThousandSep = thousand;
+    initialized = TRUE;
+    return &format;
+}
+
+static void tasklist_get_header(struct tasklist_process_info *header)
+{
+    HMODULE module;
+
+    module = GetModuleHandleW(NULL);
+    LoadStringW(module, STRING_IMAGE_NAME, header->image_name, ARRAY_SIZE(header->image_name));
+    LoadStringW(module, STRING_PID, header->pid, ARRAY_SIZE(header->pid));
+    LoadStringW(module, STRING_SESSION_NAME, header->session_name, ARRAY_SIZE(header->session_name));
+    LoadStringW(module, STRING_SESSION_NUMBER, header->session_number, ARRAY_SIZE(header->session_number));
+    LoadStringW(module, STRING_MEM_USAGE, header->memory_usage, ARRAY_SIZE(header->memory_usage));
+}
+
+static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, struct tasklist_process_info *info)
+{
+    PROCESS_MEMORY_COUNTERS memory_counters;
+    DWORD session_id;
+    WCHAR buffer[16];
+    HANDLE process;
+
+    memset(info, 0, sizeof(*info));
+
+    if (!ProcessIdToSessionId(process_entry->th32ProcessID, &session_id))
+    {
+        WINE_FIXME("Failed to get process session id, %lu.\n", GetLastError());
+        return FALSE;
+    }
+
+    process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, process_entry->th32ProcessID);
+    if (process && GetProcessMemoryInfo(process, &memory_counters, sizeof(memory_counters)))
+    {
+        swprintf(buffer, ARRAY_SIZE(buffer), L"%u", memory_counters.WorkingSetSize / 1024);
+        if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, buffer, tasklist_get_memory_format(),
+                             info->memory_usage, ARRAY_SIZE(info->memory_usage)))
+        {
+            LoadStringW(GetModuleHandleW(NULL), STRING_K, buffer, ARRAY_SIZE(buffer));
+            wcscat(info->memory_usage, L" ");
+            wcscat(info->memory_usage, buffer);
+        }
+    }
+    if (process)
+        CloseHandle(process);
+    if (info->memory_usage[0] == '\0')
+        wcscpy(info->memory_usage, L"N/A");
+
+    wcscpy(info->image_name, process_entry->szExeFile);
+    swprintf(info->pid, ARRAY_SIZE(info->pid), L"%u", process_entry->th32ProcessID);
+    wcscpy(info->session_name, session_id == 0 ? L"Services" : L"Console");
+    swprintf(info->session_number, ARRAY_SIZE(info->session_number), L"%u", session_id);
+    return TRUE;
+}
+
+static void tasklist_print(void)
+{
+    struct tasklist_process_info header, info;
+    PROCESSENTRY32W *process_list;
+    DWORD process_count, i;
+
+    wprintf(L"\n");
+    tasklist_get_header(&header);
+    wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n"
+            L"========================= ======== ================ =========== ============\n",
+            header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage);
+
+    process_list = enumerate_processes(&process_count);
+    for (i = 0; i < process_count; ++i)
+    {
+        if (!tasklist_get_process_info(&process_list[i], &info))
+            continue;
+
+        wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12s\n",
+                info.image_name, info.pid, info.session_name, info.session_number, info.memory_usage);
+    }
+    free(process_list);
+}
+
 int __cdecl wmain(int argc, WCHAR *argv[])
 {
     int i;

-    WINE_FIXME("stub:");
     for (i = 0; i < argc; i++)
-        WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
-    WINE_FIXME("\n");
+        WINE_TRACE("%s ", wine_dbgstr_w(argv[i]));
+    WINE_TRACE("\n");
+
+    for (i = 1; i < argc; i++)
+    {
+        if (!wcscmp(argv[i], L"/?"))
+        {
+            tasklist_message(STRING_USAGE);
+            return 0;
+        }
+        else
+        {
+            WINE_WARN("Ignoring option %s\n", wine_dbgstr_w(argv[i]));
+        }
+    }

+    tasklist_print();
     return 0;
 }
diff --git a/programs/tasklist/tasklist.h b/programs/tasklist/tasklist.h
new file mode 100644
index 00000000000..707121680ec
--- /dev/null
+++ b/programs/tasklist/tasklist.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2023 Zhiyi Zhang for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windef.h>
+
+#define MAXSTRING 8192
+
+#define STRING_USAGE                    101
+#define STRING_IMAGE_NAME               102
+#define STRING_PID                      103
+#define STRING_SESSION_NAME             104
+#define STRING_SESSION_NUMBER           105
+#define STRING_MEM_USAGE                106
+#define STRING_K                        107
+
+struct tasklist_process_info
+{
+    WCHAR image_name[32];
+    WCHAR pid[32];
+    WCHAR session_name[32];
+    WCHAR session_number[32];
+    WCHAR memory_usage[32];
+};
diff --git a/programs/tasklist/version.rc b/programs/tasklist/tasklist.rc
similarity index 69%
rename from programs/tasklist/version.rc
rename to programs/tasklist/tasklist.rc
index d6eecb55df2..5b5e72c4a67 100644
--- a/programs/tasklist/version.rc
+++ b/programs/tasklist/tasklist.rc
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Austin English
+ * Copyright 2023 Zhiyi Zhang for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,6 +17,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#include "tasklist.h"
+
+#pragma makedep po
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_USAGE,                   "Usage: tasklist [/?]\n"
+    STRING_IMAGE_NAME,              "Image Name"
+    STRING_PID,                     "PID"
+    STRING_SESSION_NAME,            "Session Name"
+    STRING_SESSION_NUMBER,          "Session#"
+    STRING_MEM_USAGE,               "Mem Usage"
+    STRING_K,                       "K"
+}
+
 #define WINE_FILEDESCRIPTION_STR "Wine tasklist"
 #define WINE_FILENAME_STR "tasklist.exe"
 #define WINE_FILEVERSION 6,1,7601,16385
diff --git a/programs/tasklist/tests/Makefile.in b/programs/tasklist/tests/Makefile.in
new file mode 100644
index 00000000000..ac6a97d0853
--- /dev/null
+++ b/programs/tasklist/tests/Makefile.in
@@ -0,0 +1,4 @@
+TESTDLL   = tasklist.exe
+
+C_SRCS = \
+	tasklist.c
diff --git a/programs/tasklist/tests/tasklist.c b/programs/tasklist/tests/tasklist.c
new file mode 100644
index 00000000000..cd4a2be0178
--- /dev/null
+++ b/programs/tasklist/tests/tasklist.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2023 Zhiyi Zhang for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windows.h>
+#include "wine/test.h"
+
+#define MAX_BUFFER 65536
+
+static char stdout_buffer[MAX_BUFFER], stderr_buffer[MAX_BUFFER];
+static DWORD stdout_size, stderr_size;
+
+static void read_all_from_handle(HANDLE handle, char *buffer, DWORD *size)
+{
+    char bytes[4096];
+    DWORD bytes_read;
+
+    memset(buffer, 0, MAX_BUFFER);
+    *size = 0;
+    for (;;)
+    {
+        BOOL success = ReadFile(handle, bytes, sizeof(bytes), &bytes_read, NULL);
+        if (!success || !bytes_read)
+            break;
+        if (*size + bytes_read > MAX_BUFFER)
+        {
+            ok(FALSE, "Insufficient buffer.\n");
+            break;
+        }
+        memcpy(buffer + *size, bytes, bytes_read);
+        *size += bytes_read;
+    }
+}
+
+#define run_tasklist(a, b) _run_tasklist(__FILE__, __LINE__, a, b)
+static void _run_tasklist(const char *file, int line, const char *commandline, int exitcode_expected)
+{
+    HANDLE child_stdout_write, child_stderr_write, parent_stdout_read, parent_stderr_read;
+    SECURITY_ATTRIBUTES security_attributes = {0};
+    PROCESS_INFORMATION process_info = {0};
+    STARTUPINFOA startup_info = {0};
+    DWORD exitcode;
+    char cmd[256];
+
+    security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES);
+    security_attributes.bInheritHandle = TRUE;
+
+    CreatePipe(&parent_stdout_read, &child_stdout_write, &security_attributes, 0);
+    CreatePipe(&parent_stderr_read, &child_stderr_write, &security_attributes, 0);
+    SetHandleInformation(parent_stdout_read, HANDLE_FLAG_INHERIT, 0);
+    SetHandleInformation(parent_stderr_read, HANDLE_FLAG_INHERIT, 0);
+
+    startup_info.cb = sizeof(STARTUPINFOA);
+    startup_info.hStdOutput = child_stdout_write;
+    startup_info.hStdError = child_stderr_write;
+    startup_info.dwFlags |= STARTF_USESTDHANDLES;
+
+    sprintf(cmd, "tasklist.exe %s", commandline);
+    CreateProcessA(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info);
+    CloseHandle(child_stdout_write);
+    CloseHandle(child_stderr_write);
+
+    read_all_from_handle(parent_stdout_read, stdout_buffer, &stdout_size);
+    read_all_from_handle(parent_stderr_read, stderr_buffer, &stderr_size);
+    CloseHandle(parent_stdout_read);
+    CloseHandle(parent_stderr_read);
+
+    WaitForSingleObject(process_info.hProcess, INFINITE);
+    GetExitCodeProcess(process_info.hProcess, &exitcode);
+    CloseHandle(process_info.hProcess);
+    CloseHandle(process_info.hThread);
+    ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %ld\n",
+                    exitcode_expected, exitcode);
+}
+
+static void test_basic(void)
+{
+    char *pos;
+
+    /* No options */
+    run_tasklist("", 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, "\r\n"
+                                "Image Name                     PID Session Name        Session#    Mem Usage\r\n"
+                                "========================= ======== ================ =========== ============\r\n");
+    ok(pos == stdout_buffer, "Got the wrong first line.\n");
+    pos = strstr(stdout_buffer, "tasklist.exe");
+    ok(!!pos, "Failed to list tasklist.exe.\n");
+
+    /* /? */
+    run_tasklist("/?", 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+}
+
+START_TEST(tasklist)
+{
+    if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH)
+    {
+        skip("Tests only work with English locale.\n");
+        return;
+    }
+
+    test_basic();
+}

[PATCH v5 2/4] tasklist: Support '/nh' option.

[Zhiyi Zhang]

From: Zhiyi Zhang

---
 programs/tasklist/tasklist.c       | 21 +++++++++++++++------
 programs/tasklist/tasklist.h       |  5 +++++
 programs/tasklist/tests/tasklist.c | 15 +++++++++++++++
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c
index 687b8bf6985..48d9b438e84 100644
--- a/programs/tasklist/tasklist.c
+++ b/programs/tasklist/tasklist.c
@@ -163,17 +163,21 @@ static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, stru
     return TRUE;
 }

-static void tasklist_print(void)
+static void tasklist_print(const struct tasklist_options *options)
 {
     struct tasklist_process_info header, info;
     PROCESSENTRY32W *process_list;
     DWORD process_count, i;

wprintf(L"\n");
-    tasklist_get_header(&header);
-    wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n"
-            L"========================= ======== ================ =========== ============\n",
-            header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage);
+
+    if (!options->no_header)
+    {
+        tasklist_get_header(&header);
+        wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n"
+                L"========================= ======== ================ =========== ============\n",
+                header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage);
+    }

process_list = enumerate_processes(&process_count);
     for (i = 0; i < process_count; ++i)
@@ -189,6 +193,7 @@ static void tasklist_print(void)

int __cdecl wmain(int argc, WCHAR *argv[])
 {
+    struct tasklist_options options = {0};
     int i;

for (i = 0; i < argc; i++)
@@ -202,12 +207,16 @@ int __cdecl wmain(int argc, WCHAR *argv[])
             tasklist_message(STRING_USAGE);
             return 0;
         }
+        else if (!wcsicmp(argv[i], L"/nh"))
+        {
+            options.no_header = TRUE;
+        }
         else
         {
             WINE_WARN("Ignoring option %s\n", wine_dbgstr_w(argv[i]));
         }
     }

-    tasklist_print();
+    tasklist_print(&options);
     return 0;
 }
diff --git a/programs/tasklist/tasklist.h b/programs/tasklist/tasklist.h
index 707121680ec..6add1f30277 100644
--- a/programs/tasklist/tasklist.h
+++ b/programs/tasklist/tasklist.h
@@ -36,3 +36,8 @@ struct tasklist_process_info
     WCHAR session_number[32];
     WCHAR memory_usage[32];
 };
+
+struct tasklist_options
+{
+    BOOL no_header;
+};
diff --git a/programs/tasklist/tests/tasklist.c b/programs/tasklist/tests/tasklist.c
index cd4a2be0178..2c4d77855b0 100644
--- a/programs/tasklist/tests/tasklist.c
+++ b/programs/tasklist/tests/tasklist.c
@@ -108,6 +108,20 @@ static void test_basic(void)
     ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
 }

+static void test_no_header(void)
+{
+    char *pos;
+
+    /* /nh */
+    run_tasklist("/nh", 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, "Image Name");
+    ok(!pos, "Got header.\n");
+    pos = strstr(stdout_buffer, "=");
+    ok(!pos, "Got header.\n");
+}
+
 START_TEST(tasklist)
 {
     if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH)
@@ -117,4 +131,5 @@ START_TEST(tasklist)
     }

test_basic();
+    test_no_header();
 }

[PATCH v5 3/4] tasklist: Support '/fo' option.

[Zhiyi Zhang]

From: Zhiyi Zhang

---
 po/ar.po                           |  6 +++
 po/ast.po                          |  6 +++
 po/bg.po                           |  5 ++
 po/ca.po                           |  6 +++
 po/cs.po                           |  6 +++
 po/da.po                           |  6 +++
 po/de.po                           |  6 +++
 po/el.po                           |  5 ++
 po/en.po                           |  4 ++
 po/en_US.po                        |  4 ++
 po/eo.po                           |  6 +++
 po/es.po                           |  6 +++
 po/fa.po                           |  5 ++
 po/fi.po                           |  6 +++
 po/fr.po                           |  6 +++
 po/he.po                           |  6 +++
 po/hi.po                           |  4 ++
 po/hr.po                           |  6 +++
 po/hu.po                           |  6 +++
 po/it.po                           |  6 +++
 po/ja.po                           |  6 +++
 po/ko.po                           |  6 +++
 po/lt.po                           |  6 +++
 po/ml.po                           |  4 ++
 po/nb_NO.po                        |  6 +++
 po/nl.po                           |  6 +++
 po/or.po                           |  4 ++
 po/pa.po                           |  4 ++
 po/pl.po                           |  6 +++
 po/pt_BR.po                        |  6 +++
 po/pt_PT.po                        |  6 +++
 po/rm.po                           |  5 ++
 po/ro.po                           |  6 +++
 po/ru.po                           |  6 +++
 po/si.po                           |  6 +++
 po/sk.po                           |  6 +++
 po/sl.po                           |  6 +++
 po/[e-mail]               |  5 ++
 po/[e-mail]                  |  5 ++
 po/sv.po                           |  6 +++
 po/ta.po                           |  4 ++
 po/te.po                           |  4 ++
 po/th.po                           |  5 ++
 po/tr.po                           |  6 +++
 po/uk.po                           |  6 +++
 po/wa.po                           |  5 ++
 po/wine.pot                        |  4 ++
 po/zh_CN.po                        |  6 +++
 po/zh_TW.po                        |  6 +++
 programs/tasklist/tasklist.c       | 79 +++++++++++++++++++++++++++---
 programs/tasklist/tasklist.h       |  9 ++++
 programs/tasklist/tasklist.rc      |  1 +
 programs/tasklist/tests/tasklist.c | 43 ++++++++++++++++
 53 files changed, 392 insertions(+), 8 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 7035033cd20..bf531313a6d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -18523,6 +18523,12 @@ msgstr "استخدام الذاكرة"
 msgid "K"
 msgstr "حسنًا"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Error: Invalid key name\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "خطأ : اسم المفتاح غير سليم\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "م&همة جديدة (تشغيل)..."
diff --git a/po/ast.po b/po/ast.po
index 8404c993672..1d8d339290c 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -17164,6 +17164,12 @@ msgstr ""
 msgid "K"
 msgstr "Aceutar"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: La sintaxis nun ye válida. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 231012e141b..225d0232f24 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -17163,6 +17163,11 @@ msgstr ""
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+msgid "ERROR: Invalid syntax\n"
+msgstr "Невалидни знаци в пътя.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index e62f86697a9..0f34e6a5766 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -17443,6 +17443,12 @@ msgstr "Ús de memòria"
 msgid "K"
 msgstr "D'acord"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: La sintaxi no és vàlida. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Tasca nova (executa...)"
diff --git a/po/cs.po b/po/cs.po
index d90da4216b9..1e2d93d4aa1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17927,6 +17927,12 @@ msgstr "Využití paměti"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Neplatná syntaxe. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nová úloha (Spustit...)"
diff --git a/po/da.po b/po/da.po
index 4698f307985..db9b0dc4f3c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -18434,6 +18434,12 @@ msgstr "Hukommelse forbrug"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Error: Invalid key name\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "Fejl: Ugyldigt nøgle navn\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny opgave (Kør...)"
diff --git a/po/de.po b/po/de.po
index 9e9dddf7643..8381cee3917 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17410,6 +17410,12 @@ msgstr "Speicherauslastung"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Ungültige Syntax. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Neuer Task (Ausführen...)"
diff --git a/po/el.po b/po/el.po
index 7993118c808..9a9f4a773fa 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16798,6 +16798,11 @@ msgstr ""
 msgid "K"
 msgstr ""

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+msgid "ERROR: Invalid syntax\n"
+msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index a4521ab2f01..a9d5d6f696f 100644
--- a/po/en.po
+++ b/po/en.po
@@ -17294,6 +17294,10 @@ msgstr "Mem Usage"
 msgid "K"
 msgstr "K"

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr "ERROR: Invalid syntax\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&New Task (Run...)"
diff --git a/po/en_US.po b/po/en_US.po
index 78b1634ae25..1b7a438b554 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -17294,6 +17294,10 @@ msgstr "Mem Usage"
 msgid "K"
 msgstr "K"

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr "ERROR: Invalid syntax\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&New Task (Run...)"
diff --git a/po/eo.po b/po/eo.po
index d8c30468e2c..8daca85e4ad 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -17486,6 +17486,12 @@ msgstr ""
 msgid "K"
 msgstr "Bone"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Invalid share name.\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "Nevalida nomo de kunuzata aparato.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index d74ad29837f..35ff69721e2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17768,6 +17768,12 @@ msgstr "Uso de Mem"
 msgid "K"
 msgstr "Aceptar"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Sintaxis inválida. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nueva Tarea (Ejecutar...)"
diff --git a/po/fa.po b/po/fa.po
index 5aaa8e719f3..3d9783df060 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -16992,6 +16992,11 @@ msgstr ""
 msgid "K"
 msgstr "قبول"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+msgid "ERROR: Invalid syntax\n"
+msgstr "پرونده‌های متنی (*.txt).\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 126ea2af390..01cb0632d9a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17267,6 +17267,12 @@ msgstr "Muistin käyttö"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Syntaksi ei kelpaa. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Uusi tehtävä (Suorita...)"
diff --git a/po/fr.po b/po/fr.po
index 220f6721bfb..00e199a7283 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18009,6 +18009,12 @@ msgstr "Mémoire"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg : syntaxe invalide. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nouvelle tâche (Exécuter...)"
diff --git a/po/he.po b/po/he.po
index eb9d560b82f..e74f56ef570 100644
--- a/po/he.po
+++ b/po/he.po
@@ -17940,6 +17940,12 @@ msgstr "שימוש בזיכרון"
 msgid "K"
 msgstr "אישור"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Error: Invalid key name\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "Error: Invalid key name\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "משימה &חדשה (הפעלה...)"
diff --git a/po/hi.po b/po/hi.po
index ad827af1540..4cd0a98235c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -16467,6 +16467,10 @@ msgstr ""
 msgid "K"
 msgstr ""

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index ebe8fb237c0..d537fd018f4 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -17894,6 +17894,12 @@ msgstr "Mem uporaba"
 msgid "K"
 msgstr "U redu"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Error: Invalid key name\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "Greška: Neispravan naziv ključa\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Novi zadatak (Pokreni...)"
diff --git a/po/hu.po b/po/hu.po
index 88022e96319..5957b5fb67b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -18425,6 +18425,12 @@ msgstr "Memória - (Személyes munkakészlet)"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Error: Invalid key name\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "Hiba: Érvénytelen kulcsnév\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "Új feladat (f&uttatás...)"
diff --git a/po/it.po b/po/it.po
index 0b8202cf7be..49eaa2ef94f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18512,6 +18512,12 @@ msgstr "Uso della memoria"
 msgid "K"
 msgstr "Ok"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Error: Invalid key name\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "Errore: nome della chiave non valido\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nuovo processo (Esegui...)"
diff --git a/po/ja.po b/po/ja.po
index d7afcaf7748..fe05c12612f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -17304,6 +17304,12 @@ msgstr "メモリ使用量"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: 無効な構文です。"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "新しいタスクの実行(&N)..."
diff --git a/po/ko.po b/po/ko.po
index 38cb26195f8..1af2e5a6aa7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -17244,6 +17244,12 @@ msgstr "메모리 사용량"
 msgid "K"
 msgstr "확인"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: 잘못된 구문. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "새 작업(&N) (실행...)"
diff --git a/po/lt.po b/po/lt.po
index 4bce29753e7..bd9e0b2718b 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -17319,6 +17319,12 @@ msgstr "Atm naudojimas"
 msgid "K"
 msgstr "Gerai"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Netinkama sintaksė. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nauja užduotis (vykdyti...)"
diff --git a/po/ml.po b/po/ml.po
index de2441ff6dd..325901ba3fb 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -16470,6 +16470,10 @@ msgstr ""
 msgid "K"
 msgstr "ശരി"

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index f891ec370d9..a34852e4967 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -17989,6 +17989,12 @@ msgstr "Minnebruk"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Ugyldig syntaks. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny oppgave (Kjør...)"
diff --git a/po/nl.po b/po/nl.po
index 3842d96a81e..7af274d43e1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -17384,6 +17384,12 @@ msgstr "Geheugengebruik"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Foutieve syntax. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nieuwe taak (uitvoeren...)"
diff --git a/po/or.po b/po/or.po
index 32187fc37ba..7446fea78bf 100644
--- a/po/or.po
+++ b/po/or.po
@@ -16452,6 +16452,10 @@ msgstr ""
 msgid "K"
 msgstr ""

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 49d7381fda7..2f727360d4c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -16452,6 +16452,10 @@ msgstr ""
 msgid "K"
 msgstr ""

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index e4e8a254be2..8637c10caba 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17524,6 +17524,12 @@ msgstr "Użycie pamięci"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Nieprawidłowa składnia. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nowe zadanie (Uruchom...)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3b150a48ee4..62e3721b69e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17586,6 +17586,12 @@ msgstr "Uso de Memória"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Sintaxe inválida. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nova Tarefa (Executar...)"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 4c09c2954aa..d1c5dac5a51 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -18160,6 +18160,12 @@ msgstr "Utilização de Memória"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Sintaxe inválida. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nova Tarefa (Executar...)"
diff --git a/po/rm.po b/po/rm.po
index 88ef5972eec..085f54bf0f7 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -16583,6 +16583,11 @@ msgstr ""
 msgid "K"
 msgstr ""

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+msgid "ERROR: Invalid syntax\n"
+msgstr "Tuot las datotecas (*.*).\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index b16265bec07..d68f3bbbc84 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -18189,6 +18189,12 @@ msgstr "Utilizare memorie"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Sintaxă nevalidă. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "Sarcină &nouă (executare...)"
diff --git a/po/ru.po b/po/ru.po
index 07e75ce067a..f62c674016c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17553,6 +17553,12 @@ msgstr "Память"
 msgid "K"
 msgstr "ОК"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: неверный синтаксис. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Новая задача (Выполнить...)"
diff --git a/po/si.po b/po/si.po
index b635b1a607a..ce493b00d05 100644
--- a/po/si.po
+++ b/po/si.po
@@ -17217,6 +17217,12 @@ msgstr "මතක භාවිතය"
 msgid "K"
 msgstr "හරි"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: අවලංගු රීති."
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "අලුත් කාර්යයක් (ධාවන කරන්න...) (&N)"
diff --git a/po/sk.po b/po/sk.po
index d571eb4e482..69c37198d89 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -17663,6 +17663,12 @@ msgstr ""
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Invalid name.\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "Nesprávny názov.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nová úloha (Spusti...)"
diff --git a/po/sl.po b/po/sl.po
index f15b2a92f4a..281d36cabea 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -18449,6 +18449,12 @@ msgstr "Uporaba pomnilnika"
 msgid "K"
 msgstr "V redu"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "Error: Invalid key name\n"
+msgid "ERROR: Invalid syntax\n"
+msgstr "Napaka: neveljavno ime ključa\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Novo opravilo (Zaženi ...)"
diff --git a/po/[e-mail] b/po/[e-mail]
index 1975f5de999..d9d1183cf30 100644
--- a/po/[e-mail]
+++ b/po/[e-mail]
@@ -17739,6 +17739,11 @@ msgstr ""
 msgid "K"
 msgstr "У реду"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+msgid "ERROR: Invalid syntax\n"
+msgstr "Неисправна синтакса.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/[e-mail] b/po/[e-mail]
index b163b31492f..4073d77a571 100644
--- a/po/[e-mail]
+++ b/po/[e-mail]
@@ -17934,6 +17934,11 @@ msgstr ""
 msgid "K"
 msgstr "U redu"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+msgid "ERROR: Invalid syntax\n"
+msgstr "Neispravna sintaksa.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 3140f8971ee..1a2843a1288 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18121,6 +18121,12 @@ msgstr "Minnesanvändning"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Ogiltig syntax. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny aktivitet (Kör...)"
diff --git a/po/ta.po b/po/ta.po
index 269c196679d..0913eb07765 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -16436,6 +16436,10 @@ msgstr ""
 msgid "K"
 msgstr "சரி"

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 612eb530426..81daf55f999 100644
--- a/po/te.po
+++ b/po/te.po
@@ -16452,6 +16452,10 @@ msgstr ""
 msgid "K"
 msgstr ""

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 428e98e52d1..00ee36cc9a4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -17102,6 +17102,11 @@ msgstr ""
 msgid "K"
 msgstr "ตกลง"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+msgid "ERROR: Invalid syntax\n"
+msgstr "แฟ้มตํารา (*.txt).\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index b0059097ce1..82624719b08 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17350,6 +17350,12 @@ msgstr "Bellek Kullanımı"
 msgid "K"
 msgstr "Tamam"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Geçersiz sözdizimi. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Yeni Görev (Çalıştır...)"
diff --git a/po/uk.po b/po/uk.po
index 6a5fd71c2c0..6aa152044f2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -17407,6 +17407,12 @@ msgstr "Пам'ять"
 msgid "K"
 msgstr "OK"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: Невірний синтаксис. "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Нове завдання (Виконати...)"
diff --git a/po/wa.po b/po/wa.po
index 1c90c18b6ed..c5c5091946f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -16954,6 +16954,11 @@ msgstr ""
 msgid "K"
 msgstr "I Va"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+msgid "ERROR: Invalid syntax\n"
+msgstr "Fitchîs tekse (*.txt).\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index ba468e297cc..2b9f54a74af 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -16359,6 +16359,10 @@ msgstr ""
 msgid "K"
 msgstr ""

+#: programs/tasklist/tasklist.rc:36
+msgid "ERROR: Invalid syntax\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c5386615d58..d9447b31f26 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17063,6 +17063,12 @@ msgstr "内存占用"
 msgid "K"
 msgstr "确定"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: 语法无效。"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "新任务(&N)..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9ca2f3c80e2..45e5c57de2c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17128,6 +17128,12 @@ msgstr "記憶體使用量"
 msgid "K"
 msgstr "確定"

+#: programs/tasklist/tasklist.rc:36
+#, fuzzy
+#| msgid "reg: Invalid syntax. "
+msgid "ERROR: Invalid syntax\n"
+msgstr "reg: 無效的語法。 "
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "執行新工作(&N)..."
diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c
index 48d9b438e84..c8cb8804c3a 100644
--- a/programs/tasklist/tasklist.c
+++ b/programs/tasklist/tasklist.c
@@ -33,6 +33,14 @@ static int tasklist_message(int msg)
     return wprintf(msg_buffer);
 }

+static int tasklist_error(int msg)
+{
+    WCHAR msg_buffer[MAXSTRING];
+
+    LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
+    return fwprintf(stderr, msg_buffer);
+}
+
 static PROCESSENTRY32W *enumerate_processes(DWORD *process_count)
 {
     unsigned int alloc_count = 128;
@@ -112,7 +120,8 @@ static NUMBERFMTW *tasklist_get_memory_format(void)
     return &format;
 }

-static void tasklist_get_header(struct tasklist_process_info *header)
+static void tasklist_get_header(const struct tasklist_options *options,
+                                struct tasklist_process_info *header)
 {
     HMODULE module;

@@ -122,6 +131,14 @@ static void tasklist_get_header(struct tasklist_process_info *header)
     LoadStringW(module, STRING_SESSION_NAME, header->session_name, ARRAY_SIZE(header->session_name));
     LoadStringW(module, STRING_SESSION_NUMBER, header->session_number, ARRAY_SIZE(header->session_number));
     LoadStringW(module, STRING_MEM_USAGE, header->memory_usage, ARRAY_SIZE(header->memory_usage));
+    if (options->format == LIST)
+    {
+        wcscat(header->image_name, L":");
+        wcscat(header->pid, L":");
+        wcscat(header->session_name, L":");
+        wcscat(header->session_number, L":");
+        wcscat(header->memory_usage, L":");
+    }
 }

static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, struct tasklist_process_info *info)
@@ -169,14 +186,19 @@ static void tasklist_print(const struct tasklist_options *options)
     PROCESSENTRY32W *process_list;
     DWORD process_count, i;

-    wprintf(L"\n");
+    if (options->format == TABLE)
+        wprintf(L"\n");

+    tasklist_get_header(options, &header);
     if (!options->no_header)
     {
-        tasklist_get_header(&header);
-        wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n"
-                L"========================= ======== ================ =========== ============\n",
-                header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage);
+        if (options->format == TABLE)
+            wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n"
+                    L"========================= ======== ================ =========== ============\n",
+                    header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage);
+        else if (options->format == CSV)
+            wprintf(L""%s","%s","%s","%s","%s"\n",
+                    header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage);
     }

process_list = enumerate_processes(&process_count);
@@ -185,8 +207,24 @@ static void tasklist_print(const struct tasklist_options *options)
         if (!tasklist_get_process_info(&process_list[i], &info))
             continue;

-        wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12s\n",
-                info.image_name, info.pid, info.session_name, info.session_number, info.memory_usage);
+        if (options->format == TABLE)
+            wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12s\n",
+                    info.image_name, info.pid, info.session_name, info.session_number, info.memory_usage);
+        else if (options->format == CSV)
+            wprintf(L""%s","%s","%s","%s","%s"\n",
+                    info.image_name, info.pid, info.session_name, info.session_number, info.memory_usage);
+        else if (options->format == LIST)
+            wprintf(L"\n"
+                    L"%-13.13s %s\n"
+                    L"%-13.13s %s\n"
+                    L"%-13.13s %s\n"
+                    L"%-13.13s %s\n"
+                    L"%-13.13s %s\n",
+                    header.image_name, info.image_name,
+                    header.pid, info.pid,
+                    header.session_name, info.session_name,
+                    header.session_number, info.session_number,
+                    header.memory_usage, info.memory_usage);
     }
     free(process_list);
 }
@@ -211,6 +249,31 @@ int __cdecl wmain(int argc, WCHAR *argv[])
         {
             options.no_header = TRUE;
         }
+        else if (!wcsicmp(argv[i], L"/fo"))
+        {
+            if (i + 1 >= argc)
+            {
+                tasklist_error(STRING_INVALID_SYNTAX);
+                return 1;
+            }
+            else if (!wcsicmp(argv[i + 1], L"TABLE"))
+            {
+                options.format = TABLE;
+            }
+            else if (!wcsicmp(argv[i + 1], L"CSV"))
+            {
+                options.format = CSV;
+            }
+            else if (!wcsicmp(argv[i + 1], L"LIST"))
+            {
+                options.format = LIST;
+            }
+            else
+            {
+                tasklist_error(STRING_INVALID_SYNTAX);
+                return 1;
+            }
+        }
         else
         {
             WINE_WARN("Ignoring option %s\n", wine_dbgstr_w(argv[i]));
diff --git a/programs/tasklist/tasklist.h b/programs/tasklist/tasklist.h
index 6add1f30277..5e4e90960ea 100644
--- a/programs/tasklist/tasklist.h
+++ b/programs/tasklist/tasklist.h
@@ -27,6 +27,14 @@
 #define STRING_SESSION_NUMBER           105
 #define STRING_MEM_USAGE                106
 #define STRING_K                        107
+#define STRING_INVALID_SYNTAX           108
+
+enum tasklist_format
+{
+    TABLE = 0,
+    CSV   = 1,
+    LIST  = 2,
+};

struct tasklist_process_info
 {
@@ -40,4 +48,5 @@ struct tasklist_process_info
 struct tasklist_options
 {
     BOOL no_header;
+    enum tasklist_format format;
 };
diff --git a/programs/tasklist/tasklist.rc b/programs/tasklist/tasklist.rc
index 5b5e72c4a67..f92b0348f72 100644
--- a/programs/tasklist/tasklist.rc
+++ b/programs/tasklist/tasklist.rc
@@ -32,6 +32,7 @@ STRINGTABLE
     STRING_SESSION_NUMBER,          "Session#"
     STRING_MEM_USAGE,               "Mem Usage"
     STRING_K,                       "K"
+    STRING_INVALID_SYNTAX,          "ERROR: Invalid syntax\n"
 }

#define WINE_FILEDESCRIPTION_STR "Wine tasklist"
diff --git a/programs/tasklist/tests/tasklist.c b/programs/tasklist/tests/tasklist.c
index 2c4d77855b0..011bfdeb382 100644
--- a/programs/tasklist/tests/tasklist.c
+++ b/programs/tasklist/tests/tasklist.c
@@ -122,6 +122,48 @@ static void test_no_header(void)
     ok(!pos, "Got header.\n");
 }

+static void test_format(void)
+{
+    char *pos;
+
+    /* /fo */
+    run_tasklist("/fo", 1);
+    ok(stdout_size == 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size > 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+
+    /* /fo invalid */
+    run_tasklist("/fo invalid", 1);
+    ok(stdout_size == 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size > 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+
+    /* /fo TABLE */
+    run_tasklist("/fo TABLE", 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, "\r\n"
+                                "Image Name                     PID Session Name        Session#    Mem Usage\r\n"
+                                "========================= ======== ================ =========== ============\r\n");
+    ok(pos == stdout_buffer, "Got the wrong first line.\n");
+    pos = strstr(stdout_buffer, "tasklist.exe");
+    ok(!!pos, "Failed to list tasklist.exe.\n");
+
+    /* /fo CSV */
+    run_tasklist("/fo CSV", 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, ""Image Name","PID","Session Name","Session#","Mem Usage"");
+    ok(pos == stdout_buffer, "Got the wrong first line.\n");
+    pos = strstr(stdout_buffer, ""tasklist.exe",");
+    ok(!!pos, "Failed to list tasklist.exe.\n");
+
+    /* /fo LIST */
+    run_tasklist("/fo LIST", 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, "Image Name:   tasklist.exe");
+    ok(!!pos, "Failed to list tasklist.exe.\n");
+}
+
 START_TEST(tasklist)
 {
     if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH)
@@ -132,4 +174,5 @@ START_TEST(tasklist)

test_basic();
     test_no_header();
+    test_format();
 }

[PATCH v5 4/4] tasklist: Partially support '/fi' option.

[Zhiyi Zhang]

From: Zhiyi Zhang

Some filters such as STATUS and CPUTIME are not implemented.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48596
---
 po/ar.po                           |   6 +
 po/ast.po                          |   6 +
 po/bg.po                           |   5 +
 po/ca.po                           |   6 +
 po/cs.po                           |   6 +
 po/da.po                           |   6 +
 po/de.po                           |   6 +
 po/el.po                           |   4 +
 po/en.po                           |   4 +
 po/en_US.po                        |   4 +
 po/eo.po                           |   6 +
 po/es.po                           |   6 +
 po/fa.po                           |   5 +
 po/fi.po                           |   6 +
 po/fr.po                           |   6 +
 po/he.po                           |   5 +
 po/hi.po                           |   4 +
 po/hr.po                           |   6 +
 po/hu.po                           |   6 +
 po/it.po                           |   6 +
 po/ja.po                           |   6 +
 po/ko.po                           |   6 +
 po/lt.po                           |   6 +
 po/ml.po                           |   4 +
 po/nb_NO.po                        |   6 +
 po/nl.po                           |   6 +
 po/or.po                           |   4 +
 po/pa.po                           |   4 +
 po/pl.po                           |   6 +
 po/pt_BR.po                        |   6 +
 po/pt_PT.po                        |   6 +
 po/rm.po                           |   4 +
 po/ro.po                           |   5 +
 po/ru.po                           |   6 +
 po/si.po                           |   4 +
 po/sk.po                           |   4 +
 po/sl.po                           |   6 +
 po/[e-mail]               |   5 +
 po/[e-mail]                  |   5 +
 po/sv.po                           |   6 +
 po/ta.po                           |   4 +
 po/te.po                           |   4 +
 po/th.po                           |   5 +
 po/tr.po                           |   6 +
 po/uk.po                           |   6 +
 po/wa.po                           |   5 +
 po/wine.pot                        |   4 +
 po/zh_CN.po                        |   6 +
 po/zh_TW.po                        |   6 +
 programs/tasklist/tasklist.c       | 173 ++++++++++++++++++++++++++++-
 programs/tasklist/tasklist.h       |  32 ++++++
 programs/tasklist/tasklist.rc      |   1 +
 programs/tasklist/tests/tasklist.c | 104 +++++++++++++++++
 53 files changed, 565 insertions(+), 5 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index bf531313a6d..a6c78236bc4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -18529,6 +18529,12 @@ msgstr "حسنًا"
 msgid "ERROR: Invalid syntax\n"
 msgstr "خطأ : اسم المفتاح غير سليم\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "لم يتمكن من تحليل اسم الملف.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "م&همة جديدة (تشغيل)..."
diff --git a/po/ast.po b/po/ast.po
index 1d8d339290c..7acae63fbcf 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -17170,6 +17170,12 @@ msgstr "Aceutar"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: La sintaxis nun ye válida. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The file cannot be accessed.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Nun pue accedese al ficheru.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 225d0232f24..f5bd71825b0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -17168,6 +17168,11 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Невалидни знаци в пътя.\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "'%s' не може да бъде намерен."
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 0f34e6a5766..1ea63510af7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -17449,6 +17449,12 @@ msgstr "D'acord"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: La sintaxi no és vàlida. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "No es pot resoldre el nom de fitxer.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Tasca nova (executa...)"
diff --git a/po/cs.po b/po/cs.po
index 1e2d93d4aa1..71ed79441db 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17933,6 +17933,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Neplatná syntaxe. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The file cannot be accessed.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "K souboru není možné přistupovat.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nová úloha (Spustit...)"
diff --git a/po/da.po b/po/da.po
index db9b0dc4f3c..38ccb7bd64b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -18440,6 +18440,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Fejl: Ugyldigt nøgle navn\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Filnavnet kan ikke afklares.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny opgave (Kør...)"
diff --git a/po/de.po b/po/de.po
index 8381cee3917..6cec8fc4c0d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17416,6 +17416,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Ungültige Syntax. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Der Dateiname konnte nicht gefunden werden.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Neuer Task (Ausführen...)"
diff --git a/po/el.po b/po/el.po
index 9a9f4a773fa..75f969c29b5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16803,6 +16803,10 @@ msgstr ""
 msgid "ERROR: Invalid syntax\n"
 msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n"

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index a9d5d6f696f..da810c973fa 100644
--- a/po/en.po
+++ b/po/en.po
@@ -17298,6 +17298,10 @@ msgstr "K"
 msgid "ERROR: Invalid syntax\n"
 msgstr "ERROR: Invalid syntax\n"

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "ERROR: The search filter cannot be recognized.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&New Task (Run...)"
diff --git a/po/en_US.po b/po/en_US.po
index 1b7a438b554..d63f36220fa 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -17298,6 +17298,10 @@ msgstr "K"
 msgid "ERROR: Invalid syntax\n"
 msgstr "ERROR: Invalid syntax\n"

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "ERROR: The search filter cannot be recognized.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&New Task (Run...)"
diff --git a/po/eo.po b/po/eo.po
index 8daca85e4ad..30413e5976e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -17492,6 +17492,12 @@ msgstr "Bone"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Nevalida nomo de kunuzata aparato.\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "La dosiernomo ne eblas solvi.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 35ff69721e2..64b81c5f619 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17774,6 +17774,12 @@ msgstr "Aceptar"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Sintaxis inválida. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "No puede resolverse el nombre del fichero.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nueva Tarea (Ejecutar...)"
diff --git a/po/fa.po b/po/fa.po
index 3d9783df060..09bf4d57cfe 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -16997,6 +16997,11 @@ msgstr "قبول"
 msgid "ERROR: Invalid syntax\n"
 msgstr "پرونده‌های متنی (*.txt).\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "'%s' پیدا نشد."
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 01cb0632d9a..b82c301ed48 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17273,6 +17273,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Syntaksi ei kelpaa. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Tiedostonimeä ei pystytä tulkitsemaan.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Uusi tehtävä (Suorita...)"
diff --git a/po/fr.po b/po/fr.po
index 00e199a7283..bcf6d3ead08 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18015,6 +18015,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg : syntaxe invalide. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Impossible de résoudre le nom de fichier.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nouvelle tâche (Exécuter...)"
diff --git a/po/he.po b/po/he.po
index e74f56ef570..d3cd7591551 100644
--- a/po/he.po
+++ b/po/he.po
@@ -17946,6 +17946,11 @@ msgstr "אישור"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Error: Invalid key name\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "'%s' לא נמצא."
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "משימה &חדשה (הפעלה...)"
diff --git a/po/hi.po b/po/hi.po
index 4cd0a98235c..dd87c8640e0 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -16471,6 +16471,10 @@ msgstr ""
 msgid "ERROR: Invalid syntax\n"
 msgstr ""

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index d537fd018f4..73a2e82f90b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -17900,6 +17900,12 @@ msgstr "U redu"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Greška: Neispravan naziv ključa\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Naziv datoteke se ne može dohvatit.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Novi zadatak (Pokreni...)"
diff --git a/po/hu.po b/po/hu.po
index 5957b5fb67b..dc25fabe578 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -18431,6 +18431,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Hiba: Érvénytelen kulcsnév\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "A fájlnév nem található!.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "Új feladat (f&uttatás...)"
diff --git a/po/it.po b/po/it.po
index 49eaa2ef94f..f68cb65dde5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18518,6 +18518,12 @@ msgstr "Ok"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Errore: nome della chiave non valido\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Impossibile risolvere il nome del file.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nuovo processo (Esegui...)"
diff --git a/po/ja.po b/po/ja.po
index fe05c12612f..ed6bba051ba 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -17310,6 +17310,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: 無効な構文です。"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "ファイル名は解決できません。\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "新しいタスクの実行(&N)..."
diff --git a/po/ko.po b/po/ko.po
index 1af2e5a6aa7..c5a22683c02 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -17250,6 +17250,12 @@ msgstr "확인"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: 잘못된 구문. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "파일 이름을 확인할 수 없습니다.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "새 작업(&N) (실행...)"
diff --git a/po/lt.po b/po/lt.po
index bd9e0b2718b..fee636cdde3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -17325,6 +17325,12 @@ msgstr "Gerai"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Netinkama sintaksė. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Nepavyko nustatyti failo vardo.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nauja užduotis (vykdyti...)"
diff --git a/po/ml.po b/po/ml.po
index 325901ba3fb..111a2423085 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -16474,6 +16474,10 @@ msgstr "ശരി"
 msgid "ERROR: Invalid syntax\n"
 msgstr ""

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index a34852e4967..eb2930c22ef 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -17995,6 +17995,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Ugyldig syntaks. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Kan ikke slå opp filnavnet.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny oppgave (Kjør...)"
diff --git a/po/nl.po b/po/nl.po
index 7af274d43e1..9e9fc388065 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -17390,6 +17390,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Foutieve syntax. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "De bestandsnaam kan niet worden geresolveerd.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nieuwe taak (uitvoeren...)"
diff --git a/po/or.po b/po/or.po
index 7446fea78bf..325e5f97606 100644
--- a/po/or.po
+++ b/po/or.po
@@ -16456,6 +16456,10 @@ msgstr ""
 msgid "ERROR: Invalid syntax\n"
 msgstr ""

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 2f727360d4c..59aca39767b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -16456,6 +16456,10 @@ msgstr ""
 msgid "ERROR: Invalid syntax\n"
 msgstr ""

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 8637c10caba..071574c7e5f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17530,6 +17530,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Nieprawidłowa składnia. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Nie można rozbić nazwy pliku.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nowe zadanie (Uruchom...)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 62e3721b69e..8fdcfeb808f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17592,6 +17592,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Sintaxe inválida. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "O nome de arquivo não pode ser resolvido.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nova Tarefa (Executar...)"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index d1c5dac5a51..43bef658f39 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -18166,6 +18166,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Sintaxe inválida. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "O nome de ficheiro não pode ser resolvido.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nova Tarefa (Executar...)"
diff --git a/po/rm.po b/po/rm.po
index 085f54bf0f7..ae89c0d4435 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -16588,6 +16588,10 @@ msgstr ""
 msgid "ERROR: Invalid syntax\n"
 msgstr "Tuot las datotecas (*.*).\n"

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index d68f3bbbc84..63f6b919634 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -18195,6 +18195,11 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Sintaxă nevalidă. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "'%s' nu a fost găsit."
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "Sarcină &nouă (executare...)"
diff --git a/po/ru.po b/po/ru.po
index f62c674016c..6f9167767da 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17559,6 +17559,12 @@ msgstr "ОК"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: неверный синтаксис. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Не удалось разобрать имя файла.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Новая задача (Выполнить...)"
diff --git a/po/si.po b/po/si.po
index ce493b00d05..2bffc22843f 100644
--- a/po/si.po
+++ b/po/si.po
@@ -17223,6 +17223,10 @@ msgstr "හරි"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: අවලංගු රීති."

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "අලුත් කාර්යයක් (ධාවන කරන්න...) (&N)"
diff --git a/po/sk.po b/po/sk.po
index 69c37198d89..3ee83cbaa65 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -17669,6 +17669,10 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Nesprávny názov.\n"

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Nová úloha (Spusti...)"
diff --git a/po/sl.po b/po/sl.po
index 281d36cabea..f1fb0d7630f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -18455,6 +18455,12 @@ msgstr "V redu"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Napaka: neveljavno ime ključa\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Imena datoteke ni mogoče razrešiti.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Novo opravilo (Zaženi ...)"
diff --git a/po/[e-mail] b/po/[e-mail]
index d9d1183cf30..24f04868bf6 100644
--- a/po/[e-mail]
+++ b/po/[e-mail]
@@ -17744,6 +17744,11 @@ msgstr "У реду"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Неисправна синтакса.\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Датотека „%s“ није пронађена."
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/[e-mail] b/po/[e-mail]
index 4073d77a571..03cf504ff1e 100644
--- a/po/[e-mail]
+++ b/po/[e-mail]
@@ -17939,6 +17939,11 @@ msgstr "U redu"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Neispravna sintaksa.\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Datoteka „%s“ nije pronađena."
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 1a2843a1288..2b6b98d6ee7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18127,6 +18127,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Ogiltig syntax. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Filnamnet kan inte hittas.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Ny aktivitet (Kör...)"
diff --git a/po/ta.po b/po/ta.po
index 0913eb07765..7ff4e75bba0 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -16440,6 +16440,10 @@ msgstr "சரி"
 msgid "ERROR: Invalid syntax\n"
 msgstr ""

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 81daf55f999..6637c77f80b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -16456,6 +16456,10 @@ msgstr ""
 msgid "ERROR: Invalid syntax\n"
 msgstr ""

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 00ee36cc9a4..0bd5781e5b6 100644
--- a/po/th.po
+++ b/po/th.po
@@ -17107,6 +17107,11 @@ msgstr "ตกลง"
 msgid "ERROR: Invalid syntax\n"
 msgstr "แฟ้มตํารา (*.txt).\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "ไม่พบข้อความ '%s' ที่ต้องการค้นหา.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 82624719b08..f0090b9e477 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17356,6 +17356,12 @@ msgstr "Tamam"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Geçersiz sözdizimi. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Dosya adı çözülemedi.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Yeni Görev (Çalıştır...)"
diff --git a/po/uk.po b/po/uk.po
index 6aa152044f2..04fe18bb64e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -17413,6 +17413,12 @@ msgstr "OK"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: Невірний синтаксис. "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "Ім'я файлу не може бути вирішене.\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "&Нове завдання (Виконати...)"
diff --git a/po/wa.po b/po/wa.po
index c5c5091946f..fd35c5bf626 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -16959,6 +16959,11 @@ msgstr "I Va"
 msgid "ERROR: Invalid syntax\n"
 msgstr "Fitchîs tekse (*.txt).\n"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "'%s' pout nén esse trové."
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index 2b9f54a74af..5ba23a8b291 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -16363,6 +16363,10 @@ msgstr ""
 msgid "ERROR: Invalid syntax\n"
 msgstr ""

+#: programs/tasklist/tasklist.rc:37
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr ""
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d9447b31f26..131a13988e9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17069,6 +17069,12 @@ msgstr "确定"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: 语法无效。"

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "不能解析文件名。\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "新任务(&N)..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 45e5c57de2c..772d46e00cf 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17134,6 +17134,12 @@ msgstr "確定"
 msgid "ERROR: Invalid syntax\n"
 msgstr "reg: 無效的語法。 "

+#: programs/tasklist/tasklist.rc:37
+#, fuzzy
+#| msgid "The filename cannot be resolved.\n"
+msgid "ERROR: The search filter cannot be recognized.\n"
+msgstr "無法解析檔案名稱。\n"
+
 #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108
 msgid "&New Task (Run...)"
 msgstr "執行新工作(&N)..."
diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c
index c8cb8804c3a..4f866f6b727 100644
--- a/programs/tasklist/tasklist.c
+++ b/programs/tasklist/tasklist.c
@@ -173,6 +173,9 @@ static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, stru
     if (info->memory_usage[0] == '\0')
         wcscpy(info->memory_usage, L"N/A");

+    info->pid_value = process_entry->th32ProcessID;
+    info->memory_usage_value = memory_counters.WorkingSetSize / 1024;
+    info->session_id_value = session_id;
     wcscpy(info->image_name, process_entry->szExeFile);
     swprintf(info->pid, ARRAY_SIZE(info->pid), L"%u", process_entry->th32ProcessID);
     wcscpy(info->session_name, session_id == 0 ? L"Services" : L"Console");
@@ -180,6 +183,67 @@ static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, stru
     return TRUE;
 }

+static BOOL tasklist_check_filters(const struct tasklist_filter *filter,
+                                   const struct tasklist_process_info *info)
+{
+    DWORD left_dword_operand, right_dword_operand;
+    const WCHAR *left_string_operand = NULL;
+    BOOL eval;
+
+    while (filter)
+    {
+        left_string_operand = NULL;
+        left_dword_operand = 0;
+        eval = FALSE;
+
+        if (filter->name == IMAGENAME)
+            left_string_operand = info->image_name;
+        else if (filter->name == SESSIONNAME)
+            left_string_operand = info->session_name;
+        else if (filter->name == PID)
+            left_dword_operand = info->pid_value;
+        else if (filter->name == SESSION)
+            left_dword_operand = info->session_id_value;
+        else if (filter->name == MEMUSAGE)
+            left_dword_operand = info->memory_usage_value;
+
+        if (left_string_operand)
+        {
+            eval = wcsicmp(left_string_operand, filter->value);
+            if (filter->op == EQ)
+                eval = !eval;
+        }
+        else
+        {
+            if (swscanf(filter->value, L"%lu", &right_dword_operand) != 1)
+            {
+                WINE_ERR("Invalid filter operand %s.\n", wine_dbgstr_w(filter->value));
+                return FALSE;
+            }
+
+            if (filter->op == EQ)
+                eval = left_dword_operand == right_dword_operand;
+            else if (filter->op == NE)
+                eval = left_dword_operand != right_dword_operand;
+            else if (filter->op == GT)
+                eval = left_dword_operand > right_dword_operand;
+            else if (filter->op == LT)
+                eval = left_dword_operand < right_dword_operand;
+            else if (filter->op == GE)
+                eval = left_dword_operand >= right_dword_operand;
+            else if (filter->op == LE)
+                eval = left_dword_operand <= right_dword_operand;
+        }
+
+        if (!eval)
+            return FALSE;
+
+        filter = filter->next;
+    }
+
+    return TRUE;
+}
+
 static void tasklist_print(const struct tasklist_options *options)
 {
     struct tasklist_process_info header, info;
@@ -207,6 +271,9 @@ static void tasklist_print(const struct tasklist_options *options)
         if (!tasklist_get_process_info(&process_list[i], &info))
             continue;

+        if (!tasklist_check_filters(options->filters, &info))
+            continue;
+
         if (options->format == TABLE)
             wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12s\n",
                     info.image_name, info.pid, info.session_name, info.session_number, info.memory_usage);
@@ -232,7 +299,9 @@ static void tasklist_print(const struct tasklist_options *options)
 int __cdecl wmain(int argc, WCHAR *argv[])
 {
     struct tasklist_options options = {0};
-    int i;
+    struct tasklist_filter *filter, *next, **filter_ptr = &options.filters;
+    WCHAR *filter_name, *filter_op, *buffer;
+    int i, ret = 0;

for (i = 0; i < argc; i++)
         WINE_TRACE("%s ", wine_dbgstr_w(argv[i]));
@@ -243,7 +312,7 @@ int __cdecl wmain(int argc, WCHAR *argv[])
         if (!wcscmp(argv[i], L"/?"))
         {
             tasklist_message(STRING_USAGE);
-            return 0;
+            goto done;
         }
         else if (!wcsicmp(argv[i], L"/nh"))
         {
@@ -254,7 +323,8 @@ int __cdecl wmain(int argc, WCHAR *argv[])
             if (i + 1 >= argc)
             {
                 tasklist_error(STRING_INVALID_SYNTAX);
-                return 1;
+                ret = 1;
+                goto done;
             }
             else if (!wcsicmp(argv[i + 1], L"TABLE"))
             {
@@ -271,9 +341,93 @@ int __cdecl wmain(int argc, WCHAR *argv[])
             else
             {
                 tasklist_error(STRING_INVALID_SYNTAX);
-                return 1;
+                ret = 1;
+                goto done;
             }
         }
+        else if (!wcsicmp(argv[i], L"/fi"))
+        {
+            if (i + 1 >= argc || !(filter_name = wcstok(argv[i + 1], L" ", &buffer)))
+            {
+                tasklist_error(STRING_INVALID_SYNTAX);
+                ret = 1;
+                goto done;
+            }
+
+            filter = calloc(1, sizeof(*filter));
+            if (!filter)
+            {
+                WINE_ERR("Out of memory.\n");
+                ret = 1;
+                goto done;
+            }
+
+            if (!wcsicmp(filter_name, L"IMAGENAME"))
+                filter->name = IMAGENAME;
+            else if (!wcsicmp(filter_name, L"PID"))
+                filter->name = PID;
+            else if (!wcsicmp(filter_name, L"SESSION"))
+                filter->name = SESSION;
+            else if (!wcsicmp(filter_name, L"SESSIONNAME"))
+                filter->name = SESSIONNAME;
+            else if (!wcsicmp(filter_name, L"MEMUSAGE"))
+                filter->name = MEMUSAGE;
+            else
+            {
+                WINE_WARN("Ignoring filter %s.\n", wine_dbgstr_w(filter_name));
+                free(filter);
+                continue;
+            }
+
+            filter_op = wcstok(NULL, L" ", &buffer);
+            if (!filter_op)
+            {
+                tasklist_error(STRING_FILTER_NOT_RECOGNIZED);
+                free(filter);
+                ret = 1;
+                goto done;
+            }
+
+            if (!wcsicmp(filter_op, L"EQ"))
+                filter->op = EQ;
+            else if (!wcsicmp(filter_op, L"NE"))
+                filter->op = NE;
+            else if (!wcsicmp(filter_op, L"GT"))
+                filter->op = GT;
+            else if (!wcsicmp(filter_op, L"LT"))
+                filter->op = LT;
+            else if (!wcsicmp(filter_op, L"GE"))
+                filter->op = GE;
+            else if (!wcsicmp(filter_op, L"LE"))
+                filter->op = LE;
+            else
+            {
+                tasklist_error(STRING_FILTER_NOT_RECOGNIZED);
+                free(filter);
+                ret = 1;
+                goto done;
+            }
+
+            if (filter->op >= GT && filter->name != PID && filter->name != SESSION && filter->name != MEMUSAGE)
+            {
+                tasklist_error(STRING_FILTER_NOT_RECOGNIZED);
+                free(filter);
+                ret = 1;
+                goto done;
+            }
+
+            filter->value = wcstok(NULL, L" ", &buffer);
+            if (!filter->value)
+            {
+                tasklist_error(STRING_FILTER_NOT_RECOGNIZED);
+                free(filter);
+                ret = 1;
+                goto done;
+            }
+
+            *filter_ptr = filter;
+            filter_ptr = &filter->next;
+        }
         else
         {
             WINE_WARN("Ignoring option %s\n", wine_dbgstr_w(argv[i]));
@@ -281,5 +435,14 @@ int __cdecl wmain(int argc, WCHAR *argv[])
     }

tasklist_print(&options);
-    return 0;
+
+done:
+    next = options.filters;
+    while (next)
+    {
+        filter = next->next;
+        free(next);
+        next = filter;
+    }
+    return ret;
 }
diff --git a/programs/tasklist/tasklist.h b/programs/tasklist/tasklist.h
index 5e4e90960ea..7b05224757f 100644
--- a/programs/tasklist/tasklist.h
+++ b/programs/tasklist/tasklist.h
@@ -28,6 +28,7 @@
 #define STRING_MEM_USAGE                106
 #define STRING_K                        107
 #define STRING_INVALID_SYNTAX           108
+#define STRING_FILTER_NOT_RECOGNIZED    109

enum tasklist_format
 {
@@ -36,8 +37,38 @@ enum tasklist_format
     LIST  = 2,
 };

+enum tasklist_filter_name
+{
+    IMAGENAME   = 1,
+    PID         = 2,
+    SESSION     = 3,
+    SESSIONNAME = 4,
+    MEMUSAGE    = 5,
+};
+
+enum tasklist_filter_operator
+{
+    EQ = 0,
+    NE = 1,
+    GT = 2,
+    LT = 3,
+    GE = 4,
+    LE = 5,
+};
+
+struct tasklist_filter
+{
+    enum tasklist_filter_name name;
+    enum tasklist_filter_operator op;
+    WCHAR *value;
+    struct tasklist_filter *next;
+};
+
 struct tasklist_process_info
 {
+    DWORD pid_value;
+    DWORD memory_usage_value;
+    DWORD session_id_value;
     WCHAR image_name[32];
     WCHAR pid[32];
     WCHAR session_name[32];
@@ -49,4 +80,5 @@ struct tasklist_options
 {
     BOOL no_header;
     enum tasklist_format format;
+    struct tasklist_filter *filters;
 };
diff --git a/programs/tasklist/tasklist.rc b/programs/tasklist/tasklist.rc
index f92b0348f72..b5aaccc5391 100644
--- a/programs/tasklist/tasklist.rc
+++ b/programs/tasklist/tasklist.rc
@@ -33,6 +33,7 @@ STRINGTABLE
     STRING_MEM_USAGE,               "Mem Usage"
     STRING_K,                       "K"
     STRING_INVALID_SYNTAX,          "ERROR: Invalid syntax\n"
+    STRING_FILTER_NOT_RECOGNIZED,   "ERROR: The search filter cannot be recognized.\n"
 }

#define WINE_FILEDESCRIPTION_STR "Wine tasklist"
diff --git a/programs/tasklist/tests/tasklist.c b/programs/tasklist/tests/tasklist.c
index 011bfdeb382..28c15ed3984 100644
--- a/programs/tasklist/tests/tasklist.c
+++ b/programs/tasklist/tests/tasklist.c
@@ -17,6 +17,7 @@
  */

#include <windows.h>
+#include <psapi.h>
 #include "wine/test.h"

#define MAX_BUFFER 65536
@@ -164,6 +165,108 @@ static void test_format(void)
     ok(!!pos, "Failed to list tasklist.exe.\n");
 }

+static void test_filter(void)
+{
+    char options[256], *pos, basename[64];
+    HANDLE current_process;
+    DWORD current_pid;
+
+    current_pid = GetCurrentProcessId();
+    current_process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, current_pid);
+    GetModuleBaseNameA(current_process, NULL, basename, ARRAY_SIZE(basename));
+    CloseHandle(current_process);
+
+    /* /fi */
+    /* no value for fi */
+    run_tasklist("/fi", 1);
+    ok(stdout_size == 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size > 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+
+    /* IMAGENAME eq */
+    sprintf(options, "/fi "IMAGENAME eq %s"", basename);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!!pos, "Failed to list %s.\n", basename);
+
+    /* IMAGENAME ne */
+    sprintf(options, "/fi "IMAGENAME ne %s"", basename);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!pos, "Got %s.\n", basename);
+    pos = strstr(stdout_buffer, "tasklist.exe");
+    ok(!!pos, "Failed to list tasklist.exe.\n");
+
+    /* PID eq */
+    sprintf(options, "/fi "PID eq %ld"", current_pid);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!!pos, "Failed to list %s.\n", basename);
+
+    /* PID ne */
+    sprintf(options, "/fi "PID ne %ld"", current_pid);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!pos, "Got %s.\n", basename);
+    pos = strstr(stdout_buffer, "tasklist.exe");
+    ok(!!pos, "Failed to list tasklist.exe.\n");
+
+    /* PID gt */
+    sprintf(options, "/fi "PID gt %ld"", current_pid - 1);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!!pos, "Failed to list %s.\n", basename);
+
+    /* PID lt */
+    sprintf(options, "/fi "PID lt %ld"", current_pid + 1);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!!pos, "Failed to list %s.\n", basename);
+
+    /* PID ge */
+    sprintf(options, "/fi "PID ge %ld"", current_pid);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!!pos, "Failed to list %s.\n", basename);
+
+    /* PID le */
+    sprintf(options, "/fi "PID le %ld"", current_pid);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!!pos, "Failed to list %s.\n", basename);
+
+    /* IMAGENAME eq + PID eq */
+    sprintf(options, "/fi "IMAGENAME eq %s" /fi "PID eq %ld"", basename, current_pid);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!!pos, "Failed to list %s.\n", basename);
+
+    /* IMAGENAME eq + PID eq with wrong PID */
+    sprintf(options, "/fi "IMAGENAME eq %s" /fi "PID eq %ld"", basename, current_pid + 1);
+    run_tasklist(options, 0);
+    ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size);
+    ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size);
+    pos = strstr(stdout_buffer, basename);
+    ok(!pos, "Got %s.\n", basename);
+}
+
 START_TEST(tasklist)
 {
     if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH)
@@ -175,4 +278,5 @@ START_TEST(tasklist)
     test_basic();
     test_no_header();
     test_format();
+    test_filter();
 }

[PATCH v5 0/4] MR2688: tasklist: Add basic functionality. - approved

[Alexandre Julliard (＠julliard)]

This merge request was approved by Alexandre Julliard.