From fa3e4ae5a5787b498c858b09b646bd591d77faaa Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Sun, 1 Dec 2019 05:09:29 +0000 Subject: [PATCH] fix(windows): smp characters could break context Fixes #2398. --- windows/src/engine/keyman32/appint/aiWin2000Unicode.cpp | 1 - windows/src/engine/keyman32/kmprocess.cpp | 2 -- windows/src/global/inc/Compiler.h | 1 - 3 files changed, 4 deletions(-) diff --git a/windows/src/engine/keyman32/appint/aiWin2000Unicode.cpp b/windows/src/engine/keyman32/appint/aiWin2000Unicode.cpp index d91b3453d4..4379e49971 100644 --- a/windows/src/engine/keyman32/appint/aiWin2000Unicode.cpp +++ b/windows/src/engine/keyman32/appint/aiWin2000Unicode.cpp @@ -267,7 +267,6 @@ BOOL AIWin2000Unicode::PostKeys() break; case QIT_BACK: if(Queue[n].dwData == BK_DEADKEY) break; - if(Queue[n].dwData == BK_SUPP2) break; // I1389 - supp chars on vista default to single backspace //TODO: eliminate BK_SUPP2 if(Addin_ProcessBackspace(hwnd)) break; pInputs[i].type = INPUT_KEYBOARD; diff --git a/windows/src/engine/keyman32/kmprocess.cpp b/windows/src/engine/keyman32/kmprocess.cpp index 2e15475548..49c636334f 100644 --- a/windows/src/engine/keyman32/kmprocess.cpp +++ b/windows/src/engine/keyman32/kmprocess.cpp @@ -415,8 +415,6 @@ BOOL ProcessGroup(LPGROUP gp) else { _td->app->QueueAction(QIT_BACK, 0); - if(*p >= 0xD800 && *p <= 0xDBFF) - _td->app->QueueAction(QIT_BACK, BK_SUPP2); // I1389 - supp chars on vista default to single backspace - use BK_SUPP2 flag } } p = kkp->dpOutput; diff --git a/windows/src/global/inc/Compiler.h b/windows/src/global/inc/Compiler.h index cbdbe6934d..5410337a10 100644 --- a/windows/src/global/inc/Compiler.h +++ b/windows/src/global/inc/Compiler.h @@ -108,7 +108,6 @@ #define BK_DEADKEY 1 #define BK_BACKSPACE 2 -#define BK_SUPP2 3 // I1389 - Second backspace for supplementary pairs - so we can ignore it on Vista, etc /* A blank key (in a group without "using keys") cannot be '0' as that is used for error testing and blanking out unused keys and you don't really