Author: dgorbachev Date: Sun Jan 11 13:09:25 2009 New Revision: 38710
URL: http://svn.reactos.org/svn/reactos?rev=38710&view=rev Log: - Fix "Turkish Q" keyboard layout (thanks to user mergulcu from the forum). - Change AltGr behavior for several keyboard layouts (bug #3887). - Change file description for some keyboard layouts. - Other minor changes.
Modified: trunk/reactos/dll/keyboard/kbda2/kbda2.c trunk/reactos/dll/keyboard/kbda3/kbda3.c trunk/reactos/dll/keyboard/kbdal/kbdal.c trunk/reactos/dll/keyboard/kbdarme/kbdarme.c trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c trunk/reactos/dll/keyboard/kbdbga/kbdbga.c trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c trunk/reactos/dll/keyboard/kbdbr/kbdbr.c trunk/reactos/dll/keyboard/kbdbur/kbdbur.c trunk/reactos/dll/keyboard/kbdcan/kbdcan.c trunk/reactos/dll/keyboard/kbdcr/kbdcr.c trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c trunk/reactos/dll/keyboard/kbdda/kbdda.rc trunk/reactos/dll/keyboard/kbddv/kbddv.c trunk/reactos/dll/keyboard/kbdes/kbdes.c trunk/reactos/dll/keyboard/kbdest/kbdest.c trunk/reactos/dll/keyboard/kbdfc/kbdfc.c trunk/reactos/dll/keyboard/kbdfi/kbdfi.c trunk/reactos/dll/keyboard/kbdfr/kbdfr.c trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c trunk/reactos/dll/keyboard/kbdhe/kbdhe.c trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc trunk/reactos/dll/keyboard/kbdheb/kbdheb.c trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc trunk/reactos/dll/keyboard/kbdhu/kbdhu.c trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc trunk/reactos/dll/keyboard/kbdic/kbdic.c trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c trunk/reactos/dll/keyboard/kbdinben/kbdinben.c trunk/reactos/dll/keyboard/kbdindev/kbdindev.c trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c trunk/reactos/dll/keyboard/kbdir/kbdir.c trunk/reactos/dll/keyboard/kbdit/kbdit.c trunk/reactos/dll/keyboard/kbdja/kbdja.c trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rc trunk/reactos/dll/keyboard/kbdko/kbdko.c trunk/reactos/dll/keyboard/kbdla/kbdla.c trunk/reactos/dll/keyboard/kbdlt/kbdlt.c trunk/reactos/dll/keyboard/kbdlv/kbdlv.c trunk/reactos/dll/keyboard/kbdmac/kbdmac.c trunk/reactos/dll/keyboard/kbdne/kbdne.c trunk/reactos/dll/keyboard/kbdno/kbdno.rc trunk/reactos/dll/keyboard/kbdpo/kbdpo.c trunk/reactos/dll/keyboard/kbdro/kbdro.c trunk/reactos/dll/keyboard/kbdru/kbdru.c trunk/reactos/dll/keyboard/kbdsk/kbdsk.c trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c trunk/reactos/dll/keyboard/kbdsw/kbdsw.c trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc trunk/reactos/dll/keyboard/kbdtat/kbdtat.c trunk/reactos/dll/keyboard/kbdth0/kbdth0.c trunk/reactos/dll/keyboard/kbdth1/kbdth1.c trunk/reactos/dll/keyboard/kbdth2/kbdth2.c trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc trunk/reactos/dll/keyboard/kbdth3/kbdth3.c trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c trunk/reactos/dll/keyboard/kbduk/kbduk.c trunk/reactos/dll/keyboard/kbduk/kbduk.rc trunk/reactos/dll/keyboard/kbdur/kbdur.c trunk/reactos/dll/keyboard/kbdurs/kbdurs.c trunk/reactos/dll/keyboard/kbdus/kbdus.rc trunk/reactos/dll/keyboard/kbdusa/kbdusa.c trunk/reactos/dll/keyboard/kbdusl/kbdusl.c trunk/reactos/dll/keyboard/kbdusr/kbdusr.c trunk/reactos/dll/keyboard/kbdusx/kbdusx.c trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c trunk/reactos/dll/keyboard/kbdycc/kbdycc.c trunk/reactos/dll/keyboard/kbdycl/kbdycl.c
Modified: trunk/reactos/dll/keyboard/kbda2/kbda2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/kbda2.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbda2/kbda2.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda2/kbda2.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -395,7 +395,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 2,
Modified: trunk/reactos/dll/keyboard/kbda3/kbda3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/kbda3.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbda3/kbda3.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda3/kbda3.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -395,7 +395,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 2,
Modified: trunk/reactos/dll/keyboard/kbdal/kbdal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/kbdal.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdal/kbdal.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -392,9 +392,9 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Albanian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdarme/kbdarme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarme/kbdarm... ============================================================================== --- trunk/reactos/dll/keyboard/kbdarme/kbdarme.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdarme/kbdarme.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -367,7 +367,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Armenian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/kbdarm... ============================================================================== --- trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -355,7 +355,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Armenian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdbga/kbdbga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,4 +1,5 @@ /* + * Arda - Bulgarian keyboard layout * Àðäà -Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà '÷øåðòú' çà ÐåàêòÎÑ * Copyright (C) 2007 ReactOS * License: LGPL, see: LGPL.txt @@ -165,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } };
#define NOCAPS 0 @@ -396,7 +397,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- */ + /* Ligatures -- Bulgarian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,4 +1,5 @@ /* + * Maritsa - Bulgarian keyboard layout * Ìàðèöà - Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà ïî ÁÄÑ 5237-78 çà ÐåàêòÎÑ * Copyright (C) 2007 ReactOS * License: LGPL, see: LGPL.txt @@ -165,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } };
#define NOCAPS 0 @@ -397,7 +398,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Bulgarian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,4 +1,5 @@ /* + * Tundzha - Bulgarian keyboard layout * Òóíäæà - Áúëãàðñêà êëàâèàòóðíà ïîçâóêîâà ïîäðåäáà 'ÿâåðòú' çà ÐåàêòÎÑ * Copyright (C) 2007 ReactOS * License: LGPL, see: LGPL.txt @@ -405,7 +406,7 @@ /* Key names */ (VSC_LPWSTR *)key_names, (VSC_LPWSTR *)extended_key_names, -// dead_key_names, /* Dead key names */ + // dead_key_names, /* Dead key names */ NULL, /* Dead key names */
/* scan code to virtual key maps */ @@ -414,9 +415,9 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Bulgarian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdbr/kbdbr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbr/kbdbr.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdbr/kbdbr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbr/kbdbr.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -453,7 +453,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdbur/kbdbur.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/kbdbur.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbur/kbdbur.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdcan/kbdcan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcan/kbdcan.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdcan/kbdcan.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcan/kbdcan.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -586,7 +586,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
0, 0,
Modified: trunk/reactos/dll/keyboard/kbdcr/kbdcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/kbdcr.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdcr/kbdcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcr/kbdcr.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -500,9 +500,9 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Croatian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F
ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -124,7 +126,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 0,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 0, 0, 0, 3, 0 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ };
#define NOCAPS 0 @@ -405,7 +408,7 @@ extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Czech keyboard doesn't have any */ 0,
Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DAAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Danish Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdda\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdda.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/kbddv.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbddv/kbddv.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS USASCII Keyboard layout + * ReactOS US Dvorak keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt *
Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS ESASCII Keyboard layout + * ReactOS Spanish Keyboard Layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * Created by HUMA2000 from kbdus, kbdgr, kbdda and kbdfr @@ -524,7 +524,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Spanish doesn't have any */ 0,
Modified: trunk/reactos/dll/keyboard/kbdest/kbdest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdest/kbdest.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdest/kbdest.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdest/kbdest.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -447,7 +447,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
0, 0,
Modified: trunk/reactos/dll/keyboard/kbdfc/kbdfc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfc/kbdfc.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdfc/kbdfc.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfc/kbdfc.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -464,7 +464,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
0, 0,
Modified: trunk/reactos/dll/keyboard/kbdfi/kbdfi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfi/kbdfi.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdfi/kbdfi.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfi/kbdfi.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -463,7 +463,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0, 1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,9 +1,9 @@ /* - * ReactOS FRASCII Keyboard layout + * ReactOS French keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt - * autor: Jean-Michel Gay 2003 - * Pierre Schweitzer 2007 + * Autors: Jean-Michel Gay, 2003 + * Pierre Schweitzer, 2007 * */
@@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F
/** * FIXME : - VK_DIVIDE produces ! instead of / @@ -167,9 +169,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, - { 0, 1, 2, 4,15,15,3 } - /* new: Modifier bit order, NONE, SHIFT, CTRL, ALT , ? ,? , shift+control*/ - /* old: Modifier bit order, NONE, SHIFT, CTRL, ALT */ + { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } + /* Modifier bit order: NONE, SHIFT, CTRL, ALT, ?, ?, SHIFT-CTRL */ };
#define NOCAPS 0 @@ -462,7 +463,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- French doesn't have any */ 0,
Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS FRAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS French Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdfr\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdfr.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -370,9 +370,9 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Georgian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -361,8 +361,7 @@ vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ - deadkey, + deadkey,
/* Key names */ (VSC_LPWSTR *)key_names,
Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Greek Ascii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Greek Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdhe\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdhe.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -448,7 +448,6 @@ vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ NULL,
/* Key names */ @@ -464,7 +463,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- does Hebrew have any? */ + /* Ligatures -- Hebrew doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hebrew Ascii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hebrew Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdheb\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdheb.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS HUASCII Keyboard layout + * ReactOS Hungarian keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * @@ -329,7 +329,6 @@ vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ NULL,
/* Key names */ @@ -345,7 +344,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- English doesn't have any */ + /* Ligatures -- Hungarian doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS HUAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hungarian Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdhu\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdhu.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdic/kbdic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdic/kbdic.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdic/kbdic.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdic/kbdic.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -454,9 +454,9 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Icelandic doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/kbdin... ============================================================================== --- trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -391,7 +391,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 3,
Modified: trunk/reactos/dll/keyboard/kbdinben/kbdinben.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/kbdin... ============================================================================== --- trunk/reactos/dll/keyboard/kbdinben/kbdinben.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinben/kbdinben.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -386,7 +386,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 3,
Modified: trunk/reactos/dll/keyboard/kbdindev/kbdindev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/kbdin... ============================================================================== --- trunk/reactos/dll/keyboard/kbdindev/kbdindev.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdindev/kbdindev.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -391,7 +391,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 3,
Modified: trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/kbdin... ============================================================================== --- trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -391,7 +391,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 3,
Modified: trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/kbdin... ============================================================================== --- trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -387,7 +387,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 3,
Modified: trunk/reactos/dll/keyboard/kbdir/kbdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdir/kbdir.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdir/kbdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdir/kbdir.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -419,7 +419,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -183,7 +183,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, - { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } + { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } };
#define NOCAPS 0 @@ -403,7 +403,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdja/kbdja.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdja/kbdja.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdja/kbdja.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdja/kbdja.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS USASCII Keyboard layout + * ReactOS Japanese (JIS 106) keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * @@ -343,7 +343,6 @@ vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ NULL,
/* Key names */ @@ -359,7 +358,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- English doesn't have any */ + /* Ligatures -- Japanese doesn't have any */ 0, 0, NULL @@ -369,4 +368,3 @@ return &keyboard_layout_table; }
-
Modified: trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS Kazak (Cyrillic) Keyboard layout + * ReactOS Kazakh (Cyrillic) Keyboard layout * Copyright (C) 2008 ReactOS * Author: Dmitry Chapyshev * License: LGPL, see: LGPL.txt
Modified: trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kazak (Cyrillic) Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kazakh (Cyrillic) Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdkaz\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdkaz.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdko/kbdko.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdko/kbdko.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdko/kbdko.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdko/kbdko.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -9,7 +9,7 @@
/* * Important Note / TODO: - * This file is a copy of kbdus.c and needs to adapt to korean + * This file is a copy of kbdus.c and needs to adapt to Korean * keyboard layout! */
@@ -336,7 +336,6 @@ vk_to_wchar_master_table,
/* diacritical marks -- currently implemented by wine code */ - /* English doesn't have any, anyway */ NULL,
/* Key names */ @@ -352,7 +351,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- English doesn't have any */ + /* Ligatures -- Korean doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdla/kbdla.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdla/kbdla.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdla/kbdla.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdla/kbdla.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -440,7 +440,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdlt/kbdlt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlt/kbdlt.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdlt/kbdlt.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlt/kbdlt.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -381,7 +381,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Lithuanian doesn't have any */ 0,
Modified: trunk/reactos/dll/keyboard/kbdlv/kbdlv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlv/kbdlv.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdlv/kbdlv.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlv/kbdlv.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -431,7 +431,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdmac/kbdmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdmac/kbdmac.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdmac/kbdmac.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdmac/kbdmac.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -376,7 +376,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdne/kbdne.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdne/kbdne.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdne/kbdne.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdne/kbdne.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -458,7 +458,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdno/kbdno.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS NOAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Norwegian Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdno\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdno.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/kbdpo.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpo/kbdpo.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS POASCII Keyboard layout + * ReactOS Portuguese keyboard layout * Copyright (C) 2006 ReactOS * License: LGPL, see: LGPL.txt * Based on kbdes, skbdda and skbdfr @@ -10,7 +10,7 @@ * http://keytouch.sourceforge.net/howto_keyboard/node4.html (Very Good) * http://www.microsoft.com/globaldev/tools/msklc.mspx (Keyboard layout file from MS) * - *TODO + * TODO * Correct DEADKEYS * Correct DIVIDE and PrtScr */ @@ -223,10 +223,6 @@ };
- - - - #define TIDLE_CIRC VK_OEM_2 #define ACUTE_GRAVE VK_OEM_1 #define ORDERN_SUPERSCRIPT VK_OEM_7 @@ -237,7 +233,6 @@ #define MATH_RELATE VK_OEM_102
- #define ACUTE_CHAR 0xB4 #define GRAVE_CHAR 0x60 #define CIRC_CHAR 0x5E @@ -258,12 +253,8 @@ modifier_keys, 6, { 0, 1<<0, 1<<1, 1<<2, SHFT_INVALID, SHFT_INVALID, 3 } - /* NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, SHIFT+CONTROL */ -}; - - - - + /* NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, SHIFT+CONTROL */ +};
#define NOCAPS 0 @@ -381,12 +372,6 @@ };
- - - - - - #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { @@ -396,15 +381,6 @@ vk_master(4,key_to_chars_4mod), { 0,0,0 } }; - - - - - - - - -
#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags @@ -476,10 +452,6 @@
{ 0, 0, 0} }; - - - -
ROSDATA VSC_LPWSTR key_names[] = { @@ -579,10 +551,6 @@ };
- - - - /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = {
@@ -608,7 +576,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Portuguese doesn't have any, that i'm aware */ 0,
Modified: trunk/reactos/dll/keyboard/kbdro/kbdro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/kbdro.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdro/kbdro.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdro/kbdro.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -375,7 +375,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/kbdru.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdru/kbdru.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -166,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } };
#define NOCAPS 0
Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F
ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -162,7 +164,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 0, 0, 0, 3, 0 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ };
#define NOCAPS 0 @@ -455,7 +458,7 @@ extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Slovak doesn't have any */ 0,
Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F
ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -162,7 +164,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 0, 0, 0, 3, 0 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ };
#define NOCAPS 0 @@ -455,7 +458,7 @@ extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- Slovak doesn't have any */ 0,
Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdsw.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -470,7 +470,7 @@
MAKELONG(1,1), /* Version 1.0 */
- /* Ligatures -- German doesn't have any */ + /* Ligatures -- Swedish doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS SEAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Swedish Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdsw\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdsw.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdtat/kbdtat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/kbdtat.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdtat/kbdtat.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtat/kbdtat.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -380,9 +380,9 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Russian doesn't have any */ + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Tatar doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdth0/kbdth0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth0/kbdth0.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdth0/kbdth0.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth0/kbdth0.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Thai doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdth1/kbdth1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth1/kbdth1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdth1/kbdth1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth1/kbdth1.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Thai doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdth2/kbdth2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth2.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth2.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth2.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS Thai keyboard layout (traditional) + * ReactOS Thai Kedmanee (non-ShiftLock) Keyboard layout * Copyright (C) 2007 ReactOS * License: LGPL, see: LGPL.txt *
Modified: trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth2.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Keyboard Layout (traditional)\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Kedmanee (non-ShiftLock) Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdth2\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdth2.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdth3/kbdth3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth3/kbdth3.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdth3/kbdth3.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth3/kbdth3.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- Thai doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -465,7 +465,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -195,11 +195,11 @@ { 'B', CAPS, {'b', 'B' } }, { 'N', CAPS, {'n', 'N' } }, { 'M', CAPS, {'m', 'M' } }, - { VK_OEM_2, CAPS, {0x00f6, 0x00d6} }, - { VK_OEM_5, CAPS, {0x00e7, 0x00c7} }, - { VK_OEM_PERIOD, NOCAPS, {'.', ':' } }, + { VK_OEM_COMMA, CAPS, {0x00f6, 0x00d6} }, + { VK_OEM_PERIOD, CAPS, {0x00e7, 0x00c7} }, + { VK_OEM_2, NOCAPS, {'.', ':' } }, { VK_DECIMAL, NOCAPS, {',', ',' } }, - { VK_TAB, NOCAPS, {'\t' ,'\t'} }, + { VK_TAB, NOCAPS, {'\t', '\t' } }, { VK_ADD, NOCAPS, {'+', '+' } }, { VK_DIVIDE, NOCAPS, {'/', '/' } }, { VK_MULTIPLY, NOCAPS, {'*', '*' } }, @@ -232,7 +232,7 @@ { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00a8, WCH_NONE} }, { VK_OEM_6, CAPS, {0x00fc, 0x00dc, WCH_DEAD, 0x001d } }, { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '~', WCH_NONE} }, - { VK_OEM_COMMA, NOCAPS, {',', ';', WCH_DEAD, 0x001c } }, + { VK_OEM_5, NOCAPS, {',', ';', WCH_DEAD, 0x001c } }, { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '`', WCH_NONE} }, { VK_OEM_102, NOCAPS, {'<', '>', '|', 0x001c } }, { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f } }, @@ -465,7 +465,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ /* - * ReactOS USASCII Keyboard layout + * ReactOS United Kingdom keyboard layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt * @@ -31,6 +31,8 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F
ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -128,7 +130,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 3 ,0, 0,4,5} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 3, 0, 0, 4, 5 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ };
#define NOCAPS 0 @@ -361,7 +364,7 @@ extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures -- English doesn't have any */ 0,
Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS UKAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS United Kingdom Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbduk\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbduk.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.c?... ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/kbdur.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdur/kbdur.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -166,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } };
#define NOCAPS 0
Modified: trunk/reactos/dll/keyboard/kbdurs/kbdurs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/kbdurs.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdurs/kbdurs.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdurs/kbdurs.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -166,7 +166,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } + /* Modifier bit order: NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ };
#define NOCAPS 0 @@ -375,7 +376,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.rc... ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.rc [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS USAscii Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS United States Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdus\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdus.dll\0" #include <reactos/version.rc>
Modified: trunk/reactos/dll/keyboard/kbdusa/kbdusa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusa/kbdusa.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdusa/kbdusa.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusa/kbdusa.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -377,7 +377,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdusl/kbdusl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/kbdusl.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdusl/kbdusl.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusl/kbdusl.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- English doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdusr/kbdusr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/kbdusr.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdusr/kbdusr.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusr/kbdusr.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -372,7 +372,7 @@
MAKELONG(0,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures -- English doesn't have any */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdusx/kbdusx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -461,7 +461,7 @@
MAKELONG(1,1), /* Version 1.0 */
- /* Ligatures -- Russian doesn't have any */ + /* Ligatures */ 0, 0, NULL
Modified: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/kbdvnt... ============================================================================== --- trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -375,7 +375,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdycc/kbdycc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/kbdycc.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdycc/kbdycc.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdycc/kbdycc.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -391,7 +391,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 0,
Modified: trunk/reactos/dll/keyboard/kbdycl/kbdycl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/kbdycl.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdycl/kbdycl.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdycl/kbdycl.c [iso-8859-1] Sun Jan 11 13:09:25 2009 @@ -511,7 +511,7 @@ extcode0_to_vk, extcode1_to_vk,
- MAKELONG(0,1), /* Version 1.0 */ + MAKELONG(1,1), /* Version 1.0 */
/* Ligatures */ 2,