Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004

41 files changed, 56 insertions, 53 deletions

diff --git a/Xext/EVI.c b/Xext/EVI.c
index 820312cca..09aa03b64 100644
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h
index db5655f97..dfe4423f8 100644
--- a/Xext/EVIstruct.h
+++ b/Xext/EVIstruct.h
@@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.6 2003/11/17 22:20:26 dawes Exp $ */
 
 #ifndef EVI_STRUCT_H
 #define EVI_STRUCT_H
diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index 1c05b815f..8718e3630 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.10tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.11 2003/10/28 23:08:43 tsi Exp $ */
 /*
 Copyright 1996, 1998, 2001  The Open Group
 
diff --git a/Xext/appgroup.h b/Xext/appgroup.h
index 05c9ef124..d292cf509 100644
--- a/Xext/appgroup.h
+++ b/Xext/appgroup.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/Xext/appgroup.h,v 1.1 2003/07/16 01:38:28 dawes Exp $ */
 
 void XagClientStateChange(
     CallbackListPtr* pcbl,
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 893fe9d13..ae73783d9 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */
 
 #define NEED_EVENTS
 #include "X.h"
diff --git a/Xext/cup.c b/Xext/cup.c
index d5475d3d8..70c6fa610 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.11tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.12 2003/10/28 23:08:43 tsi Exp $ */
 
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/Xext/dpms.c b/Xext/dpms.c
index e04f3470d..9d3df8798 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -33,7 +33,7 @@ Equipment Corporation.
  * @(#)RCSfile: dpms.c,v Revision: 1.1.4.5  (DEC) Date: 1996/03/04 15:27:00
  */
 
-/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.12 2004/02/17 15:30:23 eich Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index 36ad391da..b8260491e 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.3 2001/10/28 03:32:50 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.4 2003/07/16 01:38:29 dawes Exp $ */
 
 /* Prototypes for functions that the DDX must provide */
 
diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c
index 24086084a..bc85c16ca 100644
--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.4 2001/01/17 22:13:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
 
 typedef int Bool;
 
diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index 2b7798f29..7c3f5a800 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -27,7 +27,7 @@
  *
  *	Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $
  */
-/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.7 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.8 2003/11/17 22:20:26 dawes Exp $ */
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index be08abea7..4308037be 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.15 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c
index 3e6f9dc20..99400c90a 100644
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.5tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.6 2003/11/10 18:21:42 tsi Exp $ */
 /*
 
 Copyright 1989, 1998  The Open Group
diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c
index 6c3e8be6b..9c531c292 100644
--- a/Xext/mbufpx.c
+++ b/Xext/mbufpx.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.3 2001/07/23 13:15:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index 8fd6c3646..b911d7ff5 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.6 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index d9e36d47e..89a8a2d2e 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.38 2003/11/10 18:21:43 tsi Exp $ */
 
 #define NEED_REPLIES
 #include <stdio.h>
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index 1222bbaf2..d01b0b854 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -19,7 +19,7 @@
 *   or  in  FAR 52.227-19, as applicable.                       *
 *                                                               *
 *****************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index b73827150..e3ea803e6 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */
 
 #include <stdio.h>
 #include "X.h"
diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h
index 9da5876fd..d15fc8002 100644
--- a/Xext/panoramiXh.h
+++ b/Xext/panoramiXh.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.2 2003/09/13 21:33:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.3 2003/11/17 22:20:26 dawes Exp $ */
 
 /*
  *	Server dispatcher function replacements
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 6c76a309f..73a441a88 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -26,7 +26,7 @@ Equipment Corporation.
 
 /* Massively rewritten by Mark Vojkovich <markv@valinux.com> */
 
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */
 
 #include <stdio.h>
 #include "X.h"
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index 1d187bc27..27cbcda52 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.9 2001/08/11 21:00:06 mvojkovi Exp $ */
 
 #ifndef _PANORAMIXSRV_H_
 #define _PANORAMIXSRV_H_
diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
index 4f23ca383..15ed9401c 100644
--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/Xext/sampleEVI.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index fa75aa555..1b96932e2 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from the X Consortium.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.9 2004/03/02 19:43:24 dawes Exp $ */
 
 #define NEED_REPLIES
 #define NEED_EVENTS
@@ -810,7 +810,7 @@ ScreenSaverSetAttributes (ClientPtr client)
     DepthPtr			pDepth;
     WindowOptPtr		ancwopt;
     unsigned long		*pVlist;
-    unsigned long		*values = 0;
+    unsigned long		*values = 0, *save = 0;
     unsigned long		tmask, imask;
     unsigned long		val;
     Pixmap			pixID;
@@ -938,6 +938,7 @@ ScreenSaverSetAttributes (ClientPtr client)
 	ret = BadAlloc;
 	goto bail;
     }
+    save = values;
     pAttr->screen = pScreen;
     pAttr->client = client;
     pAttr->x = stuff->x;
@@ -1166,7 +1167,7 @@ PatchUp:
 bail:
     CheckScreenPrivate (pScreen);
     xfree (pAttr);
-    xfree (values);
+    xfree (save);
     return ret;
 }
 
