mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 19:49:50 +00:00
VK_0-9 and VK_A-Z are not defined in the Windows headers, removed them
(spotted by Francois Gouget).
This commit is contained in:
Alexandre Julliard
parent
2d2e2e1e55
commit
d3c0cb77d9
3 changed files with 78 additions and 113 deletions
|
|
@ -3030,23 +3030,23 @@ static void test_interthread_messages(void)
|
|||
|
||||
|
||||
static const struct message WmVkN[] = {
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_N, 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, VK_N, 1 },
|
||||
{ WM_KEYDOWN, wparam|lparam, 'N', 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, 'N', 1 },
|
||||
{ WM_CHAR, wparam|lparam, 'n', 1 },
|
||||
{ WM_COMMAND, sent|wparam|lparam, MAKEWPARAM(1002,1), 0 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_N, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_N, 0xc0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, 'N', 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, 'N', 0xc0000001 },
|
||||
{ 0 }
|
||||
};
|
||||
static const struct message WmShiftVkN[] = {
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_SHIFT, 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, VK_SHIFT, 1 },
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_N, 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, VK_N, 1 },
|
||||
{ WM_KEYDOWN, wparam|lparam, 'N', 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, 'N', 1 },
|
||||
{ WM_CHAR, wparam|lparam, 'N', 1 },
|
||||
{ WM_COMMAND, sent|wparam|lparam, MAKEWPARAM(1001,1), 0 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_N, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_N, 0xc0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, 'N', 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, 'N', 0xc0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_SHIFT, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_SHIFT, 0xc0000001 },
|
||||
{ 0 }
|
||||
|
|
@ -3054,12 +3054,12 @@ static const struct message WmShiftVkN[] = {
|
|||
static const struct message WmCtrlVkN[] = {
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_CONTROL, 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, VK_CONTROL, 1 },
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_N, 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, VK_N, 1 },
|
||||
{ WM_KEYDOWN, wparam|lparam, 'N', 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, 'N', 1 },
|
||||
{ WM_CHAR, wparam|lparam, 0x000e, 1 },
|
||||
{ WM_COMMAND, sent|wparam|lparam, MAKEWPARAM(1000,1), 0 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_N, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_N, 0xc0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, 'N', 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, 'N', 0xc0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_CONTROL, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_CONTROL, 0xc0000001 },
|
||||
{ 0 }
|
||||
|
|
@ -3067,10 +3067,10 @@ static const struct message WmCtrlVkN[] = {
|
|||
static const struct message WmCtrlVkN_2[] = {
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_CONTROL, 1 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, VK_CONTROL, 1 },
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_N, 1 },
|
||||
{ WM_KEYDOWN, wparam|lparam, 'N', 1 },
|
||||
{ WM_COMMAND, sent|wparam|lparam, MAKEWPARAM(1000,1), 0 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_N, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_N, 0xc0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, 'N', 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, 'N', 0xc0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_CONTROL, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_CONTROL, 0xc0000001 },
|
||||
{ 0 }
|
||||
|
|
@ -3078,8 +3078,8 @@ static const struct message WmCtrlVkN_2[] = {
|
|||
static const struct message WmAltVkN[] = {
|
||||
{ WM_SYSKEYDOWN, wparam|lparam, VK_MENU, 0x20000001 },
|
||||
{ WM_SYSKEYDOWN, sent|wparam|lparam, VK_MENU, 0x20000001 },
|
||||
{ WM_SYSKEYDOWN, wparam|lparam, VK_N, 0x20000001 },
|
||||
{ WM_SYSKEYDOWN, sent|wparam|lparam, VK_N, 0x20000001 },
|
||||
{ WM_SYSKEYDOWN, wparam|lparam, 'N', 0x20000001 },
|
||||
{ WM_SYSKEYDOWN, sent|wparam|lparam, 'N', 0x20000001 },
|
||||
{ WM_SYSCHAR, wparam|lparam, 'n', 0x20000001 },
|
||||
{ WM_SYSCHAR, sent|wparam|lparam, 'n', 0x20000001 },
|
||||
{ WM_SYSCOMMAND, sent|defwinproc|wparam|lparam, SC_KEYMENU, 'n' },
|
||||
|
|
@ -3093,8 +3093,8 @@ static const struct message WmAltVkN[] = {
|
|||
{ WM_EXITMENULOOP, sent|defwinproc },
|
||||
{ WM_MENUSELECT, sent|defwinproc|wparam|optional, MAKEWPARAM(0,0xffff) }, /* Win95 bug */
|
||||
{ WM_EXITMENULOOP, sent|defwinproc|optional }, /* Win95 bug */
|
||||
{ WM_SYSKEYUP, wparam|lparam, VK_N, 0xe0000001 },
|
||||
{ WM_SYSKEYUP, sent|wparam|lparam, VK_N, 0xe0000001 },
|
||||
{ WM_SYSKEYUP, wparam|lparam, 'N', 0xe0000001 },
|
||||
{ WM_SYSKEYUP, sent|wparam|lparam, 'N', 0xe0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_MENU, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 },
|
||||
{ 0 }
|
||||
|
|
@ -3102,10 +3102,10 @@ static const struct message WmAltVkN[] = {
|
|||
static const struct message WmAltVkN_2[] = {
|
||||
{ WM_SYSKEYDOWN, wparam|lparam, VK_MENU, 0x20000001 },
|
||||
{ WM_SYSKEYDOWN, sent|wparam|lparam, VK_MENU, 0x20000001 },
|
||||
{ WM_SYSKEYDOWN, wparam|lparam, VK_N, 0x20000001 },
|
||||
{ WM_SYSKEYDOWN, wparam|lparam, 'N', 0x20000001 },
|
||||
{ WM_COMMAND, sent|wparam|lparam, MAKEWPARAM(1003,1), 0 },
|
||||
{ WM_SYSKEYUP, wparam|lparam, VK_N, 0xe0000001 },
|
||||
{ WM_SYSKEYUP, sent|wparam|lparam, VK_N, 0xe0000001 },
|
||||
{ WM_SYSKEYUP, wparam|lparam, 'N', 0xe0000001 },
|
||||
{ WM_SYSKEYUP, sent|wparam|lparam, 'N', 0xe0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_MENU, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 },
|
||||
{ 0 }
|
||||
|
|
@ -3115,10 +3115,10 @@ static const struct message WmCtrlAltVkN[] = {
|
|||
{ WM_KEYDOWN, sent|wparam|lparam, VK_CONTROL, 1 },
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_MENU, 0x20000001 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, VK_MENU, 0x20000001 },
|
||||
{ WM_KEYDOWN, wparam|lparam, VK_N, 0x20000001 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, VK_N, 0x20000001 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_N, 0xe0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_N, 0xe0000001 },
|
||||
{ WM_KEYDOWN, wparam|lparam, 'N', 0x20000001 },
|
||||
{ WM_KEYDOWN, sent|wparam|lparam, 'N', 0x20000001 },
|
||||
{ WM_KEYUP, wparam|lparam, 'N', 0xe0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, 'N', 0xe0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_MENU, 0xc0000001 },
|
||||
{ WM_KEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 },
|
||||
{ WM_KEYUP, wparam|lparam, VK_CONTROL, 0xc0000001 },
|
||||
|
|
@ -3171,16 +3171,16 @@ static void test_accelerators(void)
|
|||
|
||||
trace("testing VK_N press/release\n");
|
||||
flush_sequence();
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
ok_sequence(WmVkN, "VK_N press/release", FALSE);
|
||||
|
||||
trace("testing Shift+VK_N press/release\n");
|
||||
flush_sequence();
|
||||
keybd_event(VK_SHIFT, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
ok_sequence(WmShiftVkN, "Shift+VK_N press/release", FALSE);
|
||||
|
|
@ -3188,8 +3188,8 @@ static void test_accelerators(void)
|
|||
trace("testing Ctrl+VK_N press/release\n");
|
||||
flush_sequence();
|
||||
keybd_event(VK_CONTROL, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_CONTROL, 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
ok_sequence(WmCtrlVkN, "Ctrl+VK_N press/release", FALSE);
|
||||
|
|
@ -3197,8 +3197,8 @@ static void test_accelerators(void)
|
|||
trace("testing Alt+VK_N press/release\n");
|
||||
flush_sequence();
|
||||
keybd_event(VK_MENU, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
ok_sequence(WmAltVkN, "Alt+VK_N press/release", FALSE);
|
||||
|
|
@ -3207,8 +3207,8 @@ static void test_accelerators(void)
|
|||
flush_sequence();
|
||||
keybd_event(VK_CONTROL, 0, 0, 0);
|
||||
keybd_event(VK_MENU, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_CONTROL, 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
|
|
@ -3221,16 +3221,16 @@ static void test_accelerators(void)
|
|||
|
||||
trace("testing VK_N press/release\n");
|
||||
flush_sequence();
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
ok_sequence(WmVkN, "VK_N press/release", FALSE);
|
||||
|
||||
trace("testing Shift+VK_N press/release\n");
|
||||
flush_sequence();
|
||||
keybd_event(VK_SHIFT, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
ok_sequence(WmShiftVkN, "Shift+VK_N press/release", FALSE);
|
||||
|
|
@ -3238,8 +3238,8 @@ static void test_accelerators(void)
|
|||
trace("testing Ctrl+VK_N press/release 2\n");
|
||||
flush_sequence();
|
||||
keybd_event(VK_CONTROL, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_CONTROL, 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
ok_sequence(WmCtrlVkN_2, "Ctrl+VK_N press/release 2", FALSE);
|
||||
|
|
@ -3247,8 +3247,8 @@ static void test_accelerators(void)
|
|||
trace("testing Alt+VK_N press/release 2\n");
|
||||
flush_sequence();
|
||||
keybd_event(VK_MENU, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
ok_sequence(WmAltVkN_2, "Alt+VK_N press/release 2", FALSE);
|
||||
|
|
@ -3257,8 +3257,8 @@ static void test_accelerators(void)
|
|||
flush_sequence();
|
||||
keybd_event(VK_CONTROL, 0, 0, 0);
|
||||
keybd_event(VK_MENU, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, 0, 0);
|
||||
keybd_event(VK_N, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event('N', 0, 0, 0);
|
||||
keybd_event('N', 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0);
|
||||
keybd_event(VK_CONTROL, 0, KEYEVENTF_KEYUP, 0);
|
||||
pump_msg_loop(hwnd, hAccel);
|
||||
|
|
|
|||
|
|
@ -109,69 +109,69 @@ static const WORD main_key_scan_dvorak[MAIN_LEN] =
|
|||
static const WORD main_key_vkey_qwerty[MAIN_LEN] =
|
||||
{
|
||||
/* NOTE: this layout must concur with the scan codes layout above */
|
||||
VK_OEM_3,VK_1,VK_2,VK_3,VK_4,VK_5,VK_6,VK_7,VK_8,VK_9,VK_0,VK_OEM_MINUS,VK_OEM_PLUS,
|
||||
VK_Q,VK_W,VK_E,VK_R,VK_T,VK_Y,VK_U,VK_I,VK_O,VK_P,VK_OEM_4,VK_OEM_6,
|
||||
VK_A,VK_S,VK_D,VK_F,VK_G,VK_H,VK_J,VK_K,VK_L,VK_OEM_1,VK_OEM_7,VK_OEM_5,
|
||||
VK_Z,VK_X,VK_C,VK_V,VK_B,VK_N,VK_M,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,
|
||||
VK_OEM_3,'1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_PLUS,
|
||||
'Q','W','E','R','T','Y','U','I','O','P',VK_OEM_4,VK_OEM_6,
|
||||
'A','S','D','F','G','H','J','K','L',VK_OEM_1,VK_OEM_7,VK_OEM_5,
|
||||
'Z','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,
|
||||
VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */
|
||||
};
|
||||
|
||||
static const WORD main_key_vkey_qwerty_v2[MAIN_LEN] =
|
||||
{
|
||||
/* NOTE: this layout must concur with the scan codes layout above */
|
||||
VK_OEM_5,VK_1,VK_2,VK_3,VK_4,VK_5,VK_6,VK_7,VK_8,VK_9,VK_0,VK_OEM_PLUS,VK_OEM_4,
|
||||
VK_Q,VK_W,VK_E,VK_R,VK_T,VK_Y,VK_U,VK_I,VK_O,VK_P,VK_OEM_6,VK_OEM_1,
|
||||
VK_A,VK_S,VK_D,VK_F,VK_G,VK_H,VK_J,VK_K,VK_L,VK_OEM_3,VK_OEM_7,VK_OEM_2,
|
||||
VK_Z,VK_X,VK_C,VK_V,VK_B,VK_N,VK_M,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_MINUS,
|
||||
VK_OEM_5,'1','2','3','4','5','6','7','8','9','0',VK_OEM_PLUS,VK_OEM_4,
|
||||
'Q','W','E','R','T','Y','U','I','O','P',VK_OEM_6,VK_OEM_1,
|
||||
'A','S','D','F','G','H','J','K','L',VK_OEM_3,VK_OEM_7,VK_OEM_2,
|
||||
'Z','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_MINUS,
|
||||
VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */
|
||||
};
|
||||
|
||||
static const WORD main_key_vkey_qwertz[MAIN_LEN] =
|
||||
{
|
||||
/* NOTE: this layout must concur with the scan codes layout above */
|
||||
VK_OEM_3,VK_1,VK_2,VK_3,VK_4,VK_5,VK_6,VK_7,VK_8,VK_9,VK_0,VK_OEM_MINUS,VK_OEM_PLUS,
|
||||
VK_Q,VK_W,VK_E,VK_R,VK_T,VK_Z,VK_U,VK_I,VK_O,VK_P,VK_OEM_4,VK_OEM_6,
|
||||
VK_A,VK_S,VK_D,VK_F,VK_G,VK_H,VK_J,VK_K,VK_L,VK_OEM_1,VK_OEM_7,VK_OEM_5,
|
||||
VK_Y,VK_X,VK_C,VK_V,VK_B,VK_N,VK_M,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,
|
||||
VK_OEM_3,'1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_PLUS,
|
||||
'Q','W','E','R','T','Z','U','I','O','P',VK_OEM_4,VK_OEM_6,
|
||||
'A','S','D','F','G','H','J','K','L',VK_OEM_1,VK_OEM_7,VK_OEM_5,
|
||||
'Y','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,
|
||||
VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */
|
||||
};
|
||||
|
||||
static const WORD main_key_vkey_qwertz_105[MAIN_LEN] =
|
||||
{
|
||||
/* NOTE: this layout must concur with the scan codes layout above */
|
||||
VK_OEM_3,VK_1,VK_2,VK_3,VK_4,VK_5,VK_6,VK_7,VK_8,VK_9,VK_0,VK_OEM_MINUS,VK_OEM_PLUS,
|
||||
VK_Q,VK_W,VK_E,VK_R,VK_T,VK_Z,VK_U,VK_I,VK_O,VK_P,VK_OEM_4,VK_OEM_6,
|
||||
VK_A,VK_S,VK_D,VK_F,VK_G,VK_H,VK_J,VK_K,VK_L,VK_OEM_1,VK_OEM_7,VK_OEM_5,
|
||||
VK_OEM_102,VK_Y,VK_X,VK_C,VK_V,VK_B,VK_N,VK_M,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2
|
||||
VK_OEM_3,'1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_PLUS,
|
||||
'Q','W','E','R','T','Z','U','I','O','P',VK_OEM_4,VK_OEM_6,
|
||||
'A','S','D','F','G','H','J','K','L',VK_OEM_1,VK_OEM_7,VK_OEM_5,
|
||||
VK_OEM_102,'Y','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2
|
||||
};
|
||||
|
||||
static const WORD main_key_vkey_abnt_qwerty[MAIN_LEN] =
|
||||
{
|
||||
/* NOTE: this layout must concur with the scan codes layout above */
|
||||
VK_OEM_3,VK_1,VK_2,VK_3,VK_4,VK_5,VK_6,VK_7,VK_8,VK_9,VK_0,VK_OEM_MINUS,VK_OEM_PLUS,
|
||||
VK_Q,VK_W,VK_E,VK_R,VK_T,VK_Y,VK_U,VK_I,VK_O,VK_P,VK_OEM_4,VK_OEM_6,
|
||||
VK_A,VK_S,VK_D,VK_F,VK_G,VK_H,VK_J,VK_K,VK_L,VK_OEM_1,VK_OEM_8,VK_OEM_5,
|
||||
VK_OEM_7,VK_Z,VK_X,VK_C,VK_V,VK_B,VK_N,VK_M,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,
|
||||
VK_OEM_3,'1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_PLUS,
|
||||
'Q','W','E','R','T','Y','U','I','O','P',VK_OEM_4,VK_OEM_6,
|
||||
'A','S','D','F','G','H','J','K','L',VK_OEM_1,VK_OEM_8,VK_OEM_5,
|
||||
VK_OEM_7,'Z','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,
|
||||
VK_OEM_102, /* the 102nd key (actually to the right of l-shift) */
|
||||
};
|
||||
|
||||
static const WORD main_key_vkey_azerty[MAIN_LEN] =
|
||||
{
|
||||
/* NOTE: this layout must concur with the scan codes layout above */
|
||||
VK_OEM_7,VK_1,VK_2,VK_3,VK_4,VK_5,VK_6,VK_7,VK_8,VK_9,VK_0,VK_OEM_4,VK_OEM_PLUS,
|
||||
VK_A,VK_Z,VK_E,VK_R,VK_T,VK_Y,VK_U,VK_I,VK_O,VK_P,VK_OEM_6,VK_OEM_1,
|
||||
VK_Q,VK_S,VK_D,VK_F,VK_G,VK_H,VK_J,VK_K,VK_L,VK_M,VK_OEM_3,VK_OEM_5,
|
||||
VK_W,VK_X,VK_C,VK_V,VK_B,VK_N,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,VK_OEM_8,
|
||||
VK_OEM_7,'1','2','3','4','5','6','7','8','9','0',VK_OEM_4,VK_OEM_PLUS,
|
||||
'A','Z','E','R','T','Y','U','I','O','P',VK_OEM_6,VK_OEM_1,
|
||||
'Q','S','D','F','G','H','J','K','L','M',VK_OEM_3,VK_OEM_5,
|
||||
'W','X','C','V','B','N',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,VK_OEM_8,
|
||||
VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */
|
||||
};
|
||||
|
||||
static const WORD main_key_vkey_dvorak[MAIN_LEN] =
|
||||
{
|
||||
/* NOTE: this layout must concur with the scan codes layout above */
|
||||
VK_OEM_3,VK_1,VK_2,VK_3,VK_4,VK_5,VK_6,VK_7,VK_8,VK_9,VK_0,VK_OEM_4,VK_OEM_6,
|
||||
VK_OEM_7,VK_OEM_COMMA,VK_OEM_PERIOD,VK_P,VK_Y,VK_F,VK_G,VK_C,VK_R,VK_L,VK_OEM_2,VK_OEM_PLUS,
|
||||
VK_A,VK_O,VK_E,VK_U,VK_I,VK_D,VK_H,VK_T,VK_N,VK_S,VK_OEM_MINUS,VK_OEM_5,
|
||||
VK_OEM_1,VK_Q,VK_J,VK_K,VK_X,VK_B,VK_M,VK_W,VK_V,VK_Z,
|
||||
VK_OEM_3,'1','2','3','4','5','6','7','8','9','0',VK_OEM_4,VK_OEM_6,
|
||||
VK_OEM_7,VK_OEM_COMMA,VK_OEM_PERIOD,'P','Y','F','G','C','R','L',VK_OEM_2,VK_OEM_PLUS,
|
||||
'A','O','E','U','I','D','H','T','N','S',VK_OEM_MINUS,VK_OEM_5,
|
||||
VK_OEM_1,'Q','J','K','X','B','M','W','V','Z',
|
||||
VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */
|
||||
};
|
||||
|
||||
|
|
@ -736,8 +736,8 @@ static const WORD main_key_scan_vnc[MAIN_LEN] =
|
|||
|
||||
static const WORD main_key_vkey_vnc[MAIN_LEN] =
|
||||
{
|
||||
VK_1,VK_2,VK_3,VK_4,VK_5,VK_6,VK_7,VK_8,VK_9,VK_0,VK_OEM_MINUS,VK_OEM_PLUS,VK_OEM_4,VK_OEM_6,VK_OEM_1,VK_OEM_7,VK_OEM_3,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,VK_OEM_5,
|
||||
VK_A,VK_B,VK_C,VK_D,VK_E,VK_F,VK_G,VK_H,VK_I,VK_J,VK_K,VK_L,VK_M,VK_N,VK_O,VK_P,VK_Q,VK_R,VK_S,VK_T,VK_U,VK_V,VK_W,VK_X,VK_Y,VK_Z,
|
||||
'1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_PLUS,VK_OEM_4,VK_OEM_6,VK_OEM_1,VK_OEM_7,VK_OEM_3,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,VK_OEM_5,
|
||||
'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
|
||||
VK_OEM_102
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3331,44 +3331,9 @@ typedef struct
|
|||
#define VK_INSERT 0x2D
|
||||
#define VK_DELETE 0x2E
|
||||
#define VK_HELP 0x2F
|
||||
#define VK_0 0x30
|
||||
#define VK_1 0x31
|
||||
#define VK_2 0x32
|
||||
#define VK_3 0x33
|
||||
#define VK_4 0x34
|
||||
#define VK_5 0x35
|
||||
#define VK_6 0x36
|
||||
#define VK_7 0x37
|
||||
#define VK_8 0x38
|
||||
#define VK_9 0x39
|
||||
/* VK_0 - VK-9 0x30-0x39 Use ASCII instead */
|
||||
/* 0x3A-0x40 Undefined */
|
||||
#define VK_A 0x41
|
||||
#define VK_B 0x42
|
||||
#define VK_C 0x43
|
||||
#define VK_D 0x44
|
||||
#define VK_E 0x45
|
||||
#define VK_F 0x46
|
||||
#define VK_G 0x47
|
||||
#define VK_H 0x48
|
||||
#define VK_I 0x49
|
||||
#define VK_J 0x4A
|
||||
#define VK_K 0x4B
|
||||
#define VK_L 0x4C
|
||||
#define VK_M 0x4D
|
||||
#define VK_N 0x4E
|
||||
#define VK_O 0x4F
|
||||
#define VK_P 0x50
|
||||
#define VK_Q 0x51
|
||||
#define VK_R 0x52
|
||||
#define VK_S 0x53
|
||||
#define VK_T 0x54
|
||||
#define VK_U 0x55
|
||||
#define VK_V 0x56
|
||||
#define VK_W 0x57
|
||||
#define VK_X 0x58
|
||||
#define VK_Y 0x59
|
||||
#define VK_Z 0x5A
|
||||
|
||||
/* VK_A - VK_Z 0x41-0x5A Use ASCII instead */
|
||||
#define VK_LWIN 0x5B
|
||||
#define VK_RWIN 0x5C
|
||||
#define VK_APPS 0x5D
|
||||
|
|
|
|||
Loading…
Reference in a new issue