winex11.drv: Remove unneeded address-of operators from array names

Andrew Talbot andrew.talbot at talbotville.com
Mon Dec 8 12:53:46 CST 2008


Changelog:
    winex11.drv: Remove unneeded address-of operators from array names.

diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index ee2773b..ab5d82e 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -923,71 +923,71 @@ static const struct {
     const WORD (*scan)[MAIN_LEN]; /* scan codes mapping */
     const WORD (*vkey)[MAIN_LEN]; /* virtual key codes mapping */
 } main_key_tab[]={
- {0x0409, "United States keyboard layout", &main_key_US, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0409, "United States keyboard layout (phantom key version)", &main_key_US_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0409, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_scan_dvorak, &main_key_vkey_dvorak},
- {0x0409, "United States International keyboard layout", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0809, "British keyboard layout", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0407, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x0407, "German keyboard layout without dead keys", &main_key_DE_nodead, &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x0407, "German keyboard layout for logitech desktop pro", &main_key_DE_logitech,  &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x0407, "German keyboard layout without dead keys 105", &main_key_DE_nodead_105, &main_key_scan_qwerty, &main_key_vkey_qwertz_105},
- {0x0807, "Swiss German keyboard layout", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x100c, "Swiss French keyboard layout", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x041d, "Swedish keyboard layout", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2},
- {0x0425, "Estonian keyboard layout", &main_key_ET, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0414, "Norwegian keyboard layout", &main_key_NO, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty},
- {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0c0c, "Canadian French keyboard layout (CA_fr)", &main_key_CA_fr, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty},
- {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty},
- {0x0416, "Brazilian ABNT-2 keyboard layout ALT GR", &main_key_PT_br_alt_gr,&main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty},
- {0x040b, "Finnish keyboard layout", &main_key_FI, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0402, "Bulgarian bds keyboard layout", &main_key_BG_bds, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0402, "Bulgarian phonetic keyboard layout", &main_key_BG_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0423, "Belarusian keyboard layout", &main_key_BY, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0419, "Russian keyboard layout", &main_key_RU, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0419, "Russian keyboard layout (phantom key version)", &main_key_RU_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0419, "Russian keyboard layout KOI8-R", &main_key_RU_koi8r, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0419, "Russian keyboard layout cp1251", &main_key_RU_cp1251, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0419, "Russian phonetic keyboard layout", &main_key_RU_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0422, "Ukrainian keyboard layout KOI8-U", &main_key_UA, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0422, "Ukrainian keyboard layout (standard)", &main_key_UA_std, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0419, "Russian keyboard layout (standard)", &main_key_RU_std, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x040a, "Spanish keyboard layout", &main_key_ES, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0410, "Italian keyboard layout", &main_key_IT, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x040f, "Icelandic keyboard layout", &main_key_IS, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x040e, "Hungarian keyboard layout", &main_key_HU, &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x0415, "Polish (programmer's) keyboard layout", &main_key_PL, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0424, "Slovenian keyboard layout", &main_key_SI, &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x0c1a, "Serbian keyboard layout sr", &main_key_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */
- {0x0c1a, "Serbian keyboard layout us,sr", &main_key_US_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */
- {0x041a, "Croatian keyboard layout", &main_key_HR, &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x041a, "Croatian keyboard layout (specific)", &main_key_HR_jelly, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0411, "Japanese 106 keyboard layout", &main_key_JA_jp106, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106},
- {0x0411, "Japanese Mac keyboard layout", &main_key_JA_macjp, &main_key_scan_qwerty_macjp, &main_key_vkey_qwerty_macjp},
- {0x0411, "Japanese pc98x1 keyboard layout", &main_key_JA_pc98x1, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x041b, "Slovak keyboard layout", &main_key_SK, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x041b, "Slovak and Czech keyboard layout without dead keys", &main_key_SK_prog, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0405, "Czech keyboard layout", &main_key_CS, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0405, "Czech keyboard layout cz", &main_key_CZ, &main_key_scan_qwerty, &main_key_vkey_qwertz},
- {0x0405, "Czech keyboard layout cz_qwerty", &main_key_CZ_qwerty, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x040a, "Latin American keyboard layout", &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0427, "Lithuanian (Baltic) keyboard layout", &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x041f, "Turkish keyboard layout", &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x041f, "Turkish keyboard layout tr", &main_key_TR, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x041f, "Turkish keyboard layout trf", &main_key_TR_F, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x040d, "Israelian keyboard layout", &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x040d, "Israelian phonetic keyboard layout", &main_key_IL_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x040d, "Israelian Saharon keyboard layout", &main_key_IL_saharon, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0409, "VNC keyboard layout", &main_key_vnc, &main_key_scan_vnc, &main_key_vkey_vnc},
- {0x0408, "Greek keyboard layout", &main_key_EL, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x041e, "Thai (Kedmanee)  keyboard layout", &main_key_th, &main_key_scan_qwerty, &main_key_vkey_qwerty},
- {0x0413, "Dutch keyboard layout", &main_key_NL, &main_key_scan_qwerty, &main_key_vkey_qwerty},
+ {0x0409, "United States keyboard layout", main_key_US, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0409, "United States keyboard layout (phantom key version)", main_key_US_phantom, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0409, "United States keyboard layout (dvorak)", main_key_US_dvorak, main_key_scan_dvorak, main_key_vkey_dvorak},
+ {0x0409, "United States International keyboard layout", main_key_US_intl, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0809, "British keyboard layout", main_key_UK, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0407, "German keyboard layout", main_key_DE, main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x0407, "German keyboard layout without dead keys", main_key_DE_nodead, main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x0407, "German keyboard layout for logitech desktop pro", main_key_DE_logitech,  main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x0407, "German keyboard layout without dead keys 105", main_key_DE_nodead_105, main_key_scan_qwerty, main_key_vkey_qwertz_105},
+ {0x0807, "Swiss German keyboard layout", main_key_SG, main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x100c, "Swiss French keyboard layout", main_key_SF, main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x041d, "Swedish keyboard layout", main_key_SE, main_key_scan_qwerty, main_key_vkey_qwerty_v2},
+ {0x0425, "Estonian keyboard layout", main_key_ET, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0414, "Norwegian keyboard layout", main_key_NO, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0406, "Danish keyboard layout", main_key_DA, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x040c, "French keyboard layout", main_key_FR, main_key_scan_qwerty, main_key_vkey_azerty},
+ {0x0c0c, "Canadian French keyboard layout", main_key_CF, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0c0c, "Canadian French keyboard layout (CA_fr)", main_key_CA_fr, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0c0c, "Canadian keyboard layout", main_key_CA, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x080c, "Belgian keyboard layout", main_key_BE, main_key_scan_qwerty, main_key_vkey_azerty},
+ {0x0816, "Portuguese keyboard layout", main_key_PT, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0416, "Brazilian ABNT-2 keyboard layout", main_key_PT_br, main_key_scan_abnt_qwerty, main_key_vkey_abnt_qwerty},
+ {0x0416, "Brazilian ABNT-2 keyboard layout ALT GR", main_key_PT_br_alt_gr,main_key_scan_abnt_qwerty, main_key_vkey_abnt_qwerty},
+ {0x040b, "Finnish keyboard layout", main_key_FI, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0402, "Bulgarian bds keyboard layout", main_key_BG_bds, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0402, "Bulgarian phonetic keyboard layout", main_key_BG_phonetic, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0423, "Belarusian keyboard layout", main_key_BY, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0419, "Russian keyboard layout", main_key_RU, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0419, "Russian keyboard layout (phantom key version)", main_key_RU_phantom, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0419, "Russian keyboard layout KOI8-R", main_key_RU_koi8r, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0419, "Russian keyboard layout cp1251", main_key_RU_cp1251, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0419, "Russian phonetic keyboard layout", main_key_RU_phonetic, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0422, "Ukrainian keyboard layout KOI8-U", main_key_UA, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0422, "Ukrainian keyboard layout (standard)", main_key_UA_std, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0419, "Russian keyboard layout (standard)", main_key_RU_std, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x040a, "Spanish keyboard layout", main_key_ES, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0410, "Italian keyboard layout", main_key_IT, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x040f, "Icelandic keyboard layout", main_key_IS, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x040e, "Hungarian keyboard layout", main_key_HU, main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x0415, "Polish (programmer's) keyboard layout", main_key_PL, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0424, "Slovenian keyboard layout", main_key_SI, main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x0c1a, "Serbian keyboard layout sr", main_key_SR, main_key_scan_qwerty, main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */
+ {0x0c1a, "Serbian keyboard layout us,sr", main_key_US_SR, main_key_scan_qwerty, main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */
+ {0x041a, "Croatian keyboard layout", main_key_HR, main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x041a, "Croatian keyboard layout (specific)", main_key_HR_jelly, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0411, "Japanese 106 keyboard layout", main_key_JA_jp106, main_key_scan_qwerty_jp106, main_key_vkey_qwerty_jp106},
+ {0x0411, "Japanese Mac keyboard layout", main_key_JA_macjp, main_key_scan_qwerty_macjp, main_key_vkey_qwerty_macjp},
+ {0x0411, "Japanese pc98x1 keyboard layout", main_key_JA_pc98x1, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x041b, "Slovak keyboard layout", main_key_SK, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x041b, "Slovak and Czech keyboard layout without dead keys", main_key_SK_prog, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0405, "Czech keyboard layout", main_key_CS, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0405, "Czech keyboard layout cz", main_key_CZ, main_key_scan_qwerty, main_key_vkey_qwertz},
+ {0x0405, "Czech keyboard layout cz_qwerty", main_key_CZ_qwerty, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x040a, "Latin American keyboard layout", main_key_LA, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0427, "Lithuanian (Baltic) keyboard layout", main_key_LT_B, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x041f, "Turkish keyboard layout", main_key_TK, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x041f, "Turkish keyboard layout tr", main_key_TR, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x041f, "Turkish keyboard layout trf", main_key_TR_F, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x040d, "Israelian keyboard layout", main_key_IL, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x040d, "Israelian phonetic keyboard layout", main_key_IL_phonetic, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x040d, "Israelian Saharon keyboard layout", main_key_IL_saharon, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0409, "VNC keyboard layout", main_key_vnc, main_key_scan_vnc, main_key_vkey_vnc},
+ {0x0408, "Greek keyboard layout", main_key_EL, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x041e, "Thai (Kedmanee)  keyboard layout", main_key_th, main_key_scan_qwerty, main_key_vkey_qwerty},
+ {0x0413, "Dutch keyboard layout", main_key_NL, main_key_scan_qwerty, main_key_vkey_qwerty},
 
  {0, NULL, NULL, NULL, NULL} /* sentinel */
 };



More information about the wine-patches mailing list