diff --git a/base/shell/cmd/console.c b/base/shell/cmd/console.c
index 9d14d273011..a3d6b6c984d 100644
--- a/base/shell/cmd/console.c
+++ b/base/shell/cmd/console.c
@@ -329,4 +329,44 @@ BOOL ConSetScreenColor(HANDLE hOutput, WORD wColor, BOOL bFill)
 }
 #endif
 
+#include <cjkcode.h>
+#include "wcwidth.c"
+
+// NOTE: The check against 0x80 is to avoid calling the helper function
+// for characters that we already know are not full-width.
+#define IS_FULL_WIDTH(wch)  \
+    (((USHORT)(wch) >= 0x0080) && (mk_wcwidth_cjk(wch) == 2))
+
+SIZE_T ConGetTextWidthW(PCWSTR pszText)
+{
+    SIZE_T ich, cxWidth;
+
+    if (!IsCJKCodePage(OutputCodePage))
+        return _tcslen(pszText);
+
+    for (ich = cxWidth = 0; pszText[ich]; ++ich)
+    {
+        if (IS_FULL_WIDTH(pszText[ich]))
+            cxWidth += 2;
+        else
+            ++cxWidth;
+    }
+
+    return cxWidth;
+}
+
+SIZE_T ConGetTextWidthA(PCSTR pszText)
+{
+    int cchMax;
+    PWSTR pszWide;
+    SIZE_T cxWidth;
+
+    cchMax = MultiByteToWideChar(OutputCodePage, 0, pszText, -1, NULL, 0);
+    pszWide = cmd_alloc(cchMax * sizeof(WCHAR));
+    MultiByteToWideChar(OutputCodePage, 0, pszText, -1, pszWide, cchMax);
+    cxWidth = ConGetTextWidthW(pszWide);
+    cmd_free(pszWide);
+    return cxWidth;
+}
+
 /* EOF */
diff --git a/base/shell/cmd/console.h b/base/shell/cmd/console.h
index 445225690f7..9ea070dfe6c 100644
--- a/base/shell/cmd/console.h
+++ b/base/shell/cmd/console.h
@@ -96,3 +96,12 @@ BOOL ConSetScreenColor(HANDLE hOutput, WORD wColor, BOOL bFill);
 
 // INT FilePromptYN (UINT);
 // INT FilePromptYNA (UINT);
+
+SIZE_T ConGetTextWidthA(PCSTR pszText);
+SIZE_T ConGetTextWidthW(PCWSTR pszText);
+
+#ifdef UNICODE
+    #define ConGetTextWidth ConGetTextWidthW
+#else
+    #define ConGetTextWidth ConGetTextWidthA
+#endif
diff --git a/base/shell/cmd/dir.c b/base/shell/cmd/dir.c
index 5750dd236b8..1862d69edee 100644
--- a/base/shell/cmd/dir.c
+++ b/base/shell/cmd/dir.c
@@ -141,6 +141,7 @@
  */
 
 #include "precomp.h"
+#include <cjkcode.h>
 
 #ifdef INCLUDE_CMD_DIR
 
