[WIN32K] - Formating... No code changes.
[reactos.git] / reactos / subsystems / win32 / win32k / ntuser / input.c
index d5e6dbb..0e80515 100644 (file)
@@ -1,21 +1,15 @@
 /*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
- * PURPOSE:          Window classes
+ * PURPOSE:          General input functions
  * FILE:             subsystems/win32/win32k/ntuser/input.c
- * PROGRAMER:        Casper S. Hornstrup (chorns@users.sourceforge.net)
- * REVISION HISTORY:
- *       06-06-2001  CSH  Created
+ * PROGRAMERS:       Casper S. Hornstrup (chorns@users.sourceforge.net)
+ *                   Rafal Harabien (rafalh@reactos.org)
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <win32k.h>
-#include <ntddkbd.h>
-
 DBG_DEFAULT_CHANNEL(UserInput);
 
-extern BYTE gKeyStateTable[];
 extern NTSTATUS Win32kInitWin32Thread(PETHREAD Thread);
 extern PPROCESSINFO ppiScrnSaver;
 
@@ -26,41 +20,22 @@ PTHREADINFO ptiKeyboard;
 PTHREADINFO ptiMouse;
 PKTIMER MasterTimer = NULL;
 PATTACHINFO gpai = NULL;
+HANDLE ghKeyboardDevice;
 
 static DWORD LastInputTick = 0;
-static HANDLE MouseDeviceHandle;
-static HANDLE MouseThreadHandle;
-static CLIENT_ID MouseThreadId;
-static HANDLE KeyboardThreadHandle;
-static CLIENT_ID KeyboardThreadId;
-static HANDLE KeyboardDeviceHandle;
-static HANDLE RawInputThreadHandle;
-static CLIENT_ID RawInputThreadId;
-static KEVENT InputThreadsStart;
-static BOOLEAN InputThreadsRunning = FALSE;
-static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP
-                                or a WM_KEYUP message */
+static HANDLE ghMouseDevice;
 
 /* FUNCTIONS *****************************************************************/
-DWORD IntLastInputTick(BOOL LastInputTickSetGet);
-
-#define ClearMouseInput(mi) \
-  mi.dx = 0; \
-  mi.dy = 0; \
-  mi.mouseData = 0; \
-  mi.dwFlags = 0;
-
-#define SendMouseEvent(mi) \
-  if(mi.dx != 0 || mi.dy != 0) \
-    mi.dwFlags |= MOUSEEVENTF_MOVE; \
-  if(mi.dwFlags) \
-    IntMouseInput(&mi,FALSE); \
-  ClearMouseInput(mi);
 
-
-DWORD IntLastInputTick(BOOL LastInputTickSetGet)
+/*
+ * IntLastInputTick
+ *
+ * Updates or gets last input tick count
+ */
+static DWORD FASTCALL
+IntLastInputTick(BOOL bUpdate)
 {
-    if (LastInputTickSetGet == TRUE)
+    if (bUpdate)
     {
         LARGE_INTEGER TickCount;
         KeQueryTickCount(&TickCount);
@@ -70,8 +45,13 @@ DWORD IntLastInputTick(BOOL LastInputTickSetGet)
     return LastInputTick;
 }
 
-
-VOID FASTCALL DoTheScreenSaver(VOID)
+/*
+ * DoTheScreenSaver
+ *
+ * Check if scrensaver should be started and sends message to SAS window
+ */
+VOID FASTCALL
+DoTheScreenSaver(VOID)
 {
     LARGE_INTEGER TickCount;
     DWORD Test, TO;
@@ -106,1374 +86,387 @@ VOID FASTCALL DoTheScreenSaver(VOID)
     }
 }
 
-VOID FASTCALL
-ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount)
-{
-    PMOUSE_INPUT_DATA mid;
-    MOUSEINPUT mi;
-    ULONG i;
-
-    ClearMouseInput(mi);
-    mi.time = 0;
-    mi.dwExtraInfo = 0;
-    for(i = 0; i < InputCount; i++)
-    {
-        mid = (Data + i);
-        mi.dx += mid->LastX;
-        mi.dy += mid->LastY;
-
-        /* Check if the mouse move is absolute */
-        if (mid->Flags == MOUSE_MOVE_ABSOLUTE)
-        {
-            /* Set flag to convert to screen location */
-            mi.dwFlags |= MOUSEEVENTF_ABSOLUTE;
-        }
-
-        if(mid->ButtonFlags)
-        {
-            if(mid->ButtonFlags & MOUSE_LEFT_BUTTON_DOWN)
-            {
-                mi.dwFlags |= MOUSEEVENTF_LEFTDOWN;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_LEFT_BUTTON_UP)
-            {
-                mi.dwFlags |= MOUSEEVENTF_LEFTUP;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_MIDDLE_BUTTON_DOWN)
-            {
-                mi.dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_MIDDLE_BUTTON_UP)
-            {
-                mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_RIGHT_BUTTON_DOWN)
-            {
-                mi.dwFlags |= MOUSEEVENTF_RIGHTDOWN;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_RIGHT_BUTTON_UP)
-            {
-                mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_BUTTON_4_DOWN)
-            {
-                mi.mouseData |= XBUTTON1;
-                mi.dwFlags |= MOUSEEVENTF_XDOWN;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_BUTTON_4_UP)
-            {
-                mi.mouseData |= XBUTTON1;
-                mi.dwFlags |= MOUSEEVENTF_XUP;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_BUTTON_5_DOWN)
-            {
-                mi.mouseData |= XBUTTON2;
-                mi.dwFlags |= MOUSEEVENTF_XDOWN;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_BUTTON_5_UP)
-            {
-                mi.mouseData |= XBUTTON2;
-                mi.dwFlags |= MOUSEEVENTF_XUP;
-                SendMouseEvent(mi);
-            }
-            if(mid->ButtonFlags & MOUSE_WHEEL)
-            {
-                mi.mouseData = mid->ButtonData;
-                mi.dwFlags |= MOUSEEVENTF_WHEEL;
-                SendMouseEvent(mi);
-            }
-        }
-    }
-
-    SendMouseEvent(mi);
-}
-
-
-
-
-VOID APIENTRY
-MouseThreadMain(PVOID StartContext)
+/*
+ * OpenInputDevice
+ *
+ * Opens input device for asynchronous access
+ */
+static
+NTAPI NTSTATUS
+OpenInputDevice(PHANDLE pHandle, PFILE_OBJECT *ppObject, CONST WCHAR *pszDeviceName)
 {
-    UNICODE_STRING MouseDeviceName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0");
-    OBJECT_ATTRIBUTES MouseObjectAttributes;
-    IO_STATUS_BLOCK Iosb;
+    UNICODE_STRING DeviceName;
+    OBJECT_ATTRIBUTES ObjectAttributes;
     NTSTATUS Status;
-    MOUSE_ATTRIBUTES MouseAttr;
+    IO_STATUS_BLOCK Iosb;
 
-    KeSetPriorityThread(&PsGetCurrentThread()->Tcb,
-                        LOW_REALTIME_PRIORITY + 3);
+    RtlInitUnicodeString(&DeviceName, pszDeviceName);
 
-    InitializeObjectAttributes(&MouseObjectAttributes,
-                               &MouseDeviceName,
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &DeviceName,
                                0,
                                NULL,
                                NULL);
-    do
-    {
-        LARGE_INTEGER DueTime;
-        KEVENT Event;
-        DueTime.QuadPart = (LONGLONG)(-10000000);
-        KeInitializeEvent(&Event, NotificationEvent, FALSE);
-        Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime);
-        Status = NtOpenFile(&MouseDeviceHandle,
-                            FILE_ALL_ACCESS,
-                            &MouseObjectAttributes,
-                            &Iosb,
-                            0,
-                            FILE_SYNCHRONOUS_IO_ALERT);
-    } while (!NT_SUCCESS(Status));
-
-    /* Need to setup basic win32k for this thread to process WH_MOUSE_LL messages. */
-    Status = Win32kInitWin32Thread(PsGetCurrentThread());
-    if (!NT_SUCCESS(Status))
+
+    Status = ZwOpenFile(pHandle,
+                        FILE_ALL_ACCESS,
+                        &ObjectAttributes,
+                        &Iosb,
+                        0,
+                        0);
+    if (NT_SUCCESS(Status) && ppObject)
     {
-        ERR("Win32K: Failed making mouse thread a win32 thread.\n");
-        return; //(Status);
+        Status = ObReferenceObjectByHandle(*pHandle, SYNCHRONIZE, NULL, KernelMode, (PVOID*)ppObject, NULL);
+        ASSERT(NT_SUCCESS(Status));
     }
 
