Author: gadamopoulos
Date: Sat Feb 11 22:09:01 2012
New Revision: 55549
URL: http://svn.reactos.org/svn/reactos?rev=55549&view=rev
Log:
[win32k]
- Update pti->pClientInfo->hKL when pti->KeyboardLayout changes
- Fixes assertion after activating a second keyboard layout
Modified:
trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c?rev=55549&r1=55548&r2=55549&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Sat
Feb 11 22:09:01 2012
@@ -377,6 +377,7 @@
UserDereferenceObject(pklPrev);
pti->KeyboardLayout = pKl;
+ pti->pClientInfo->hKL = pKl->hkl;
UserReferenceObject(pKl);
if (Flags & KLF_SETFORPROCESS)
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c?rev=55549&r1=55548&r2=55549&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sat
Feb 11 22:09:01 2012
@@ -1087,6 +1087,7 @@
if (!pti->KeyboardLayout)
{
pti->KeyboardLayout = W32kGetDefaultKeyLayout();
+ pti->pClientInfo->hKL = pti->KeyboardLayout ? pti->KeyboardLayout->hkl
: NULL;
pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl;
}
else