diff --git a/Xext/security.c b/Xext/security.c
index bf3f98157..f8e96afad 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */
 
 #include "dixstruct.h"
 #include "extnsionst.h"
diff --git a/Xext/shape.c b/Xext/shape.c
index 433a4e31d..956a8ebfc 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/Xext/shm.c b/Xext/shm.c
index 29eab06f5..b81ff5b22 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c
index 891522431..afde19cba 100644
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.6 2003/07/16 01:38:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.7 2003/11/17 22:20:27 dawes Exp $ */
 
 /* dixsleep.c - implement millisecond timeouts for X clients */
 
diff --git a/Xext/sync.c b/Xext/sync.c
index 62636a0c7..25d360bfa 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -50,7 +50,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.13 2003/09/02 18:19:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.14 2003/11/17 22:20:27 dawes Exp $ */
 
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 7c9348c0f..b31057a0d 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.8 2003/11/17 22:20:27 dawes Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index dec2c181e..1da665af0 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.17 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.18 2003/11/17 22:20:27 dawes Exp $ */
 /*
  * BIGFONT extension for sharing font metrics between clients (if possible)
  * and for transmitting font metrics to clients in a compressed form.
diff --git a/Xext/xprint.c b/Xext/xprint.c
index 96e2ca078..e50fb4068 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -64,7 +64,7 @@ copyright holders.
 **    *********************************************************
 **
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.15 2003/10/28 23:08:44 tsi Exp $ */
 
 #define _XP_PRINT_SERVER_
 #include "X.h"
diff --git a/Xext/xres.c b/Xext/xres.c
index d96b3e150..28e926642 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -1,7 +1,7 @@
 /*
    Copyright (c) 2002  XFree86 Inc
 */
-/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.9 2004/03/04 19:31:37 dawes Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
@@ -52,22 +52,23 @@ ProcXResQueryClients (ClientPtr client)
     /* REQUEST(xXResQueryClientsReq); */
     xXResQueryClientsReply rep;
     int *current_clients;
-    int i;
+    int i, num_clients;
 
     REQUEST_SIZE_MATCH(xXResQueryClientsReq);
 
     current_clients = ALLOCATE_LOCAL((currentMaxClients - 1) * sizeof(int));
 
-    rep.num_clients = 0;
+    num_clients = 0;
     for(i = 1; i < currentMaxClients; i++) {
        if(clients[i]) {
-           current_clients[rep.num_clients] = i;
-           rep.num_clients++;   
+           current_clients[num_clients] = i;
+           num_clients++;   
        }
     }
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
+    rep.num_clients = num_clients;
     rep.length = rep.num_clients * sz_xXResClient >> 2;
     if (client->swapped) {
         int n;
@@ -77,10 +78,10 @@ ProcXResQueryClients (ClientPtr client)
     }   
     WriteToClient (client, sizeof (xXResQueryClientsReply), (char *) &rep);
 
