https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2220e566a2940fc157c636...
commit 2220e566a2940fc157c636ad30460ec9ae06a79c Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Sat Aug 6 08:03:46 2022 +0900 Commit: GitHub noreply@github.com CommitDate: Sat Aug 6 08:03:46 2022 +0900
[KEYBOARD][BOOTDATA][TOOLS] Rename keyboard layout files (#4596)
The keyboard layout file names of ReactOS are different from Windows' ones. It was one reason why ImmInstallIMEW fails. - s/kbdbgm/kbdbu/ Bulgarian (Typewriter) - s/kbdgrist/kbdgr1/ German_IBM - s/kbdes/kbdsp/ Spanish (non-alternate!) - s/kbdja/kbdjpn/ Japanese - s/kbdko/kbdkor/ Korean - s/kbdsk/kbdsl/ Slovak - s/kbdsk1/kbdsl1/ Slovak (QWERTY) CORE-11700 --- boot/bootdata/hivesys.inf | 14 +++++++------- boot/bootdata/txtsetup.sif | 14 +++++++------- dll/keyboard/CMakeLists.txt | 14 +++++++------- dll/keyboard/{kbdbgm/kbdbgm.c => kbdbu/kbdbu.c} | 0 dll/keyboard/{kbdbgm/kbdbgm.rc => kbdbu/kbdbu.rc} | 4 ++-- dll/keyboard/{kbdbgm/kbdbgm.spec => kbdbu/kbdbu.spec} | 0 dll/keyboard/{kbdgrist/kbdgrist.c => kbdgr1/kbdgr1.c} | 0 dll/keyboard/{kbdgrist/kbdgrist.rc => kbdgr1/kbdgr1.rc} | 4 ++-- dll/keyboard/{kbdes/kbdes.spec => kbdgr1/kbdgr1.spec} | 0 dll/keyboard/{kbdja/kbdja.c => kbdjpn/kbdjpn.c} | 0 dll/keyboard/{kbdja/kbdja.rc => kbdjpn/kbdjpn.rc} | 4 ++-- .../{kbdgrist/kbdgrist.spec => kbdjpn/kbdjpn.spec} | 0 dll/keyboard/{kbdko/kbdko.c => kbdkor/kbdkor.c} | 0 dll/keyboard/{kbdko/kbdko.rc => kbdkor/kbdkor.rc} | 4 ++-- dll/keyboard/{kbdja/kbdja.spec => kbdkor/kbdkor.spec} | 0 dll/keyboard/{kbdsk/kbdsk.c => kbdsl/kbdsl.c} | 0 dll/keyboard/{kbdsk/kbdsk.rc => kbdsl/kbdsl.rc} | 4 ++-- dll/keyboard/{kbdko/kbdko.spec => kbdsl/kbdsl.spec} | 0 dll/keyboard/{kbdsk1/kbdsk1.c => kbdsl1/kbdsl1.c} | 0 dll/keyboard/{kbdsk1/kbdsk1.rc => kbdsl1/kbdsl1.rc} | 4 ++-- dll/keyboard/{kbdsk/kbdsk.spec => kbdsl1/kbdsl1.spec} | 0 dll/keyboard/{kbdes/kbdes.c => kbdsp/kbdsp.c} | 0 dll/keyboard/{kbdes/kbdes.rc => kbdsp/kbdsp.rc} | 4 ++-- dll/keyboard/{kbdsk1/kbdsk1.spec => kbdsp/kbdsp.spec} | 0 sdk/tools/gen_baseaddress.py | 14 +++++++------- 25 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 4a447614b8f..08210654e43 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -492,7 +492,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout Text",0x00000000,%ARABIC_102_AZERTY% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5086"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000402","Layout File",0x00000000,"kbdbgm.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000402","Layout File",0x00000000,"kbdbu.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000402","Layout Text",0x00000000,%BULGARIAN_BDS% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000402","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5136"
@@ -524,7 +524,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,"kbdgrist.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout File",0x00000000,"kbdgr1.dll" 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"
@@ -582,7 +582,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Id", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Text",0x00000000,%US_ARABIC% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5123"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdes.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdsp.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Text",0x00000000,%SPANISH% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5020"
@@ -626,12 +626,12 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Text",0x00000000,%ITALIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5015"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdja.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdjpn.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Text",0x00000000,%JAPANESE% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5061" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Id",0x00000000,"0001"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout File",0x00000000,"kbdko.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout File",0x00000000,"kbdkor.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Text",0x00000000,%KOREAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5063" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Id",0x00000000,"0001" @@ -692,11 +692,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout Text",0x00000000,%SERBIAN_CYRILLIC% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5057"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsk.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Text",0x00000000,%SLOVAK% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5039"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout File",0x00000000,"kbdsk1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout File",0x00000000,"kbdsl1.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Text",0x00000000,%SLOVAK_QWERTY% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5040"
diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index c74b3328aae..9b7e35d025e 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -568,13 +568,13 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00020401 = kbda3.dll 00020402 = kbdbgt.dll 00030402 = kbdbga.dll -00040402 = kbdbgm.dll +00040402 = kbdbu.dll 00000405 = kbdcz.dll 00010405 = kbdcz1.dll 00000406 = kbdda.dll 00000407 = kbdgr.dll 00000807 = kbdsg.dll -00010407 = kbdgrist.dll +00010407 = kbdgr1.dll 00020407 = kbdgneo.dll 00030407 = kbdgerg.dll 00000408 = kbdhe.dll @@ -588,7 +588,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00030409 = kbdusl.dll 00040409 = kbdusr.dll 00050409 = kbdusa.dll -0000040A = kbdes.dll +0000040A = kbdsp.dll 0000080A = kbdla.dll 0000040B = kbdfi.dll 0000040C = kbdfr.dll @@ -598,8 +598,8 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 0000040E = kbdhu.dll 0000040F = kbdic.dll 00000410 = kbdit.dll -00000411 = kbdja.dll -00000412 = kbdko.dll +00000411 = kbdjpn.dll +00000412 = kbdkor.dll 00000413 = kbdne.dll 00000813 = kbdbe.dll 00000414 = kbdno.dll @@ -613,8 +613,8 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 0000041A = kbdcr.dll 0000081A = kbdycl.dll 00000C1A = kbdycc.dll -0000041B = kbdsk.dll -0001041B = kbdsk1.dll +0000041B = kbdsl.dll +0001041B = kbdsl1.dll 0000041C = kbdal.dll 0000041D = kbdsw.dll 0000041E = kbdth0.dll diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt index 9401bde674a..4a89c297d38 100644 --- a/dll/keyboard/CMakeLists.txt +++ b/dll/keyboard/CMakeLists.txt @@ -10,10 +10,10 @@ list(APPEND _keyboard_layouts kbdazel kbdbe kbdbga - kbdbgm kbdbgt kbdblr kbdbr + kbdbu kbdbur kbdcan kbdcr @@ -22,7 +22,6 @@ list(APPEND _keyboard_layouts kbdda kbddv kbdeo - kbdes kbdest kbdfc kbdfi @@ -31,7 +30,7 @@ list(APPEND _keyboard_layouts kbdgerg kbdgneo kbdgr - kbdgrist + kbdgr1 kbdhe kbdheb kbdhu @@ -43,9 +42,9 @@ list(APPEND _keyboard_layouts kbdinmal kbdir kbdit - kbdja + kbdjpn kbdkaz - kbdko + kbdkor kbdla kbdlt1 kbdlv @@ -61,8 +60,9 @@ list(APPEND _keyboard_layouts kbdru1 kbdsf kbdsg - kbdsk - kbdsk1 + kbdsl + kbdsl1 + kbdsp kbdsw kbdtat kbdth0 diff --git a/dll/keyboard/kbdbgm/kbdbgm.c b/dll/keyboard/kbdbu/kbdbu.c similarity index 100% rename from dll/keyboard/kbdbgm/kbdbgm.c rename to dll/keyboard/kbdbu/kbdbu.c diff --git a/dll/keyboard/kbdbgm/kbdbgm.rc b/dll/keyboard/kbdbu/kbdbu.rc similarity index 70% rename from dll/keyboard/kbdbgm/kbdbgm.rc rename to dll/keyboard/kbdbu/kbdbu.rc index fea38815ec0..fdb79cc8b78 100644 --- a/dll/keyboard/kbdbgm/kbdbgm.rc +++ b/dll/keyboard/kbdbu/kbdbu.rc @@ -1,6 +1,6 @@ #define REACTOS_VERSION_DLL #pragma code_page(65001) #define REACTOS_STR_FILE_DESCRIPTION "Марица - Българска клавиатурна подредба по БДС 5237-78 за РеактОС\0" -#define REACTOS_STR_INTERNAL_NAME "kbdbgm" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdbgm.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdbu" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdbu.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdbgm/kbdbgm.spec b/dll/keyboard/kbdbu/kbdbu.spec similarity index 100% rename from dll/keyboard/kbdbgm/kbdbgm.spec rename to dll/keyboard/kbdbu/kbdbu.spec diff --git a/dll/keyboard/kbdgrist/kbdgrist.c b/dll/keyboard/kbdgr1/kbdgr1.c similarity index 100% rename from dll/keyboard/kbdgrist/kbdgrist.c rename to dll/keyboard/kbdgr1/kbdgr1.c diff --git a/dll/keyboard/kbdgrist/kbdgrist.rc b/dll/keyboard/kbdgr1/kbdgr1.rc similarity index 57% rename from dll/keyboard/kbdgrist/kbdgrist.rc rename to dll/keyboard/kbdgr1/kbdgr1.rc index d6583979555..eac41c9938c 100644 --- a/dll/keyboard/kbdgrist/kbdgrist.rc +++ b/dll/keyboard/kbdgr1/kbdgr1.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS German Ristome Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdgrist" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdgrist.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdgr1" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdgr1.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdes/kbdes.spec b/dll/keyboard/kbdgr1/kbdgr1.spec similarity index 100% rename from dll/keyboard/kbdes/kbdes.spec rename to dll/keyboard/kbdgr1/kbdgr1.spec diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdjpn/kbdjpn.c similarity index 100% rename from dll/keyboard/kbdja/kbdja.c rename to dll/keyboard/kbdjpn/kbdjpn.c diff --git a/dll/keyboard/kbdja/kbdja.rc b/dll/keyboard/kbdjpn/kbdjpn.rc similarity index 58% rename from dll/keyboard/kbdja/kbdja.rc rename to dll/keyboard/kbdjpn/kbdjpn.rc index 4bf7f7d62a6..1999ad9272c 100644 --- a/dll/keyboard/kbdja/kbdja.rc +++ b/dll/keyboard/kbdjpn/kbdjpn.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Japanese (JIS 106) Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdja" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdja.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdjpn" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdjpn.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdgrist/kbdgrist.spec b/dll/keyboard/kbdjpn/kbdjpn.spec similarity index 100% rename from dll/keyboard/kbdgrist/kbdgrist.spec rename to dll/keyboard/kbdjpn/kbdjpn.spec diff --git a/dll/keyboard/kbdko/kbdko.c b/dll/keyboard/kbdkor/kbdkor.c similarity index 100% rename from dll/keyboard/kbdko/kbdko.c rename to dll/keyboard/kbdkor/kbdkor.c diff --git a/dll/keyboard/kbdko/kbdko.rc b/dll/keyboard/kbdkor/kbdkor.rc similarity index 56% rename from dll/keyboard/kbdko/kbdko.rc rename to dll/keyboard/kbdkor/kbdkor.rc index 03bf04311ab..c3b6ecdecd7 100644 --- a/dll/keyboard/kbdko/kbdko.rc +++ b/dll/keyboard/kbdkor/kbdkor.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Korean Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdko" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdko.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdkor" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdkor.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdja/kbdja.spec b/dll/keyboard/kbdkor/kbdkor.spec similarity index 100% rename from dll/keyboard/kbdja/kbdja.spec rename to dll/keyboard/kbdkor/kbdkor.spec diff --git a/dll/keyboard/kbdsk/kbdsk.c b/dll/keyboard/kbdsl/kbdsl.c similarity index 100% rename from dll/keyboard/kbdsk/kbdsk.c rename to dll/keyboard/kbdsl/kbdsl.c diff --git a/dll/keyboard/kbdsk/kbdsk.rc b/dll/keyboard/kbdsl/kbdsl.rc similarity index 57% rename from dll/keyboard/kbdsk/kbdsk.rc rename to dll/keyboard/kbdsl/kbdsl.rc index 96284619b66..2bf6532a7e0 100644 --- a/dll/keyboard/kbdsk/kbdsk.rc +++ b/dll/keyboard/kbdsl/kbdsl.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdsk" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdsl" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsl.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdko/kbdko.spec b/dll/keyboard/kbdsl/kbdsl.spec similarity index 100% rename from dll/keyboard/kbdko/kbdko.spec rename to dll/keyboard/kbdsl/kbdsl.spec diff --git a/dll/keyboard/kbdsk1/kbdsk1.c b/dll/keyboard/kbdsl1/kbdsl1.c similarity index 100% rename from dll/keyboard/kbdsk1/kbdsk1.c rename to dll/keyboard/kbdsl1/kbdsl1.c diff --git a/dll/keyboard/kbdsk1/kbdsk1.rc b/dll/keyboard/kbdsl1/kbdsl1.rc similarity index 58% rename from dll/keyboard/kbdsk1/kbdsk1.rc rename to dll/keyboard/kbdsl1/kbdsl1.rc index 38919752600..339c490c7db 100644 --- a/dll/keyboard/kbdsk1/kbdsk1.rc +++ b/dll/keyboard/kbdsl1/kbdsl1.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak (QWERTY) Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdsk1" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk1.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdsl1" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsl1.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdsk/kbdsk.spec b/dll/keyboard/kbdsl1/kbdsl1.spec similarity index 100% rename from dll/keyboard/kbdsk/kbdsk.spec rename to dll/keyboard/kbdsl1/kbdsl1.spec diff --git a/dll/keyboard/kbdes/kbdes.c b/dll/keyboard/kbdsp/kbdsp.c similarity index 100% rename from dll/keyboard/kbdes/kbdes.c rename to dll/keyboard/kbdsp/kbdsp.c diff --git a/dll/keyboard/kbdes/kbdes.rc b/dll/keyboard/kbdsp/kbdsp.rc similarity index 57% rename from dll/keyboard/kbdes/kbdes.rc rename to dll/keyboard/kbdsp/kbdsp.rc index ac48c105edd..93d9ab634ff 100644 --- a/dll/keyboard/kbdes/kbdes.rc +++ b/dll/keyboard/kbdsp/kbdsp.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Spanish Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdes" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdes.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdsp" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsp.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdsk1/kbdsk1.spec b/dll/keyboard/kbdsp/kbdsp.spec similarity index 100% rename from dll/keyboard/kbdsk1/kbdsk1.spec rename to dll/keyboard/kbdsp/kbdsp.spec diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index e709dfb9822..0b0cc2e4739 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -121,10 +121,10 @@ EXCLUDE = ( 'kbdazel.dll', 'kbdbe.dll', 'kbdbga.dll', - 'kbdbgm.dll', 'kbdbgt.dll', 'kbdblr.dll', 'kbdbr.dll', + 'kbdbu.dll', 'kbdbur.dll', 'kbdcan.dll', 'kbdcr.dll', @@ -132,7 +132,6 @@ EXCLUDE = ( 'kbdcz1.dll', 'kbdda.dll', 'kbddv.dll', - 'kbdes.dll', 'kbdest.dll', 'kbdfc.dll', 'kbdfi.dll', @@ -141,7 +140,7 @@ EXCLUDE = ( 'kbdgerg.dll', 'kbdgneo.dll', 'kbdgr.dll', - 'kbdgrist.dll', + 'kbdgr1.dll', 'kbdhe.dll', 'kbdheb.dll', 'kbdhu.dll', @@ -153,9 +152,9 @@ EXCLUDE = ( 'kbdinmal.dll', 'kbdir.dll', 'kbdit.dll', - 'kbdja.dll', + 'kbdjpn.dll', 'kbdkaz.dll', - 'kbdko.dll', + 'kbdkor.dll', 'kbdla.dll', 'kbdlt1.dll', 'kbdlv.dll', @@ -169,8 +168,9 @@ EXCLUDE = ( 'kbdru.dll', 'kbdru1.dll', 'kbdsg.dll', - 'kbdsk.dll', - 'kbdsk1.dll', + 'kbdsl.dll', + 'kbdsl1.dll', + 'kbdsp.dll', 'kbdsw.dll', 'kbdtat.dll', 'kbdth0.dll',
-
Katayama Hirofumi MZ