From a8e5ba3485f620caecff20bc1984cbd90cb61bf8 Mon Sep 17 00:00:00 2001 From: Michael Martin Date: Thu, 20 May 2010 21:45:15 +0000 Subject: [PATCH] [win32k] - Move the initialization of MasterTimer into InitInputImp which is called from win32k DriverEntry routine instead of initializing it in the secondary thread RawInputThreadMain. svn path=/trunk/; revision=47285 --- reactos/subsystems/win32/win32k/ntuser/input.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/input.c b/reactos/subsystems/win32/win32k/ntuser/input.c index 7cd94f2c5f9..006b0f123b0 100644 --- a/reactos/subsystems/win32/win32k/ntuser/input.c +++ b/reactos/subsystems/win32/win32k/ntuser/input.c @@ -868,14 +868,6 @@ RawInputThreadMain(PVOID StartContext) NTSTATUS Status; LARGE_INTEGER DueTime; - MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), TAG_INPUT); - if (!MasterTimer) - { - DPRINT1("Win32K: Failed making Raw Input thread a win32 thread.\n"); - return; - } - KeInitializeTimer(MasterTimer); - DueTime.QuadPart = (LONGLONG)(-10000000); do @@ -937,6 +929,15 @@ InitInputImpl(VOID) KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE); + MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), TAG_INPUT); + if (!MasterTimer) + { + DPRINT1("Win32K: Failed making Raw Input thread a win32 thread.\n"); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + KeInitializeTimer(MasterTimer); + /* Initialize the default keyboard layout */ if(!UserInitDefaultKeyboardLayout()) {