- Add back and fix useful dprint.
[reactos.git] / reactos / subsys / win32k / ntuser / keyboard.c
index 9e53fa6..99653e3 100644 (file)
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: keyboard.c,v 1.15 2003/11/24 00:22:53 arty Exp $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Messages
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <internal/kbd.h>
-#include <include/guicheck.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/object.h>
-#include <include/winsta.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
 /* Key States */
 #define KS_DOWN_MASK     0xc0
 #define KS_DOWN_BIT      0x80
-#define KS_EXT_BIT       0x40
 #define KS_LOCK_BIT    0x01
 /* lParam bits */
 #define LP_EXT_BIT       (1<<24)
 /* From kbdxx.c -- Key changes with numlock */
-#define KNUMP         0x400 
+#define KNUMP         0x400
 
-/* Lock the keyboard state to prevent unusual concurrent access */ 
-KSPIN_LOCK QueueStateLock;
+/* Lock the keyboard state to prevent unusual concurrent access */
+FAST_MUTEX QueueStateLock;
 
 BYTE QueueKeyStateTable[256];
 
+#define IntLockQueueState \
+  ExAcquireFastMutex(&QueueStateLock)
+
+#define IntUnLockQueueState \
+  ExReleaseFastMutex(&QueueStateLock)
+
 /* FUNCTIONS *****************************************************************/
 
 /* Initialization -- Right now, just zero the key state and init the lock */
 NTSTATUS FASTCALL InitKeyboardImpl(VOID) {
-  KeInitializeSpinLock(&QueueStateLock);
+  ExInitializeFastMutex(&QueueStateLock);
   RtlZeroMemory(&QueueKeyStateTable,0x100);
   return STATUS_SUCCESS;
 }
 
 /*** Statics used by TranslateMessage ***/
 