-    ptiMouse = PsGetCurrentThreadWin32Thread();
-    ptiMouse->TIF_flags |= TIF_SYSTEMTHREAD;
-    TRACE("Mouse Thread 0x%x \n", ptiMouse);
+    return Status;
+}
+
+/*
+ * RawInputThreadMain
+ *
+ * Reads data from input devices and supports win32 timers
+ */
+VOID NTAPI
+RawInputThreadMain()
+{
+    NTSTATUS MouStatus = STATUS_UNSUCCESSFUL, KbdStatus = STATUS_UNSUCCESSFUL, Status;
+    IO_STATUS_BLOCK MouIosb, KbdIosb;
+    PFILE_OBJECT pKbdDevice, pMouDevice;
+    LARGE_INTEGER WaitTimeout, ByteOffset;
+    PVOID WaitObjects[3], pSignaledObject = NULL;
+    ULONG cWaitObjects = 0, cMaxWaitObjects = 1;
+    MOUSE_INPUT_DATA MouseInput;
+    KEYBOARD_INPUT_DATA KeyInput;
+    
+    ByteOffset.QuadPart = (LONGLONG)0;
+    WaitTimeout.QuadPart = (LONGLONG)(-10000000);
+
+    ptiRawInput = PsGetCurrentThreadWin32Thread();
+    ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD;
+    TRACE("Raw Input Thread 0x%x\n", ptiRawInput);
 
     KeSetPriorityThread(&PsGetCurrentThread()->Tcb,
                         LOW_REALTIME_PRIORITY + 3);
 
+    UserEnterExclusive();
+    StartTheTimers();
+    UserLeave();
+
     for(;;)
     {
-        /*
-         * Wait to start input.
-         */
-        TRACE("Mouse Input Thread Waiting for start event\n");
-        Status = KeWaitForSingleObject(&InputThreadsStart,
-                                       0,
-                                       KernelMode,
-                                       TRUE,
-                                       NULL);
-        TRACE("Mouse Input Thread Starting...\n");
+        if (!ghMouseDevice)
+        {
+            /* Check if mouse device already exists */
+            Status = OpenInputDevice(&ghMouseDevice, &pMouDevice, L"\\Device\\PointerClass0" );
+            if (NT_SUCCESS(Status))
+            {
+                ++cMaxWaitObjects;
+                TRACE("Mouse connected!\n");
+            }
+        }
+        if (!ghKeyboardDevice)
+        {
+            /* Check if keyboard device already exists */
+            Status = OpenInputDevice(&ghKeyboardDevice, &pKbdDevice, L"\\Device\\KeyboardClass0");
+            if (NT_SUCCESS(Status))
+            {
+                ++cMaxWaitObjects;
+                TRACE("Keyboard connected!\n");
+            }
+        }
+
+        /* Reset WaitHandles array */
+        cWaitObjects = 0;
+        WaitObjects[cWaitObjects++] = MasterTimer;
 
-        /*FIXME: Does mouse attributes need to be used for anything */
-        Status = NtDeviceIoControlFile(MouseDeviceHandle,
+        if (ghMouseDevice)
+        {
+            /* Try to read from mouse if previous reading is not pending */
+            if (MouStatus != STATUS_PENDING)
+            {
+                MouStatus = ZwReadFile(ghMouseDevice,
                                        NULL,
                                        NULL,
                                        NULL,
-                                       &Iosb,
-                                       IOCTL_MOUSE_QUERY_ATTRIBUTES,
-                                       &MouseAttr, sizeof(MOUSE_ATTRIBUTES),
-                                       NULL, 0);
-        if(!NT_SUCCESS(Status))
-        {
-            TRACE("Failed to get mouse attributes\n");
+                                       &MouIosb,
+                                       &MouseInput,
+                                       sizeof(MOUSE_INPUT_DATA),
+                                       &ByteOffset,
+                                       NULL);
+            }
+            
+            if (MouStatus == STATUS_PENDING)
+                WaitObjects[cWaitObjects++] = &pMouDevice->Event;
         }
 
-        /*
-         * Receive and process mouse input.
-         */
-        while(InputThreadsRunning)
+        if (ghKeyboardDevice)
         {
-            MOUSE_INPUT_DATA MouseInput;
-            Status = NtReadFile(MouseDeviceHandle,
-                                NULL,
-                                NULL,
-                                NULL,
-                                &Iosb,
-                                &MouseInput,
-                                sizeof(MOUSE_INPUT_DATA),
-                                NULL,
-                                NULL);
-            if(Status == STATUS_ALERTED && !InputThreadsRunning)
-            {
-                break;
-            }
-            if(Status == STATUS_PENDING)
+            /* Try to read from keyboard if previous reading is not pending */
+            if (KbdStatus != STATUS_PENDING)
             {
-                NtWaitForSingleObject(MouseDeviceHandle, FALSE, NULL);
-                Status = Iosb.Status;
+                KbdStatus = ZwReadFile(ghKeyboardDevice,
+                                       NULL,
+                                       NULL,
+                                       NULL,
+                                       &KbdIosb,
+                                       &KeyInput,
+                                       sizeof(KEYBOARD_INPUT_DATA),
+                                       &ByteOffset,
+                                       NULL);
+                
             }
-            if(!NT_SUCCESS(Status))
+            if (KbdStatus == STATUS_PENDING)
+                WaitObjects[cWaitObjects++] = &pKbdDevice->Event;
+        }
+
+        /* If all objects are pending, wait for them */
+        if (cWaitObjects == cMaxWaitObjects)
+        {
+            Status = KeWaitForMultipleObjects(cWaitObjects,
+                                              WaitObjects,
+                                              WaitAny,
+                                              UserRequest,
+                                              KernelMode,
+                                              TRUE,
+                                              NULL,//&WaitTimeout,
+                                              NULL);
+
+            if (Status >= STATUS_WAIT_0 && Status < STATUS_WAIT_0 + cWaitObjects)
             {
-                ERR("Win32K: Failed to read from mouse.\n");
-                return; //(Status);
+                /* Some device has finished reading */
+                pSignaledObject = WaitObjects[Status - STATUS_WAIT_0];
+
+                /* Check if it is mouse or keyboard and update status */
+                if (pSignaledObject == &pMouDevice->Event)
+                    MouStatus = MouIosb.Status;
+                else if (pSignaledObject == &pKbdDevice->Event)
+                    KbdStatus = KbdIosb.Status;
+                else if (pSignaledObject == MasterTimer)
+                {
+                    /* FIXME: where it should go? */
+                    ProcessTimers();
+                }
+                else ASSERT(FALSE);
             }
+        }
+
+        /* Have we successed reading from mouse? */
+        if (NT_SUCCESS(MouStatus) && MouStatus != STATUS_PENDING)
+        {
             TRACE("MouseEvent\n");
+
+            /* Set LastInputTick */
             IntLastInputTick(TRUE);
 
+            /* Process data */
             UserEnterExclusive();
+            UserProcessMouseInput(&MouseInput, MouIosb.Information / sizeof(MOUSE_INPUT_DATA));
+            UserLeave();
+        }
+        else if (MouStatus != STATUS_PENDING)
+            ERR("Failed to read from mouse: %x.\n", MouStatus);
 
-            ProcessMouseInputData(&MouseInput, Iosb.Information / sizeof(MOUSE_INPUT_DATA));
+        /* Have we successed reading from keyboard? */
+        if (NT_SUCCESS(KbdStatus) && KbdStatus != STATUS_PENDING)
+        {
+            TRACE("KeyboardEvent: %s %04x\n",
+                  (KeyInput.Flags & KEY_BREAK) ? "up" : "down",
+                  KeyInput.MakeCode);
+
+            /* Set LastInputTick */
+            IntLastInputTick(TRUE);
 
+            /* Process data */
+            UserEnterExclusive();
+            UserProcessKeyboardInput(&KeyInput);
             UserLeave();
         }
-        TRACE("Mouse Input Thread Stopped...\n");
+        else if (KbdStatus != STATUS_PENDING)
+            ERR("Failed to read from keyboard: %x.\n", KbdStatus);
     }
+    ERR("Raw Input Thread Exit!\n");
 }
 
-/* Returns a value that indicates if the key is a modifier key, and
- * which one.
+/*
+ * CreateSystemThreads
+ *
+ * Called form dedicated thread in CSRSS. RIT is started in context of this
+ * thread because it needs valid Win32 process with TEB initialized
  */
-static UINT APIENTRY
-IntKeyboardGetModifiers(KEYBOARD_INPUT_DATA *InputData)
+DWORD NTAPI
+CreateSystemThreads(UINT Type)
 {
-    if (InputData->Flags & KEY_E1)
-        return 0;
+    UserLeave();
 
-    if (!(InputData->Flags & KEY_E0))
+    switch (Type)
     {
-        switch (InputData->MakeCode)
-        {
-            case 0x2a: /* left shift */
-            case 0x36: /* right shift */
-                return MOD_SHIFT;
-
-            case 0x1d: /* left control */
-                return MOD_CONTROL;
-
-            case 0x38: /* left alt */
-                return MOD_ALT;
-
-            default:
-                return 0;
-        }
+        case 0: RawInputThreadMain(); break;
+        default: ERR("Wrong type: %x\n", Type);
     }
-    else
-    {
-        switch (InputData->MakeCode)
-        {
-            case 0x1d: /* right control */
-                return MOD_CONTROL;
-
-            case 0x38: /* right alt */
-                return MOD_ALT;
 
-            case 0x5b: /* left gui (windows) */
-            case 0x5c: /* right gui (windows) */
-                return MOD_WIN;
+    UserEnterShared();
 
-            default:
-                return 0;
-        }
-    }
+    return 0;
 }
 
-/* Asks the keyboard driver to send a small table that shows which
- * lights should connect with which scancodes
+/*
+ * InitInputImpl
+ *
+ * Inits input implementation
  */
-static NTSTATUS APIENTRY
-IntKeyboardGetIndicatorTrans(HANDLE KeyboardDeviceHandle,
-                             PKEYBOARD_INDICATOR_TRANSLATION *IndicatorTrans)
+INIT_FUNCTION
+NTSTATUS
+NTAPI
+InitInputImpl(VOID)
 {
-    NTSTATUS Status;
-    DWORD Size = 0;
-    IO_STATUS_BLOCK Block;
-    PKEYBOARD_INDICATOR_TRANSLATION Ret;
-
-    Size = sizeof(KEYBOARD_INDICATOR_TRANSLATION);
-
-    Ret = ExAllocatePoolWithTag(PagedPool,
-                                Size,
-                                USERTAG_KBDTABLE);
-
-    while (Ret)
+    MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), USERTAG_SYSTEM);
+    if (!MasterTimer)
     {
-        Status = NtDeviceIoControlFile(KeyboardDeviceHandle,
-                                       NULL,
-                                       NULL,
-                                       NULL,
-                                       &Block,
-                                       IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION,
-                                       NULL, 0,
-                                       Ret, Size);
-
-        if (Status != STATUS_BUFFER_TOO_SMALL)
-            break;
-
-        ExFreePoolWithTag(Ret, USERTAG_KBDTABLE);
-
-        Size += sizeof(KEYBOARD_INDICATOR_TRANSLATION);
-
-        Ret = ExAllocatePoolWithTag(PagedPool,
-                                    Size,
-                                    USERTAG_KBDTABLE);
+        ERR("Failed to allocate memory\n");
+        ASSERT(FALSE);
+        return STATUS_UNSUCCESSFUL;
     }
