[PATCH 2/2] kernel32: Set language ID to 0x1000 for various minority languages
Alex Henrie
alexhenrie24 at gmail.com
Fri Mar 1 00:35:01 CST 2019
According to MSDN, Cornish, Surinamese Dutch, and Esperanto all have the
language ID 0x1000. Presumably Manx and Walloon will also use 0x1000 if
Windows ever gets support for them.
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/a9eac961-e77d-41a6-90a5-ce1a8b0cdb9c
---
dlls/kernel32/locale_rc.rc | 15 +++++++--------
dlls/kernel32/nls/cor.nls | 2 +-
dlls/kernel32/nls/eox.nls | 12 ++----------
dlls/kernel32/nls/gdv.nls | 2 +-
dlls/kernel32/nls/nls.nls | 7 +------
dlls/kernel32/nls/wal.nls | 4 ++--
6 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc
index 3f9cfd46d4..d578e9135f 100644
--- a/dlls/kernel32/locale_rc.rc
+++ b/dlls/kernel32/locale_rc.rc
@@ -125,6 +125,7 @@
#include "nls/nld.nls" /* 0x0413 LANG_DUTCH, SUBLANG_DUTCH */
#include "nls/nlb.nls" /* 0x0813 LANG_DUTCH, SUBLANG_DUTCH_BELGIAN */
+#include "nls/nls.nls" /* 0x1000 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */
#include "nls/nor.nls" /* 0x0414 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL */
#include "nls/non.nls" /* 0x0814 LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK */
@@ -244,16 +245,14 @@
#include "nls/gdh.nls" /* 0x0491 LANG_SCOTTISH_GAELIC, SUBLANG_SCOTTISH_GAELIC */
-/* Wine extensions */
-
-#include "nls/nls.nls" /* 0x0c13 LANG_DUTCH, SUBLANG_DUTCH_SURINAM */
+#include "nls/cor.nls" /* 0x1000 LANG_CORNISH, SUBLANG_DEFAULT */
-#include "nls/eox.nls" /* 0x048f LANG_ESPERANTO, SUBLANG_DEFAULT */
+#include "nls/eox.nls" /* 0x1000 LANG_ESPERANTO, SUBLANG_DEFAULT */
-#include "nls/wal.nls" /* 0x0490 LANG_WALON, SUBLANG_DEFAULT */
+/* Wine extensions */
-#include "nls/cor.nls" /* 0x0492 LANG_CORNISH, SUBLANG_DEFAULT */
+#include "nls/ivl.nls" /* 0x047f LANG_INVARIANT, SUBLANG_NEUTRAL */
-#include "nls/gdv.nls" /* 0x0494 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */
+#include "nls/gdv.nls" /* 0x1000 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */
-#include "nls/ivl.nls" /* 0x047f LANG_INVARIANT, SUBLANG_NEUTRAL */
+#include "nls/wal.nls" /* 0x1000 LANG_WALON, SUBLANG_DEFAULT */
diff --git a/dlls/kernel32/nls/cor.nls b/dlls/kernel32/nls/cor.nls
index ab6cbde28b..29caa11895 100644
--- a/dlls/kernel32/nls/cor.nls
+++ b/dlls/kernel32/nls/cor.nls
@@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_CORNISH, SUBLANG_DEFAULT
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
LOCALE_IINTLCURRDIGITS "2"
- LOCALE_ILANGUAGE "0492"
+ LOCALE_ILANGUAGE "1000"
LOCALE_ILDATE "1"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "0"
diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls
index d6713730e2..4f3d0e6362 100644
--- a/dlls/kernel32/nls/eox.nls
+++ b/dlls/kernel32/nls/eox.nls
@@ -1,14 +1,6 @@
/*
* Locale definitions for Esperanto
*
- * Esperanto seems not to be supported by Windows
- *
- * TODO: MS numerical ID for language ?
- *
- * I choose 0x8f for esperanto language as it is high enough
- * not to be attributed to another language in the immediate
- * future (as of 19980901 the last official languageID is 0x51)
- *
* No Windows 125[0-8] codepage has the c^ g^ h^ j^ s^ used by esperanto.
* And for DOS codepage ?
*
@@ -50,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
LOCALE_IDEFAULTCODEPAGE "1"
LOCALE_IDEFAULTCOUNTRY ""
LOCALE_IDEFAULTEBCDICCODEPAGE "28593"
- LOCALE_IDEFAULTLANGUAGE "048f"
+ LOCALE_IDEFAULTLANGUAGE "1000"
LOCALE_IDEFAULTMACCODEPAGE "2"
LOCALE_IDEFAULTUNIXCODEPAGE "65001"
LOCALE_IDIGITS "2"
@@ -58,7 +50,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
LOCALE_IINTLCURRDIGITS "2"
- LOCALE_ILANGUAGE "048f"
+ LOCALE_ILANGUAGE "1000"
LOCALE_ILDATE "1"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "0"
diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls
index 5410325738..15eff26d5e 100644
--- a/dlls/kernel32/nls/gdv.nls
+++ b/dlls/kernel32/nls/gdv.nls
@@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "0"
LOCALE_IINTLCURRDIGITS "2"
- LOCALE_ILANGUAGE "0494"
+ LOCALE_ILANGUAGE "1000"
LOCALE_ILDATE "1"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "0"
diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls
index 47c1260d1e..7c46205218 100644
--- a/dlls/kernel32/nls/nls.nls
+++ b/dlls/kernel32/nls/nls.nls
@@ -1,11 +1,6 @@
/*
* Locale definitions for Dutch (Surinam)
*
- * The code for Dutch/Surinam doesn't appear on my docs;
- * It should be something + 0x13 as 0x13 is the Dutch language;
- * Following the same logic as other multi-countries languages
- * I picked 0x0c13 for Surinam/Dutch.
- *
* Copyright 1998 Marcel Baur
* Copyright 2002 Alexandre Julliard for CodeWeavers
*
@@ -48,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM
LOCALE_IFIRSTDAYOFWEEK "0"
LOCALE_IFIRSTWEEKOFYEAR "2"
LOCALE_IINTLCURRDIGITS "2"
- LOCALE_ILANGUAGE "0c13"
+ LOCALE_ILANGUAGE "1000"
LOCALE_ILDATE "1"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "0"
diff --git a/dlls/kernel32/nls/wal.nls b/dlls/kernel32/nls/wal.nls
index e39c5bf4a6..c56e13d450 100644
--- a/dlls/kernel32/nls/wal.nls
+++ b/dlls/kernel32/nls/wal.nls
@@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
LOCALE_IDEFAULTCODEPAGE "850"
LOCALE_IDEFAULTCOUNTRY "32"
LOCALE_IDEFAULTEBCDICCODEPAGE "20297"
- LOCALE_IDEFAULTLANGUAGE "0490"
+ LOCALE_IDEFAULTLANGUAGE "0809"
LOCALE_IDEFAULTMACCODEPAGE "10000"
LOCALE_IDEFAULTUNIXCODEPAGE "28605"
LOCALE_IDIGITS "2"
@@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
LOCALE_IFIRSTDAYOFWEEK "6"
LOCALE_IFIRSTWEEKOFYEAR "0"
LOCALE_IINTLCURRDIGITS "2"
- LOCALE_ILANGUAGE "0490"
+ LOCALE_ILANGUAGE "1000"
LOCALE_ILDATE "1"
LOCALE_ILZERO "1"
LOCALE_IMEASURE "0"
--
2.21.0
More information about the wine-devel
mailing list