- Update pti->pClientInfo->hKL when pti->KeyboardLayout changes
- Fixes assertion after activating a second keyboard layout

svn path=/trunk/; revision=55549
This commit is contained in:
Giannis Adamopoulos
2012-02-11 22:09:01 +00:00
parent 4ff2062ccb
commit 9c80eb0d00
2 changed files with 2 additions and 0 deletions
@@ -377,6 +377,7 @@ co_UserActivateKbl(PTHREADINFO pti, PKL pKl, UINT Flags)
UserDereferenceObject(pklPrev);
pti->KeyboardLayout = pKl;
pti->pClientInfo->hKL = pKl->hkl;
UserReferenceObject(pKl);
if (Flags & KLF_SETFORPROCESS)
@@ -1087,6 +1087,7 @@ IntTranslateKbdMessage(LPMSG lpMsg,
if (!pti->KeyboardLayout)
{
pti->KeyboardLayout = W32kGetDefaultKeyLayout();
pti->pClientInfo->hKL = pti->KeyboardLayout ? pti->KeyboardLayout->hkl : NULL;
pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl;
}
else