From 989f7d64817008050b8e2e2968cbf27bd79f5b69 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 24 Mar 2022 17:30:25 +0100
Subject: [PATCH] make_unicode: Generate the language groups registry keys.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/kernelbase/kernelbase.rgs | 299 +++++++++++++++++++++++++++++
 dlls/usp10/tests/usp10.c       |   4 +
 loader/wine.inf.in             | 330 +--------------------------------
 tools/make_unicode             |  21 ++-
 4 files changed, 325 insertions(+), 329 deletions(-)

diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs
index 7b63b681f53..da998e72927 100644
--- a/dlls/kernelbase/kernelbase.rgs
+++ b/dlls/kernelbase/kernelbase.rgs
@@ -79,6 +79,305 @@ HKLM
                         val '949' = s 'c_949.nls'
                         val '950' = s 'c_950.nls'
                     }
+                    'Language Groups'
+                    {
+                        val '1' = s '1'
+                        val '10' = s '1'
+                        val '11' = s '1'
+                        val '2' = s '1'
+                        val '3' = s '1'
+                        val '4' = s '1'
+                        val '5' = s '1'
+                        val '6' = s '1'
+                        val '7' = s '1'
+                        val '8' = s '1'
+                        val '9' = s '1'
+                        val 'a' = s '1'
+                        val 'b' = s '1'
+                        val 'c' = s '1'
+                        val 'd' = s '1'
+                        val 'e' = s '1'
+                        val 'f' = s '1'
+                    }
+                    Locale = s '00000409'
+                    {
+                        val '00000401' = s 'd'
+                        val '00000402' = s '5'
+                        val '00000403' = s '1'
+                        val '00000404' = s '9'
+                        val '00000405' = s '2'
+                        val '00000406' = s '1'
+                        val '00000407' = s '1'
+                        val '00000408' = s '4'
+                        val '00000409' = s '1'
+                        val '0000040a' = s '1'
+                        val '0000040b' = s '1'
+                        val '0000040c' = s '1'
+                        val '0000040d' = s 'c'
+                        val '0000040e' = s '2'
+                        val '0000040f' = s '1'
+                        val '00000410' = s '1'
+                        val '00000411' = s '7'
+                        val '00000412' = s '8'
+                        val '00000413' = s '1'
+                        val '00000414' = s '1'
+                        val '00000415' = s '2'
+                        val '00000416' = s '1'
+                        val '00000417' = s '1'
+                        val '00000418' = s '2'
+                        val '00000419' = s '5'
+                        val '0000041a' = s '2'
+                        val '0000041b' = s '2'
+                        val '0000041c' = s '2'
+                        val '0000041d' = s '1'
+                        val '0000041e' = s 'b'
+                        val '0000041f' = s '6'
+                        val '00000420' = s 'd'
+                        val '00000421' = s '1'
+                        val '00000422' = s '5'
+                        val '00000423' = s '5'
+                        val '00000424' = s '2'
+                        val '00000425' = s '3'
+                        val '00000426' = s '3'
+                        val '00000427' = s '3'
+                        val '00000428' = s '5'
+                        val '00000429' = s 'd'
+                        val '0000042a' = s 'e'
+                        val '0000042b' = s '11'
+                        val '0000042c' = s '2'
+                        val '0000042d' = s '1'
+                        val '0000042e' = s '1'
+                        val '0000042f' = s '5'
+                        val '00000430' = s '1'
+                        val '00000431' = s '1'
+                        val '00000432' = s '1'
+                        val '00000433' = s '1'
+                        val '00000434' = s '1'
+                        val '00000435' = s '1'
+                        val '00000436' = s '1'
+                        val '00000437' = s '10'
+                        val '00000438' = s '1'
+                        val '00000439' = s 'f'
+                        val '0000043a' = s '1'
+                        val '0000043b' = s '1'
+                        val '0000043d' = s '1'
+                        val '0000043e' = s '1'
+                        val '0000043f' = s '5'
+                        val '00000440' = s '5'
+                        val '00000441' = s '1'
+                        val '00000442' = s '2'
+                        val '00000443' = s '2'
+                        val '00000444' = s '5'
+                        val '00000445' = s 'f'
+                        val '00000446' = s 'f'
+                        val '00000447' = s 'f'
+                        val '00000448' = s 'f'
+                        val '00000449' = s 'f'
+                        val '0000044a' = s 'f'
+                        val '0000044b' = s 'f'
+                        val '0000044c' = s 'f'
+                        val '0000044d' = s 'f'
+                        val '0000044e' = s 'f'
+                        val '0000044f' = s 'f'
+                        val '00000450' = s '5'
+                        val '00000451' = s 'f'
+                        val '00000452' = s '1'
+                        val '00000453' = s 'f'
+                        val '00000454' = s 'f'
+                        val '00000455' = s '1'
+                        val '00000456' = s '1'
+                        val '00000457' = s 'f'
+                        val '00000458' = s '1'
+                        val '00000459' = s 'f'
+                        val '0000045a' = s 'd'
+                        val '0000045b' = s 'f'
+                        val '0000045c' = s '1'
+                        val '0000045d' = s '1'
+                        val '0000045e' = s '1'
+                        val '00000461' = s 'f'
+                        val '00000462' = s '1'
+                        val '00000463' = s 'd'
+                        val '00000464' = s '1'
+                        val '00000465' = s 'd'
+                        val '00000466' = s '1'
+                        val '00000467' = s '1'
+                        val '00000468' = s '1'
+                        val '0000046a' = s '1'
+                        val '0000046b' = s '1'
+                        val '0000046c' = s '1'
+                        val '0000046d' = s '5'
+                        val '0000046e' = s '1'
+                        val '0000046f' = s '1'
+                        val '00000470' = s '1'
+                        val '00000471' = s '1'
+                        val '00000472' = s '1'
+                        val '00000473' = s '1'
+                        val '00000474' = s '1'
+                        val '00000475' = s '1'
+                        val '00000476' = s '1'
+                        val '00000477' = s '1'
+                        val '00000478' = s '9'
+                        val '0000047a' = s '1'
+                        val '0000047c' = s '1'
+                        val '0000047e' = s '1'
+                        val '00000480' = s 'd'
+                        val '00000481' = s '1'
+                        val '00000482' = s '1'
+                        val '00000483' = s '1'
+                        val '00000484' = s '1'
+                        val '00000485' = s '5'
+                        val '00000486' = s '1'
+                        val '00000487' = s '1'
+                        val '00000488' = s '1'
+                        val '0000048c' = s 'd'
+                        val '00000491' = s '1'
+                        val '00000492' = s 'd'
+                        val '00000801' = s 'd'
+                        val '00000803' = s '1'
+                        val '00000804' = s 'a'
+                        val '00000807' = s '1'
+                        val '00000809' = s '1'
+                        val '0000080a' = s '1'
+                        val '0000080c' = s '1'
+                        val '00000810' = s '1'
+                        val '00000813' = s '1'
+                        val '00000814' = s '1'
+                        val '00000816' = s '1'
+                        val '00000818' = s '1'
+                        val '00000819' = s '1'
+                        val '0000081d' = s '1'
+                        val '00000820' = s '1'
+                        val '0000082c' = s '5'
+                        val '0000082e' = s '1'
+                        val '00000832' = s '1'
+                        val '0000083b' = s '1'
+                        val '0000083c' = s '1'
+                        val '0000083e' = s '1'
+                        val '00000843' = s '5'
+                        val '00000845' = s 'f'
+                        val '00000846' = s 'd'
+                        val '00000849' = s 'f'
+                        val '00000850' = s 'f'
+                        val '00000859' = s 'd'
+                        val '0000085d' = s '1'
+                        val '0000085f' = s '1'
+                        val '00000860' = s 'f'
+                        val '00000861' = s '1'
+                        val '00000867' = s '1'
+                        val '0000086b' = s '1'
+                        val '00000873' = s '1'
+                        val '00000c01' = s 'd'
+                        val '00000c04' = s '9'
+                        val '00000c07' = s '1'
+                        val '00000c09' = s '1'
+                        val '00000c0a' = s '1'
+                        val '00000c0c' = s '1'
+                        val '00000c3b' = s '1'
+                        val '00000c50' = s 'f'
+                        val '00000c51' = s '1'
+                        val '00000c6b' = s '1'
+                        val '00001001' = s 'd'
+                        val '00001004' = s 'a'
+                        val '00001007' = s '1'
+                        val '00001009' = s '1'
+                        val '0000100a' = s '1'
+                        val '0000100c' = s '1'
+                        val '0000101a' = s '2'
+                        val '0000103b' = s '1'
+                        val '00001401' = s 'd'
+                        val '00001404' = s '9'
+                        val '00001407' = s '1'
+                        val '00001409' = s '1'
+                        val '0000140a' = s '1'
+                        val '0000140c' = s '1'
+                        val '0000141a' = s '2'
+                        val '0000143b' = s '1'
+                        val '00001801' = s 'd'
+                        val '00001809' = s '1'
+                        val '0000180a' = s '1'
+                        val '0000180c' = s '1'
+                        val '0000181a' = s '2'
+                        val '0000183b' = s '1'
+                        val '00001c01' = s 'd'
+                        val '00001c09' = s '1'
+                        val '00001c0a' = s '1'
+                        val '00001c0c' = s '1'
+                        val '00001c1a' = s '5'
+                        val '00001c3b' = s '1'
+                        val '00002001' = s 'd'
+                        val '00002009' = s '1'
+                        val '0000200a' = s '1'
+                        val '0000200c' = s '1'
+                        val '0000201a' = s '5'
+                        val '0000203b' = s '1'
+                        val '00002401' = s 'd'
+                        val '00002409' = s '1'
+                        val '0000240a' = s '1'
+                        val '0000240c' = s '1'
+                        val '0000241a' = s '2'
+                        val '0000243b' = s '1'
+                        val '00002801' = s 'd'
+                        val '00002809' = s '1'
+                        val '0000280a' = s '1'
+                        val '0000280c' = s '1'
+                        val '0000281a' = s '5'
+                        val '00002c01' = s 'd'
+                        val '00002c09' = s '1'
+                        val '00002c0a' = s '1'
+                        val '00002c0c' = s '1'
+                        val '00002c1a' = s '2'
+                        val '00003001' = s 'd'
+                        val '00003009' = s '1'
+                        val '0000300a' = s '1'
+                        val '0000300c' = s '1'
+                        val '0000301a' = s '5'
+                        val '00003401' = s 'd'
+                        val '00003409' = s '1'
+                        val '0000340a' = s '1'
+                        val '0000340c' = s '1'
+                        val '00003801' = s 'd'
+                        val '00003809' = s '1'
+                        val '0000380a' = s '1'
+                        val '0000380c' = s '1'
+                        val '00003c01' = s 'd'
+                        val '00003c09' = s '1'
+                        val '00003c0a' = s '1'
+                        val '00003c0c' = s '1'
+                        val '00004001' = s 'd'
+                        val '00004009' = s '1'
+                        val '0000400a' = s '1'
+                        val '00004409' = s '1'
+                        val '0000440a' = s '1'
+                        val '00004809' = s '1'
+                        val '0000480a' = s '1'
+                        val '00004c09' = s '1'
+                        val '00004c0a' = s '1'
+                        val '0000500a' = s '1'
+                        val '0000540a' = s '1'
+                        val '0000580a' = s '1'
+                        val '00005c0a' = s '1'
+                    }
+                    Locale
+                    {
+                        'Alternate Sorts'
+                        {
+                            val '0000040a' = s '1'
+                            val '0001007f' = s '1'
+                            val '00010407' = s '1'
+                            val '0001040e' = s '2'
+                            val '00010437' = s '10'
+                            val '00020804' = s 'a'
+                            val '00021004' = s 'a'
+                            val '00021404' = s '9'
+                            val '00030404' = s '9'
+                            val '00040404' = s '9'
+                            val '00040411' = s '7'
+                            val '00040c04' = s '9'
+                            val '00041404' = s '9'
+                            val '00050804' = s 'a'
+                            val '00051004' = s 'a'
+                        }
+                    }
                     Normalization
                     {
                         val '1' = s 'normnfc.nls'
diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index aee751423b3..c18076bab53 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -3613,6 +3613,7 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l
     SCRIPT_CONTROL sc;
     SCRIPT_STATE ss;
     LCID lcid_old;
+    BOOL todo;
 
     if (!IsValidLocale(lcid, LCID_INSTALLED)) return TRUE;
 
@@ -3623,7 +3624,10 @@ static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR l
     lcid_old = GetThreadLocale();
     if (!SetThreadLocale(lcid)) return TRUE;
 
+    todo = !GetLocaleInfoW(lcid, LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER, NULL, 0);
+
     hr = ScriptRecordDigitSubstitution(lcid, &sds);
+    todo_wine_if( todo )
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
     hr = ScriptApplyDigitSubstitution(&sds, &sc, &ss);
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index f5e8c85e9b1..46b2caf3647 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -65,7 +65,6 @@ AddReg=\
     Fonts,\
     MCI,\
     Misc,\
-    Nls,\
     OLE,\
     Printing,\
     Services, \
@@ -90,7 +89,6 @@ AddReg=\
     Fonts,\
     MCI,\
     Misc,\
-    Nls,\
     OLE,\
     Printing,\
     Services, \
@@ -117,7 +115,6 @@ AddReg=\
     Fonts,\
     MCI,\
     Misc,\
-    Nls,\
     OLE,\
     Printing,\
     Services, \
@@ -144,7 +141,6 @@ AddReg=\
     Fonts,\
     MCI,\
     Misc,\
-    Nls,\
     OLE,\
     Printing,\
     Services, \
@@ -566,6 +562,8 @@ HKLM,System\CurrentControlSet\Control\hivelist,,16
 HKLM,System\CurrentControlSet\Control\Lsa,"Security Packages",0x10002,kerberos,schannel
 HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16
 HKLM,System\CurrentControlSet\Control\Lsa\MSV1_0,,16
+HKLM,System\CurrentControlSet\Control\Nls\Language,"Default",,"0409"
+HKLM,System\CurrentControlSet\Control\Nls\Language,"InstallLanguage",,"0409"
 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1
 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI"
 HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,""
@@ -599,330 +597,6 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic
 HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http"
 HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https"
 
-[Nls]
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0402",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0403",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0404",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0405",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0406",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0407",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0408",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0409",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"040a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"040b",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"040c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"040d",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"040e",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"040f",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0410",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0411",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0412",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0413",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0414",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0415",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0416",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0418",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0419",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"041a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"041b",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"041c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"041d",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"041e",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"041f",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0420",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0421",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0422",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0423",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0424",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0425",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0426",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0427",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0429",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"042a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"042b",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"042c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"042d",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"042f",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0436",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0437",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0438",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0439",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"043e",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"043f",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0440",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0441",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0443",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0444",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0446",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0447",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0449",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"044a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"044b",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"044e",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"044f",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0450",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0452",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0456",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0457",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"045a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0465",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"047e",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"048f",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0490",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0491",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0494",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0801",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0804",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0807",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0809",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"080a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"080c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0810",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0813",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0814",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0816",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"081a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"081d",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"082c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"083e",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0843",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0894",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0c01",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0c04",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0c07",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0c09",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0c0a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0c0c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0c1a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"0c94",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1001",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1004",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1007",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1009",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"100a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"100c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1401",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1404",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1407",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1409",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"140a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"140c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1801",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1809",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"180a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"180c",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1c01",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1c09",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"1c0a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2001",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2009",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"200a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2401",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2409",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"240a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2801",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2809",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"280a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2c01",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2c09",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"2c0a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"3001",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"3009",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"300a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"3401",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"3409",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"340a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"3801",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"380a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"3c01",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"3c0a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"4001",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"400a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"440a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"480a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"4c0a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"500a",,"l_intl.nls"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"Default",,"0409"
-HKLM,System\CurrentControlSet\Control\Nls\Language,"InstallLanguage",,"0409"
-
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"1",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"10",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"11",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"2",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"3",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"4",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"5",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"6",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"7",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"8",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"9",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"b",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"c",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"d",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"e",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Language Groups,"f",,"1"
-
-HKLM,System\CurrentControlSet\Control\Nls\Locale,,,"00000409"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000401",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000402",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000403",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000404",,"9"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000405",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000406",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000407",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000408",,"4"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000409",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000040a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000040b",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000040c",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000040d",,"c"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000040e",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000040f",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000410",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000411",,"7"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000412",,"8"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000413",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000414",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000415",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000416",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000417",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000418",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000419",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000041a",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000041b",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000041c",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000041d",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000041e",,"b"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000041f",,"6"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000420",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000421",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000422",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000423",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000424",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000425",,"3"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000426",,"3"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000427",,"3"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000429",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000042a",,"e"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000042b",,"11"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000042c",,"6"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000042d",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000042f",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000436",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000437",,"10"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000438",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000439",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000043e",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000043f",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000440",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000441",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000443",,"6"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000444",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000445",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000446",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000447",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000449",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000044a",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000044b",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000044e",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000044f",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000450",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000452",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000456",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000457",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000045a",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000045b",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000461",,"f"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000465",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000047e",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000048f",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000490",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000491",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000492",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000494",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"000004a5",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000801",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000804",,"a"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000807",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000809",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000080a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000080c",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000810",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000813",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000814",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000816",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000081a",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000081d",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000082c",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000083c",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000083e",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000843",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c01",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c04",,"9"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c07",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c09",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c0a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c0c",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c13",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00000c1a",,"5"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001001",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001004",,"a"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001007",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001009",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000100a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000100c",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001401",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001404",,"9"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001407",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001409",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000140a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000140c",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001801",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001809",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000180a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000180c",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001c01",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001c09",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00001c0a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002001",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002009",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000200a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002401",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002409",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000240a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002801",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002809",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000280a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002c01",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002c09",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00002c0a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00003001",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00003009",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000300a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00003401",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00003409",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000340a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00003801",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000380a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00003c01",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00003c0a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00004001",,"d"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000400a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000440a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000480a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"00004c0a",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale,"0000500a",,"1"
-
-HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00010407",,"1"
-HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"0001040e",,"2"
-HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00010437",,"10"
-HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00020804",,"a"
-HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021004",,"a"
-HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021404",,"9"
-HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00030404",,"9"
-
 [OLE]
 HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y"
 HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"
diff --git a/tools/make_unicode b/tools/make_unicode
index a37af197b31..0ab8745e614 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -4570,6 +4570,24 @@ sub build_locale_data()
             add_string( "k0-windows-us" ) # FIXME  # keyboard_layout
     }
 