+/*** Shift state code was out of hand, sorry. --- arty */
+
 static UINT DontDistinguishShifts( UINT ret ) {
-    if( ret == VK_LSHIFT || ret == VK_RSHIFT ) ret = VK_SHIFT;
-    if( ret == VK_LCONTROL || ret == VK_RCONTROL ) ret = VK_CONTROL;
-    if( ret == VK_LMENU || ret == VK_RMENU ) ret = VK_MENU;
+    if( ret == VK_LSHIFT || ret == VK_RSHIFT ) ret = VK_LSHIFT;
+    if( ret == VK_LCONTROL || ret == VK_RCONTROL ) ret = VK_LCONTROL;
+    if( ret == VK_LMENU || ret == VK_RMENU ) ret = VK_LMENU;
     return ret;
 }
 
 static VOID STDCALL SetKeyState(DWORD key, DWORD vk, DWORD ext, BOOL down) {
+  ASSERT(vk <= 0xff);
+
   /* Special handling for toggles like numpad and caps lock */
-  if (vk == VK_CAPITAL || vk == VK_NUMLOCK) 
-    {
-      if (down) QueueKeyStateTable[key] ^= 1;
-    } 
+  if (vk == VK_CAPITAL || vk == VK_NUMLOCK) {
+    if (down) QueueKeyStateTable[vk] ^= KS_LOCK_BIT;
+  }
+
+  if (ext && vk == VK_LSHIFT)
+    vk = VK_RSHIFT;
+  if (ext && vk == VK_LCONTROL)
+    vk = VK_RCONTROL;
+  if (ext && vk == VK_LMENU)
+    vk = VK_RMENU;
 
   if (down)
-    QueueKeyStateTable[key] |= KS_DOWN_BIT | (ext ? KS_EXT_BIT : 0);
+    QueueKeyStateTable[vk] |= KS_DOWN_BIT;
   else
-    QueueKeyStateTable[key] &= ~KS_DOWN_MASK;
+    QueueKeyStateTable[vk] &= ~KS_DOWN_MASK;
+
+  if (vk == VK_LSHIFT || vk == VK_RSHIFT) {
+    if ((QueueKeyStateTable[VK_LSHIFT] & KS_DOWN_BIT) ||
+        (QueueKeyStateTable[VK_RSHIFT] & KS_DOWN_BIT)) {
+      QueueKeyStateTable[VK_SHIFT] |= KS_DOWN_BIT;
+    } else {
+      QueueKeyStateTable[VK_SHIFT] &= ~KS_DOWN_MASK;
+    }
+  }
+
+  if (vk == VK_LCONTROL || vk == VK_RCONTROL) {
+    if ((QueueKeyStateTable[VK_LCONTROL] & KS_DOWN_BIT) ||
+        (QueueKeyStateTable[VK_RCONTROL] & KS_DOWN_BIT)) {
+      QueueKeyStateTable[VK_CONTROL] |= KS_DOWN_BIT;
+    } else {
+      QueueKeyStateTable[VK_CONTROL] &= ~KS_DOWN_MASK;
+    }
+  }
+
+  if (vk == VK_LMENU || vk == VK_RMENU) {
+    if ((QueueKeyStateTable[VK_LMENU] & KS_DOWN_BIT) ||
+        (QueueKeyStateTable[VK_RMENU] & KS_DOWN_BIT)) {
+      QueueKeyStateTable[VK_MENU] |= KS_DOWN_BIT;
+    } else {
+      QueueKeyStateTable[VK_MENU] &= ~KS_DOWN_MASK;
+    }
+  }
 }
 
 VOID DumpKeyState( PBYTE KeyState ) {
@@ -107,72 +138,65 @@ VOID DumpKeyState( PBYTE KeyState ) {
   DbgPrint( "};\n" );
 }
 
-static BYTE KeysSet( PKBDTABLES pkKT, PBYTE KeyState, 
-                    int Mod, int FakeModLeft, int FakeModRight ) {
-  int i;
-  UINT Vk = 0;
-
+static BYTE KeysSet( PKBDTABLES pkKT, PBYTE KeyState,
+                    int FakeModLeft, int FakeModRight ) {
   if( !KeyState || !pkKT ) return 0;
 
-  for( i = 0; i < pkKT->bMaxVSCtoVK; i++ ) {
-    Vk = pkKT->pusVSCtoVK[i] & 0xff;
-    if( KeyState[i] && 
-       ((Vk == Mod) ||
-        (FakeModLeft && Vk == FakeModLeft) ||
-        (FakeModRight && Vk == FakeModRight)) ) {
-      return KeyState[i];
-    }
-  }
+  /* Search special codes first */
+  if( FakeModLeft && KeyState[FakeModLeft] )
+      return KeyState[FakeModLeft];
+  else if( FakeModRight && KeyState[FakeModRight] )
+      return KeyState[FakeModRight];
 
   return 0;
 }
 
-static DWORD ModBits( PKBDTABLES pkKT, PBYTE KeyState ) {
+/* Search the keyboard layout modifiers table for the shift bit.  I don't
+ * want to count on the shift bit not moving, because it can be specified
+ * in the layout */
+
+static DWORD FASTCALL GetShiftBit( PKBDTABLES pkKT, DWORD Vk ) {
   int i;
+
+  for( i = 0; pkKT->pCharModifiers->pVkToBit[i].Vk; i++ )
+    if( pkKT->pCharModifiers->pVkToBit[i].Vk == Vk )
+      return pkKT->pCharModifiers->pVkToBit[i].ModBits;
+
+  return 0;
+}
+
+static DWORD ModBits( PKBDTABLES pkKT, PBYTE KeyState ) {
   DWORD ModBits = 0;
-  BYTE Mask;
 
   if( !KeyState ) return 0;
 
   /* DumpKeyState( KeyState ); */
 
-  for( i = 0; pkKT->pCharModifiers->pVkToBit[i].Vk; i++ ) {
-    int Vk = pkKT->pCharModifiers->pVkToBit[i].Vk;
-    switch(Vk)
-      {
-        case VK_SHIFT:
-         Mask = KeysSet( pkKT, KeyState, Vk, VK_LSHIFT, VK_RSHIFT );
-          if (Mask & KS_DOWN_MASK)
-           ModBits |= pkKT->pCharModifiers->pVkToBit[i].ModBits;
-         break;
-        case VK_CONTROL:
-         Mask = KeysSet( pkKT, KeyState, Vk, VK_LCONTROL, VK_RCONTROL );
-          if (Mask & KS_DOWN_MASK)
-           ModBits |= pkKT->pCharModifiers->pVkToBit[i].ModBits;
-         break;
-        case VK_MENU:
-         Mask = KeysSet( pkKT, KeyState, Vk, VK_LMENU, VK_RMENU );
-          if (Mask & KS_DOWN_MASK)
-           ModBits |= pkKT->pCharModifiers->pVkToBit[i].ModBits;
-          if (Mask & KS_EXT_BIT)
-            ModBits |= MOD_KCTRL;
-         break;
-       default:
-         Mask = KeysSet( pkKT, KeyState, Vk, 0, 0 );
-          if (Mask & KS_DOWN_BIT)
-           ModBits |= pkKT->pCharModifiers->pVkToBit[i].ModBits;
-         break;
-      }
-  }
+  if (KeysSet( pkKT, KeyState, VK_LSHIFT, VK_RSHIFT ) &
+      KS_DOWN_BIT)
+      ModBits |= GetShiftBit( pkKT, VK_SHIFT );
+
+  if (KeysSet( pkKT, KeyState, VK_LCONTROL, VK_RCONTROL ) &
+      KS_DOWN_BIT )
+      ModBits |= GetShiftBit( pkKT, VK_CONTROL );
+
+  if (KeysSet( pkKT, KeyState, VK_LMENU, VK_RMENU ) &
+      KS_DOWN_BIT )
+      ModBits |= GetShiftBit( pkKT, VK_MENU );
 
-  /* Deal with VK_CAPITAL */
-  if (KeysSet( pkKT, KeyState, VK_CAPITAL, 0, 0 ) & KS_LOCK_BIT) 
+  /* Handle Alt+Gr */
+  if (KeysSet( pkKT, KeyState, VK_RMENU, 0 ) &
+      KS_DOWN_BIT )
+      ModBits |= GetShiftBit( pkKT, VK_CONTROL );
+
+      /* Deal with VK_CAPITAL */
+  if (KeysSet( pkKT, KeyState, VK_CAPITAL, 0 ) & KS_LOCK_BIT)
     {
       ModBits |= CAPITAL_BIT;
     }
 
   /* Deal with VK_NUMLOCK */
-  if (KeysSet( pkKT, KeyState, VK_NUMLOCK, 0, 0 ) & KS_LOCK_BIT) 
+  if (KeysSet( pkKT, KeyState, VK_NUMLOCK, 0 ) & KS_LOCK_BIT)
     {
       ModBits |= NUMLOCK_BIT;
     }
@@ -187,31 +211,25 @@ static BOOL TryToTranslateChar(WORD wVirtKey,
                               PBOOL pbDead,
                               PBOOL pbLigature,
                               PWCHAR pwcTranslatedChar,
-                              PKBDTABLES keyLayout ) 
+                              PKBDTABLES keyLayout )
 {
   PVK_TO_WCHAR_TABLE vtwTbl;
   PVK_TO_WCHARS10 vkPtr;
   size_t size_this_entry;
-  int nMod, shift;
+  int nMod;
   DWORD CapsMod = 0, CapsState = 0;
 
   CapsState = ModBits & ~MOD_BITS_MASK;
   ModBits = ModBits & MOD_BITS_MASK;
 
-  DPRINT ( "TryToTranslate: %04x %x\n", wVirtKey, ModBits ); 
+  DPRINT ( "TryToTranslate: %04x %x\n", wVirtKey, ModBits );
 
   if (ModBits > keyLayout->pCharModifiers->wMaxModBits)
     {
       return FALSE;
     }
-  shift = keyLayout->pCharModifiers->ModNumber[ModBits];
-
   for (nMod = 0; keyLayout->pVkToWcharTable[nMod].nModifications; nMod++)
     {
-      if (shift > keyLayout->pVkToWcharTable[nMod].nModifications)
-        {
-         continue;
-       }
       vtwTbl = &keyLayout->pVkToWcharTable[nMod];
       size_this_entry = vtwTbl->cbSize;
       vkPtr = (PVK_TO_WCHARS10)((BYTE *)vtwTbl->pVkToWchars);
@@ -219,26 +237,38 @@ static BOOL TryToTranslateChar(WORD wVirtKey,
         {
           if( wVirtKey == (vkPtr->VirtualKey & 0xff) )
            {
-             CapsMod = 
-               shift | ((CapsState & CAPITAL_BIT) ? vkPtr->Attributes : 0);
-             
+              CapsMod = keyLayout->pCharModifiers->ModNumber
+                  [ModBits ^
+                   ((CapsState & CAPITAL_BIT) ? vkPtr->Attributes : 0)];
+
+             if( CapsMod > keyLayout->pVkToWcharTable[nMod].nModifications ) {
+                 DWORD MaxBit = 1;
+                 while( MaxBit <
+                        keyLayout->pVkToWcharTable[nMod].nModifications )
+                     MaxBit <<= 1;
+
+                 CapsMod &= MaxBit - 1; /* Guarantee that CapsMod lies
+                                           in bounds. */
+             }
+
              *pbDead = vkPtr->wch[CapsMod] == WCH_DEAD;
              *pbLigature = vkPtr->wch[CapsMod] == WCH_LGTR;
              *pwcTranslatedChar = vkPtr->wch[CapsMod];
-             
-             DPRINT("CapsMod %08x CapsState %08x shift %08x Char %04x\n",
-                    CapsMod, CapsState, shift, *pwcTranslatedChar);
 
-             if( *pbDead ) 
+             DPRINT("%d %04x: CapsMod %08x CapsState %08x Char %04x\n",
+                      nMod, wVirtKey,
+                      CapsMod, CapsState, *pwcTranslatedChar);
+
+             if( *pbDead )
                {
                   vkPtr = (PVK_TO_WCHARS10)(((BYTE *)vkPtr) + size_this_entry);
-                 if( vkPtr->VirtualKey != 0xff ) 
+                 if( vkPtr->VirtualKey != 0xff )
                    {
                      DPRINT( "Found dead key with no trailer in the table.\n" );
                      DPRINT( "VK: %04x, ADDR: %08x\n", wVirtKey, (int)vkPtr );
                      return FALSE;
                    }
-                 *pwcTranslatedChar = vkPtr->wch[shift];
+                 *pwcTranslatedChar = vkPtr->wch[CapsMod];
                }
                return TRUE;
            }
@@ -268,10 +298,10 @@ ToUnicodeInner(UINT wVirtKey,
                          ModBits( pkKT, lpKeyState ),
                          &bDead,
                          &bLigature,
-                         &wcTranslatedChar, 
-                         pkKT ) ) 
+                         &wcTranslatedChar,
+                         pkKT ) )
     {
-      if( bLigature ) 
+      if( bLigature )
         {
          DPRINT("Not handling ligature (yet)\n" );
          return 0;
@@ -290,19 +320,35 @@ STDCALL
 NtUserGetKeyState(
   DWORD key)
 {
-  KIRQL OldIrql;
   DWORD ret = 0;
 
-  KeAcquireSpinLock(&QueueStateLock, &OldIrql);
+  IntLockQueueState;
   if( key < 0x100 ) {
     ret = ((DWORD)(QueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) |
-      (QueueKeyStateTable[key] & KS_EXT_BIT) |
       (QueueKeyStateTable[key] & KS_LOCK_BIT);
   }
-  KeReleaseSpinLock(&QueueStateLock, OldIrql);
+  IntUnLockQueueState;
   return ret;
 }
 
+DWORD
+STDCALL
+NtUserGetAsyncKeyState(
+  DWORD key)
+{
+  DWORD ret = 0;
+
+  IntLockQueueState;
+  if( key < 0x100 ) {
+    ret = ((DWORD)(QueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) |
+      (QueueKeyStateTable[key] & KS_LOCK_BIT);
+  }
+  IntUnLockQueueState;
+  return ret;
+}
+
+
+
 int STDCALL ToUnicodeEx( UINT wVirtKey,
                         UINT wScanCode,
                         PBYTE lpKeyState,
@@ -310,19 +356,25 @@ int STDCALL ToUnicodeEx( UINT wVirtKey,
                         int cchBuff,
                         UINT wFlags,
                         HKL dwhkl ) {
-  KIRQL OldIrql;
   int ToUnicodeResult = 0;
 
-  KeAcquireSpinLock(&QueueStateLock, &OldIrql);
-  ToUnicodeResult = ToUnicodeInner( wVirtKey,
-                                   wScanCode,
-                                   lpKeyState,
-                                   pwszBuff,
-                                   cchBuff,
-                                   wFlags,
-                                   PsGetWin32Thread() ? 
-                                   PsGetWin32Thread()->KeyboardLayout : 0 );
-  KeReleaseSpinLock(&QueueStateLock, OldIrql);
+  if (0 == (lpKeyState[wVirtKey] & KS_DOWN_BIT))
+    {
+      ToUnicodeResult = 0;
+    }
+  else
+    {
+      IntLockQueueState;
+      ToUnicodeResult = ToUnicodeInner( wVirtKey,
+                                       wScanCode,
+                                       lpKeyState,
+                                       pwszBuff,
+                                       cchBuff,
+                                       wFlags,
+                                       PsGetWin32Thread() ?
+                                       PsGetWin32Thread()->KeyboardLayout : 0 );
+      IntUnLockQueueState;
+    }
 
   return ToUnicodeResult;
 }
@@ -342,7 +394,7 @@ int STDCALL ToUnicode( UINT wVirtKey,
                      0 );
 }
 
-/* 
+/*
  * Utility to copy and append two unicode strings.
  *
  * IN OUT PUNICODE_STRING ResultFirst -> First string and result
@@ -353,29 +405,30 @@ int STDCALL ToUnicode( UINT wVirtKey,
  * Returns NTSTATUS.
  */
 
-static NTSTATUS ReallyAppendUnicodeString(PUNICODE_STRING ResultFirst,
-                                         PUNICODE_STRING Second,
-                                         BOOL Deallocate) {
-  NTSTATUS Status;
-  PWSTR new_string = 
-    ExAllocatePool(PagedPool,
-                  (ResultFirst->Length + Second->Length + sizeof(WCHAR)));
-  if( !new_string ) {
-    return STATUS_NO_MEMORY;
-  }
-  memcpy( new_string, ResultFirst->Buffer, 
-         ResultFirst->Length );
-  memcpy( new_string + ResultFirst->Length / sizeof(WCHAR),
-         Second->Buffer,
-         Second->Length );
-  if( Deallocate ) RtlFreeUnicodeString(ResultFirst);
-  ResultFirst->Length += Second->Length;
-  ResultFirst->MaximumLength = ResultFirst->Length;
-  new_string[ResultFirst->Length / sizeof(WCHAR)] = 0;
-  Status = RtlCreateUnicodeString(ResultFirst,new_string) ? 
-    STATUS_SUCCESS : STATUS_NO_MEMORY;
-  ExFreePool(new_string);
-  return Status;
+NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst,
+                                  PUNICODE_STRING Second,
+                                  BOOL Deallocate) {
+    NTSTATUS Status;
+    PWSTR new_string =
+       ExAllocatePoolWithTag(PagedPool,
+                             (ResultFirst->Length + Second->Length + sizeof(WCHAR)),
+                             TAG_STRING);
+    if( !new_string ) {
+       return STATUS_NO_MEMORY;
+    }
+    memcpy( new_string, ResultFirst->Buffer,
+           ResultFirst->Length );
+    memcpy( new_string + ResultFirst->Length / sizeof(WCHAR),
+           Second->Buffer,
+           Second->Length );
+    if( Deallocate ) RtlFreeUnicodeString(ResultFirst);
+    ResultFirst->Length += Second->Length;
+    ResultFirst->MaximumLength = ResultFirst->Length;
+    new_string[ResultFirst->Length / sizeof(WCHAR)] = 0;
+    Status = RtlCreateUnicodeString(ResultFirst,new_string) ?
+       STATUS_SUCCESS : STATUS_NO_MEMORY;
+    ExFreePool(new_string);
+    return Status;
 }
 
 /*
@@ -388,66 +441,66 @@ static NTSTATUS ReallyAppendUnicodeString(PUNICODE_STRING ResultFirst,
  * Returns NTSTATUS
  */
 
-static NTSTATUS ReadRegistryValue( PUNICODE_STRING KeyName,
-                                  PUNICODE_STRING ValueName,
-                                  PUNICODE_STRING ReturnedValue ) {
-  NTSTATUS Status;
-  HANDLE KeyHandle;
-  OBJECT_ATTRIBUTES KeyAttributes;
-  PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo;
-  ULONG Length = 0;
-  ULONG ResLength = 0;
-  UNICODE_STRING Temp;
-
-  InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE,
-                            NULL, NULL);
-  Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes);
-  if( !NT_SUCCESS(Status) ) {
-    return Status;
-  }
+static NTSTATUS NTAPI ReadRegistryValue( PUNICODE_STRING KeyName,
+                                        PUNICODE_STRING ValueName,
+                                        PUNICODE_STRING ReturnedValue ) {
+    NTSTATUS Status;
+    HANDLE KeyHandle;
+    OBJECT_ATTRIBUTES KeyAttributes;
+    PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo;
+    ULONG Length = 0;
+    ULONG ResLength = 0;
+    UNICODE_STRING Temp;
+
+    InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE,
+                              NULL, NULL);
+    Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes);
+    if( !NT_SUCCESS(Status) ) {
+       return Status;
+    }
 
-  Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation,
-                          0,
-                          0,
-                          &ResLength);
+    Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation,
+                            0,
+                            0,
+                            &ResLength);
 
-  if( Status != STATUS_BUFFER_TOO_SMALL ) {
-    NtClose(KeyHandle);
-    return Status;
-  }
+    if( Status != STATUS_BUFFER_TOO_SMALL ) {
+       NtClose(KeyHandle);
+       return Status;
+    }
 
-  ResLength += sizeof( *KeyValuePartialInfo );
-  KeyValuePartialInfo = 
-    ExAllocatePool(PagedPool, ResLength);
-  Length = ResLength;
+    ResLength += sizeof( *KeyValuePartialInfo );
+    KeyValuePartialInfo =
+       ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING);
+    Length = ResLength;
 
-  if( !KeyValuePartialInfo ) {
-    NtClose(KeyHandle);
-    return STATUS_NO_MEMORY;
-  }
+    if( !KeyValuePartialInfo ) {
+       NtClose(KeyHandle);
+       return STATUS_NO_MEMORY;
+    }
 
-  Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation,
-                          (PVOID)KeyValuePartialInfo,
-                          Length,
-                          &ResLength);
+    Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation,
+                            (PVOID)KeyValuePartialInfo,
+                            Length,
+                            &ResLength);
 
-  if( !NT_SUCCESS(Status) ) {
-    NtClose(KeyHandle);
-    ExFreePool(KeyValuePartialInfo);
-    return Status;
-  }
+    if( !NT_SUCCESS(Status) ) {
+       NtClose(KeyHandle);
+       ExFreePool(KeyValuePartialInfo);
+       return Status;
+    }
 
-  Temp.Length = Temp.MaximumLength = KeyValuePartialInfo->DataLength;
-  Temp.Buffer = (PWCHAR)KeyValuePartialInfo->Data;
-  
-  /* At this point, KeyValuePartialInfo->Data contains the key data */
-  RtlInitUnicodeString(ReturnedValue,L"");
-  ReallyAppendUnicodeString(ReturnedValue,&Temp,FALSE);
+    Temp.Length = Temp.MaximumLength = KeyValuePartialInfo->DataLength;
+    Temp.Buffer = (PWCHAR)KeyValuePartialInfo->Data;
 
-  ExFreePool(KeyValuePartialInfo);
-  NtClose(KeyHandle);
+    /* At this point, KeyValuePartialInfo->Data contains the key data */
+    RtlInitUnicodeString(ReturnedValue,L"");
+    AppendUnicodeString(ReturnedValue,&Temp,FALSE);
 
-  return Status;
+    ExFreePool(KeyValuePartialInfo);
+    NtClose(KeyHandle);
+
+    return Status;
 }
 
 typedef PVOID (*KbdLayerDescriptor)(VOID);
