--- ./programs/Xserver/hw/xwin/save_winmouse.c	2007-02-15 18:05:44.000000000 +0000
+++ ./programs/Xserver/hw/xwin/winmouse.c	2007-02-15 17:52:31.000000000 +0000
@@ -100,9 +100,10 @@
       InitPointerDeviceStruct (pDevice,
 			       map,
 			       lngMouseButtons + lngWheelEvents,
-			       miPointerGetMotionEvents,
+			       GetMotionHistory,
 			       winMouseCtrl,
-			       miPointerGetMotionBufferSize ());
+			       GetMotionHistorySize(),
+			       2);
       free(map);
 
 #if defined(XFree86Server) && defined(XINPUT)