+    # output language groups
+
+    my %groups;
+    add_registry_key( "Locale", "00000409" );
+    foreach my $loc (@locales)
+    {
+        next unless defined $loc->{lcid};
+        next if ($loc->{lcid} & 0x80000000);
+        next if !defined($loc->{alias}) && $loc->{name} !~ /-$loc->{territory}/; # skip neutral locales
+        my $group = locale_entry( $loc, "group", 1 );
+        my $name = sprintf( "%08x", $loc->{lcid} );
+        my $val = sprintf( "%x", $group );
+        add_registry_value( "Locale", $name, $val ) unless ($loc->{lcid} & 0x000f0000);
+        add_registry_value( "Locale\\Alternate Sorts", $name, $val ) if $loc->{name} =~ /_/;
+        $groups{$val} = 1;
+    }
+    foreach my $group (keys %groups) { add_registry_value( "Language Groups", $group, "1" ); }
+
     my $nb_lcids = scalar keys %lcids;
     my $nb_locales = scalar grep { !defined $_->{alias} } @locales;
     my $nb_lcnames = scalar keys %lcnames;
@@ -4656,7 +4674,8 @@ sub dump_registry_script($%)
         my ($def, @vals) = @{$keys{$k}};
         for (my $i = 0; $i < @subkeys; $i++)
         {
-            printf OUTPUT "%*s%s%s\n%*s{\n", 4 * $indent, "", $subkeys[$i],
+            printf OUTPUT "%*s%s%s\n%*s{\n", 4 * $indent, "",
+                $subkeys[$i] =~ /\s/ ? "'$subkeys[$i]'" :  $subkeys[$i],
                 $i == $#subkeys && $def ? " = s '$def'" : "", 4 * $indent, "";
             $indent++;
         }