[ros-diffs] [jimtabor] 54196: - Move mouse history to mouse.c and it is not effected by the hook bypass.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Wed Oct 19 01:07:19 2011
New Revision: 54196

URL: http://svn.reactos.org/svn/reactos?rev=54196&view=rev
Log:
- Move mouse history to mouse.c and it is not effected by the hook bypass.

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c
    trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c?rev=54196&r1=54195&r2=54196&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c [iso-8859-1] Wed Oct 19 01:07:19 2011
@@ -10,6 +10,9 @@
 #include <win32k.h>
 DBG_DEFAULT_CHANNEL(UserInput);
 
+MOUSEMOVEPOINT MouseHistoryOfMoves[64];
+INT gcur_count = 0;
+
 #define ClearMouseInput(mi) \
   mi.dx = 0; \
   mi.dy = 0; \
@@ -159,6 +162,14 @@
             MousePos.y += mi->dy;
         }
     }
+
+    /* Do GetMouseMovePointsEx FIFO. */
+    MouseHistoryOfMoves[gcur_count].x = MousePos.x;
+    MouseHistoryOfMoves[gcur_count].y = MousePos.y;
+    MouseHistoryOfMoves[gcur_count].time = mi->time;
+    MouseHistoryOfMoves[gcur_count].dwExtraInfo = mi->dwExtraInfo;
+    if (++gcur_count == ARRAYSIZE(MouseHistoryOfMoves))
+       gcur_count = 0; // 0 - 63 is 64, FIFO forwards.
 
     /*
      * Insert the messages into the system queue

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c?rev=54196&r1=54195&r2=54196&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Oct 19 01:07:19 2011
@@ -14,8 +14,6 @@
 /* GLOBALS *******************************************************************/
 
 static PAGED_LOOKASIDE_LIST MessageLookasideList;
-MOUSEMOVEPOINT MouseHistoryOfMoves[64];
-INT gcur_count = 0;
 PUSER_MESSAGE_QUEUE gpqCursor;
 
 /* FUNCTIONS *****************************************************************/
@@ -587,14 +585,6 @@
        GreMovePointer(hdcScreen, Msg->pt.x, Msg->pt.y);
        CurInfo->ShowingCursor = 0;
    }
-
-   /* Do GetMouseMovePointsEx FIFO. */
-   MouseHistoryOfMoves[gcur_count].x = Msg->pt.x;
-   MouseHistoryOfMoves[gcur_count].y = Msg->pt.y;
-   MouseHistoryOfMoves[gcur_count].time = Msg->time;
-   MouseHistoryOfMoves[gcur_count].dwExtraInfo = dwExtraInfo;
-   if (++gcur_count == ARRAYSIZE(MouseHistoryOfMoves))
-      gcur_count = 0; // 0 - 63 is 64, FIFO forwards.
 }
 
 VOID FASTCALL