From da13fb5a41ce3c5e941a32dfcdfd942784fddf5c Mon Sep 17 00:00:00 2001
From: Saveliy Tretiakov <saveliyt@gmail.com>
Date: Thu, 22 Feb 2007 19:41:10 +0000
Subject: [PATCH] NtUserLoadKeyboardLayoutEx: Support KLF_REORDER and
 KLF_ACTIVATE. NtUserActivateKeyboardLayout: Support HKL_NEXT, HKL_PREV,
 KLF_REORDER.

svn path=/trunk/; revision=25879
---
 .../win32/win32k/ntuser/kbdlayout.c           | 70 ++++++++++++++-----
 1 file changed, 51 insertions(+), 19 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
index ebde849adf8..8612239d1c8 100644
--- a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
+++ b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
@@ -328,7 +328,7 @@ static PKBL UserActivateKbl(PW32THREAD Thread, PKBL pKbl)
    Thread->KeyboardLayout = pKbl;
    pKbl->RefCount++;
    
-   // Post WM_INPUTLANGCHANGE to thread's focus window
+   // Send WM_INPUTLANGCHANGE to thread's focus window
          
    Msg.hwnd = Thread->MessageQueue->FocusWindow;
    Msg.message = WM_INPUTLANGCHANGE;
@@ -457,33 +457,46 @@ NtUserLoadKeyboardLayoutEx(
    IN DWORD Unused4)
 {
    HKL Ret = NULL;
-   PKBL pKbl;
+   PKBL pKbl = NULL, Cur;
    
    UserEnterExclusive();
    
-   pKbl = KBLList;
+   Cur = KBLList;
    do
    {
-      if(pKbl->klid == dwKLID)
+      if(Cur->klid == dwKLID)
+      {
+         pKbl = Cur;
+         break;
+      }
+      
+      Cur = (PKBL) Cur->List.Flink;
+   } while(Cur != KBLList);
+   
+   if(!pKbl) 
+   {
+      pKbl = UserLoadDllAndCreateKbl(dwKLID);
+   
+      if(!pKbl)
       {
-         Ret = pKbl->hkl;
          goto the_end;
       }
       
-      pKbl = (PKBL) pKbl->List.Flink;
-   } while(pKbl != KBLList);
-   
-   pKbl = UserLoadDllAndCreateKbl(dwKLID);
-   
-   if(!pKbl)
-   {
-      goto the_end;
+      InsertTailList(&KBLList->List, &pKbl->List);
    }
    
-   InsertTailList(&KBLList->List, &pKbl->List);
+   if(Flags & KLF_REORDER) KBLList = pKbl;
+   
+   if(Flags & KLF_ACTIVATE) 
+   {
+      UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl);
+   }
+
    Ret = pKbl->hkl;
    
    //FIXME: Respect Flags!
+   //       KLF_NOTELLSHELL KLF_SETFORPROCESS
+   //       KLF_REPLACELANG KLF_SUBSTITUTE_OK 
    
 the_end:
    UserLeave();
@@ -502,17 +515,35 @@ NtUserActivateKeyboardLayout(
    
    UserEnterExclusive();
    
-   pKbl = UserHklToKbl(hKl);
+   pWThread = PsGetCurrentThreadWin32Thread();
    
-   //FIXME: Respect flags!
+   if(pWThread->KeyboardLayout->hkl == hKl)
+   {
+      Ret = hKl;
+      goto the_end;
+   }
+    
+   if(hKl == (HKL)HKL_NEXT)
+   {
+      pKbl = (PKBL)pWThread->KeyboardLayout->List.Flink;
+   }
+   else if(hKl == (HKL)HKL_PREV)
+   {
+      pKbl = (PKBL)pWThread->KeyboardLayout->List.Blink;
+   }
+   else pKbl = UserHklToKbl(hKl);
+   
+   //FIXME:  KLF_RESET, KLF_SHIFTLOCK
+   //FIXME:  KLF_SETFORPROCESS
    
    if(pKbl)
    {
-      pWThread = PsGetCurrentThreadWin32Thread();
+      if(Flags & KLF_REORDER)
+         KBLList = pKbl;
       
-      if(pWThread->KeyboardLayout->hkl == hKl)
+      if(pKbl == pWThread->KeyboardLayout)
       {
-         Ret = hKl;
+         Ret = pKbl->hkl;
       }
       else
       {
@@ -521,6 +552,7 @@ NtUserActivateKeyboardLayout(
       }
    }
    
+the_end:
    UserLeave();
    return Ret;
 }