mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 00:43:21 +00:00
Don't return characters is key is up
svn path=/trunk/; revision=12853
This commit is contained in:
parent
e228aadfe5
commit
528b35b1df
|
@ -1,5 +1,4 @@
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* reactos/subsys/csrss/win32csr/conio.c
|
* reactos/subsys/csrss/win32csr/conio.c
|
||||||
*
|
*
|
||||||
* Console I/O functions
|
* Console I/O functions
|
||||||
|
@ -1127,7 +1126,7 @@ ConioProcessChar(PCSRSS_CONSOLE Console,
|
||||||
if (0 == (Console->Mode & ENABLE_LINE_INPUT)
|
if (0 == (Console->Mode & ENABLE_LINE_INPUT)
|
||||||
|| Console->EarlyReturn
|
|| Console->EarlyReturn
|
||||||
|| ('\n' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar
|
|| ('\n' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar
|
||||||
&& ! KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown))
|
&& KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown))
|
||||||
{
|
{
|
||||||
if ('\n' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar)
|
if ('\n' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar)
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* PURPOSE: Messages
|
* PURPOSE: Messages
|
||||||
|
@ -342,16 +341,23 @@ int STDCALL ToUnicodeEx( UINT wVirtKey,
|
||||||
HKL dwhkl ) {
|
HKL dwhkl ) {
|
||||||
int ToUnicodeResult = 0;
|
int ToUnicodeResult = 0;
|
||||||
|
|
||||||
IntLockQueueState;
|
if (0 == (lpKeyState[wVirtKey] & KS_DOWN_BIT))
|
||||||
ToUnicodeResult = ToUnicodeInner( wVirtKey,
|
{
|
||||||
wScanCode,
|
ToUnicodeResult = 0;
|
||||||
lpKeyState,
|
}
|
||||||
pwszBuff,
|
else
|
||||||
cchBuff,
|
{
|
||||||
wFlags,
|
IntLockQueueState;
|
||||||
PsGetWin32Thread() ?
|
ToUnicodeResult = ToUnicodeInner( wVirtKey,
|
||||||
PsGetWin32Thread()->KeyboardLayout : 0 );
|
wScanCode,
|
||||||
IntUnLockQueueState;
|
lpKeyState,
|
||||||
|
pwszBuff,
|
||||||
|
cchBuff,
|
||||||
|
wFlags,
|
||||||
|
PsGetWin32Thread() ?
|
||||||
|
PsGetWin32Thread()->KeyboardLayout : 0 );
|
||||||
|
IntUnLockQueueState;
|
||||||
|
}
|
||||||
|
|
||||||
return ToUnicodeResult;
|
return ToUnicodeResult;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue