Author: jimtabor
Date: Fri May 27 01:36:41 2011
New Revision: 51945
URL: http://svn.reactos.org/svn/reactos?rev=51945&view=rev
Log:
[Win32k|User32]
- Remove NtUserGetLastInputInfo.
Modified:
trunk/reactos/dll/win32/user32/windows/input.c
trunk/reactos/include/reactos/win32k/ntuser.h
trunk/reactos/subsystems/win32/win32k/ntuser/input.c
trunk/reactos/subsystems/win32/win32k/w32ksvc.db
trunk/reactos/subsystems/win32/win32k/w32ksvc.h
Modified: trunk/reactos/dll/win32/user32/windows/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/input.c?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Fri May 27
01:36:41 2011
@@ -181,7 +181,6 @@
return NtUserGetKeyNameText( lParam, lpString, nSize );
}
-
/*
* @implemented
*/
@@ -190,7 +189,6 @@
{
return (SHORT) NtUserGetKeyState((DWORD) nVirtKey);
}
-
/*
* @implemented
@@ -225,16 +223,23 @@
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
@@ -247,7 +252,6 @@
strtoul(pwszKLID, NULL, 16),
Flags);
}
-
/*
* @implemented
@@ -263,7 +267,6 @@
Flags);
}
-
/*
* @implemented
*/
@@ -273,7 +276,6 @@
{
return MapVirtualKeyExA( uCode, uMapType, GetKeyboardLayout( 0 ) );
}
-
/*
* @implemented
Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntuser.h?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri May 27
01:36:41 2011
@@ -3161,11 +3161,6 @@
BOOL
NTAPI
-NtUserGetLastInputInfo(
- PLASTINPUTINFO plii);
-
-BOOL
-NTAPI
NtUserGetMinMaxInfo(
HWND hwnd,
MINMAXINFO *MinMaxInfo,
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/input.c?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri May
27 01:36:41 2011
@@ -65,43 +65,10 @@
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)
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32ksvc.db?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Fri May 27
01:36:41 2011
@@ -683,7 +683,6 @@
#
NtUserBuildMenuItemList 4
NtUserGetMenuDefaultItem 3
-NtUserGetLastInputInfo 1
NtUserGetMinMaxInfo 3
NtUserGetMonitorInfo 2
NtUserMenuInfo 3
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32ksvc.h?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Fri May 27
01:36:41 2011
@@ -683,7 +683,6 @@
SVC_(UserBuildMenuItemList, 4)
SVC_(UserGetMenuDefaultItem, 3)
-SVC_(UserGetLastInputInfo, 1)
SVC_(UserGetMinMaxInfo, 3)
SVC_(UserGetMonitorInfo, 2)
SVC_(UserMenuInfo, 3)
