Ukrainian codepage 21866 added and respective files corrected. Two

dlls/kernel/locale.c

@@ -121,7 +121,7 @@ static const struct charset_entry
     { "ISO88598", 28598 },
     { "ISO88599", 28599 },
     { "KOI8R", 20866 },
-    { "KOI8U", 20866 },
+    { "KOI8U", 21866 },
     { "UTF8", CP_UTF8 }
 };
 

dlls/kernel/nls/ukr.nls

@@ -36,7 +36,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
   LOCALE_IDEFAULTEBCDICCODEPAGE "500"
   LOCALE_IDEFAULTLANGUAGE "0422"
   LOCALE_IDEFAULTMACCODEPAGE "10017"
-  LOCALE_IDEFAULTUNIXCODEPAGE "20866"
+  LOCALE_IDEFAULTUNIXCODEPAGE "21866"
   LOCALE_IDIGITS "2"
   LOCALE_IDIGITSUBSTITUTION "1"
   LOCALE_IFIRSTDAYOFWEEK "0"

dlls/mlang/mlang.c

@@ -187,6 +187,12 @@ static const MIME_CP_INFO cyrillic_cp[] =
              MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT |
              MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST,
       "koi8-r", "koi8-r", "koi8-r" },
+    { "Cyrillic (KOI8-U)",
+      21866, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL |
+             MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS |
+             MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT |
+             MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST,
+      "koi8-u", "koi8-u", "koi8-u" },
     { "Cyrillic (ISO)",
       28595, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL |
              MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS |

dlls/x11drv/keyboard.c

@@ -488,6 +488,27 @@ static const char main_key_UA[MAIN_LEN][4] =
  "<>" /* the phantom key */
 };
 
+/*** Ukrainian keyboard layout KOI8-U by O. Nykyforchyn */
+/***  (as it appears on most of keyboards sold today)   */
+static const char main_key_UA_std[MAIN_LEN][4] =
+{
+ "","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+",
+ "","","","","","","","","","","","",
+ "","","","","","","","","","","","\\/",
+ "","","","","","","","","",".,",
+ "<>" /* the phantom key */
+};
+
+/*** Russian keyboard layout KOI8-R (pair to the previous) */
+static const char main_key_RU_std[MAIN_LEN][4] =
+{
+ "","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+",
+ "","","","","","","","","","","","",
+ "","","","","","","","","","","","\\/",
+ "","","","","","","","","",".,",
+ "<>" /* the phantom key */
+};
+
 /*** Spanish keyboard layout (setxkbmap es) */
 static const char main_key_ES[MAIN_LEN][4] =
 {
@@ -812,6 +833,8 @@ static const struct {
  {0x0419, "Russian keyboard layout cp1251", &main_key_RU_cp1251, &main_key_scan_qwerty, &main_key_vkey_qwerty},
  {0x0419, "Russian phonetic keyboard layout", &main_key_RU_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty},
  {0x0422, "Ukrainian keyboard layout KOI8-U", &main_key_UA, &main_key_scan_qwerty, &main_key_vkey_qwerty},
+ {0x0422, "Ukrainian keyboard layout (standard)", &main_key_UA_std, &main_key_scan_qwerty, &main_key_vkey_qwerty},
+ {0x0419, "Russian keyboard layout (standard)", &main_key_RU_std, &main_key_scan_qwerty, &main_key_vkey_qwerty},
  {0x040a, "Spanish keyboard layout", &main_key_ES, &main_key_scan_qwerty, &main_key_vkey_qwerty},
  {0x0410, "Italian keyboard layout", &main_key_IT, &main_key_scan_qwerty, &main_key_vkey_qwerty},
  {0x040f, "Icelandic keyboard layout", &main_key_IS, &main_key_scan_qwerty, &main_key_vkey_qwerty},

dlls/x11drv/xfont.c

@@ -178,8 +178,8 @@ static const SuffixCharset sufch_windows[] = {
 
 static const SuffixCharset sufch_koi8[] = {
     { "r", RUSSIAN_CHARSET, 20866, X11DRV_CPTABLE_SBCS },
-    { "ru", RUSSIAN_CHARSET, 20866, X11DRV_CPTABLE_SBCS },
-    { "u", RUSSIAN_CHARSET, 20866, X11DRV_CPTABLE_SBCS },
+    { "ru", RUSSIAN_CHARSET, 21866, X11DRV_CPTABLE_SBCS },
+    { "u", RUSSIAN_CHARSET, 21866, X11DRV_CPTABLE_SBCS },
     { NULL, RUSSIAN_CHARSET, 20866, X11DRV_CPTABLE_SBCS }};
 
 static const SuffixCharset sufch_jisx0201[] = {

libs/unicode/Makefile.in

@@ -53,6 +53,7 @@ CODEPAGES = \
 	10081 \
 	20866 \
 	20932 \
+	21866 \
 	28591 \
 	28592 \
 	28593 \

libs/unicode/cpmap.pl

@@ -82,6 +82,7 @@ $DEF_CHAR = ord '?';
     [ 10081, "VENDORS/MICSFT/MAC/TURKISH.TXT",    "Mac Turkish" ],
     [ 20866, "VENDORS/MISC/KOI8-R.TXT",           "Russian KOI8" ],
     [ 20932, "OBSOLETE/EASTASIA/JIS/JIS0208.TXT", "EUC-JP" ],
+    [ 21866, "VENDORS/MISC/KOI8-U.TXT",           "Ukrainian KOI8" ],
     [ 28591, "ISO8859/8859-1.TXT",                "ISO 8859-1 Latin 1" ],
     [ 28592, "ISO8859/8859-2.TXT",                "ISO 8859-2 Latin 2 (East European)" ],
     [ 28593, "ISO8859/8859-3.TXT",                "ISO 8859-3 Latin 3 (South European)" ],

libs/unicode/cptable.c

@@ -69,6 +69,7 @@ extern union cptable cptable_10079;
 extern union cptable cptable_10081;
 extern union cptable cptable_20866;
 extern union cptable cptable_20932;
+extern union cptable cptable_21866;
 extern union cptable cptable_28591;
 extern union cptable cptable_28592;
 extern union cptable cptable_28593;
@@ -84,7 +85,7 @@ extern union cptable cptable_28604;
 extern union cptable cptable_28605;
 extern union cptable cptable_28606;
 
-static const union cptable * const cptables[59] =
+static const union cptable * const cptables[60] =
 {
     &cptable_037,
     &cptable_424,
@@ -131,6 +132,7 @@ static const union cptable * const cptables[59] =
     &cptable_10081,
     &cptable_20866,
     &cptable_20932,
+    &cptable_21866,
     &cptable_28591,
     &cptable_28592,
     &cptable_28593,