From dd54fd1837ad91d1f8ff023d63bbd7e664d9159d Mon Sep 17 00:00:00 2001
From: Matthias Kupfer <mkupfer@reactos.org>
Date: Wed, 30 Jun 2010 18:40:20 +0000
Subject: [PATCH] - move set of msg-time (for messages) back to msg queue (msg
 time is needed for all mouse events not only mouse move) - ClickLock will
 work again

svn path=/trunk/; revision=47917
---
 reactos/subsystems/win32/win32k/ntuser/cursoricon.c | 4 ----
 reactos/subsystems/win32/win32k/ntuser/msgqueue.c   | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
index 832d820a98e..4fd09418eb8 100644
--- a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
+++ b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
@@ -179,7 +179,6 @@ BOOL UserSetCursorPos( INT x, INT y, BOOL CallHooks)
 {
     PWINDOW_OBJECT DesktopWindow;
     PSYSTEM_CURSORINFO CurInfo;
-    LARGE_INTEGER LargeTickCount;
     MSLLHOOKSTRUCT MouseHookData;
     HDC hDC;
     MSG Msg;
@@ -223,9 +222,6 @@ BOOL UserSetCursorPos( INT x, INT y, BOOL CallHooks)
     gpsi->ptCursor.x = x;
     gpsi->ptCursor.y = y;
 
-    KeQueryTickCount(&LargeTickCount);
-    Msg.time = MsqCalculateMessageTime(&LargeTickCount);
-
     //Move the mouse pointer
     GreMovePointer(hDC, x, y);
 
diff --git a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
index 52587ac7946..2567c80cbf3 100644
--- a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
+++ b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
@@ -171,9 +171,12 @@ MsqInitializeImpl(VOID)
 VOID FASTCALL
 MsqInsertSystemMessage(MSG* Msg)
 {
+   LARGE_INTEGER LargeTickCount;
    KIRQL OldIrql;
    ULONG Prev;
 
+   KeQueryTickCount(&LargeTickCount);
+   Msg->time = MsqCalculateMessageTime(&LargeTickCount);
    /*
     * If we got WM_MOUSEMOVE and there are already messages in the
     * system message queue, check if the last message is mouse move