@@ -456,14 +509,15 @@ NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module,
                                        DWORD flags,
                                        PVOID *func_addr);
 
-void InitKbdLayout( PVOID *pkKeyboardLayout ) {
-  UNICODE_STRING KeyName;
-  UNICODE_STRING ValueName;
+void InitKbdLayout( PVOID *pkKeyboardLayout )
+{
+  WCHAR LocaleBuffer[16];
   UNICODE_STRING LayoutKeyName;
   UNICODE_STRING LayoutValueName;
   UNICODE_STRING DefaultLocale;
   UNICODE_STRING LayoutFile;
   UNICODE_STRING FullLayoutPath;
+  LCID LocaleId;
   PWCHAR KeyboardLayoutWSTR;
   HMODULE kbModule = 0;
   NTSTATUS Status;
@@ -473,79 +527,75 @@ void InitKbdLayout( PVOID *pkKeyboardLayout ) {
   #define XX_STATUS(x) if (!NT_SUCCESS(Status = (x))) continue;
 
   do {
-    RtlInitUnicodeString(&KeyName,
-                        L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet"
-                        L"\\Control\\Nls\\Locale");
-    RtlInitUnicodeString(&ValueName,
-                        L"(Default)");
-       
-    DPRINT("KeyName = %wZ, ValueName = %wZ\n", &KeyName, &ValueName);
-
-    Status = ReadRegistryValue(&KeyName,&ValueName,&DefaultLocale);
-    
-    if( !NT_SUCCESS(Status) ) {
-      DbgPrint( "Could not get default locale (%08x).\n", Status );
-    } else {
-      DPRINT( "DefaultLocale = %wZ\n", &DefaultLocale );
+    Status = ZwQueryDefaultLocale(FALSE, &LocaleId);
+    if (!NT_SUCCESS(Status))
+    {
+      DPRINT1("Could not get default locale (%08lx).\n", Status);
+    }
+    else
+    {
+      DPRINT("DefaultLocale = %lx\n", LocaleId);
+      swprintf(LocaleBuffer, L"%08lx", LocaleId);
+      DPRINT("DefaultLocale = %S\n", LocaleBuffer);
+      RtlInitUnicodeString(&DefaultLocale, LocaleBuffer);
 
       RtlInitUnicodeString(&LayoutKeyName,
                           L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet"
                           L"\\Control\\KeyboardLayouts\\");
 
-      ReallyAppendUnicodeString(&LayoutKeyName,&DefaultLocale,FALSE);
+      AppendUnicodeString(&LayoutKeyName,&DefaultLocale,FALSE);
 
-      RtlFreeUnicodeString(&DefaultLocale);
       RtlInitUnicodeString(&LayoutValueName,L"Layout File");
 
       Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile);
       RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR);
 
       if( !NT_SUCCESS(Status) ) {
-       DbgPrint("Got default locale but not layout file. (%08x)\n",
+       DPRINT1("Got default locale but not layout file. (%08lx)\n",
                 Status);
-       RtlFreeUnicodeString(&LayoutFile);
       } else {
        DPRINT("Read registry and got %wZ\n", &LayoutFile);
-    
+
        RtlFreeUnicodeString(&LayoutKeyName);
 
-       ReallyAppendUnicodeString(&FullLayoutPath,&LayoutFile,FALSE);
+       AppendUnicodeString(&FullLayoutPath,&LayoutFile,FALSE);
 
        DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath);
 
        RtlFreeUnicodeString(&LayoutFile);
 
-       KeyboardLayoutWSTR = ExAllocatePool(PagedPool,
-                                           (FullLayoutPath.Length + 1) * 
-                                           sizeof(WCHAR));
+       KeyboardLayoutWSTR =
+         ExAllocatePoolWithTag(PagedPool,
+                               FullLayoutPath.Length + sizeof(WCHAR),
+                               TAG_STRING);
 
        if( !KeyboardLayoutWSTR ) {
-         DbgPrint("Couldn't allocate a string for the keyboard layout name.\n");
+         DPRINT1("Couldn't allocate a string for the keyboard layout name.\n");
          RtlFreeUnicodeString(&FullLayoutPath);
          return;
        }
        memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer,
-              (FullLayoutPath.Length + 1) * sizeof(WCHAR));
-       KeyboardLayoutWSTR[FullLayoutPath.Length] = 0;
+              FullLayoutPath.Length + sizeof(WCHAR));
+       KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0;
 
        kbModule = EngLoadImage(KeyboardLayoutWSTR);
        DPRINT( "Load Keyboard Layout: %S\n", KeyboardLayoutWSTR );
 
         if( !kbModule )
-         DbgPrint( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath );
-      }
+         DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath );
 
-      RtlFreeUnicodeString(&FullLayoutPath);
+       RtlFreeUnicodeString(&FullLayoutPath);
+      }
     }
 
     if( !kbModule )
     {
-      DbgPrint("Trying to load US Keyboard Layout\n");
+      DPRINT1("Trying to load US Keyboard Layout\n");
       kbModule = EngLoadImage(L"\\SystemRoot\\system32\\kbdus.dll");
-      
+
       if (!kbModule)
       {
-        DbgPrint("Failed to load any Keyboard Layout\n");
+        DPRINT1("Failed to load any Keyboard Layout\n");
         return;
            }
     }