+    KeInitializeTimer(MasterTimer);
 
-    if (!Ret)
-        return STATUS_INSUFFICIENT_RESOURCES;
-
-    if (Status != STATUS_SUCCESS)
+    /* Initialize the default keyboard layout */
+    if (!UserInitDefaultKeyboardLayout())
     {
-        ExFreePoolWithTag(Ret, USERTAG_KBDTABLE);
-        return Status;
+        ERR("Failed to initialize default keyboard layout!\n");
     }
 
-    *IndicatorTrans = Ret;
-    return Status;
+    return STATUS_SUCCESS;
 }
 
-/* Sends the keyboard commands to turn on/off the lights.
+/*
+ * CleanupInputImp
+ *
+ * Cleans input implementation
  */
-static NTSTATUS APIENTRY
-IntKeyboardUpdateLeds(HANDLE KeyboardDeviceHandle,
-                      PKEYBOARD_INPUT_DATA KeyInput,
-                      PKEYBOARD_INDICATOR_TRANSLATION IndicatorTrans)
+NTSTATUS FASTCALL
+CleanupInputImp(VOID)
 {
-    NTSTATUS Status;
-    UINT Count;
-    static KEYBOARD_INDICATOR_PARAMETERS Indicators;
-    IO_STATUS_BLOCK Block;
-
-    if (!IndicatorTrans)
-        return STATUS_NOT_SUPPORTED;
+    return STATUS_SUCCESS;
+}
 
