* Comment out some unused but set variables.
* Check for NtDeviceIoControlFile returned status and warn on failure.

svn path=/trunk/; revision=54491
This commit is contained in:
Amine Khaldi 2011-11-24 12:38:26 +00:00
parent ebcf61a63b
commit 4f7abdba44
3 changed files with 10 additions and 4 deletions

View file

@ -134,14 +134,15 @@ RawInputThreadMain()
NTSTATUS MouStatus = STATUS_UNSUCCESSFUL, KbdStatus = STATUS_UNSUCCESSFUL, Status;
IO_STATUS_BLOCK MouIosb, KbdIosb;
PFILE_OBJECT pKbdDevice, pMouDevice;
LARGE_INTEGER WaitTimeout, ByteOffset;
LARGE_INTEGER ByteOffset;
//LARGE_INTEGER WaitTimeout;
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);
//WaitTimeout.QuadPart = (LONGLONG)(-10000000);
ptiRawInput = PsGetCurrentThreadWin32Thread();
ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD;

View file

@ -171,6 +171,11 @@ UserInitKeyboard(HANDLE hKeyboardDevice)
NULL, 0,
&gIndicators, sizeof(gIndicators));
if (!NT_SUCCESS(Status))
{
WARN("NtDeviceIoControlFile() failed, ignored\n");
}
SET_KEY_LOCKED(gafAsyncKeyState, VK_CAPITAL,
gIndicators.LedFlags & KEYBOARD_CAPS_LOCK_ON);
SET_KEY_LOCKED(gafAsyncKeyState, VK_NUMLOCK,

View file

@ -951,7 +951,7 @@ CLEANUP:
BOOL APIENTRY
NtUserFlashWindowEx(IN PFLASHWINFO pfwi)
{
PWND pWnd;
//PWND pWnd;
FLASHWINFO finfo = {0};
BOOL Ret = TRUE;
@ -971,7 +971,7 @@ NtUserFlashWindowEx(IN PFLASHWINFO pfwi)
if (!Ret) goto Exit;
if (!(pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) ||
if (!(/* pWnd = */ (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) ||
finfo.cbSize != sizeof(FLASHWINFO) ||
finfo.dwFlags & ~(FLASHW_ALL|FLASHW_TIMER|FLASHW_TIMERNOFG) )
{