Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 05:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k|User32]

Browse source 
- Remove NtUserGetLastInputInfo.

svn path=/trunk/; revision=51945
This commit is contained in:
James Tabor 2011-05-27 01:36:41 +00:00
parent bb403dcfbc
commit 90e8da7f8a
5 changed files with 11 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/user32/windows/input.c
View file

@ -181,7 +181,6 @@ GetKeyNameTextW(LONG lParam,
return NtUserGetKeyNameText( lParam, lpString, nSize ); return NtUserGetKeyNameText( lParam, lpString, nSize );
} }
/* /*
* @implemented * @implemented
*/ */
@ -191,7 +190,6 @@ GetKeyState(int nVirtKey)
return (SHORT) NtUserGetKeyState((DWORD) nVirtKey); return (SHORT) NtUserGetKeyState((DWORD) nVirtKey);
} }
/* /*
* @implemented * @implemented
*/ */
@ -225,16 +223,23 @@ GetKeyboardType(int nTypeFlag)
return (int)NtUserCallOneParam((DWORD_PTR) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE); return (int)NtUserCallOneParam((DWORD_PTR) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE);
} }
/* /*
* @implemented * @implemented
*/ */
BOOL WINAPI BOOL WINAPI
GetLastInputInfo(PLASTINPUTINFO plii) 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 * @implemented
@ -248,7 +253,6 @@ LoadKeyboardLayoutA(LPCSTR pwszKLID,
Flags); Flags);
} }
/* /*
* @implemented * @implemented
*/ */
@ -263,7 +267,6 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID,
Flags); Flags);
} }
/* /*
* @implemented * @implemented
*/ */
@ -274,7 +277,6 @@ MapVirtualKeyA(UINT uCode,
return MapVirtualKeyExA( uCode, uMapType, GetKeyboardLayout( 0 ) ); return MapVirtualKeyExA( uCode, uMapType, GetKeyboardLayout( 0 ) );
} }
/* /*
* @implemented * @implemented
*/ */

5
reactos/include/reactos/win32k/ntuser.h
View file

@ -3159,11 +3159,6 @@ NtUserGetMenuDefaultItem(
UINT fByPos, UINT fByPos,
UINT gmdiFlags); UINT gmdiFlags);
BOOL
NTAPI
NtUserGetLastInputInfo(
PLASTINPUTINFO plii);
BOOL BOOL
NTAPI NTAPI
NtUserGetMinMaxInfo( NtUserGetMinMaxInfo(

35
reactos/subsystems/win32/win32k/ntuser/input.c
View file

@ -65,44 +65,11 @@ DWORD IntLastInputTick(BOOL LastInputTickSetGet)
LARGE_INTEGER TickCount; LARGE_INTEGER TickCount;
KeQueryTickCount(&TickCount); KeQueryTickCount(&TickCount);
LastInputTick = TickCount.u.LowPart * (KeQueryTimeIncrement() / 10000); LastInputTick = TickCount.u.LowPart * (KeQueryTimeIncrement() / 10000);
if (gpsi) gpsi->dwLastRITEventTickCount = LastInputTick;
} }
return 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 VOID FASTCALL
ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount) ProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount)
{ {

1
reactos/subsystems/win32/win32k/w32ksvc.db
View file

@ -683,7 +683,6 @@ NtGdiOffsetWindowOrgEx 4
# #
NtUserBuildMenuItemList 4 NtUserBuildMenuItemList 4
NtUserGetMenuDefaultItem 3 NtUserGetMenuDefaultItem 3
NtUserGetLastInputInfo 1
NtUserGetMinMaxInfo 3 NtUserGetMinMaxInfo 3
NtUserGetMonitorInfo 2 NtUserGetMonitorInfo 2
NtUserMenuInfo 3 NtUserMenuInfo 3

1
reactos/subsystems/win32/win32k/w32ksvc.h
View file

@ -683,7 +683,6 @@ SVC_(GdiOffsetWindowOrgEx, 4)
SVC_(UserBuildMenuItemList, 4) SVC_(UserBuildMenuItemList, 4)
SVC_(UserGetMenuDefaultItem, 3) SVC_(UserGetMenuDefaultItem, 3)
SVC_(UserGetLastInputInfo, 1)
SVC_(UserGetMinMaxInfo, 3) SVC_(UserGetMinMaxInfo, 3)
SVC_(UserGetMonitorInfo, 2) SVC_(UserGetMonitorInfo, 2)
SVC_(UserMenuInfo, 3) SVC_(UserMenuInfo, 3)