@@ -556,14 +606,14 @@ void InitKbdLayout( PVOID *pkKeyboardLayout ) {
                           &kbdProcedureName,
                           0,
                           (PVOID*)&layerDescGetFn);
-    
+
     if( layerDescGetFn ) {
       *pkKeyboardLayout = layerDescGetFn();
     }
   } while (FALSE);
 
   if( !*pkKeyboardLayout ) {
-    DbgPrint("Failed to load the keyboard layout.\n");
+    DPRINT1("Failed to load the keyboard layout.\n");
   }
 
 #undef XX_STATUS
@@ -575,43 +625,41 @@ PKBDTABLES W32kGetDefaultKeyLayout() {
   return pkKeyboardLayout;
 }
 
-BOOL STDCALL
-NtUserTranslateMessage(LPMSG lpMsg,
-                      HKL dwhkl) /* Used to pass the kbd layout */
+BOOL FASTCALL
+IntTranslateKbdMessage(LPMSG lpMsg,
+                       HKL dwhkl)
 {
-  KIRQL OldIrql;
   static INT dead_char = 0;
   LONG UState = 0;
   WCHAR wp[2] = { 0 };
   MSG NewMsg = { 0 };
-  MSG InMsg = { 0 };
-  PUSER_MESSAGE UMsg;
   PKBDTABLES keyLayout;
   BOOL Result = FALSE;
   DWORD ScanCode = 0;
 
-  if( !NT_SUCCESS(MmCopyFromCaller(&InMsg, lpMsg, sizeof(InMsg))) ) {
-    return FALSE;
-  }
 
   keyLayout = PsGetWin32Thread()->KeyboardLayout;
   if( !keyLayout )
     return FALSE;
 
-  if (InMsg.message != WM_KEYDOWN && InMsg.message != WM_SYSKEYDOWN)
+  if (lpMsg->message != WM_KEYDOWN && lpMsg->message != WM_SYSKEYDOWN)
     return FALSE;
 
-  ScanCode = (InMsg.lParam >> 16) & 0xff;
+  ScanCode = (lpMsg->lParam >> 16) & 0xff;
+
+  IntLockQueueState;
 
-  KeAcquireSpinLock(&QueueStateLock, &OldIrql);
+  /* All messages have to contain the cursor point. */
+  IntGetCursorLocation(PsGetWin32Thread()->Desktop->WindowStation,
+                       &NewMsg.pt);
 
-  UState = ToUnicodeInner(InMsg.wParam, HIWORD(InMsg.lParam) & 0xff,
-                         QueueKeyStateTable, wp, 2, 0, 
+  UState = ToUnicodeInner(lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff,
+                         QueueKeyStateTable, wp, 2, 0,
                          keyLayout );
 
   if (UState == 1)
     {
-      NewMsg.message = (InMsg.message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR;
+      NewMsg.message = (lpMsg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR;
       if (dead_char)
         {
          ULONG i;
@@ -622,7 +670,7 @@ NtUserTranslateMessage(LPMSG lpMsg,
            {
              first = keyLayout->pDeadKey[i].dwBoth >> 16;
              second = keyLayout->pDeadKey[i].dwBoth;
-             if (first == dead_char && second == wp[0]) 
+             if (first == dead_char && second == wp[0])
                {
                  wp[0] = keyLayout->pDeadKey[i].wchComposed;
                  dead_char = 0;
@@ -632,64 +680,52 @@ NtUserTranslateMessage(LPMSG lpMsg,
 
          DPRINT("FINAL CHAR: %c\n", wp[0]);
        }
-      if (dead_char) 
+
+      if (dead_char)
        {
-         NewMsg.hwnd = InMsg.hwnd;
+         NewMsg.hwnd = lpMsg->hwnd;
          NewMsg.wParam = dead_char;
-         NewMsg.lParam = InMsg.lParam;
-         UMsg = MsqCreateMessage(&NewMsg);
+         NewMsg.lParam = lpMsg->lParam;
          dead_char = 0;
-         if (UMsg)
-           MsqPostMessage(PsGetWin32Thread()->MessageQueue, UMsg);
+         MsqPostMessage(PsGetWin32Thread()->MessageQueue, &NewMsg, FALSE, QS_KEY);
        }
-      
-      NewMsg.hwnd = InMsg.hwnd;
+
+      NewMsg.hwnd = lpMsg->hwnd;
       NewMsg.wParam = wp[0];
-      NewMsg.lParam = InMsg.lParam;
-      UMsg = MsqCreateMessage(&NewMsg);
-      DPRINT( "CHAR='%c' %04x %08x\n", wp[0], wp[0], InMsg.lParam );
-      if (UMsg) 
-       MsqPostMessage(PsGetWin32Thread()->MessageQueue, UMsg);
+      NewMsg.lParam = lpMsg->lParam;
+      DPRINT( "CHAR='%c' %04x %08x\n", wp[0], wp[0], lpMsg->lParam );
+      MsqPostMessage(PsGetWin32Thread()->MessageQueue, &NewMsg, FALSE, QS_KEY);
       Result = TRUE;
     }
   else if (UState == -1)
     {
-      NewMsg.message = 
-       (InMsg.message == WM_KEYDOWN) ? WM_DEADCHAR : WM_SYSDEADCHAR;
-      NewMsg.hwnd = InMsg.hwnd;
+      NewMsg.message =
+       (lpMsg->message == WM_KEYDOWN) ? WM_DEADCHAR : WM_SYSDEADCHAR;
+      NewMsg.hwnd = lpMsg->hwnd;
       NewMsg.wParam = wp[0];
-      NewMsg.lParam = InMsg.lParam;
+      NewMsg.lParam = lpMsg->lParam;
       dead_char = wp[0];
-      UMsg = MsqCreateMessage(&NewMsg);
-      if (UMsg)
-       MsqPostMessage(PsGetWin32Thread()->MessageQueue, UMsg);
+      MsqPostMessage(PsGetWin32Thread()->MessageQueue, &NewMsg, FALSE, QS_KEY);
       Result = TRUE;
     }
 
-  KeReleaseSpinLock(&QueueStateLock, OldIrql);
+  IntUnLockQueueState;
   return Result;
 }
 
-HWND STDCALL
-NtUserSetFocus(HWND hWnd)
-{
-  return IntSetFocusWindow(hWnd);
-}
-
 DWORD
 STDCALL
 NtUserGetKeyboardState(
   LPBYTE lpKeyState)
 {
-  KIRQL OldIrql;
   BOOL Result = TRUE;
 
-  KeAcquireSpinLock(&QueueStateLock, &OldIrql);
+  IntLockQueueState;
   if (lpKeyState) {
        if(!NT_SUCCESS(MmCopyToCaller(lpKeyState, QueueKeyStateTable, 256)))
          Result = FALSE;
   }
-  KeReleaseSpinLock(&QueueStateLock, OldIrql);
+  IntUnLockQueueState;
   return Result;
 }
 
@@ -698,16 +734,15 @@ STDCALL
 NtUserSetKeyboardState(
   LPBYTE lpKeyState)
 {
-  KIRQL OldIrql;
   BOOL Result = TRUE;
 
 KeAcquireSpinLock(&QueueStateLock, &OldIrql);
IntLockQueueState;
   if (lpKeyState) {
     if(! NT_SUCCESS(MmCopyFromCaller(QueueKeyStateTable, lpKeyState, 256)))
       Result = FALSE;
   }
-  KeReleaseSpinLock(&QueueStateLock, OldIrql);
-  
+  IntUnLockQueueState;
+
   return Result;
 }
 
@@ -731,11 +766,11 @@ UINT ScanToVk( UINT Code, BOOL ExtKey, PKBDTABLES pkKT ) {
     int i;
 
     for( i = 0; pkKT->pVSCtoVK_E0[i].Vsc; i++ ) {
-      if( pkKT->pVSCtoVK_E0[i].Vsc == Code ) 
+      if( pkKT->pVSCtoVK_E0[i].Vsc == Code )
        return pkKT->pVSCtoVK_E0[i].Vk & 0xff;
     }
     for( i = 0; pkKT->pVSCtoVK_E1[i].Vsc; i++ ) {
-      if( pkKT->pVSCtoVK_E1[i].Vsc == Code ) 
+      if( pkKT->pVSCtoVK_E1[i].Vsc == Code )
        return pkKT->pVSCtoVK_E1[i].Vk & 0xff;
     }
 
@@ -777,7 +812,7 @@ static UINT IntMapVirtualKeyEx( UINT Code, UINT Type, PKBDTABLES keyLayout ) {
     break;
 
   case 1:
-    ret = 
+    ret =
       DontDistinguishShifts
       (IntMapVirtualKeyEx( Code, 3, keyLayout ) );
     break;
@@ -791,6 +826,7 @@ static UINT IntMapVirtualKeyEx( UINT Code, UINT Type, PKBDTABLES keyLayout ) {
   } break;
 
   case 3:
+
     ret = ScanToVk( Code, FALSE, keyLayout );
     break;
   }
@@ -801,7 +837,7 @@ static UINT IntMapVirtualKeyEx( UINT Code, UINT Type, PKBDTABLES keyLayout ) {
 UINT
 STDCALL
 NtUserMapVirtualKeyEx( UINT Code, UINT Type, DWORD keyboardId, HKL dwhkl ) {
-  PKBDTABLES keyLayout = PsGetWin32Thread() ? 
+  PKBDTABLES keyLayout = PsGetWin32Thread() ?
     PsGetWin32Thread()->KeyboardLayout : 0;
 
   if( !keyLayout ) return 0;
@@ -823,17 +859,17 @@ NtUserToUnicodeEx(
   BYTE KeyStateBuf[0x100];
   PWCHAR OutPwszBuff = 0;
   int ret = 0;
-  
+
 
   if( !NT_SUCCESS(MmCopyFromCaller(KeyStateBuf,
                                   lpKeyState,
                                   sizeof(KeyStateBuf))) ) {
-    DbgPrint( "Couldn't copy key state from caller.\n" );
+    DPRINT1( "Couldn't copy key state from caller.\n" );
     return 0;
   }
-  OutPwszBuff = ExAllocatePool(NonPagedPool,sizeof(WCHAR) * cchBuff);
+  OutPwszBuff = ExAllocatePoolWithTag(NonPagedPool,sizeof(WCHAR) * cchBuff, TAG_STRING);
   if( !OutPwszBuff ) {
-    DbgPrint( "ExAllocatePool(%d) failed\n", sizeof(WCHAR) * cchBuff);
+    DPRINT1( "ExAllocatePool(%d) failed\n", sizeof(WCHAR) * cchBuff);
     return 0;
   }
   RtlZeroMemory( OutPwszBuff, sizeof( WCHAR ) * cchBuff );
@@ -844,7 +880,7 @@ NtUserToUnicodeEx(
                     OutPwszBuff,
                     cchBuff,
                     wFlags,
-                    dwhkl );  
+                    dwhkl );
 
   MmCopyToCaller(pwszBuff,OutPwszBuff,sizeof(WCHAR)*cchBuff);
   ExFreePool(OutPwszBuff);
@@ -866,8 +902,8 @@ NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ) {
   UINT VkCode = 0;
   UINT ScanCode = (lParam >> 16) & 0xff;
   BOOL ExtKey = lParam & (1<<24) ? TRUE : FALSE;
-  PKBDTABLES keyLayout = 
-    PsGetWin32Thread() ? 
+  PKBDTABLES keyLayout =
+    PsGetWin32Thread() ?
     PsGetWin32Thread()->KeyboardLayout : 0;
 
   if( !keyLayout || nSize < 1 ) return 0;
@@ -886,12 +922,12 @@ NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ) {
 
   VSC_LPWSTR *KeyNames = 0;
 
-  if( CareVk != VkCode ) 
+  if( CareVk != VkCode )
     ScanCode = VkToScan( VkCode, ExtKey, keyLayout );
-  
-  if( ExtKey ) 
+
+  if( ExtKey )
     KeyNames = keyLayout->pKeyNamesExt;
-  else 
+  else
     KeyNames = keyLayout->pKeyNames;
 
   for( i = 0; KeyNames[i].pwsz; i++ ) {
@@ -899,8 +935,8 @@ NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ) {
       UINT StrLen = wcslen(KeyNames[i].pwsz);
       UINT StrMax = StrLen > (nSize - 1) ? (nSize - 1) : StrLen;
       WCHAR null_wc = 0;
-      if( NT_SUCCESS( MmCopyToCaller( lpString, 
-                                     KeyNames[i].pwsz, 
+      if( NT_SUCCESS( MmCopyToCaller( lpString,
+                                     KeyNames[i].pwsz,
                                      StrMax * sizeof(WCHAR) ) ) &&
          NT_SUCCESS( MmCopyToCaller( lpString + StrMax,
                                      &null_wc,
@@ -931,11 +967,11 @@ NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ) {
  */
 
 VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
-  KIRQL OldIrql;
   DWORD ScanCode = 0, ModifierBits = 0;
   DWORD i = 0;
+  DWORD BaseMapping = 0;
   DWORD RawVk = 0;
-  static WORD NumpadConversion[][2] = 
+  static WORD NumpadConversion[][2] =
     { { VK_DELETE, VK_DECIMAL },
       { VK_INSERT, VK_NUMPAD0 },
       { VK_END,    VK_NUMPAD1 },
@@ -949,31 +985,40 @@ VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
       { VK_PRIOR,  VK_NUMPAD9 },
       { 0,0 } };
 
-  if( !KeyboardLayout || !Msg || 
+  if( !KeyboardLayout || !Msg ||
       (Msg->message != WM_KEYDOWN && Msg->message != WM_SYSKEYDOWN &&
-       Msg->message != WM_KEYUP   && Msg->message != WM_SYSKEYUP) ) 
+       Msg->message != WM_KEYUP   && Msg->message != WM_SYSKEYUP) )
     {
       return;
     }
 
-  KeAcquireSpinLock(&QueueStateLock, &OldIrql);
+  IntLockQueueState;
 
-  /* arty -- handle numpad -- On real windows, the actual key produced 
+  /* arty -- handle numpad -- On real windows, the actual key produced
    * by the messaging layer is different based on the state of numlock. */
   ModifierBits = ModBits(KeyboardLayout,QueueKeyStateTable);
 
   /* Get the raw scan code, so we can look up whether the key is a numpad
-   * key */
+   * key
+   *
+   * Shift and the LP_EXT_BIT cancel. */
   ScanCode = (Msg->lParam >> 16) & 0xff;
-  Msg->wParam = IntMapVirtualKeyEx( ScanCode, 1, KeyboardLayout );
-  RawVk = KeyboardLayout->pusVSCtoVK[ScanCode];
+  BaseMapping = Msg->wParam =
+    IntMapVirtualKeyEx( ScanCode, 1, KeyboardLayout );
+  if( ScanCode >= KeyboardLayout->bMaxVSCtoVK )
+    RawVk = 0;
+  else
+    RawVk = KeyboardLayout->pusVSCtoVK[ScanCode];
 
-  if ((ModifierBits & NUMLOCK_BIT) && (RawVk & KNUMP)) 
+  if ((ModifierBits & NUMLOCK_BIT) &&
+      !(ModifierBits & GetShiftBit(KeyboardLayout, VK_SHIFT)) &&
+      (RawVk & KNUMP) &&
+      !(Msg->lParam & LP_EXT_BIT))
     {
       /* The key in question is a numpad key.  Search for a translation. */
-      for (i = 0; NumpadConversion[i][0]; i++) 
+      for (i = 0; NumpadConversion[i][0]; i++)
        {
-         if ((RawVk & 0xff) == NumpadConversion[i][0]) 
+           if ((BaseMapping & 0xff) == NumpadConversion[i][0]) /* RawVk? */
            {
              Msg->wParam = NumpadConversion[i][1];
              break;
@@ -981,6 +1026,8 @@ VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
        }
     }
 
+  DPRINT("Key: [%04x -> %04x]\n", BaseMapping, Msg->wParam);
+
   /* Now that we have the VK, we can set the keymap appropriately
    * This is a better place for this code, as it's guaranteed to be
    * run, unlike translate message. */
@@ -995,6 +1042,134 @@ VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) {
                   FALSE ); /* Release key */
     }
 
-  KeReleaseSpinLock(&QueueStateLock, OldIrql);
+  /* We need to unset SYSKEYDOWN if the ALT key is an ALT+Gr */
+  if( QueueKeyStateTable[VK_RMENU] & KS_DOWN_BIT ) {
+      if( Msg->message == WM_SYSKEYDOWN ) Msg->message = WM_KEYDOWN;
+      else Msg->message = WM_KEYUP;
+  }
+
+  IntUnLockQueueState;
+}
+
+DWORD
+STDCALL
+NtUserGetKeyboardLayoutList(
+  DWORD Items,
+  DWORD pHklBuff)
+{
+  UNIMPLEMENTED
+
+  return 0;
 }
+
+DWORD
+STDCALL
+NtUserGetKeyboardLayoutName(
+  DWORD lpszName)
+{
+  UNIMPLEMENTED
+
+  return 0;
+}
+
+HKL
+STDCALL
+NtUserGetKeyboardLayout(
+  DWORD dwThreadId)
+{
+  NTSTATUS Status;
+  PETHREAD Thread;
+  PW32THREAD W32Thread;
+  PKBDTABLES layout;
+
+  if (!dwThreadId)
+     W32Thread = PsGetWin32Thread();
+  else 
+  {
+     Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread);
+     if(!NT_SUCCESS(Status))
+       {
+         SetLastWin32Error(ERROR_INVALID_PARAMETER);
+         return 0;
+       }
+     W32Thread = Thread->Tcb.Win32Thread;
+  }
+  layout = W32Thread->KeyboardLayout;
+  if(!layout) return 0;
+  return (HKL)layout;
+}
+    
+  
+DWORD
+STDCALL
+NtUserGetKeyboardType(
+  DWORD TypeFlag)
+{
+  switch(TypeFlag)
+  {
+    case 0:        /* Keyboard type */
+      return 4;    /* AT-101 */
+    case 1:        /* Keyboard Subtype */
+      return 0;    /* There are no defined subtypes */
+    case 2:        /* Number of F-keys */
+      return 12;   /* We're doing an 101 for now, so return 12 F-keys */
+    default:
+    DPRINT1("Unknown type!\n");
+      return 0;    /* The book says 0 here, so 0 */
+  }
+}
+
+
+/*
+    Based on TryToTranslateChar, instead of processing VirtualKey match,
+    look for wChar match.
+ */
+DWORD
+STDCALL
+NtUserVkKeyScanEx(
+  DWORD wChar,
+  DWORD KeyboardLayout,
+  DWORD Unknown2)
+{
+  PKBDTABLES KeyLayout;
+  PVK_TO_WCHAR_TABLE vtwTbl;
+  PVK_TO_WCHARS10 vkPtr;
+  size_t size_this_entry;
+  int nMod;
+  DWORD CapsMod = 0, CapsState = 0;
+
+  if(!KeyboardLayout) return -1;
+  KeyLayout = (PKBDTABLES) KeyboardLayout;
+  
+  for (nMod = 0; KeyLayout->pVkToWcharTable[nMod].nModifications; nMod++)
+  {
+    vtwTbl = &KeyLayout->pVkToWcharTable[nMod];
+    size_this_entry = vtwTbl->cbSize;
+    vkPtr = (PVK_TO_WCHARS10)((BYTE *)vtwTbl->pVkToWchars);
+
+    while(vkPtr->VirtualKey)
+    {
+     /*
+        0x01 Shift key
+        0x02 Ctrl key
+        0x04 Alt key
+        Should have only 8 valid possibilities. Including zero.
+      */
+      for(CapsState = 0; CapsState < vtwTbl->nModifications; CapsState++)
+      {
+        if(vkPtr->wch[CapsState] == wChar)
+        {
+          CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState];
+          DPRINT("nMod %d wC %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n",
+                 nMod, wChar, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits);
+          return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff));
+        }
+      }
+      vkPtr = (PVK_TO_WCHARS10)(((BYTE *)vkPtr) + size_this_entry);
+    }
+  }
+  return -1;
+}
+
+    
 /* EOF */