-    if(rep.num_clients) {
+    if(num_clients) {
         xXResClient scratch;
 
-        for(i = 0; i < rep.num_clients; i++) {
+        for(i = 0; i < num_clients; i++) {
             scratch.resource_base = clients[current_clients[i]]->clientAsMask;
             scratch.resource_mask = RESOURCE_ID_MASK;
         
@@ -112,7 +113,7 @@ ProcXResQueryClientResources (ClientPtr client)
 {
     REQUEST(xXResQueryClientResourcesReq);
     xXResQueryClientResourcesReply rep;
-    int i, clientID;
+    int i, clientID, num_types;
     int *counts;
 
     REQUEST_SIZE_MATCH(xXResQueryClientResourcesReq);
@@ -132,14 +133,15 @@ ProcXResQueryClientResources (ClientPtr client)
 
     FindAllClientResources(clients[clientID], ResFindAllRes, counts);
 
-    rep.num_types = 0;
+    num_types = 0;
 
     for(i = 0; i <= lastResourceType; i++) {
-       if(counts[i]) rep.num_types++;
+       if(counts[i]) num_types++;
     }
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
+    rep.num_types = num_types;
     rep.length = rep.num_types * sz_xXResType >> 2;
     if (client->swapped) {
         int n;
@@ -149,7 +151,7 @@ ProcXResQueryClientResources (ClientPtr client)
     }   
     WriteToClient (client,sizeof(xXResQueryClientResourcesReply),(char*)&rep);
 
-    if(rep.num_types) {
+    if(num_types) {
         xXResType scratch;
 
         for(i = 0; i < lastResourceType; i++) {
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 622a1427f..89bcae3a4 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.11 2003/11/17 22:20:27 dawes Exp $ */
 
 #include "X.h"
 #define NEED_EVENTS
diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c
index 96e680832..41c78d9c9 100644
--- a/Xext/xtest1dd.c
+++ b/Xext/xtest1dd.c
@@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the
 University of California.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.6 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.7 2003/11/17 22:20:28 dawes Exp $ */
 
 /***************************************************************
  * include files
diff --git a/Xext/xtest1dd.h b/Xext/xtest1dd.h
index 60663dfb9..6e258080e 100644
--- a/Xext/xtest1dd.h
+++ b/Xext/xtest1dd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.2 2001/08/01 00:44:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.3 2003/11/17 22:20:28 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c
index cb22019cb..539d14e30 100644
--- a/Xext/xtest1di.c
+++ b/Xext/xtest1di.c
@@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the
 University of California.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.5 2003/09/13 21:33:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.6 2003/11/17 22:20:28 dawes Exp $ */
 
 /*****************************************************************************
  * include files
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index c63565762..40313470c 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.27 2003/07/16 01:38:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.29 2003/10/02 13:29:39 eich Exp $ */
 
 /*
 ** File: 
diff --git a/Xext/xvdisp.h b/Xext/xvdisp.h
index 00af9858b..342a874e8 100644
--- a/Xext/xvdisp.h
+++ b/Xext/xvdisp.h
@@ -1,3 +1,3 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdisp.h,v 1.1 2003/07/16 01:38:31 dawes Exp $ */
 
 extern void XineramifyXv(void);
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index d4bff69ad..8dafa8b26 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */
 
 #ifndef XVDIX_H
 #define XVDIX_H
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index dfd6d2faa..2c3f484bd 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.15tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */
 
 /*
 ** File: 
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index c892c9567..cb6c06301 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.8 2003/07/16 01:38:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.9 2003/07/17 16:04:33 dawes Exp $ */
 
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index 6b39d1356..b589c5487 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.2 2003/07/17 16:04:33 dawes Exp $ */
 
 #ifndef _XVMC_H
 #define _XVMC_H