-    if (KeyInput->Flags & (KEY_E0 | KEY_E1 | KEY_BREAK))
-        return STATUS_SUCCESS;
+BOOL FASTCALL
+IntBlockInput(PTHREADINFO pti, BOOL BlockIt)
+{
+    PTHREADINFO OldBlock;
+    ASSERT(pti);
 
-    for (Count = 0; Count < IndicatorTrans->NumberOfIndicatorKeys; Count++)
+    if(!pti->rpdesk || ((pti->TIF_flags & TIF_INCLEANUP) && BlockIt))
     {
-        if (KeyInput->MakeCode == IndicatorTrans->IndicatorList[Count].MakeCode)
-        {
-            Indicators.LedFlags ^=
-                IndicatorTrans->IndicatorList[Count].IndicatorFlags;
+        /*
+         * fail blocking if exiting the thread
+         */
 
-            /* Update the lights on the hardware */
+        return FALSE;
+    }
 
-            Status = NtDeviceIoControlFile(KeyboardDeviceHandle,
-                                           NULL,
-                                           NULL,
-                                           NULL,
-                                           &Block,
-                                           IOCTL_KEYBOARD_SET_INDICATORS,
-                                           &Indicators, sizeof(Indicators),
-                                           NULL, 0);
+    /*
+     * FIXME - check access rights of the window station
+     *         e.g. services running in the service window station cannot block input
+     */
+    if(!ThreadHasInputAccess(pti) ||
+       !IntIsActiveDesktop(pti->rpdesk))
+    {
+        EngSetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
+    }
 
-            return Status;
+    ASSERT(pti->rpdesk);
+    OldBlock = pti->rpdesk->BlockInputThread;
+    if(OldBlock)
+    {
+        if(OldBlock != pti)
+        {
+            EngSetLastError(ERROR_ACCESS_DENIED);
+            return FALSE;
         }
+        pti->rpdesk->BlockInputThread = (BlockIt ? pti : NULL);
+        return OldBlock == NULL;
     }
 
-    return STATUS_SUCCESS;
+    pti->rpdesk->BlockInputThread = (BlockIt ? pti : NULL);
+    return OldBlock == NULL;
 }
 
-static VOID APIENTRY
-IntKeyboardSendWinKeyMsg()
+BOOL
+APIENTRY
+NtUserBlockInput(
+    BOOL BlockIt)
 {
-    PWND Window;
-    MSG Mesg;
+    BOOL ret;
 
-    if (!(Window = UserGetWindowObject(InputWindowStation->ShellWindow)))
-    {
-        ERR("Couldn't find window to send Windows key message!\n");
-        return;
-    }
+    TRACE("Enter NtUserBlockInput\n");
+    UserEnterExclusive();
 
-    Mesg.hwnd = InputWindowStation->ShellWindow;
-    Mesg.message = WM_SYSCOMMAND;
-    Mesg.wParam = SC_TASKLIST;
-    Mesg.lParam = 0;
+    ret = IntBlockInput(PsGetCurrentThreadWin32Thread(), BlockIt);
 
-    /* The QS_HOTKEY is just a guess */
-    MsqPostMessage(Window->head.pti->MessageQueue, &Mesg, FALSE, QS_HOTKEY);
-}
+    UserLeave();
+    TRACE("Leave NtUserBlockInput, ret=%i\n", ret);
 
-static VOID APIENTRY
-co_IntKeyboardSendAltKeyMsg()
-{
-    ERR("co_IntKeyboardSendAltKeyMsg\n");
-//   co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0); // This sends everything into a msg loop!
+    return ret;
 }
 
-static VOID APIENTRY
-KeyboardThreadMain(PVOID StartContext)
+BOOL FASTCALL
+UserAttachThreadInput(PTHREADINFO pti, PTHREADINFO ptiTo, BOOL fAttach)
 {
-    UNICODE_STRING KeyboardDeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0");
-    OBJECT_ATTRIBUTES KeyboardObjectAttributes;
-    IO_STATUS_BLOCK Iosb;
-    NTSTATUS Status;
-    MSG msg;
-    PUSER_MESSAGE_QUEUE FocusQueue;
-    struct _ETHREAD *FocusThread;
-
-    PKEYBOARD_INDICATOR_TRANSLATION IndicatorTrans = NULL;
-    UINT ModifierState = 0;
-    USHORT LastMakeCode = 0;
-    USHORT LastFlags = 0;
-    UINT RepeatCount = 0;
-
-    InitializeObjectAttributes(&KeyboardObjectAttributes,
-                               &KeyboardDeviceName,
-                               0,
-                               NULL,
-                               NULL);
-    do
-    {
-        LARGE_INTEGER DueTime;
-        KEVENT Event;
-        DueTime.QuadPart = (LONGLONG)(-10000000);
-        KeInitializeEvent(&Event, NotificationEvent, FALSE);
-        Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime);
-        Status = NtOpenFile(&KeyboardDeviceHandle,
-                            FILE_ALL_ACCESS,
-                            &KeyboardObjectAttributes,
-                            &Iosb,
-                            0,
-                            FILE_SYNCHRONOUS_IO_ALERT);
-    } while (!NT_SUCCESS(Status));
-
-    /* Not sure if converting this thread to a win32 thread is such
-       a great idea. Since we're posting keyboard messages to the focus
-       window message queue, we'll be (indirectly) doing sendmessage
-       stuff from this thread (for WH_KEYBOARD_LL processing), which
-       means we need our own message queue. If keyboard messages were
-       instead queued to the system message queue, the thread removing
-       the message from the system message queue would be responsible
-       for WH_KEYBOARD_LL processing and we wouldn't need this thread
-       to be a win32 thread. */
-    Status = Win32kInitWin32Thread(PsGetCurrentThread());
-    if (!NT_SUCCESS(Status))
-    {
-        ERR("Win32K: Failed making keyboard thread a win32 thread.\n");
-        return; //(Status);
-    }
+    PATTACHINFO pai;
 
-    ptiKeyboard = PsGetCurrentThreadWin32Thread();
-    ptiKeyboard->TIF_flags |= TIF_SYSTEMTHREAD;
-    TRACE("Keyboard Thread 0x%x \n", ptiKeyboard);
+    /* Can not be the same thread.*/
+    if (pti == ptiTo) return FALSE;
 
-    KeSetPriorityThread(&PsGetCurrentThread()->Tcb,
-                        LOW_REALTIME_PRIORITY + 3);
+    /* Do not attach to system threads or between different desktops. */
+    if (pti->TIF_flags & TIF_DONTATTACHQUEUE ||
+            ptiTo->TIF_flags & TIF_DONTATTACHQUEUE ||
+            pti->rpdesk != ptiTo->rpdesk)
+        return FALSE;
 
-    IntKeyboardGetIndicatorTrans(KeyboardDeviceHandle,
-                                 &IndicatorTrans);
+    /* If Attach set, allocate and link. */
+    if (fAttach)
+    {
+        pai = ExAllocatePoolWithTag(PagedPool, sizeof(ATTACHINFO), USERTAG_ATTACHINFO);
+        if (!pai) return FALSE;
 
-    for (;;)
+        pai->paiNext = gpai;
+        pai->pti1 = pti;
+        pai->pti2 = ptiTo;
+        gpai = pai;
+    }
+    else /* If clear, unlink and free it. */
     {
-        /*
-         * Wait to start input.
-         */
-        TRACE( "Keyboard Input Thread Waiting for start event\n" );
-        Status = KeWaitForSingleObject(&InputThreadsStart,
-                                       0,
-                                       KernelMode,
-                                       TRUE,
-                                       NULL);
+        PATTACHINFO paiprev = NULL;
 
-        TRACE( "Keyboard Input Thread Starting...\n" );
-        /*
-         * Receive and process keyboard input.
-         */
-        while (InputThreadsRunning)
-        {
-            BOOLEAN NumKeys = 1;
-            BOOLEAN bLeftAlt;
-            KEYBOARD_INPUT_DATA KeyInput;
-            KEYBOARD_INPUT_DATA NextKeyInput;
-            LPARAM lParam = 0;
-            UINT fsModifiers, fsNextModifiers;
-            struct _ETHREAD *Thread;
-            HWND hWnd;
-            int id;
-
-            TRACE("KeyInput @ %08x\n", &KeyInput);
-
-            Status = NtReadFile (KeyboardDeviceHandle,
-                                 NULL,
-                                 NULL,
-                                 NULL,
-                                 &Iosb,
-                                 &KeyInput,
-                                 sizeof(KEYBOARD_INPUT_DATA),
-                                 NULL,
-                                 NULL);
-
-            if(Status == STATUS_ALERTED && !InputThreadsRunning)
-            {
-                break;
-            }
-            if(Status == STATUS_PENDING)
-            {
-                NtWaitForSingleObject(KeyboardDeviceHandle, FALSE, NULL);
-                Status = Iosb.Status;
-            }
-            if(!NT_SUCCESS(Status))
-            {
-                ERR("Win32K: Failed to read from keyboard.\n");
-                return; //(Status);
-            }
+        if (!gpai) return FALSE;
 
-            TRACE("KeyRaw: %s %04x\n",
-                  (KeyInput.Flags & KEY_BREAK) ? "up" : "down",
-                  KeyInput.MakeCode );
+        pai = gpai;
 
-            if (Status == STATUS_ALERTED && !InputThreadsRunning)
-                break;
+        /* Search list and free if found or return false. */
+        do
+        {
+            if (pai->pti2 == ptiTo && pai->pti1 == pti) break;
+            paiprev = pai;
+            pai = pai->paiNext;
+        } while (pai);
 
-            if (!NT_SUCCESS(Status))
-            {
-                ERR("Win32K: Failed to read from keyboard.\n");
-                return; //(Status);
-            }
+        if (!pai) return FALSE;
 
-            /* Set LastInputTick */
-            IntLastInputTick(TRUE);
+        if (paiprev) paiprev->paiNext = pai->paiNext;
 
-            /* Update modifier state */
-            fsModifiers = IntKeyboardGetModifiers(&KeyInput);
+        ExFreePoolWithTag(pai, USERTAG_ATTACHINFO);
+    }
 
-            if (fsModifiers)
-            {
-                if (KeyInput.Flags & KEY_BREAK)
-                {
-                    ModifierState &= ~fsModifiers;
-                    if(fsModifiers == MOD_ALT)
-                    {
-                        if(KeyInput.Flags & KEY_E0)
-                        {
-                            gKeyStateTable[VK_RMENU] = 0;
-                        }
-                        else
-                        {
-                            gKeyStateTable[VK_LMENU] = 0;
-                        }
-                        if (gKeyStateTable[VK_RMENU] == 0 &&
-                                gKeyStateTable[VK_LMENU] == 0)
-                        {
-                            gKeyStateTable[VK_MENU] = 0;
-                        }
-                    }
-                }
-                else
-                {
-                    ModifierState |= fsModifiers;
-
-                    if (ModifierState == fsModifiers &&
-                            (fsModifiers == MOD_ALT || fsModifiers == MOD_WIN))
-                    {
-                        /* First send out special notifications
-                         * (For alt, the message that turns on accelerator
-                         * display, not sure what for win. Both TODO though.)
-                         */
-                        bLeftAlt = FALSE;
-                        if(fsModifiers == MOD_ALT)
-                        {
-                            if(KeyInput.Flags & KEY_E0)
-                            {
-                                gKeyStateTable[VK_RMENU] = KS_DOWN_BIT;
-                            }
-                            else
-                            {
-                                gKeyStateTable[VK_LMENU] = KS_DOWN_BIT;
-                                bLeftAlt = TRUE;
-                            }
-
-                            gKeyStateTable[VK_MENU] = KS_DOWN_BIT;
-                        }
-
-                        /* Read the next key before sending this one */
-                        do
-                        {
-                            Status = NtReadFile (KeyboardDeviceHandle,
-                                                 NULL,
-                                                 NULL,
-                                                 NULL,
-                                                 &Iosb,
-                                                 &NextKeyInput,
-                                                 sizeof(KEYBOARD_INPUT_DATA),
-                                                 NULL,
-                                                 NULL);
-                            TRACE("KeyRaw: %s %04x\n",
-                                  (NextKeyInput.Flags & KEY_BREAK) ? "up" : "down",
-                                  NextKeyInput.MakeCode );
-
-                            if (Status == STATUS_ALERTED && !InputThreadsRunning)
-                                goto KeyboardEscape;
-
-                        }
-                        while ((!(NextKeyInput.Flags & KEY_BREAK)) &&
-                                NextKeyInput.MakeCode == KeyInput.MakeCode);
-                        /* ^ Ignore repeats, they'll be KEY_MAKE and the same
-                         *   code. I'm not caring about the counting, not sure
-                         *   if that matters. I think not.
-                         */
-
-                        /* If the ModifierState is now empty again, send a
-                         * special notification and eat both keypresses
-                         */
-
-                        fsNextModifiers = IntKeyboardGetModifiers(&NextKeyInput);
-
-                        if (fsNextModifiers)
-                            ModifierState ^= fsNextModifiers;
-
-                        if (ModifierState == 0)
-                        {
-                            UserEnterExclusive();
-                            if (fsModifiers == MOD_WIN)
-                                IntKeyboardSendWinKeyMsg();
-                            else if (fsModifiers == MOD_ALT)
-                            {
-                                gKeyStateTable[VK_MENU] = 0;
-                                if(bLeftAlt)
-                                {
-                                    gKeyStateTable[VK_LMENU] = 0;
-                                }
-                                else
-                                {
-                                    gKeyStateTable[VK_RMENU] = 0;
-                                }
-                                co_IntKeyboardSendAltKeyMsg();
-                            }
-                            UserLeave();
-                            continue;
-                        }
-
-                        NumKeys = 2;
-                    }
-                }
-            }
-
-            UserEnterExclusive();
-
-            for (; NumKeys; memcpy(&KeyInput, &NextKeyInput, sizeof(KeyInput)),
-                    NumKeys--)
-            {
-                PKBL keyboardLayout = NULL;
-                lParam = 0;
-
-                IntKeyboardUpdateLeds(KeyboardDeviceHandle,
-                                      &KeyInput,
-                                      IndicatorTrans);
-
-                /* While we are working, we set up lParam. The format is:
-                 *  0-15: The number of times this key has autorepeated
-                 * 16-23: The keyboard scancode
-                 *    24: Set if it's and extended key (I assume KEY_E0 | KEY_E1)
-                 *        Note that E1 is only used for PAUSE (E1-1D-45) and
-                 *        E0-45 happens not to be anything.
-                 *    29: Alt is pressed ('Context code')
-                 *    30: Previous state, if the key was down before this message
-                 *        This is a cheap way to ignore autorepeat keys
-                 *    31: 1 if the key is being pressed
-                 */
-
-                /* If it's a KEY_MAKE (which is 0, so test using !KEY_BREAK)
-                 * and it's the same key as the last one, increase the repeat
-                 * count.
-                 */
-
-                if (!(KeyInput.Flags & KEY_BREAK))
-                {
-                    if (((KeyInput.Flags & (KEY_E0 | KEY_E1)) == LastFlags) &&
-                            (KeyInput.MakeCode == LastMakeCode))
-                    {
-                        RepeatCount++;
-                        lParam |= (KF_REPEAT << 16);
-                    }
-                    else
-                    {
-                        RepeatCount = 1;
-                        LastFlags = KeyInput.Flags & (KEY_E0 | KEY_E1);
-                        LastMakeCode = KeyInput.MakeCode;
-                    }
-                }
-                else
-                {
-                    LastFlags = 0;
-                    LastMakeCode = 0; /* Should never match */
-                    lParam |= (KF_UP << 16) | (KF_REPEAT << 16);
-                }
-
-                lParam |= RepeatCount;
-
-                lParam |= (KeyInput.MakeCode & 0xff) << 16;
-
-                if (KeyInput.Flags & KEY_E0)
-                    lParam |= (KF_EXTENDED << 16);
-
-                if (ModifierState & MOD_ALT)
-                {
-                    lParam |= (KF_ALTDOWN << 16);
-
-                    if (!(KeyInput.Flags & KEY_BREAK))
-                        msg.message = WM_SYSKEYDOWN;
-                    else
-                        msg.message = WM_SYSKEYUP;
-                }
-                else
-                {
-                    if (!(KeyInput.Flags & KEY_BREAK))
-                        msg.message = WM_KEYDOWN;
-                    else
-                        msg.message = WM_KEYUP;
-                }
-
-                /* Find the target thread whose locale is in effect */
-                FocusQueue = IntGetFocusMessageQueue();
-
-                if (FocusQueue)
-                {
-                    msg.hwnd = FocusQueue->FocusWindow;
-
-                    FocusThread = FocusQueue->Thread;
-                    if (FocusThread && FocusThread->Tcb.Win32Thread)
-                    {
-                        keyboardLayout = ((PTHREADINFO)FocusThread->Tcb.Win32Thread)->KeyboardLayout;
-                    }
-                    if ( FocusQueue->QF_flags & QF_DIALOGACTIVE )
-                        lParam |= (KF_DLGMODE << 16);
-                    if ( FocusQueue->MenuOwner )//FocusQueue->MenuState ) // MenuState needs a start flag...
-                        lParam |= (KF_MENUMODE << 16);
-                }
-                if (!keyboardLayout)
-                {
-                    keyboardLayout = W32kGetDefaultKeyLayout();
-                }
-
-                msg.lParam = lParam;
-
-                /* This function uses lParam to fill wParam according to the
-                 * keyboard layout in use.
-                 */
-                W32kKeyProcessMessage(&msg,
-                                      keyboardLayout->KBTables,
-                                      KeyInput.Flags & KEY_E0 ? 0xE0 :
-                                      (KeyInput.Flags & KEY_E1 ? 0xE1 : 0));
-
-                if (GetHotKey(ModifierState,
-                              msg.wParam,
-                              &Thread,
-                              &hWnd,
-                              &id))
-                {
-                    if (!(KeyInput.Flags & KEY_BREAK))
-                    {
-                        TRACE("Hot key pressed (hWnd %lx, id %d)\n", hWnd, id);
-                        MsqPostHotKeyMessage (Thread,
-                                              hWnd,
-                                              (WPARAM)id,
-                                              MAKELPARAM((WORD)ModifierState,
-                                                         (WORD)msg.wParam));
-                    }
-                    continue; /* Eat key up motion too */
-                }
-
-                if (!FocusQueue)
-                {
-                    /* There is no focused window to receive a keyboard message */
-                    continue;
-                }
-                if ( msg.wParam == VK_F10 ) // Bypass this key before it is in the queue.
-                {
-                    if (msg.message == WM_KEYUP) msg.message = WM_SYSKEYUP;
-                    if (msg.message == WM_KEYDOWN) msg.message = WM_SYSKEYDOWN;
-                }
-                /*
-                 * Post a keyboard message.
-                 */
-                co_MsqPostKeyboardMessage(msg.message, msg.wParam, msg.lParam);
-            }
-
-            UserLeave();
-        }
-
-KeyboardEscape:
-        TRACE( "KeyboardInput Thread Stopped...\n" );
-    }
+    return TRUE;
 }
 
