Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 08:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Do not look outside VkToWcharTable[].

Browse source 
- Check for WCH_NONE.

svn path=/trunk/; revision=26940
This commit is contained in:
Dmitry Gorbachev 2007-05-30 09:35:41 +00:00
parent 90342114af
commit eb8e07f1a2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/subsystems/win32/win32k/ntuser/keyboard.c
View file

@ -248,6 +248,7 @@ static BOOL TryToTranslateChar(WORD wVirtKey,
{ {
return FALSE; return FALSE;
} }
for (nMod = 0; keyLayout->pVkToWcharTable[nMod].nModifications; nMod++) for (nMod = 0; keyLayout->pVkToWcharTable[nMod].nModifications; nMod++)
{ {
vtwTbl = &keyLayout->pVkToWcharTable[nMod]; vtwTbl = &keyLayout->pVkToWcharTable[nMod];
@ -263,13 +264,12 @@ static BOOL TryToTranslateChar(WORD wVirtKey,
if( CapsMod >= keyLayout->pVkToWcharTable[nMod].nModifications ) if( CapsMod >= keyLayout->pVkToWcharTable[nMod].nModifications )
{ {
DWORD MaxBit = 1; return FALSE;
while( MaxBit < }
keyLayout->pVkToWcharTable[nMod].nModifications )
MaxBit <<= 1;
CapsMod &= MaxBit - 1; /* Guarantee that CapsMod lies if( vkPtr->wch[CapsMod] == WCH_NONE )
in bounds. */ {
return FALSE;
} }
*pbDead = vkPtr->wch[CapsMod] == WCH_DEAD; *pbDead = vkPtr->wch[CapsMod] == WCH_DEAD;