From 4f7abdba4487fabad609ee00879dcdcfd3333221 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 24 Nov 2011 12:38:26 +0000 Subject: [PATCH] [WIN32K] * Comment out some unused but set variables. * Check for NtDeviceIoControlFile returned status and warn on failure. svn path=/trunk/; revision=54491 --- reactos/subsystems/win32/win32k/ntuser/input.c | 5 +++-- reactos/subsystems/win32/win32k/ntuser/keyboard.c | 5 +++++ reactos/subsystems/win32/win32k/ntuser/painting.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/input.c b/reactos/subsystems/win32/win32k/ntuser/input.c index 92b691cab59..8452084a9e5 100644 --- a/reactos/subsystems/win32/win32k/ntuser/input.c +++ b/reactos/subsystems/win32/win32k/ntuser/input.c @@ -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; diff --git a/reactos/subsystems/win32/win32k/ntuser/keyboard.c b/reactos/subsystems/win32/win32k/ntuser/keyboard.c index 806ba20f919..87d0efceafa 100644 --- a/reactos/subsystems/win32/win32k/ntuser/keyboard.c +++ b/reactos/subsystems/win32/win32k/ntuser/keyboard.c @@ -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, diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c index 406070ac8ad..b45bd55234d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/painting.c +++ b/reactos/subsystems/win32/win32k/ntuser/painting.c @@ -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) ) {