Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K:NTUSER]

Browse source 
- Terminate the RawInputThread on shutdown
CORE-10217 #resolve

svn path=/trunk/; revision=69556
This commit is contained in:
Thomas Faber 2015-10-16 15:30:35 +00:00
parent 683001f661
commit 4367fbf372
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reactos/win32ss/user/ntuser/input.c
View file

@ -132,10 +132,12 @@ RawInputThreadMain(VOID)
PFILE_OBJECT pKbdDevice = NULL, pMouDevice = NULL; PFILE_OBJECT pKbdDevice = NULL, pMouDevice = NULL;
LARGE_INTEGER ByteOffset; LARGE_INTEGER ByteOffset;
//LARGE_INTEGER WaitTimeout; //LARGE_INTEGER WaitTimeout;
PVOID WaitObjects[3], pSignaledObject = NULL; PVOID WaitObjects[4], pSignaledObject = NULL;
ULONG cWaitObjects = 0, cMaxWaitObjects = 1; KWAIT_BLOCK WaitBlockArray[RTL_NUMBER_OF(WaitObjects)];
ULONG cWaitObjects = 0, cMaxWaitObjects = 2;
MOUSE_INPUT_DATA MouseInput; MOUSE_INPUT_DATA MouseInput;
KEYBOARD_INPUT_DATA KeyInput; KEYBOARD_INPUT_DATA KeyInput;
PVOID ShutdownEvent;
ByteOffset.QuadPart = (LONGLONG)0; ByteOffset.QuadPart = (LONGLONG)0;
//WaitTimeout.QuadPart = (LONGLONG)(-10000000); //WaitTimeout.QuadPart = (LONGLONG)(-10000000);
@ -156,6 +158,7 @@ RawInputThreadMain(VOID)
NT_ASSERT(ghMouseDevice == NULL); NT_ASSERT(ghMouseDevice == NULL);
NT_ASSERT(ghKeyboardDevice == NULL); NT_ASSERT(ghKeyboardDevice == NULL);
PoRequestShutdownEvent(&ShutdownEvent);
for (;;) for (;;)
{ {
if (!ghMouseDevice) if (!ghMouseDevice)
@ -189,6 +192,7 @@ RawInputThreadMain(VOID)
/* Reset WaitHandles array */ /* Reset WaitHandles array */
cWaitObjects = 0; cWaitObjects = 0;
WaitObjects[cWaitObjects++] = ShutdownEvent;
WaitObjects[cWaitObjects++] = MasterTimer; WaitObjects[cWaitObjects++] = MasterTimer;
if (ghMouseDevice) if (ghMouseDevice)
@ -241,7 +245,7 @@ RawInputThreadMain(VOID)
KernelMode, KernelMode,
TRUE, TRUE,
NULL,//&WaitTimeout, NULL,//&WaitTimeout,
NULL); WaitBlockArray);
if ((Status >= STATUS_WAIT_0) && if ((Status >= STATUS_WAIT_0) &&
(Status < (STATUS_WAIT_0 + (LONG)cWaitObjects))) (Status < (STATUS_WAIT_0 + (LONG)cWaitObjects)))
@ -264,6 +268,10 @@ RawInputThreadMain(VOID)
{ {
ProcessTimers(); ProcessTimers();
} }
else if (pSignaledObject == ShutdownEvent)
{
break;
}
else ASSERT(FALSE); else ASSERT(FALSE);
} }
} }
@ -302,6 +310,23 @@ RawInputThreadMain(VOID)
else if (KbdStatus != STATUS_PENDING) else if (KbdStatus != STATUS_PENDING)
ERR("Failed to read from keyboard: %x.\n", KbdStatus); ERR("Failed to read from keyboard: %x.\n", KbdStatus);
} }
if (ghMouseDevice)
{
(void)ZwCancelIoFile(ghMouseDevice, &MouIosb);
ObCloseHandle(ghMouseDevice, KernelMode);
ObDereferenceObject(pMouDevice);
ghMouseDevice = NULL;
}
if (ghKeyboardDevice)
{
(void)ZwCancelIoFile(ghKeyboardDevice, &KbdIosb);
ObCloseHandle(ghKeyboardDevice, KernelMode);
ObDereferenceObject(pKbdDevice);
ghKeyboardDevice = NULL;
}
ERR("Raw Input Thread Exit!\n"); ERR("Raw Input Thread Exit!\n");
} }

2
reactos/win32ss/user/winsrv/usersrv/init.c
View file

@ -102,7 +102,7 @@ NTAPI
CreateSystemThreads(PVOID pParam) CreateSystemThreads(PVOID pParam)
{ {
NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS);
DPRINT1("This thread should not terminate!\n"); RtlExitUserThread(0);
return 0; return 0;
} }