-
-static PVOID Objects[2];
 /*
-    Raw Input Thread.
-    Since this relies on InputThreadsStart, just fake it.
+ * NtUserSendInput
+ *
+ * Generates input events from software
  */
-static VOID APIENTRY
-RawInputThreadMain(PVOID StartContext)
-{
-    NTSTATUS Status;
-    LARGE_INTEGER DueTime;
-
-    DueTime.QuadPart = (LONGLONG)(-10000000);
-
-    do
-    {
-        KEVENT Event;
-        KeInitializeEvent(&Event, NotificationEvent, FALSE);
-        Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime);
-    } while (!NT_SUCCESS(Status));
-
-
-    Objects[0] = &InputThreadsStart;
-    Objects[1] = MasterTimer;
-
-    // This thread requires win32k!
-    Status = Win32kInitWin32Thread(PsGetCurrentThread());
-    if (!NT_SUCCESS(Status))
-    {
-        ERR("Win32K: Failed making Raw Input thread a win32 thread.\n");
-        return; //(Status);
-    }
-
-    ptiRawInput = PsGetCurrentThreadWin32Thread();
-    ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD;
-    TRACE("Raw Input Thread 0x%x \n", ptiRawInput);
-
-    KeSetPriorityThread(&PsGetCurrentThread()->Tcb,
-                        LOW_REALTIME_PRIORITY + 3);
-
-    UserEnterExclusive();
-    StartTheTimers();
-    UserLeave();
-
-    //
-    // ATM, we just have one job to handle, merge the other two later.
-    //
-    for(;;)
-    {
-        TRACE( "Raw Input Thread Waiting for start event\n" );
-
-        Status = KeWaitForMultipleObjects( 2,
-                                           Objects,
-                                           WaitAll, //WaitAny,
-                                           WrUserRequest,
-                                           KernelMode,
-                                           TRUE,
-                                           NULL,
-                                           NULL);
-        TRACE( "Raw Input Thread Starting...\n" );
-
-        ProcessTimers();
-    }
-    ERR("Raw Input Thread Exit!\n");
-}
-
-INIT_FUNCTION
-NTSTATUS
-NTAPI
-InitInputImpl(VOID)
-{
-    NTSTATUS Status;
-
-    KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE);
-
-    MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), USERTAG_SYSTEM);
-    if (!MasterTimer)
-    {
-        ERR("Win32K: Failed making Raw Input thread a win32 thread.\n");
-        ASSERT(FALSE);
-        return STATUS_UNSUCCESSFUL;
-    }
-    KeInitializeTimer(MasterTimer);
-
-    /* Initialize the default keyboard layout */
-    if(!UserInitDefaultKeyboardLayout())
-    {
-        ERR("Failed to initialize default keyboard layout!\n");
-    }
-
-    Status = PsCreateSystemThread(&RawInputThreadHandle,
-                                  THREAD_ALL_ACCESS,
-                                  NULL,
-                                  NULL,
-                                  &RawInputThreadId,
-                                  RawInputThreadMain,
-                                  NULL);
-    if (!NT_SUCCESS(Status))
-    {
-        ERR("Win32K: Failed to create raw thread.\n");
-    }
-
-    Status = PsCreateSystemThread(&KeyboardThreadHandle,
-                                  THREAD_ALL_ACCESS,
-                                  NULL,
-                                  NULL,
-                                  &KeyboardThreadId,
-                                  KeyboardThreadMain,
-                                  NULL);
-    if (!NT_SUCCESS(Status))
-    {
-        ERR("Win32K: Failed to create keyboard thread.\n");
-    }
-
-    Status = PsCreateSystemThread(&MouseThreadHandle,
-                                  THREAD_ALL_ACCESS,
-                                  NULL,
-                                  NULL,
-                                  &MouseThreadId,
-                                  MouseThreadMain,
-                                  NULL);
-    if (!NT_SUCCESS(Status))
-    {
-        ERR("Win32K: Failed to create mouse thread.\n");
-    }
-
-    InputThreadsRunning = TRUE;
-    KeSetEvent(&InputThreadsStart, IO_NO_INCREMENT, FALSE);
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS FASTCALL
-CleanupInputImp(VOID)
-{
-    return(STATUS_SUCCESS);
-}
-
-BOOL FASTCALL
-IntBlockInput(PTHREADINFO W32Thread, BOOL BlockIt)
-{
-    PTHREADINFO OldBlock;
-    ASSERT(W32Thread);
-
-    if(!W32Thread->rpdesk || ((W32Thread->TIF_flags & TIF_INCLEANUP) && BlockIt))
-    {
-        /*
-         * fail blocking if exiting the thread
-         */
-
-        return FALSE;
-    }
-
-    /*
-     * FIXME - check access rights of the window station
-     *         e.g. services running in the service window station cannot block input
-     */
-    if(!ThreadHasInputAccess(W32Thread) ||
-            !IntIsActiveDesktop(W32Thread->rpdesk))
-    {
-        EngSetLastError(ERROR_ACCESS_DENIED);
-        return FALSE;
-    }
-
-    ASSERT(W32Thread->rpdesk);
-    OldBlock = W32Thread->rpdesk->BlockInputThread;
-    if(OldBlock)
-    {
-        if(OldBlock != W32Thread)
-        {
-            EngSetLastError(ERROR_ACCESS_DENIED);
-            return FALSE;
-        }
-        W32Thread->rpdesk->BlockInputThread = (BlockIt ? W32Thread : NULL);
-        return OldBlock == NULL;
-    }
-
-    W32Thread->rpdesk->BlockInputThread = (BlockIt ? W32Thread : NULL);
-    return OldBlock == NULL;
-}
-
-BOOL
-APIENTRY
-NtUserBlockInput(
-    BOOL BlockIt)
-{
-    DECLARE_RETURN(BOOLEAN);
-
-    TRACE("Enter NtUserBlockInput\n");
-    UserEnterExclusive();
-
-    RETURN( IntBlockInput(PsGetCurrentThreadWin32Thread(), BlockIt));
-
-CLEANUP:
-    TRACE("Leave NtUserBlockInput, ret=%i\n", _ret_);
-    UserLeave();
-    END_CLEANUP;
-}
-
-BOOL FASTCALL
-IntMouseInput(MOUSEINPUT *mi, BOOL Injected)
-{
-    const UINT SwapBtnMsg[2][2] =
-    {
-        {WM_LBUTTONDOWN, WM_RBUTTONDOWN},
-        {WM_LBUTTONUP, WM_RBUTTONUP}
-    };
-    const WPARAM SwapBtn[2] =
-    {
-        MK_LBUTTON, MK_RBUTTON
-    };
-    POINT MousePos;
-    PSYSTEM_CURSORINFO CurInfo;
-    BOOL SwapButtons;
-    MSG Msg;
-
-    ASSERT(mi);
-
-    CurInfo = IntGetSysCursorInfo();
-
-    if(!mi->time)
-    {
-        LARGE_INTEGER LargeTickCount;
-        KeQueryTickCount(&LargeTickCount);
-        mi->time = MsqCalculateMessageTime(&LargeTickCount);
-    }
-
-    SwapButtons = gspv.bMouseBtnSwap;
-
-    MousePos = gpsi->ptCursor;
-
-    if(mi->dwFlags & MOUSEEVENTF_MOVE)
-    {
-        if(mi->dwFlags & MOUSEEVENTF_ABSOLUTE)
-        {
-            MousePos.x = mi->dx * UserGetSystemMetrics(SM_CXVIRTUALSCREEN) >> 16;
-            MousePos.y = mi->dy * UserGetSystemMetrics(SM_CYVIRTUALSCREEN) >> 16;
-        }
-        else
-        {
-            MousePos.x += mi->dx;
-            MousePos.y += mi->dy;
-        }
-    }
-
-    /*
-     * Insert the messages into the system queue
-     */
-    Msg.wParam = 0;
-    Msg.lParam = MAKELPARAM(MousePos.x, MousePos.y);
-    Msg.pt = MousePos;
-
-    if (gKeyStateTable[VK_SHIFT] & KS_DOWN_BIT)
-    {
-        Msg.wParam |= MK_SHIFT;
-    }
-
-    if (gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT)
-    {
-        Msg.wParam |= MK_CONTROL;
-    }
-
-    if(mi->dwFlags & MOUSEEVENTF_MOVE)
-    {
-        UserSetCursorPos(MousePos.x, MousePos.y, Injected, mi->dwExtraInfo, TRUE);
-    }
-    if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN)
-    {
-        gKeyStateTable[VK_LBUTTON] |= KS_DOWN_BIT;
-        Msg.message = SwapBtnMsg[0][SwapButtons];
-        CurInfo->ButtonsDown |= SwapBtn[SwapButtons];
-        Msg.wParam |= CurInfo->ButtonsDown;
-        co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-    }
-    else if(mi->dwFlags & MOUSEEVENTF_LEFTUP)
-    {
-        gKeyStateTable[VK_LBUTTON] &= ~KS_DOWN_BIT;
-        Msg.message = SwapBtnMsg[1][SwapButtons];
-        CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons];
-        Msg.wParam |= CurInfo->ButtonsDown;
-        co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-    }
-    if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN)
-    {
-        gKeyStateTable[VK_MBUTTON] |= KS_DOWN_BIT;
-        Msg.message = WM_MBUTTONDOWN;
-        CurInfo->ButtonsDown |= MK_MBUTTON;
-        Msg.wParam |= CurInfo->ButtonsDown;
-        co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-    }
-    else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP)
-    {
-        gKeyStateTable[VK_MBUTTON] &= ~KS_DOWN_BIT;
-        Msg.message = WM_MBUTTONUP;
-        CurInfo->ButtonsDown &= ~MK_MBUTTON;
-        Msg.wParam |= CurInfo->ButtonsDown;
-        co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-    }
-    if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN)
-    {
-        gKeyStateTable[VK_RBUTTON] |= KS_DOWN_BIT;
-        Msg.message = SwapBtnMsg[0][!SwapButtons];
-        CurInfo->ButtonsDown |= SwapBtn[!SwapButtons];
-        Msg.wParam |= CurInfo->ButtonsDown;
-        co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-    }
-    else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP)
-    {
-        gKeyStateTable[VK_RBUTTON] &= ~KS_DOWN_BIT;
-        Msg.message = SwapBtnMsg[1][!SwapButtons];
-        CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons];
-        Msg.wParam |= CurInfo->ButtonsDown;
-        co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-    }
-
-    if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) &&
-            (mi->dwFlags & MOUSEEVENTF_WHEEL))
-    {
-        /* fail because both types of events use the mouseData field */
-        return FALSE;
-    }
-
-    if(mi->dwFlags & MOUSEEVENTF_XDOWN)
-    {
-        Msg.message = WM_XBUTTONDOWN;
-        if(mi->mouseData & XBUTTON1)
-        {
-            gKeyStateTable[VK_XBUTTON1] |= KS_DOWN_BIT;
-            CurInfo->ButtonsDown |= MK_XBUTTON1;
-            Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1);
-            co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-        }
-        if(mi->mouseData & XBUTTON2)
-        {
-            gKeyStateTable[VK_XBUTTON2] |= KS_DOWN_BIT;
-            CurInfo->ButtonsDown |= MK_XBUTTON2;
-            Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2);
-            co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-        }
-    }
-    else if(mi->dwFlags & MOUSEEVENTF_XUP)
-    {
-        Msg.message = WM_XBUTTONUP;
-        if(mi->mouseData & XBUTTON1)
-        {
-            gKeyStateTable[VK_XBUTTON1] &= ~KS_DOWN_BIT;
-            CurInfo->ButtonsDown &= ~MK_XBUTTON1;
-            Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1);
-            co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-        }
-        if(mi->mouseData & XBUTTON2)
-        {
-            gKeyStateTable[VK_XBUTTON2] &= ~KS_DOWN_BIT;
-            CurInfo->ButtonsDown &= ~MK_XBUTTON2;
-            Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2);
-            co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-        }
-    }
-    if(mi->dwFlags & MOUSEEVENTF_WHEEL)
-    {
-        Msg.message = WM_MOUSEWHEEL;
-        Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData);
-        co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE);
-    }
-
-    return TRUE;
-}
-
-BOOL FASTCALL
-IntKeyboardInput(KEYBDINPUT *ki, BOOL Injected)
-{
-    PUSER_MESSAGE_QUEUE FocusMessageQueue;
-    MSG Msg;
-    LARGE_INTEGER LargeTickCount;
-    KBDLLHOOKSTRUCT KbdHookData;
-    WORD flags, wVkStripped, wVkL, wVkR, wVk = ki->wVk, vk_hook = ki->wVk;
-
-    Msg.lParam = 0;
-
-    // Condition may arise when calling MsqPostMessage and waiting for an event.
-    ASSERT (UserIsEntered());
-
-    wVk = LOBYTE(wVk);
-    Msg.wParam = wVk;
-    flags = LOBYTE(ki->wScan);
-
-    FocusMessageQueue = IntGetFocusMessageQueue();
-
-    if (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) flags |= KF_EXTENDED;
-    /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */
-    if ( FocusMessageQueue && FocusMessageQueue->QF_flags & QF_DIALOGACTIVE )
-        flags |= KF_DLGMODE;
-    if ( FocusMessageQueue && FocusMessageQueue->MenuOwner )//FocusMessageQueue->MenuState ) // MenuState needs a start flag...
-        flags |= KF_MENUMODE;
-
-    /* strip left/right for menu, control, shift */
-    switch (wVk)
-    {
-        case VK_MENU:
-        case VK_LMENU:
-        case VK_RMENU:
-            wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RMENU : VK_LMENU;
-            wVkStripped = VK_MENU;
-            wVkL = VK_LMENU;
-            wVkR = VK_RMENU;
-            break;
-        case VK_CONTROL:
-        case VK_LCONTROL:
-        case VK_RCONTROL:
-            wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RCONTROL : VK_LCONTROL;
-            wVkStripped = VK_CONTROL;
-            wVkL = VK_LCONTROL;
-            wVkR = VK_RCONTROL;
-            break;
-        case VK_SHIFT:
-        case VK_LSHIFT:
-        case VK_RSHIFT:
-            wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RSHIFT : VK_LSHIFT;
-            wVkStripped = VK_SHIFT;
-            wVkL = VK_LSHIFT;
-            wVkR = VK_RSHIFT;
-            break;
-        default:
-            wVkStripped = wVkL = wVkR = wVk;
-    }
-
-    if (ki->dwFlags & KEYEVENTF_KEYUP)
-    {
-        Msg.message = WM_KEYUP;
-        if (((gKeyStateTable[VK_MENU] & KS_DOWN_BIT) &&
-                ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL)
-                 || !(gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT)))
-                || (wVkStripped == VK_F10))
-        {
-            if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */
-                    (wVkStripped != VK_MENU)) /* <ALT>-down...<something else>-up */
-                Msg.message = WM_SYSKEYUP;
-            TrackSysKey = 0;
-        }
-        flags |= KF_REPEAT | KF_UP;
-    }
-    else
-    {
-        Msg.message = WM_KEYDOWN;
-        if (((gKeyStateTable[VK_MENU] & KS_DOWN_BIT || wVkStripped == VK_MENU) &&
-                !(gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT || wVkStripped == VK_CONTROL))
-                || (wVkStripped == VK_F10))
-        {
-            Msg.message = WM_SYSKEYDOWN;
-            TrackSysKey = wVkStripped;
-        }
-        if (!(ki->dwFlags & KEYEVENTF_UNICODE) && gKeyStateTable[wVk] & KS_DOWN_BIT) flags |= KF_REPEAT;
-    }
-
-    if (ki->dwFlags & KEYEVENTF_UNICODE)
-    {
-        vk_hook = Msg.wParam = wVk = VK_PACKET;
-        Msg.lParam = MAKELPARAM(1 /* repeat count */, ki->wScan);
-    }
-
-    if (!(ki->dwFlags & KEYEVENTF_UNICODE))
-    {
-        if (ki->dwFlags & KEYEVENTF_KEYUP)
-        {
-            gKeyStateTable[wVk] &= ~KS_DOWN_BIT;
-            gKeyStateTable[wVkStripped] = gKeyStateTable[wVkL] | gKeyStateTable[wVkR];
-        }
-        else
-        {
-            if (!(gKeyStateTable[wVk] & KS_DOWN_BIT)) gKeyStateTable[wVk] ^= KS_LOCK_BIT;
-            gKeyStateTable[wVk] |= KS_DOWN_BIT;
-            gKeyStateTable[wVkStripped] = gKeyStateTable[wVkL] | gKeyStateTable[wVkR];
-        }
-
-        if (gKeyStateTable[VK_MENU] & KS_DOWN_BIT) flags |= KF_ALTDOWN;
-
-        if (wVkStripped == VK_SHIFT) flags &= ~KF_EXTENDED;
-
-        Msg.lParam = MAKELPARAM(1 /* repeat count */, flags);
-    }
-
-    Msg.hwnd = 0;
-
-    if (FocusMessageQueue && (FocusMessageQueue->FocusWindow != (HWND)0))
-        Msg.hwnd = FocusMessageQueue->FocusWindow;
-
-    if (!ki->time)
-    {
-        KeQueryTickCount(&LargeTickCount);
-        Msg.time = MsqCalculateMessageTime(&LargeTickCount);
-    }
-    else
-        Msg.time = ki->time;
-
-    /* All messages have to contain the cursor point. */
-    Msg.pt = gpsi->ptCursor;
-
-    KbdHookData.vkCode = vk_hook;
-    KbdHookData.scanCode = ki->wScan;
-    KbdHookData.flags = (flags & (KF_EXTENDED | KF_ALTDOWN | KF_UP)) >> 8;
-    if (Injected) KbdHookData.flags |= LLKHF_INJECTED;
-    KbdHookData.time = Msg.time;
-    KbdHookData.dwExtraInfo = ki->dwExtraInfo;
-    if (co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, Msg.message, (LPARAM) &KbdHookData))
-    {
-        ERR("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n",
-            Msg.message, vk_hook, Msg.lParam);
-
-        return FALSE;
-    }
-
-    if (FocusMessageQueue == NULL)
-    {
-        TRACE("No focus message queue\n");
-
-        return FALSE;
-    }
-
-    if (FocusMessageQueue->FocusWindow != (HWND)0)
-    {
-        Msg.hwnd = FocusMessageQueue->FocusWindow;
-        TRACE("Msg.hwnd = %x\n", Msg.hwnd);
-
-        FocusMessageQueue->Desktop->pDeskInfo->LastInputWasKbd = TRUE;
-
-        // Post to hardware queue, based on the first part of wine "some GetMessage tests"
-        // in test_PeekMessage()
-        MsqPostMessage(FocusMessageQueue, &Msg, TRUE, QS_KEY);
-    }
-    else
-    {
-        TRACE("Invalid focus window handle\n");
-    }
-
-    return TRUE;
-}
-
-BOOL FASTCALL
-UserAttachThreadInput( PTHREADINFO pti, PTHREADINFO ptiTo, BOOL fAttach)
-{
-    PATTACHINFO pai;
-
-    /* Can not be the same thread.*/
-    if (pti == ptiTo) return FALSE;
-
-    /* Do not attach to system threads or between different desktops. */
-    if ( pti->TIF_flags & TIF_DONTATTACHQUEUE ||
-            ptiTo->TIF_flags & TIF_DONTATTACHQUEUE ||
-            pti->rpdesk != ptiTo->rpdesk )
-        return FALSE;
-
-    /* If Attach set, allocate and link. */
-    if ( fAttach )
-    {
-        pai = ExAllocatePoolWithTag(PagedPool, sizeof(ATTACHINFO), USERTAG_ATTACHINFO);
-        if ( !pai ) return FALSE;
-
-        pai->paiNext = gpai;
-        pai->pti1 = pti;
-        pai->pti2 = ptiTo;
-        gpai = pai;
-    }
-    else /* If clear, unlink and free it. */
-    {
-        PATTACHINFO paiprev = NULL;
-
-        if ( !gpai ) return FALSE;
-
-        pai = gpai;
-
-        /* Search list and free if found or return false. */
-        do
-        {
-            if ( pai->pti2 == ptiTo && pai->pti1 == pti ) break;
-            paiprev = pai;
-            pai = pai->paiNext;
-        } while (pai);
-
-        if ( !pai ) return FALSE;
-
-        if (paiprev) paiprev->paiNext = pai->paiNext;
-
-        ExFreePoolWithTag(pai, USERTAG_ATTACHINFO);
-    }
-
-    return TRUE;
-}
-
 UINT
 APIENTRY
 NtUserSendInput(
@@ -1481,359 +474,72 @@ NtUserSendInput(
     LPINPUT pInput,
     INT cbSize)
 {
-    PTHREADINFO W32Thread;
-    UINT cnt;
-    DECLARE_RETURN(UINT);
+    PTHREADINFO pti;
+    UINT uRet = 0;
 
     TRACE("Enter NtUserSendInput\n");
     UserEnterExclusive();
 
-    W32Thread = PsGetCurrentThreadWin32Thread();
-    ASSERT(W32Thread);
+    pti = PsGetCurrentThreadWin32Thread();
+    ASSERT(pti);
 
-    if(!W32Thread->rpdesk)
+    if (!pti->rpdesk)
     {
-        RETURN( 0);
+        goto cleanup;
     }
 
-    if(!nInputs || !pInput || (cbSize != sizeof(INPUT)))
+    if (!nInputs || !pInput || cbSize != sizeof(INPUT))
     {
         EngSetLastError(ERROR_INVALID_PARAMETER);
-        RETURN( 0);
+        goto cleanup;
     }
 
     /*
      * FIXME - check access rights of the window station
      *         e.g. services running in the service window station cannot block input
      */
-    if(!ThreadHasInputAccess(W32Thread) ||
-            !IntIsActiveDesktop(W32Thread->rpdesk))
+    if (!ThreadHasInputAccess(pti) ||
+        !IntIsActiveDesktop(pti->rpdesk))
     {
         EngSetLastError(ERROR_ACCESS_DENIED);
-        RETURN( 0);
+        goto cleanup;
     }
 
-    cnt = 0;
-    while(nInputs--)
+    while (nInputs--)
     {
         INPUT SafeInput;
         NTSTATUS Status;
 
         Status = MmCopyFromCaller(&SafeInput, pInput++, sizeof(INPUT));
-        if(!NT_SUCCESS(Status))
+        if (!NT_SUCCESS(Status))
         {
             SetLastNtError(Status);
-            RETURN( cnt);
+            goto cleanup;
         }
 
-        switch(SafeInput.type)
+        switch (SafeInput.type)
         {
             case INPUT_MOUSE:
-                if(IntMouseInput(&SafeInput.mi, TRUE))
-                {
-                    cnt++;
-                }
+                if (IntMouseInput(&SafeInput.mi, TRUE))
+                    uRet++;
                 break;
             case INPUT_KEYBOARD:
-                if(IntKeyboardInput(&SafeInput.ki, TRUE))
-                {
-                    cnt++;
-                }
+                if (UserSendKeyboardInput(&SafeInput.ki, TRUE))
+                    uRet++;
                 break;
             case INPUT_HARDWARE:
+                FIXME("INPUT_HARDWARE not supported!");
                 break;
-#ifndef NDEBUG
-
             default:
                 ERR("SendInput(): Invalid input type: 0x%x\n", SafeInput.type);
                 break;
-#endif
-
         }
     }
 
-    RETURN( cnt);
-
-CLEANUP:
-    TRACE("Leave NtUserSendInput, ret=%i\n", _ret_);
-    UserLeave();
-    END_CLEANUP;
-}
-
-BOOL
-FASTCALL
-IntQueryTrackMouseEvent(
-    LPTRACKMOUSEEVENT lpEventTrack)
-{
-    PDESKTOP pDesk;
-    PTHREADINFO pti;
-
-    pti = PsGetCurrentThreadWin32Thread();
-    pDesk = pti->rpdesk;
-
-    /* Always cleared with size set and return true. */
-    RtlZeroMemory(lpEventTrack , sizeof(TRACKMOUSEEVENT));
-    lpEventTrack->cbSize = sizeof(TRACKMOUSEEVENT);
-
-    if ( pDesk->dwDTFlags & (DF_TME_LEAVE | DF_TME_HOVER) &&
-            pDesk->spwndTrack &&
-            pti->MessageQueue == pDesk->spwndTrack->head.pti->MessageQueue )
-    {
-        if ( pDesk->htEx != HTCLIENT )
-            lpEventTrack->dwFlags |= TME_NONCLIENT;
-
-        if ( pDesk->dwDTFlags & DF_TME_LEAVE )
-            lpEventTrack->dwFlags |= TME_LEAVE;
-
-        if ( pDesk->dwDTFlags & DF_TME_HOVER )
-        {
-            lpEventTrack->dwFlags |= TME_HOVER;
-            lpEventTrack->dwHoverTime = pDesk->dwMouseHoverTime;
-        }
-        lpEventTrack->hwndTrack = UserHMGetHandle(pDesk->spwndTrack);
-    }
-    return TRUE;
-}
-
-BOOL
-FASTCALL
-IntTrackMouseEvent(
-    LPTRACKMOUSEEVENT lpEventTrack)
-{
-    PDESKTOP pDesk;
-    PTHREADINFO pti;
-    PWND pWnd;
-    POINT point;
-
-    pti = PsGetCurrentThreadWin32Thread();
-    pDesk = pti->rpdesk;
-
-    if (!(pWnd = UserGetWindowObject(lpEventTrack->hwndTrack)))
-        return FALSE;
-
-    if ( pDesk->spwndTrack != pWnd ||
-            (pDesk->htEx != HTCLIENT) ^ !!(lpEventTrack->dwFlags & TME_NONCLIENT) )
-    {
-        if ( lpEventTrack->dwFlags & TME_LEAVE && !(lpEventTrack->dwFlags & TME_CANCEL) )
-        {
-            UserPostMessage( lpEventTrack->hwndTrack,
-                             lpEventTrack->dwFlags & TME_NONCLIENT ? WM_NCMOUSELEAVE : WM_MOUSELEAVE,
-                             0, 0);
-        }
-        TRACE("IntTrackMouseEvent spwndTrack 0x%x pwnd 0x%x\n", pDesk->spwndTrack, pWnd);
-        return TRUE;
-    }
-
-    /* Tracking spwndTrack same as pWnd */
-    if ( lpEventTrack->dwFlags & TME_CANCEL ) // Canceled mode.
-    {
-        if ( lpEventTrack->dwFlags & TME_LEAVE )
-            pDesk->dwDTFlags &= ~DF_TME_LEAVE;
-
-        if ( lpEventTrack->dwFlags & TME_HOVER )
-        {
-            if ( pDesk->dwDTFlags & DF_TME_HOVER )
-            {   // Kill hover timer.
-                IntKillTimer(pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE);
-                pDesk->dwDTFlags &= ~DF_TME_HOVER;
-            }
-        }
-    }
-    else // Not Canceled.
-    {
-        if ( lpEventTrack->dwFlags & TME_LEAVE )
-            pDesk->dwDTFlags |= DF_TME_LEAVE;
-
-        if ( lpEventTrack->dwFlags & TME_HOVER )
-        {
-            pDesk->dwDTFlags |= DF_TME_HOVER;
-
-            if ( !lpEventTrack->dwHoverTime || lpEventTrack->dwHoverTime == HOVER_DEFAULT )
-                pDesk->dwMouseHoverTime = gspv.iMouseHoverTime; // use the system default hover time-out.
-            else
-                pDesk->dwMouseHoverTime = lpEventTrack->dwHoverTime;
-            // Start timer for the hover period.
-            IntSetTimer( pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, pDesk->dwMouseHoverTime, SystemTimerProc, TMRF_SYSTEM);
-            // Get windows thread message points.
-            point = pWnd->head.pti->ptLast;
-            // Set desktop mouse hover from the system default hover rectangle.
-            RECTL_vSetRect(&pDesk->rcMouseHover,
-                           point.x - gspv.iMouseHoverWidth  / 2,
-                           point.y - gspv.iMouseHoverHeight / 2,
-                           point.x + gspv.iMouseHoverWidth  / 2,
-                           point.y + gspv.iMouseHoverHeight / 2);
-        }
-    }
-    return TRUE;
-}
-
-BOOL
-APIENTRY
-NtUserTrackMouseEvent(
-    LPTRACKMOUSEEVENT lpEventTrack)
-{
-    TRACKMOUSEEVENT saveTME;
-    BOOL Ret = FALSE;
-
-    TRACE("Enter NtUserTrackMouseEvent\n");
-    UserEnterExclusive();
-
-    _SEH2_TRY
-    {
-        ProbeForRead(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1);
-        RtlCopyMemory(&saveTME, lpEventTrack, sizeof(TRACKMOUSEEVENT));
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        SetLastNtError(_SEH2_GetExceptionCode());
-        _SEH2_YIELD(goto Exit;)
-    }
-    _SEH2_END;
-
-    if ( saveTME.cbSize != sizeof(TRACKMOUSEEVENT) )
-    {
-        EngSetLastError(ERROR_INVALID_PARAMETER);
-        goto Exit;
-    }
-
-    if (saveTME.dwFlags & ~(TME_CANCEL | TME_QUERY | TME_NONCLIENT | TME_LEAVE | TME_HOVER) )
-    {
-        EngSetLastError(ERROR_INVALID_FLAGS);
-        goto Exit;
-    }
-
-    if ( saveTME.dwFlags & TME_QUERY )
-    {
-        Ret = IntQueryTrackMouseEvent(&saveTME);
-        _SEH2_TRY
-        {
-            ProbeForWrite(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1);
-            RtlCopyMemory(lpEventTrack, &saveTME, sizeof(TRACKMOUSEEVENT));
-        }
-        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-        {
-            SetLastNtError(_SEH2_GetExceptionCode());
-            Ret = FALSE;
-        }
-        _SEH2_END;
-    }
-    else
-    {
-        Ret = IntTrackMouseEvent(&saveTME);
-    }
-
-Exit:
-    TRACE("Leave NtUserTrackMouseEvent, ret=%i\n", Ret);
-    UserLeave();
-    return Ret;
-}
-
-extern MOUSEMOVEPOINT MouseHistoryOfMoves[];
-extern INT gcur_count;
-
-DWORD
-APIENTRY
-NtUserGetMouseMovePointsEx(
-    UINT cbSize,
-    LPMOUSEMOVEPOINT lpptIn,
-    LPMOUSEMOVEPOINT lpptOut,
-    int nBufPoints,
-    DWORD resolution)
-{
-    MOUSEMOVEPOINT Safeppt;
-    BOOL Hit;
-    INT Count = -1;
-    DECLARE_RETURN(DWORD);
-
-    TRACE("Enter NtUserGetMouseMovePointsEx\n");
-    UserEnterExclusive();
-
-    if ((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64))
-    {
-        EngSetLastError(ERROR_INVALID_PARAMETER);
-        RETURN( -1);
-    }
-
-    if (!lpptIn || (!lpptOut && nBufPoints))
-    {
-        EngSetLastError(ERROR_NOACCESS);
-        RETURN( -1);
-    }
-
-    _SEH2_TRY
-    {
-        ProbeForRead( lpptIn, cbSize, 1);
-        RtlCopyMemory(&Safeppt, lpptIn, cbSize);
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        SetLastNtError(_SEH2_GetExceptionCode());
-        _SEH2_YIELD(RETURN( -1))
-    }
-    _SEH2_END;
-
-    // http://msdn.microsoft.com/en-us/library/ms646259(v=vs.85).aspx
-    // This explains the math issues in transforming points.
-    Count = gcur_count; // FIFO is forward so retrieve backward.
-    Hit = FALSE;
-    do
-    {
-        if (Safeppt.x == 0 && Safeppt.y == 0)
-            break; // No test.
-        // Finds the point, it returns the last nBufPoints prior to and including the supplied point.
-        if (MouseHistoryOfMoves[Count].x == Safeppt.x && MouseHistoryOfMoves[Count].y == Safeppt.y)
-        {
-            if ( Safeppt.time ) // Now test time and it seems to be absolute.
-            {
-                if (Safeppt.time == MouseHistoryOfMoves[Count].time)
-                {
-                    Hit = TRUE;
-                    break;
-                }
-                else
-                {
-                    if (--Count < 0) Count = 63;
-                    continue;
-                }
-            }
-            Hit = TRUE;
-            break;
-        }
-        if (--Count < 0) Count = 63;
-    }
-    while ( Count != gcur_count);
-
-    switch(resolution)
-    {
-        case GMMP_USE_DISPLAY_POINTS:
-            if (nBufPoints)
-            {
-                _SEH2_TRY
-                {
-                    ProbeForWrite(lpptOut, cbSize, 1);
-                }
-                _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-                {
-                    SetLastNtError(_SEH2_GetExceptionCode());
-                    _SEH2_YIELD(RETURN( -1))
-                }
-                _SEH2_END;
-            }
-            Count = nBufPoints;
-            break;
-        case GMMP_USE_HIGH_RESOLUTION_POINTS:
-            break;
-        default:
-            EngSetLastError(ERROR_POINT_NOT_FOUND);
-            RETURN( -1);
-    }
-
-    RETURN( Count);
-
-CLEANUP:
-    TRACE("Leave NtUserGetMouseMovePointsEx, ret=%i\n", _ret_);
+cleanup:
+    TRACE("Leave NtUserSendInput, ret=%i\n", uRet);
     UserLeave();
-    END_CLEANUP;
+    return uRet;
 }
 
 /* EOF */