svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

3 files changed, 7 insertions, 3 deletions

diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c
index 1f84e5309..f9ca9a70b 100644
--- a/xorg-server/mi/mipointer.c
+++ b/xorg-server/mi/mipointer.c
@@ -39,6 +39,7 @@ in this Software without prior written authorization from The Open Group.
 # include   "cursorstr.h"

 # include   "dixstruct.h"

 # include   "inputstr.h"

+# include   "inpututils.h"

 

 DevPrivateKeyRec miPointerScreenKeyRec;

 

@@ -553,6 +554,7 @@ miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {

     int i, nevents;

     int valuators[2];

+    ValuatorMask mask;

 

     miPointerMoveNoEvent(pDev, pScreen, x, y);

 

@@ -571,7 +573,9 @@ miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
         }

     }

 

-    nevents = GetPointerEvents(events, pDev, MotionNotify, 0, POINTER_SCREEN | POINTER_ABSOLUTE, 0, 2, valuators);

+    valuator_mask_set_range(&mask, 0, 2, valuators);

+    nevents = GetPointerEvents(events, pDev, MotionNotify, 0,

+                               POINTER_SCREEN | POINTER_ABSOLUTE, &mask);

 

     OsBlockSignals();

 #ifdef XQUARTZ

diff --git a/xorg-server/mi/mispans.c b/xorg-server/mi/mispans.c
index ccf2a723e..4202c9bb9 100644
--- a/xorg-server/mi/mispans.c
+++ b/xorg-server/mi/mispans.c
@@ -215,7 +215,7 @@ void miAppendSpans(SpanGroup *spanGroup, SpanGroup *otherGroup, Spans *spans)
 

 void miFreeSpanGroup(SpanGroup *spanGroup)

 {

-    if (spanGroup->group != NULL) free(spanGroup->group);

+    free(spanGroup->group);

 }

 

 static void QuickSortSpansX(

diff --git a/xorg-server/mi/miwideline.c b/xorg-server/mi/miwideline.c
index 869142382..2d27dd7dc 100644
--- a/xorg-server/mi/miwideline.c
+++ b/xorg-server/mi/miwideline.c
@@ -407,7 +407,7 @@ miPolyBuildPoly (
     i = top;

     j = StepAround (top, -1, count);

 

-    if (slopes[j].dy * slopes[i].dx > slopes[i].dy * slopes[j].dx)

+    if ((int64_t)slopes[j].dy * slopes[i].dx > (int64_t)slopes[i].dy * slopes[j].dx)

     {

 	clockwise = -1;

 	slopeoff = -1;