From 90e8da7f8ad47fac800da0966fbbfc597026b4d1 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Fri, 27 May 2011 01:36:41 +0000
Subject: [PATCH] [Win32k|User32] - Remove NtUserGetLastInputInfo.

svn path=/trunk/; revision=51945
---
 reactos/dll/win32/user32/windows/input.c      | 18 +++++-----
 reactos/include/reactos/win32k/ntuser.h       |  5 ---
 .../subsystems/win32/win32k/ntuser/input.c    | 35 +------------------
 reactos/subsystems/win32/win32k/w32ksvc.db    |  1 -
 reactos/subsystems/win32/win32k/w32ksvc.h     |  1 -
 5 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c
index 9eadc0e81c2..b761d26760b 100644
--- a/reactos/dll/win32/user32/windows/input.c
+++ b/reactos/dll/win32/user32/windows/input.c
@@ -181,7 +181,6 @@ GetKeyNameTextW(LONG lParam,
   return NtUserGetKeyNameText( lParam, lpString, nSize );
 }
 
-
 /*
  * @implemented
  */
@@ -191,7 +190,6 @@ GetKeyState(int nVirtKey)
  return (SHORT) NtUserGetKeyState((DWORD) nVirtKey);
 }
 
-
 /*
  * @implemented
  */
@@ -225,16 +223,23 @@ GetKeyboardType(int nTypeFlag)
 return (int)NtUserCallOneParam((DWORD_PTR) nTypeFlag,  ONEPARAM_ROUTINE_GETKEYBOARDTYPE);
 }
 
-
 /*
  * @implemented
  */
 BOOL WINAPI
 GetLastInputInfo(PLASTINPUTINFO plii)
 {
-  return NtUserGetLastInputInfo(plii);
-}
+  TRACE("%p\n", plii);
 
+  if (plii->cbSize != sizeof (*plii) )
+  {
+     SetLastError(ERROR_INVALID_PARAMETER);
+     return FALSE;
+  }
+
+  plii->dwTime = gpsi->dwLastRITEventTickCount;
+  return TRUE;
+}
 
 /*
  * @implemented
@@ -248,7 +253,6 @@ LoadKeyboardLayoutA(LPCSTR pwszKLID,
                Flags);
 }
 
-
 /*
  * @implemented
  */
@@ -263,7 +267,6 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID,
                Flags);
 }
 
-
 /*
  * @implemented
  */
@@ -274,7 +277,6 @@ MapVirtualKeyA(UINT uCode,
   return MapVirtualKeyExA( uCode, uMapType, GetKeyboardLayout( 0 ) );
 }
 
-
 /*
  * @implemented
  */
diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index 432390a5fc7..0b6ef486103 100644
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -3159,11 +3159,6 @@ NtUserGetMenuDefaultItem(
   UINT fByPos,
   UINT gmdiFlags);
 
-BOOL
-NTAPI
-NtUserGetLastInputInfo(
-    PLASTINPUTINFO plii);
-
 BOOL
 NTAPI
 NtUserGetMinMaxInfo(
diff --git a/reactos/subsystems/win32/win32k/ntuser/input.c b/reactos/subsystems/win32/win32k/ntuser/input.c
index 81128b9c61e..a75fa14355a 100644
--- a/reactos/subsystems/win32/win32k/ntuser/input.c
+++ b/reactos/subsystems/win32/win32k/ntuser/input.c
@@ -65,44 +65,11 @@ DWORD IntLastInputTick(BOOL LastInputTickSetGet)
 		LARGE_INTEGER TickCount;
         KeQueryTickCount(&TickCount);
         LastInputTick = TickCount.u.LowPart * (KeQueryTimeIncrement() / 10000);
+        if (gpsi) gpsi->dwLastRITEventTickCount = LastInputTick;
 	}
     return LastInputTick;
 }
 
-BOOL
-APIENTRY
-NtUserGetLastInputInfo(PLASTINPUTINFO plii)
-{
-    BOOL ret = TRUE;
-
-    UserEnterShared();
-
-    _SEH2_TRY
-    {
-        if (ProbeForReadUint(&plii->cbSize) != sizeof(LASTINPUTINFO))
-        {
-            EngSetLastError(ERROR_INVALID_PARAMETER);
-            ret = FALSE;
-            _SEH2_LEAVE;
-        }
-
-        ProbeForWrite(plii, sizeof(LASTINPUTINFO), sizeof(DWORD));
-
-        plii->dwTime = IntLastInputTick(FALSE);
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        SetLastNtError(_SEH2_GetExceptionCode());
-        ret = FALSE;
-    }
-    _SEH2_END;
-
-    UserLeave();
-
-    return ret;
-}
-
-
 VOID FASTCALL
 ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount)
 {
diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db
index 3bbee921273..e797b044a97 100644
--- a/reactos/subsystems/win32/win32k/w32ksvc.db
+++ b/reactos/subsystems/win32/win32k/w32ksvc.db
@@ -683,7 +683,6 @@ NtGdiOffsetWindowOrgEx                  4
 #
 NtUserBuildMenuItemList                 4
 NtUserGetMenuDefaultItem                3
-NtUserGetLastInputInfo                  1
 NtUserGetMinMaxInfo                     3
 NtUserGetMonitorInfo                    2
 NtUserMenuInfo                          3
diff --git a/reactos/subsystems/win32/win32k/w32ksvc.h b/reactos/subsystems/win32/win32k/w32ksvc.h
index 0dcaec07fbb..1bd678d0570 100644
--- a/reactos/subsystems/win32/win32k/w32ksvc.h
+++ b/reactos/subsystems/win32/win32k/w32ksvc.h
@@ -683,7 +683,6 @@ SVC_(GdiOffsetWindowOrgEx, 4)
 
 SVC_(UserBuildMenuItemList, 4)
 SVC_(UserGetMenuDefaultItem, 3)
-SVC_(UserGetLastInputInfo, 1)
 SVC_(UserGetMinMaxInfo, 3)
 SVC_(UserGetMonitorInfo, 2)
 SVC_(UserMenuInfo, 3)