From c62ef77697b2a156de8604b9d66952fa56183364 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 28 Jul 2025 21:20:40 +0200
Subject: [PATCH] [KEYBOARD] Rename kbdgr1.dll to kbdgrist.dll

kbdgr1.dll is reserved for the German (IBM) keyboard layout but it is currently used by the German (RISTOME) keyboard layout.
---
 boot/bootdata/hivesys.inf                     | 2 +-
 boot/bootdata/txtsetup.sif                    | 2 +-
 dll/keyboard/CMakeLists.txt                   | 2 +-
 dll/keyboard/{kbdgr1 => kbdgrist}/kbdgr1.c    | 0
 dll/keyboard/{kbdgr1 => kbdgrist}/kbdgr1.rc   | 0
 dll/keyboard/{kbdgr1 => kbdgrist}/kbdgr1.spec | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename dll/keyboard/{kbdgr1 => kbdgrist}/kbdgr1.c (100%)
 rename dll/keyboard/{kbdgr1 => kbdgrist}/kbdgr1.rc (100%)
 rename dll/keyboard/{kbdgr1 => kbdgrist}/kbdgr1.spec (100%)

diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf
index e88a33fa047..1aabdf93341 100644
--- a/boot/bootdata/hivesys.inf
+++ b/boot/bootdata/hivesys.inf
@@ -528,7 +528,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout File",
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout Text",0x00000000,%GERMAN_NEO%
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5138"
 
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout File",0x00000000,"kbdgr1.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout File",0x00000000,"kbdgrist.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Id",  0x00000000,"0012"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Text",0x00000000,%GERMAN_RISTOME%
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5137"
diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index b703f321142..c39450f7239 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -577,7 +577,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 00000406 = kbdda.dll
 00000407 = kbdgr.dll
 00000807 = kbdsg.dll
-00010407 = kbdgr1.dll
+00010407 = kbdgrist.dll
 00020407 = kbdgneo.dll
 00030407 = kbdgerg.dll
 00000408 = kbdhe.dll
diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt
index 9b6638c8f94..e2b52d7e88b 100644
--- a/dll/keyboard/CMakeLists.txt
+++ b/dll/keyboard/CMakeLists.txt
@@ -30,7 +30,7 @@ list(APPEND _keyboard_layouts
     kbdgerg
     kbdgneo
     kbdgr
-    kbdgr1
+    kbdgrist
     kbdhe
     kbdheb
     kbdhu
diff --git a/dll/keyboard/kbdgr1/kbdgr1.c b/dll/keyboard/kbdgrist/kbdgr1.c
similarity index 100%
rename from dll/keyboard/kbdgr1/kbdgr1.c
rename to dll/keyboard/kbdgrist/kbdgr1.c
diff --git a/dll/keyboard/kbdgr1/kbdgr1.rc b/dll/keyboard/kbdgrist/kbdgr1.rc
similarity index 100%
rename from dll/keyboard/kbdgr1/kbdgr1.rc
rename to dll/keyboard/kbdgrist/kbdgr1.rc
diff --git a/dll/keyboard/kbdgr1/kbdgr1.spec b/dll/keyboard/kbdgrist/kbdgr1.spec
similarity index 100%
rename from dll/keyboard/kbdgr1/kbdgr1.spec
rename to dll/keyboard/kbdgrist/kbdgr1.spec