@@ -965,22 +966,20 @@ DirPrintWideList(PDIRFINDINFO ptrFiles[],       /* [IN] Files' Info */
     DWORD i;
     DWORD j;
     DWORD temp;
+    BOOL bCJK = IsCJKCodePage(OutputCodePage);
+    SIZE_T cxWidth;
 
     /* Calculate longest name */
     iLongestName = 1;
     for (i = 0; i < dwCount; i++)
     {
+        cxWidth = ConGetTextWidth(ptrFiles[i]->stFindInfo.cFileName);
+
+        /* Directories need 2 additional characters for brackets */
         if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        {
-            /* Directories need 2 additional characters for brackets */
-            if ((_tcslen(ptrFiles[i]->stFindInfo.cFileName) + 2) > iLongestName)
-                iLongestName = _tcslen(ptrFiles[i]->stFindInfo.cFileName) + 2;
-        }
-        else
-        {
-            if (_tcslen(ptrFiles[i]->stFindInfo.cFileName) > iLongestName)
-                iLongestName = _tcslen(ptrFiles[i]->stFindInfo.cFileName);
-        }
+            cxWidth += 2;
+
+        iLongestName = max(iLongestName, cxWidth);
     }
 
     /* Count the highest number of columns */
@@ -1019,7 +1018,16 @@ DirPrintWideList(PDIRFINDINFO ptrFiles[],       /* [IN] Files' Info */
             else
                 _stprintf(szTempFname, _T("%s"), ptrFiles[temp]->stFindInfo.cFileName);
 
-            DirPrintf(lpFlags, _T("%-*s"), iLongestName + 1, szTempFname);
+            if (bCJK)
+            {
+                cxWidth = ConGetTextWidth(szTempFname);
+                /* Print string and add space padding */
+                DirPrintf(lpFlags, _T("%s%*s"), szTempFname, iLongestName + 1 - cxWidth, _T(""));
+            }
+            else
+            {
+                DirPrintf(lpFlags, _T("%-*s"), iLongestName + 1, szTempFname);
+            }
         }
 
         /* Add a new line after the last item in the column */
diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc
index 4754bff4a95..25b7282795d 100644
--- a/base/shell/cmd/lang/cs-CZ.rc
+++ b/base/shell/cmd/lang/cs-CZ.rc
@@ -175,10 +175,10 @@ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n"
     STRING_DIR_HELP2 " Volume in drive %c is %s\n"
     STRING_DIR_HELP3 " Volume in drive %c has no label.\n"
     STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Total Files Listed:\n%16i File(s)% 14s bytes\n"
-    STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n"
+    STRING_DIR_HELP5 "\n     Total Files Listed:\n%16i File(s) %14s bytes\n"
+    STRING_DIR_HELP6 "%16i Dir(s)  %14s bytes free\n"
     STRING_DIR_HELP7 "\n Directory of %s\n\n"
-    STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n"
+    STRING_DIR_HELP8 "%16i File(s) %14s bytes\n"
     STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\
 changes to the specified directory.\n\n\
 PUSHD [path | ..]\n\n\
diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc
index 7422018a5f2..ea323f28c7a 100644
--- a/base/shell/cmd/lang/de-DE.rc
+++ b/base/shell/cmd/lang/de-DE.rc
@@ -170,10 +170,10 @@ Optionen können in der Umgebungsvariablen DIRCMD voreingestellt werden.\n\
     STRING_DIR_HELP2 " Datenträger in Laufwerk %c ist %s\n"
     STRING_DIR_HELP3 " Datenträger in Laufwerk %c hat keine Bezeichnung\n"
     STRING_DIR_HELP4 " Volumeseriennummer: %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Anzahl der angezeigten Dateien:\n%16i Datei(en)% 15s Bytes\n"
-    STRING_DIR_HELP6 "%16i Verzeichnis(se), % 15s Bytes frei\n"
+    STRING_DIR_HELP5 "\n     Anzahl der angezeigten Dateien:\n%16i Datei(en)        %14s Bytes\n"
+    STRING_DIR_HELP6 "%16i Verzeichnis(se), %14s Bytes frei\n"
     STRING_DIR_HELP7 "\n Verzeichnis von %s\n\n"
-    STRING_DIR_HELP8 "%16i Datei(en)% 14s Bytes\n"
+    STRING_DIR_HELP8 "%16i Datei(en)        %14s Bytes\n"
     STRING_DIRSTACK_HELP1 "Speichert das aktuelle Verzeichnis für den POPD-Befehl und\n\
 wechselt dann in das festgelegte Verzeichnis.\n\n\
 PUSHD [path | ..]\n\n\
diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc
index 3c81b6a4827..fc811d25dc6 100644
--- a/base/shell/cmd/lang/el-GR.rc
+++ b/base/shell/cmd/lang/el-GR.rc
@@ -174,10 +174,10 @@ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n"
     STRING_DIR_HELP2 " Volume in drive %c is %s\n"
     STRING_DIR_HELP3 " Volume in drive %c has no label.\n"
     STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Total Files Listed:\n%16i File(s)% 14s bytes\n"
-    STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n"
+    STRING_DIR_HELP5 "\n     Total Files Listed:\n%16i File(s) %14s bytes\n"
+    STRING_DIR_HELP6 "%16i Dir(s)  %14s bytes free\n"
     STRING_DIR_HELP7 "\n Directory of %s\n\n"
-    STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n"
+    STRING_DIR_HELP8 "%16i File(s) %14s bytes\n"
     STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\
 changes to the specified directory.\n\n\
 PUSHD [path | ..]\n\n\
diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc
index 3751bdb54b0..070e997db8c 100644
--- a/base/shell/cmd/lang/en-US.rc
+++ b/base/shell/cmd/lang/en-US.rc
@@ -170,10 +170,10 @@ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n"
     STRING_DIR_HELP2 " Volume in drive %c is %s\n"
     STRING_DIR_HELP3 " Volume in drive %c has no label.\n"
     STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Total Files Listed:\n%16i File(s)% 14s bytes\n"
-    STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n"
+    STRING_DIR_HELP5 "\n     Total Files Listed:\n%16i File(s) %14s bytes\n"
+    STRING_DIR_HELP6 "%16i Dir(s)  %14s bytes free\n"
     STRING_DIR_HELP7 "\n Directory of %s\n\n"
-    STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n"
+    STRING_DIR_HELP8 "%16i File(s) %14s bytes\n"
     STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\
 changes to the specified directory.\n\n\
 PUSHD [path | ..]\n\n\
diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc
index 85e74e06520..3bae0a9794e 100644
--- a/base/shell/cmd/lang/es-ES.rc
+++ b/base/shell/cmd/lang/es-ES.rc
@@ -174,10 +174,10 @@ ajustes previos anteponiendo a cualquier modificador - (hyphen)--por ejemplo, /-
     STRING_DIR_HELP2 " El volumen en la unidad %c es %s\n"
     STRING_DIR_HELP3 " El volumen en la unidad %c no tiene etiqueta.\n"
     STRING_DIR_HELP4 " El volumen Serial Number is %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Total de archivos mostrados:\n%16i archivo(s)% 14s bytes\n"
-    STRING_DIR_HELP6 "%16i Directorio(s)% 15s bytes libres\n"
+    STRING_DIR_HELP5 "\n     Total de archivos mostrados:\n%16i archivo(s)    %14s bytes\n"
+    STRING_DIR_HELP6 "%16i Directorio(s) %14s bytes libres\n"
     STRING_DIR_HELP7 "\n Directorio %s\n\n"
-    STRING_DIR_HELP8 "%16i archivo(s)% 14s bytes\n"
+    STRING_DIR_HELP8 "%16i archivo(s)    %14s bytes\n"
     STRING_DIRSTACK_HELP1 "Almacena el directorio actual para usarlo por el comando,\n\
 entonces cambia al directorio especificado.\n\n\
 PUSHD [ruta | ..]\n\n\
diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc
index 4401cb31f98..a87e276a888 100644
--- a/base/shell/cmd/lang/fr-FR.rc
+++ b/base/shell/cmd/lang/fr-FR.rc
@@ -183,10 +183,10 @@ Modifier les paramètres mémorisés avec un - (tiret)--par exemple, /-W.\n"
     STRING_DIR_HELP2 " Le nom de volume du lecteur %c est %s\n"
     STRING_DIR_HELP3 " Le lecteur %c n'a pas de nom de volume\n"
     STRING_DIR_HELP4 " Le numéro de série du volume est %04X-%04X\n"
-    STRING_DIR_HELP5 "\n   Total de fichiers listés :\n%16i Fichier(s)% 14s octets\n"
-    STRING_DIR_HELP6 "%16i Rép(s)% 15s octets libres\n"
+    STRING_DIR_HELP5 "\n   Total de fichiers listés :\n%16i Fichier(s) %14s octets\n"
+    STRING_DIR_HELP6 "%16i Rép(s)     %14s octets libres\n"
     STRING_DIR_HELP7 "\n Répertoire de %s\n\n"
-    STRING_DIR_HELP8 "%16i Fichier(s)% 14s octets\n"
+    STRING_DIR_HELP8 "%16i Fichier(s) %14s octets\n"
     STRING_DIRSTACK_HELP1 "Stocke le répertoire courant pour utilisation avec la commande POPD,\n\
 ensuite change de répertoire vers le répertoire spécifié.\n\n\
 PUSHD [chemin | ..]\n\n\
diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc
index a6b32acd36f..9e62549b518 100644
--- a/base/shell/cmd/lang/hu-HU.rc
+++ b/base/shell/cmd/lang/hu-HU.rc
@@ -171,8 +171,8 @@ használja a kapcsolót a - (mínusz) jellel, pl. /-W.\n"
     STRING_DIR_HELP2 " A (%c) meghajtóban található kötet %s\n"
     STRING_DIR_HELP3 " A (%c) meghajtóban található kötetnek nincs címkéje.\n"
     STRING_DIR_HELP4 " A kötet sorozatszáma: %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Összes listázott fájl:\n%16i Fájl% 14s bájt\n"
-    STRING_DIR_HELP6 "%16i Mappa %15s bájt szabad"
+    STRING_DIR_HELP5 "\n     Összes listázott fájl:\n%16i Fájl     %14s bájt\n"
+    STRING_DIR_HELP6 "%16i Mappa    %14s bájt szabad"
     STRING_DIR_HELP7 "\n %s mappája\n\n"
     STRING_DIR_HELP8 "%16i Állomány %14s bájt\n"
     STRING_DIRSTACK_HELP1 "Megjegyzi az aktuális mappát a POPD parancsnak,\n\
diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc
index f5fa43576f3..7623e6208af 100644
--- a/base/shell/cmd/lang/id-ID.rc
+++ b/base/shell/cmd/lang/id-ID.rc
@@ -172,10 +172,10 @@ preset dengan mengawali setiap saklar dengan - (minus)--contohnya, /-W.\n"
     STRING_DIR_HELP2 " Volume di drive %c adalah %s\n"
     STRING_DIR_HELP3 " Volume di drive %c tidak berlabel.\n"
     STRING_DIR_HELP4 " Nomor Seri Volume adalah %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Total File Didaftar:\n%16i File% 14s byte\n"
-    STRING_DIR_HELP6 "%16i Dir% 15s byte tersisa\n"
+    STRING_DIR_HELP5 "\n     Total File Didaftar:\n%16i File %14s byte\n"
+    STRING_DIR_HELP6 "%16i Dir  %14s byte tersisa\n"
     STRING_DIR_HELP7 "\n Direktori %s\n\n"
-    STRING_DIR_HELP8 "%16i File% 14s byte\n"
+    STRING_DIR_HELP8 "%16i File %14s byte\n"
     STRING_DIRSTACK_HELP1 "Menyimpan direktori sekarang untuk digunakan oleh perintah POPD, lalu\n\
 mengubah ke direktori yang ditetapkan.\n\n\
 PUSHD [path | ..]\n\n\
diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc
index 6451daaea96..e39c246abe6 100644
--- a/base/shell/cmd/lang/it-IT.rc
+++ b/base/shell/cmd/lang/it-IT.rc
@@ -169,10 +169,10 @@ le selezioni preimpostate mettendo - (trattino) prima della selezione per esempi
     STRING_DIR_HELP2 " Il Volume nel disco %c è %s\n"
     STRING_DIR_HELP3 " Il Volume nel disco %c non ha etichetta.\n"
     STRING_DIR_HELP4 " Il numero di serie del Volume è %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Numero dei file elencati:\n%16i % 14s byte\n"
-    STRING_DIR_HELP6 "%16i Cartelle% 15s byte liberi\n"
+    STRING_DIR_HELP5 "\n     Numero dei file elencati:\n%16i File     %14s byte\n"
+    STRING_DIR_HELP6 "%16i Cartelle %14s byte liberi\n"
     STRING_DIR_HELP7 "\n Cartelle di %s\n\n"
-    STRING_DIR_HELP8 "%16i File% 14s byte\n"
+    STRING_DIR_HELP8 "%16i File     %14s byte\n"
     STRING_DIRSTACK_HELP1 "Salva la cartella corrente per l'uso con il comando POPD, poi\n\
 passa alla cartella indicata.\n\n\
 PUSHD [percorso | ..]\n\n\
diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc
index b74faf98385..aa32b46c436 100644
--- a/base/shell/cmd/lang/ja-JP.rc
+++ b/base/shell/cmd/lang/ja-JP.rc
@@ -177,10 +177,10 @@ DIR [ドライブ:][パス][ファイル名] [/A[[:]属性]] [/B] [/C] [/D] [/L]
     STRING_DIR_HELP2 " ドライブ %c のボリューム ラベルは %s です\n"
     STRING_DIR_HELP3 " ドライブ %c にはボリューム ラベルがありません。\n"
     STRING_DIR_HELP4 " ボリューム シリアル番号は %04X-%04X です\n"
-    STRING_DIR_HELP5 "\n     ファイルの総数:\n%16i 個のファイル% 14s バイト\n"
-    STRING_DIR_HELP6 "%16i 個のディレクトリ% 15s バイト\n"
+    STRING_DIR_HELP5 "\n     ファイルの総数:\n%16i 個のファイル     %14s バイト\n"
+    STRING_DIR_HELP6 "%16i 個のディレクトリ %14s バイト\n"
     STRING_DIR_HELP7 "\n %s のディレクトリ\n\n"
-    STRING_DIR_HELP8 "%16i 個のファイル% 14s バイト\n"
+    STRING_DIR_HELP8 "%16i 個のファイル     %14s バイト\n"
     STRING_DIRSTACK_HELP1 "POPD コマンドで使用するために現在のディレクトリを保存し、\n\
 指定したディレクトリに変更します。\n\n\
 PUSHD [パス | ..]\n\n\
diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc
index d63aa0ebaca..9f7183151c1 100644
--- a/base/shell/cmd/lang/no-NO.rc
+++ b/base/shell/cmd/lang/no-NO.rc
@@ -170,10 +170,10 @@ forhåndsinnstilte brytere ved å sette en bindestrek (-) foran, for eksempel, /
     STRING_DIR_HELP2 " Volumet i stasjon %c er %s\n"
     STRING_DIR_HELP3 " Volumet i stasjon %c er uten navn.\n"
     STRING_DIR_HELP4 " Volumserienummeret er %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Totalt filer listet:\n%16i fil(er)% 14s byte\n"
-    STRING_DIR_HELP6 "%16i mappe(r)% 15s byte ledig\n"
+    STRING_DIR_HELP5 "\n     Totalt filer listet:\n%16i fil(er)  %14s byte\n"
+    STRING_DIR_HELP6 "%16i mappe(r) %14s byte ledig\n"
     STRING_DIR_HELP7 "\n mappe av %s\n\n"
-    STRING_DIR_HELP8 "%16i fil(er)% 14s byte\n"
+    STRING_DIR_HELP8 "%16i fil(er)  %14s byte\n"
     STRING_DIRSTACK_HELP1 "Lagrer gjeldende mappe for bruk av POPD kommando, og\n\
 endrer deretter til spesifisert mappe.\n\n\
 PUSHD [mappe | ..]\n\n\
diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc
index e19b7841ca9..20361769681 100644
--- a/base/shell/cmd/lang/pl-PL.rc
+++ b/base/shell/cmd/lang/pl-PL.rc
@@ -179,10 +179,10 @@ odwrócić działanie parametrów przedrostkiem - (myślnik)-- na przykład, /-W
     STRING_DIR_HELP2 " Wolumin w napędzie %c ma etykietę: %s\n"
     STRING_DIR_HELP3 " Wolumin w napędzie %c nie posiada etykiety.\n"
     STRING_DIR_HELP4 " Numer seryjny woluminu to: %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Ogółem wyświetonych:\n%16i plik(ów)% 14s bajtów\n"
-    STRING_DIR_HELP6 "%16i katalog(ów)% 15s bajtów wolne\n"
+    STRING_DIR_HELP5 "\n     Ogółem wyświetonych:\n%16i plik(ów)    %14s bajtów\n"
+    STRING_DIR_HELP6 "%16i katalog(ów) %14s bajtów wolne\n"
     STRING_DIR_HELP7 "\n katalog %s\n\n"
-    STRING_DIR_HELP8 "%16i plik(ów)% 14s bajtów\n"
+    STRING_DIR_HELP8 "%16i plik(ów)    %14s bajtów\n"
     STRING_DIRSTACK_HELP1 "Przechowuje obecny katalog dla potrzeb komendy POPD, następnie\n\
 zmienia na podany.\n\n\
 PUSHD [ścieżka | ..]\n\n\
diff --git a/base/shell/cmd/lang/pt-BR.rc b/base/shell/cmd/lang/pt-BR.rc
index f0b4c9c0a07..4cc11ed42c9 100644
--- a/base/shell/cmd/lang/pt-BR.rc
+++ b/base/shell/cmd/lang/pt-BR.rc
@@ -185,7 +185,7 @@ parâmetro - por exemplo, /-W.\n"
     STRING_DIR_HELP3 " Volume na unidade %c não tem rótulo.\n"
     STRING_DIR_HELP4 " Número de série do volume é %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Total de arquivos listados:\n%16i arquivo(s) %14s bytes\n"
-    STRING_DIR_HELP6 "%16i Dir(s) %15s bytes livres\n"
+    STRING_DIR_HELP6 "%16i Dir(s)     %14s bytes livres\n"
     STRING_DIR_HELP7 "\n Diretório de %s\n\n"
     STRING_DIR_HELP8 "%16i arquivo(s) %14s bytes\n"
     STRING_DIRSTACK_HELP1 "Armazena o diretório atual para uso pelo comando POPD, de\n\
diff --git a/base/shell/cmd/lang/pt-PT.rc b/base/shell/cmd/lang/pt-PT.rc
index 420156e1634..9cbe01d818a 100644
--- a/base/shell/cmd/lang/pt-PT.rc
+++ b/base/shell/cmd/lang/pt-PT.rc
@@ -178,7 +178,7 @@ parâmetro - por exemplo, /-W.\n"
     STRING_DIR_HELP3 " Volume na unidade %c não tem rótulo.\n"
     STRING_DIR_HELP4 " Número de série do volume é %04X-%04X\n"
     STRING_DIR_HELP5 "\n     Total de ficheiros listados:\n%16i ficheiro(s) %14s bytes\n"
-    STRING_DIR_HELP6 "%16i Dir(s) %15s bytes livres\n"
+    STRING_DIR_HELP6 "%16i Dir(s)      %14s bytes livres\n"
     STRING_DIR_HELP7 "\n Diretório de %s\n\n"
     STRING_DIR_HELP8 "%16i ficheiro(s) %14s bytes\n"
     STRING_DIRSTACK_HELP1 "Armazena o directório actual para uso pelo comando POPD, de\n\
diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc
index 12b282417b0..097728b6cfe 100644
--- a/base/shell/cmd/lang/ro-RO.rc
+++ b/base/shell/cmd/lang/ro-RO.rc
@@ -190,10 +190,10 @@ De exemplu /-W.\n"
     STRING_DIR_HELP2 " Volumul unității %c este etichetat ca %s\n"
     STRING_DIR_HELP3 " Volumul unității %c nu este etichetat.\n"
     STRING_DIR_HELP4 " Numărul de serie al volumului este %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Numărul de fișiere enumerate:\n%16i fișier(e)% 14s octeți\n"
-    STRING_DIR_HELP6 "%16i dir-re% 15s octeți liberi\n"
+    STRING_DIR_HELP5 "\n     Numărul de fișiere enumerate:\n%16i fișier(e) %14s octeți\n"
+    STRING_DIR_HELP6 "%16i dir-re    %14s octeți liberi\n"
     STRING_DIR_HELP7 "\n Directorul %s\n\n"
-    STRING_DIR_HELP8 "%16i fișiere% 14s octeți\n"
+    STRING_DIR_HELP8 "%16i fișier(e) %14s octeți\n"
     STRING_DIRSTACK_HELP1 "Înregistrează directorul curent în stivă, pentru a-l accesa\n\
 ulterior prin comanda POPD, apoi schimbă directorul curent cu cel specificat.\n\n\
 PUSHD [cale | ..]\n\n\
diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc
index 48f007feb57..a08ed2db272 100644
--- a/base/shell/cmd/lang/ru-RU.rc
+++ b/base/shell/cmd/lang/ru-RU.rc
@@ -178,10 +178,10 @@ DELAY [/m]n\n\n\
     STRING_DIR_HELP2 " Том в устройстве %c имеет метку %s\n"
     STRING_DIR_HELP3 " Том в устройстве %c не имеет метки.\n"
     STRING_DIR_HELP4 " Серийный номер тома: %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Всего:\n%16i файл(ов)% 14s байт\n"
-    STRING_DIR_HELP6 "%16i каталог(ов)% 15s байт свободно\n"
+    STRING_DIR_HELP5 "\n     Всего:\n%16i файл(ов)    %14s байт\n"
+    STRING_DIR_HELP6 "%16i каталог(ов) %14s байт свободно\n"
     STRING_DIR_HELP7 "\n каталог %s\n\n"
-    STRING_DIR_HELP8 "%16i файл(ов)% 14s байт\n"
+    STRING_DIR_HELP8 "%16i файл(ов)    %14s байт\n"
     STRING_DIRSTACK_HELP1 "Сохраняет текущую директорию для использования командой POPD, затем\n\
 изменяет ее на указанную.\n\n\
 PUSHD [путь | ..]\n\n\
diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc
index 261b8cde527..c8da98bdfda 100644
--- a/base/shell/cmd/lang/sk-SK.rc
+++ b/base/shell/cmd/lang/sk-SK.rc
@@ -176,10 +176,10 @@ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n"
     STRING_DIR_HELP2 " Volume in drive %c is %s\n"
     STRING_DIR_HELP3 " Volume in drive %c has no label.\n"
     STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Total Files Listed:\n%16i File(s)% 14s bytes\n"
-    STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n"
+    STRING_DIR_HELP5 "\n     Total Files Listed:\n%16i File(s) %14s bytes\n"
+    STRING_DIR_HELP6 "%16i Dir(s)  %14s bytes free\n"
     STRING_DIR_HELP7 "\n Directory of %s\n\n"
-    STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n"
+    STRING_DIR_HELP8 "%16i File(s) %14s bytes\n"
     STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\
 changes to the specified directory.\n\n\
 PUSHD [path | ..]\n\n\
diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc
index 70c523c5867..6149ab9da4a 100644
--- a/base/shell/cmd/lang/sq-AL.rc
+++ b/base/shell/cmd/lang/sq-AL.rc
@@ -174,10 +174,10 @@ ndryshimet prezente duke vënë përpara një ndryshim me - (hyphen)--për shemb
     STRING_DIR_HELP2 " Volumi në drive %c is %s\n"
     STRING_DIR_HELP3 " Volumi në drive %c has no label.\n"
     STRING_DIR_HELP4 " Volumi Serial dhe Numberi është %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Lista e dokumentave total:\n%16i File(s)% 14s bytes\n"
-    STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n"
+    STRING_DIR_HELP5 "\n     Lista e dokumentave total:\n%16i File(s) %14s bytes\n"
+    STRING_DIR_HELP6 "%16i Dir(s)  %14s bytes free\n"
     STRING_DIR_HELP7 "\n Directory of %s\n\n"
-    STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n"
+    STRING_DIR_HELP8 "%16i File(s) %14s bytes\n"
     STRING_DIRSTACK_HELP1 "Ndryshimet mund të jenë paraprakisht në variablin e mjedisit DIRCMD\n\
 dhe skedes specifike.\n\n\
 PUSHD [rrugë | ..]\n\n\
diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc
index ba10b6c944d..91653be0023 100644
--- a/base/shell/cmd/lang/sv-SE.rc
+++ b/base/shell/cmd/lang/sv-SE.rc
@@ -170,10 +170,10 @@ förinställda växlar med ett bindestreck (-) före, till exempel, /-W.\n"
     STRING_DIR_HELP2 " Volumen i enhet %c är %s\n"
     STRING_DIR_HELP3 " Volumet i enhet %c är utan namn.\n"
     STRING_DIR_HELP4 " Volymens serienummer är %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Totalt filer listet:\n%16i fil(är)% 14s byte\n"
-    STRING_DIR_HELP6 "%16i mapp(ar)% 15s byte ledigt\n"
+    STRING_DIR_HELP5 "\n     Totalt filer listet:\n%16i fil(är)  %14s byte\n"
+    STRING_DIR_HELP6 "%16i mapp(ar) %14s byte ledigt\n"
     STRING_DIR_HELP7 "\n mapp av %s\n\n"
-    STRING_DIR_HELP8 "%16i fil(er)% 14s byte\n"
+    STRING_DIR_HELP8 "%16i fil(er)  %14s byte\n"
     STRING_DIRSTACK_HELP1 "Sparar aktuell mapp for användning av POPD kommandot, och\n\
 ändrar därefter till angiven mapp.\n\n\
 PUSHD [mapp | ..]\n\n\
diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc
index 2f86c3646d4..0cbc3a72e2f 100644
--- a/base/shell/cmd/lang/tr-TR.rc
+++ b/base/shell/cmd/lang/tr-TR.rc
@@ -173,10 +173,10 @@ bir anahtarın önüne - (tire) koyarak ön ayarlı anahtarları geçersiz kıl
     STRING_DIR_HELP2 " %c sürücüsündeki birimin etiketi %s\n"
     STRING_DIR_HELP3 " %c sürücüsündeki birimin etiketi yok.\n"
     STRING_DIR_HELP4 " Birimin Seri Numarası: %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Toplam Listelenen Dosya Miktarı:\n%16i dosya(lar)% 14s bayt değerinde\n"
-    STRING_DIR_HELP6 "%16i dizin %15s bayt boş\n"
+    STRING_DIR_HELP5 "\n     Toplam Listelenen Dosya Miktarı:\n%16i dosya(lar) %14s bayt değerinde\n"
+    STRING_DIR_HELP6 "%16i dizin      %14s bayt boş\n"
     STRING_DIR_HELP7 "\n %s'nın dizini\n\n"
-    STRING_DIR_HELP8 "%16i dosya(lar)% 14s bayt\n"
+    STRING_DIR_HELP8 "%16i dosya(lar) %14s bayt\n"
     STRING_DIRSTACK_HELP1 "Şimdiki dizini POPD komutu tarafından kullanılmak üzere depolar,\n\
 ardından belirtilen dizine değiştirir.\n\n\
 PUSHD [yol | ..]\n\n\
diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc
index 4dbd88aa831..62eb7db3de0 100644
--- a/base/shell/cmd/lang/uk-UA.rc
+++ b/base/shell/cmd/lang/uk-UA.rc
@@ -181,10 +181,10 @@ DELAY [/m]n\n\n\
     STRING_DIR_HELP2 " Том в пристрої %c має мiтку %s\n"
     STRING_DIR_HELP3 " Том в пристрої %c не має мiтки.\n"
     STRING_DIR_HELP4 " Серiйний номер тому: %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     Всього:\n%16i Файл(iв)% 14s байт\n"
-    STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n"
+    STRING_DIR_HELP5 "\n     Всього:\n%16i Файл(iв) %14s байт\n"
+    STRING_DIR_HELP6 "%16i Dir(s)   %14s bytes free\n"
     STRING_DIR_HELP7 "\n Directory of %s\n\n"
-    STRING_DIR_HELP8 "%16i Файл(iв)% 14s байт\n"
+    STRING_DIR_HELP8 "%16i Файл(iв) %14s байт\n"
     STRING_DIRSTACK_HELP1 "Зберiгає поточну директорiю для використання командою POPD, потiм\n\
 замiнює її на вказану.\n\n\
 PUSHD [path | ..]\n\n\
diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc
index e51d6d41d5a..0d002218656 100644
--- a/base/shell/cmd/lang/zh-CN.rc
+++ b/base/shell/cmd/lang/zh-CN.rc
@@ -169,10 +169,10 @@ DELAY [/m]n\n\n\
     STRING_DIR_HELP2 " 驱动器 %c 中的卷是 %s\n"
     STRING_DIR_HELP3 " 驱动器 %c 中的卷没有卷标。\n"
     STRING_DIR_HELP4 " 卷的序列号是 %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     总计：\n%16i 个文件共占据 % 14s 字节\n"
-    STRING_DIR_HELP6 "%16i 个目录 % 15s 字节空闲\n"
+    STRING_DIR_HELP5 "\n     总计：\n%16i 个文件共占据 %14s 字节\n"
+    STRING_DIR_HELP6 "%16i 个目录 %14s 字节空闲\n"
     STRING_DIR_HELP7 "\n %s 的目录\n\n"
-    STRING_DIR_HELP8 "%16i 个文件 % 14s 字节\n"
+    STRING_DIR_HELP8 "%16i 个文件 %14s 字节\n"
     STRING_DIRSTACK_HELP1 "将当前目录存储以便 POPD 命令使用，然后切换到指定的目录。\n\n\
 PUSHD [路径 | ..]\n\n\
   路径          指定要切换到的目录。\n"
diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc
index b4447a8b6f2..bc32ae71020 100644
--- a/base/shell/cmd/lang/zh-TW.rc
+++ b/base/shell/cmd/lang/zh-TW.rc
@@ -169,10 +169,10 @@ DELAY [/m]n\n\n\
     STRING_DIR_HELP2 " 磁碟機 %c 中的磁碟區標籤是 %s\n"
     STRING_DIR_HELP3 " 磁碟機 %c 中的磁碟區沒有標籤。\n"
     STRING_DIR_HELP4 " 磁碟區的序列號是 %04X-%04X\n"
-    STRING_DIR_HELP5 "\n     總計：\n%16i 個檔案共佔據 % 14s 位元組\n"
-    STRING_DIR_HELP6 "%16i 個目錄 % 15s 位元組的可用空間\n"
+    STRING_DIR_HELP5 "\n     總計：\n%16i 個檔案共佔據 %14s 位元組\n"
+    STRING_DIR_HELP6 "%16i 個目錄 %14s 位元組的可用空間\n"
     STRING_DIR_HELP7 "\n %s 的目錄\n\n"
-    STRING_DIR_HELP8 "%16i 個檔案 % 14s 位元組\n"
+    STRING_DIR_HELP8 "%16i 個檔案 %14s 位元組\n"
     STRING_DIRSTACK_HELP1 "將目前的目錄存儲以便 POPD 命令使用，然後切換到指定的目錄。\n\n\
 PUSHD [路徑 | ..]\n\n\
   路徑          指定要切換到的目錄。\n"
diff --git a/base/shell/cmd/wcwidth.c b/base/shell/cmd/wcwidth.c
new file mode 100644
index 00000000000..6a39b02a2a6
--- /dev/null
+++ b/base/shell/cmd/wcwidth.c
@@ -0,0 +1,313 @@
+/*
+ * This is an implementation of wcwidth() and wcswidth() (defined in
+ * IEEE Std 1002.1-2001) for Unicode.
+ *
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html
+ *
+ * In fixed-width output devices, Latin characters all occupy a single
+ * "cell" position of equal width, whereas ideographic CJK characters
+ * occupy two such cells. Interoperability between terminal-line
+ * applications and (teletype-style) character terminals using the
+ * UTF-8 encoding requires agreement on which character should advance
+ * the cursor by how many cell positions. No established formal
+ * standards exist at present on which Unicode character shall occupy
+ * how many cell positions on character terminals. These routines are
+ * a first attempt of defining such behavior based on simple rules
+ * applied to data provided by the Unicode Consortium.
+ *
+ * For some graphical characters, the Unicode standard explicitly
+ * defines a character-cell width via the definition of the East Asian
+ * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes.
+ * In all these cases, there is no ambiguity about which width a
+ * terminal shall use. For characters in the East Asian Ambiguous (A)
+ * class, the width choice depends purely on a preference of backward
+ * compatibility with either historic CJK or Western practice.
+ * Choosing single-width for these characters is easy to justify as
+ * the appropriate long-term solution, as the CJK practice of
+ * displaying these characters as double-width comes from historic
+ * implementation simplicity (8-bit encoded characters were displayed
+ * single-width and 16-bit ones double-width, even for Greek,
+ * Cyrillic, etc.) and not any typographic considerations.
+ *
+ * Much less clear is the choice of width for the Not East Asian
+ * (Neutral) class. Existing practice does not dictate a width for any
+ * of these characters. It would nevertheless make sense
+ * typographically to allocate two character cells to characters such
+ * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be
+ * represented adequately with a single-width glyph. The following
+ * routines at present merely assign a single-cell width to all
+ * neutral characters, in the interest of simplicity. This is not
+ * entirely satisfactory and should be reconsidered before
+ * establishing a formal standard in this area. At the moment, the
+ * decision which Not East Asian (Neutral) characters should be
+ * represented by double-width glyphs cannot yet be answered by
+ * applying a simple rule from the Unicode database content. Setting
+ * up a proper standard for the behavior of UTF-8 character terminals
+ * will require a careful analysis not only of each Unicode character,
+ * but also of each presentation form, something the author of these
+ * routines has avoided to do so far.
+ *
+ * http://www.unicode.org/unicode/reports/tr11/
+ *
+ * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * for any purpose and without fee is hereby granted. The author
+ * disclaims all warranties with regard to this software.
+ *
+ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+ */
+
+#include <wchar.h>
+
+struct interval {
+  int first;
+  int last;
+};
+
+/* auxiliary function for binary search in interval table */
+static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+  int min = 0;
+  int mid;
+
+  if (ucs < table[0].first || ucs > table[max].last)
+    return 0;
+  while (max >= min) {
+    mid = (min + max) / 2;
+    if (ucs > table[mid].last)
+      min = mid + 1;
+    else if (ucs < table[mid].first)
+      max = mid - 1;
+    else
+      return 1;
+  }
+
+  return 0;
+}
+
+
+/* The following two functions define the column width of an ISO 10646
+ * character as follows:
+ *
+ *    - The null character (U+0000) has a column width of 0.
+ *
+ *    - Other C0/C1 control characters and DEL will lead to a return
+ *      value of -1.
+ *
+ *    - Non-spacing and enclosing combining characters (general
+ *      category code Mn or Me in the Unicode database) have a
+ *      column width of 0.
+ *
+ *    - SOFT HYPHEN (U+00AD) has a column width of 1.
+ *
+ *    - Other format characters (general category code Cf in the Unicode
+ *      database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
+ *
+ *    - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+ *      have a column width of 0.
+ *
+ *    - Spacing characters in the East Asian Wide (W) or East Asian
+ *      Full-width (F) category as defined in Unicode Technical
+ *      Report #11 have a column width of 2.
+ *
+ *    - All remaining characters (including all printable
+ *      ISO 8859-1 and WGL4 characters, Unicode control characters,
+ *      etc.) have a column width of 1.
+ *
+ * This implementation assumes that wchar_t characters are encoded
+ * in ISO 10646.
+ */
+
+int mk_wcwidth(wchar_t ucs)
+{
+  /* sorted list of non-overlapping intervals of non-spacing characters */
+  /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
+  static const struct interval combining[] = {
+    { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
+    { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
+    { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
+    { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
+    { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
+    { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
+    { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
+    { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
+    { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
+    { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
+    { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
+    { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
+    { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
+    { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
+    { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
+    { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
+    { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
+    { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
+    { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
+    { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
+    { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
+    { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
+    { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
+    { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
+    { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
+    { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
+    { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
+    { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
+    { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
+    { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
+    { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
+    { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
+    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
+    { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
+    { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
+    { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
+    { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
+    { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
+    { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
+    { 0xE0100, 0xE01EF }
+  };
+
+  /* test for 8-bit control characters */
+  if (ucs == 0)
+    return 0;
+  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+    return -1;
+
+  /* binary search in table of non-spacing characters */
+  if (bisearch(ucs, combining,
+	       sizeof(combining) / sizeof(struct interval) - 1))
+    return 0;
+
+  /* if we arrive here, ucs is not a combining or C0/C1 control character */
+
+  return 1 + 
+    (ucs >= 0x1100 &&
+     (ucs <= 0x115f ||                    /* Hangul Jamo init. consonants */
+      ucs == 0x2329 || ucs == 0x232a ||
+      (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+       ucs != 0x303f) ||                  /* CJK ... Yi */
+      (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+      (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+      (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
+      (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+      (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
+      (ucs >= 0xffe0 && ucs <= 0xffe6)
+#if !defined(__REACTOS__) || (defined(WCHAR_MAX) && (WCHAR_MAX >= 0x10000))
+                                       ||
+      (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+      (ucs >= 0x30000 && ucs <= 0x3fffd)
+#endif
+                                        ));
+}
+
+
+int mk_wcswidth(const wchar_t *pwcs, size_t n)
+{
+  int w, width = 0;
+
+  for (;*pwcs && n-- > 0; pwcs++)
+    if ((w = mk_wcwidth(*pwcs)) < 0)
+      return -1;
+    else
+      width += w;
+
+  return width;
+}
+
+
+/*
+ * The following functions are the same as mk_wcwidth() and
+ * mk_wcswidth(), except that spacing characters in the East Asian
+ * Ambiguous (A) category as defined in Unicode Technical Report #11
+ * have a column width of 2. This variant might be useful for users of
+ * CJK legacy encodings who want to migrate to UCS without changing
+ * the traditional terminal character-width behaviour. It is not
+ * otherwise recommended for general use.
+ */
+int mk_wcwidth_cjk(wchar_t ucs)
+{
+  /* sorted list of non-overlapping intervals of East Asian Ambiguous
+   * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
+  static const struct interval ambiguous[] = {
+    { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
+    { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
+    { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
+    { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
+    { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
+    { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
+    { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
+    { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
+    { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
+    { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
+    { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
+    { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
+    { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
+    { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
+    { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
+    { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
+    { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
+    { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 },
+    { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 },
+    { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 },
+    { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 },
+    { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 },
+    { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 },
+    { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 },
+    { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC },
+    { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 },
+    { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
+    { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
+    { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
+    { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
+    { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
+    { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
+    { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
+    { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
+    { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
+    { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
+    { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
+    { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
+    { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
+    { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
+    { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
+    { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
+    { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
+    { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
+    { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
+    { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
+    { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
+    { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
+    { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
+    { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
+    { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
+    { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
+  };
+
+  /* binary search in table of non-spacing characters */
+  if (bisearch(ucs, ambiguous,
+	       sizeof(ambiguous) / sizeof(struct interval) - 1))
+    return 2;
+
+  return mk_wcwidth(ucs);
+}
+
+
+int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n)
+{
+  int w, width = 0;
+
+  for (;*pwcs && n-- > 0; pwcs++)
+    if ((w = mk_wcwidth_cjk(*pwcs)) < 0)
+      return -1;
+    else
+      width += w;
+
+  return width;
+}
diff --git a/sdk/include/reactos/cjkcode.h b/sdk/include/reactos/cjkcode.h
new file mode 100644
index 00000000000..3cc43b3f08d
--- /dev/null
+++ b/sdk/include/reactos/cjkcode.h
@@ -0,0 +1,47 @@
+/*
+ * PROJECT:     ReactOS header
+ * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
+ * PURPOSE:     Encoding, charsets and codepages for Chinese, Japanese and Korean (CJK)
+ * COPYRIGHT:   Copyright 2017-2022 Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
+                Copyright 2017-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
+ */
+
+#pragma once
+
+#define CP_SHIFTJIS 932  // Japanese Shift-JIS
+#define CP_HANGUL   949  // Korean Hangul/Wansung
+#define CP_JOHAB    1361 // Korean Johab
+#define CP_GB2312   936  // Chinese Simplified (GB2312)
+#define CP_BIG5     950  // Chinese Traditional (Big5)
+
+/*
+ * "Human-understandable" names for the previous standard code pages.
+ * Taken from https://github.com/microsoft/terminal/blob/main/src/inc/unicode.hpp
+ */
+#define CP_JAPANESE             CP_SHIFTJIS
+#define CP_KOREAN               CP_HANGUL
+#define CP_CHINESE_SIMPLIFIED   CP_GB2312
+#define CP_CHINESE_TRADITIONAL  CP_BIG5
+
+/* IsFarEastCP(CodePage) */
+#define IsCJKCodePage(CodePage) \
+    ((CodePage) == CP_SHIFTJIS || (CodePage) == CP_HANGUL || \
+  /* (CodePage) == CP_JOHAB || */ \
+     (CodePage) == CP_BIG5     || (CodePage) == CP_GB2312)
+
+#if !defined(_WINGDI_) || defined(NOGDI)
+#define SHIFTJIS_CHARSET    128
+#define HANGEUL_CHARSET     129
+#define HANGUL_CHARSET      129 // HANGEUL_CHARSET
+#if (WINVER >= 0x0400)
+#define JOHAB_CHARSET       130
+#endif /* WINVER */
+#define GB2312_CHARSET      134
+#define CHINESEBIG5_CHARSET 136
+#endif /* !defined(_WINGDI_) || defined(NOGDI) */
+
+/* IsAnyDBCSCharSet(CharSet) */
+#define IsCJKCharSet(CharSet)   \
+    ((CharSet) == SHIFTJIS_CHARSET || (CharSet) == HANGUL_CHARSET || \
+  /* (CharSet) == JOHAB_CHARSET || */ \
+     (CharSet) == GB2312_CHARSET   || (CharSet) == CHINESEBIG5_CHARSET)
diff --git a/win32ss/user/winsrv/concfg/font.h b/win32ss/user/winsrv/concfg/font.h
index 382792817c5..a45d5a81653 100644
--- a/win32ss/user/winsrv/concfg/font.h
+++ b/win32ss/user/winsrv/concfg/font.h
@@ -18,48 +18,11 @@
 
 #define CP_USA      437  // United States (OEM)
 
-#define CP_SHIFTJIS 932  // Japanese Shift-JIS
-#define CP_HANGUL   949  // Korean Hangul/Wansung
-#define CP_JOHAB    1361 // Korean Johab
-#define CP_GB2312   936  // Chinese Simplified (GB2312)
-#define CP_BIG5     950  // Chinese Traditional (Big5)
-
-/*
- * "Human-understandable" names for the previous standard code pages.
- * Taken from https://github.com/microsoft/terminal/blob/main/src/inc/unicode.hpp
- */
-#define CP_JAPANESE             CP_SHIFTJIS
-#define CP_KOREAN               CP_HANGUL
-#define CP_CHINESE_SIMPLIFIED   CP_GB2312
-#define CP_CHINESE_TRADITIONAL  CP_BIG5
-
-/* IsFarEastCP(CodePage) */
-#define IsCJKCodePage(CodePage) \
-    ((CodePage) == CP_SHIFTJIS || (CodePage) == CP_HANGUL || \
-  /* (CodePage) == CP_JOHAB || */ \
-     (CodePage) == CP_BIG5     || (CodePage) == CP_GB2312)
-
-#if !defined(_WINGDI_) || defined(NOGDI)
-#define SHIFTJIS_CHARSET    128
-#define HANGEUL_CHARSET     129
-#define HANGUL_CHARSET      129 // HANGEUL_CHARSET
-#if(WINVER >= 0x0400)
-#define JOHAB_CHARSET       130
-#endif /* WINVER */
-#define GB2312_CHARSET      134
-#define CHINESEBIG5_CHARSET 136
-#endif /* !defined(_WINGDI_) || defined(NOGDI) */
-
-/* IsAnyDBCSCharSet(CharSet) */
-#define IsCJKCharSet(CharSet)   \
-    ((CharSet) == SHIFTJIS_CHARSET || (CharSet) == HANGUL_CHARSET || \
-  /* (CharSet) == JOHAB_CHARSET || */ \
-     (CharSet) == GB2312_CHARSET   || (CharSet) == CHINESEBIG5_CHARSET)
+#include <cjkcode.h>
 
 #define IsBoldFont(Weight)  \
     ((Weight) >= FW_SEMIBOLD) /* Sometimes, just > FW_MEDIUM */
 
-
 /*
  * @struct  TrueType font list, cached from
  * HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Console\TrueTypeFont