From 24b2c4be8c1540c2bcc55bfa161f91dab7694e65 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Mon, 16 Jun 2025 17:16:19 +0900
Subject: [PATCH] [INF] intl.inf: Add [KbdLayoutIds] section (#8115)

Win2K internat.exe uses this section.
WinXP and Win2k3 have this section.
JIRA issue: CORE-19268
- Add [KbdLayoutIds] section and add values to intl.inf.
- Add some missing "Layout Id" for "SYSTEM\
  CurrentControlSet\Control\Keyboard Layouts" of
  hivesys.inf.
---
 boot/bootdata/hivesys.inf |  2 ++
 media/inf/intl.inf        | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf
index 19e9a204d1c..2d701f2cb98 100644
--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@@ -762,6 +762,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Displa
 
 ; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout File",0x00000000,"kbdlv1.dll"
 ; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Text",0x00000000,%LATVIAN_QWERTY%
+; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Id",0x00000000,"0015"
 ; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5044"
 
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010427","Layout File",0x00000000,"kbdlt1.dll"
@@ -779,6 +780,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042b","Layout Displa
 
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout File",0x00000000,"kbdarmw.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Text",0x00000000,%ARMENIAN_WESTERN%
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Id",0x00000000,"0025"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5121"
 
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout File",0x00000000,"kbdazel.dll"
diff --git a/media/inf/intl.inf b/media/inf/intl.inf
index 0740f3ad0fc..fcdf87301a3 100644
--- a/media/inf/intl.inf
+++ b/media/inf/intl.inf
@@ -326,6 +326,36 @@ DriverVer = 05/29/2008,0.1
 52936  = %CP52936%
 54936  = %CP54936%
 
+; Special IDs for keyboard layouts. See also HKLM\SYSTEM\CurrentControlSet\Control\Keyboard Layouts
+[KbdLayoutIds]
+;00010402 = 0004
+00010405 = 0005
+00010407 = 0012
+;00010408 = 0016
+00010409 = 0002
+;0001040a = 0086
+;0001040e = 0006
+;00010410 = 0003
+00010415 = 0007
+00010416 = 001d
+00010419 = 0008
+0001041b = 0013
+0001041f = 0014
+;00010426 = 0015
+00010427 = 0027
+0001042b = 0025
+;00010c0c = 0085
+00011009 = 0020
+;00020408 = 0018
+00020409 = 0001
+;00030408 = 0017
+00030409 = 001a
+;00040408 = 0011
+00040409 = 001b
+;00050408 = 0019
+00050409 = 000b
+;00060408 = 001f
+
 [LanguageGroups]
 1  = %LG_WESTERN_EUROPE%,
 2  = %LG_CENTRAL_EUROPE%,