Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/dix/resource.c

1 files changed, 7 insertions, 3 deletions

diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 14f1af18a..60d57a352 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -218,7 +218,7 @@ UpdateCurrentTimeIf(void)
     systime.milliseconds = GetTimeInMillis();

     if (systime.milliseconds < currentTime.milliseconds)

         systime.months++;

-    if (*checkForInput[0] == *checkForInput[1])

+    if (CompareTimeStamps(systime, currentTime) == LATER)

         currentTime = systime;

 }

 

@@ -400,6 +400,9 @@ Dispatch(void)
                 }

                 /* now, finally, deal with client requests */

 

+                /* Update currentTime so request time checks, such as for input

+                 * device grabs, are calculated correctly */

+                UpdateCurrentTimeIf();

                 result = ReadRequestFromClient(client);

                 if (result <= 0) {

                     if (result < 0)

@@ -422,8 +425,9 @@ Dispatch(void)
                     StartMajorOp=client->majorOp;

                     XSERVER_REQUEST_START(LookupMajorName(client->majorOp),

                                           client->majorOp,

-                                          ((xReq *)client->requestBuffer)->length,

-                                          client->index, client->requestBuffer);

+                                          ((xReq *) client->requestBuffer)->length,

+                                          client->index,

+                                          client->requestBuffer);

                 }

 #endif

                 if (result > (maxBigRequestSize << 2))