From 8ccd7405b69940eae361fd83f47e20c68097fced Mon Sep 17 00:00:00 2001 From: Saveliy Tretiakov Date: Fri, 23 Feb 2007 18:41:48 +0000 Subject: [PATCH] Update keyboard layout names. Add "Layout Id" key for Us-Dvorak. Rename kbdse.dll to kbdsw.dll svn path=/trunk/; revision=25893 --- reactos/boot/bootdata/hivesys.inf | 25 ++++++++++--------- reactos/dll/keyboard/kbdse/kbdse.rbuild | 9 ------- .../keyboard/{kbdse/kbdse.c => kbdsw/kbdsw.c} | 0 .../{kbdse/kbdse.def => kbdsw/kbdsw.def} | 0 reactos/dll/keyboard/kbdsw/kbdsw.rbuild | 9 +++++++ .../{kbdse/kbdse.rc => kbdsw/kbdsw.rc} | 0 reactos/dll/keyboard/keyboard.rbuild | 4 +-- 7 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 reactos/dll/keyboard/kbdse/kbdse.rbuild rename reactos/dll/keyboard/{kbdse/kbdse.c => kbdsw/kbdsw.c} (100%) rename reactos/dll/keyboard/{kbdse/kbdse.def => kbdsw/kbdsw.def} (100%) create mode 100644 reactos/dll/keyboard/kbdsw/kbdsw.rbuild rename reactos/dll/keyboard/{kbdse/kbdse.rc => kbdsw/kbdsw.rc} (100%) diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf index 90a3e5f2177..852014d40d5 100644 --- a/reactos/boot/bootdata/hivesys.inf +++ b/reactos/boot/bootdata/hivesys.inf @@ -42,33 +42,34 @@ HKLM,"SYSTEM\CurrentControlSet\Enum\Root\LEGACY_UNKNOWN\0000","ConfigFlags",0x00 ; Keyboard Layouts HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout File",0x00000000,"kbdda.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout Text",0x00000000,"DA" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout Text",0x00000000,"Danish" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout File",0x00000000,"kbdes.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout Text",0x00000000,"ES" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout Text",0x00000000,"Spanish" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout File",0x00000000,"kbdgr.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout Text",0x00000000,"GR" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout Text",0x00000000,"German" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout File",0x00000000,"kbdus.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout Text",0x00000000,"US" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout Text",0x00000000,"United States" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout File",0x00000000,"kbddv.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout Id", 0x00000000,"0002" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout Text",0x00000000,"US-Dvorak" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout File",0x00000000,"kbdfr.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout Text",0x00000000,"FR" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout Text",0x00000000,"French" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout File",0x00000000,"kbdit.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout Text",0x00000000,"IT" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout Text",0x00000000,"Italian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout File",0x00000000,"kbdru.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdse.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdsw.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"Swedish" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout File",0x00000000,"kbdth.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout Text",0x00000000,"Thai" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout Text",0x00000000,"UK" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout Text",0x00000000,"United Kingdom" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout File",0x00000000,"kbdsg.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout Text",0x00000000,"SG" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout Text",0x00000000,"Swiss German" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout File",0x00000000,"kbdbe.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout Text",0x00000000,"BE (point)" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout Text",0x00000000,"Belgian Dutch" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout File",0x00000000,"kbdhe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout Text",0x00000000,"Greek" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layout File",0x00000000,"kbdsk.dll" @@ -76,7 +77,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layout Text",0 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000816","Layout File",0x00000000,"kbdpo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000816","Layout Text",0x00000000,"Portuguese" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout File",0x00000000,"kbdja.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout Text",0x00000000,"JP" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout Text",0x00000000,"Japanese" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" diff --git a/reactos/dll/keyboard/kbdse/kbdse.rbuild b/reactos/dll/keyboard/kbdse/kbdse.rbuild deleted file mode 100644 index 8aac06b97ca..00000000000 --- a/reactos/dll/keyboard/kbdse/kbdse.rbuild +++ /dev/null @@ -1,9 +0,0 @@ - - - include - - - 0x0500 - kbdse.c - kbdse.rc - diff --git a/reactos/dll/keyboard/kbdse/kbdse.c b/reactos/dll/keyboard/kbdsw/kbdsw.c similarity index 100% rename from reactos/dll/keyboard/kbdse/kbdse.c rename to reactos/dll/keyboard/kbdsw/kbdsw.c diff --git a/reactos/dll/keyboard/kbdse/kbdse.def b/reactos/dll/keyboard/kbdsw/kbdsw.def similarity index 100% rename from reactos/dll/keyboard/kbdse/kbdse.def rename to reactos/dll/keyboard/kbdsw/kbdsw.def diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild new file mode 100644 index 00000000000..38ef7bbe820 --- /dev/null +++ b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild @@ -0,0 +1,9 @@ + + + include + + + 0x0500 + kbdsw.c + kbdsw.rc + diff --git a/reactos/dll/keyboard/kbdse/kbdse.rc b/reactos/dll/keyboard/kbdsw/kbdsw.rc similarity index 100% rename from reactos/dll/keyboard/kbdse/kbdse.rc rename to reactos/dll/keyboard/kbdsw/kbdsw.rc diff --git a/reactos/dll/keyboard/keyboard.rbuild b/reactos/dll/keyboard/keyboard.rbuild index fa47713c632..0424c17ec49 100644 --- a/reactos/dll/keyboard/keyboard.rbuild +++ b/reactos/dll/keyboard/keyboard.rbuild @@ -29,8 +29,8 @@ - - + +