Author: akhaldi
Date: Thu Nov 24 12:38:26 2011
New Revision: 54491
URL:
http://svn.reactos.org/svn/reactos?rev=54491&view=rev
Log:
[WIN32K]
* Comment out some unused but set variables.
* Check for NtDeviceIoControlFile returned status and warn on failure.
Modified:
trunk/reactos/subsystems/win32/win32k/ntuser/input.c
trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c
trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Nov 24 12:38:26
2011
@@ -134,14 +134,15 @@
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;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Thu Nov 24
12:38:26 2011
@@ -170,6 +170,11 @@
IOCTL_KEYBOARD_QUERY_INDICATORS,
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);
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu Nov 24
12:38:26 2011
@@ -951,7 +951,7 @@
BOOL APIENTRY
NtUserFlashWindowEx(IN PFLASHWINFO pfwi)
{
- PWND pWnd;
+ //PWND pWnd;
FLASHWINFO finfo = {0};
BOOL Ret = TRUE;
@@ -971,7 +971,7 @@
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) )
{