Hugh McMaster : kernel32: Use virtual-key codes in the console StdKeyMap.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Nov 23 09:59:46 CST 2015


Module: wine
Branch: master
Commit: 7dcfc00dc327dd0cd56326f6bd7cf4b5a91b5484
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7dcfc00dc327dd0cd56326f6bd7cf4b5a91b5484

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Mon Nov 23 20:58:36 2015 +1100

kernel32: Use virtual-key codes in the console StdKeyMap.

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/editline.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c
index b330869..0f3c2cd 100644
--- a/dlls/kernel32/editline.c
+++ b/dlls/kernel32/editline.c
@@ -787,9 +787,9 @@ static void WCEL_ToggleInsert(WCEL_Context* ctx)
 #define CTRL(x)	((x) - '@')
 static const KeyEntry StdKeyMap[] =
 {
-    {/*BACK*/0x08,	WCEL_DeletePrevChar 	},
-    {/*RETURN*/0x0d,	WCEL_Done		},
-    {/*DEL*/127,	WCEL_DeleteCurrChar 	},
+    {/*VK_BACK*/  0x08, WCEL_DeletePrevChar     },
+    {/*VK_RETURN*/0x0d, WCEL_Done               },
+    {/*VK_DELETE*/0x2e, WCEL_DeleteCurrChar     },
     {	0,		NULL			}
 };
 
@@ -857,7 +857,7 @@ static const KeyEntry EmacsStdKeyMap[] =
 
 static const KeyMap EmacsKeyMap[] =
 {
-    {0,                  1, StdKeyMap},
+    {0,                  0, StdKeyMap},
     {0,                  0, EmacsStdKeyMap},
     {RIGHT_ALT_PRESSED,  1, EmacsKeyMapAlt},	/* right alt  */
     {LEFT_ALT_PRESSED,   1, EmacsKeyMapAlt},	/* left  alt  */
@@ -891,7 +891,7 @@ static const KeyEntry Win32KeyMapCtrl[] =
 
 static const KeyMap Win32KeyMap[] =
 {
-    {0,                  1, StdKeyMap},
+    {0,                  0, StdKeyMap},
     {0,                  0, Win32StdKeyMap},
     {RIGHT_CTRL_PRESSED, 0, Win32KeyMapCtrl},
     {LEFT_CTRL_PRESSED,  0, Win32KeyMapCtrl},




More information about the wine-cvs mailing list