364. Fix for CERT Vulnerability Note VU#102441 (Marc La France).xf-4_5-branch

6 files changed, 130 insertions, 400 deletions

diff --git a/programs/Xserver/afb/afbpixmap.c b/programs/Xserver/afb/afbpixmap.c
index 574e5555c..901492918 100644
--- a/programs/Xserver/afb/afbpixmap.c
+++ b/programs/Xserver/afb/afbpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.2tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.1tsi Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
@@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XConsortium: afbpixmap.c,v 5.13 94/04/17 20:28:28 dpw Exp $ */
 
 /* pixmap management
    written by drewry, september 1986
@@ -65,7 +66,11 @@ SOFTWARE.
 #include "mfb.h"
 
 PixmapPtr
-afbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
+afbCreatePixmap(pScreen, width, height, depth)
+	ScreenPtr		pScreen;
+	int				width;
+	int				height;
+	int				depth;
 {
 	PixmapPtr pPixmap;
 	int datasize;
@@ -102,7 +107,8 @@ afbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
 }
 
 Bool
-afbDestroyPixmap(PixmapPtr pPixmap)
+afbDestroyPixmap(pPixmap)
+	PixmapPtr pPixmap;
 {
 	if(--pPixmap->refcnt)
 		return(TRUE);
@@ -112,9 +118,10 @@ afbDestroyPixmap(PixmapPtr pPixmap)
 
 
 PixmapPtr
-afbCopyPixmap(PixmapPtr pSrc)
+afbCopyPixmap(pSrc)
+	register PixmapPtr pSrc;
 {
-	PixmapPtr pDst;
+	register PixmapPtr pDst;
 	int size;
 	ScreenPtr pScreen;
 
@@ -141,14 +148,15 @@ afbCopyPixmap(PixmapPtr pSrc)
 	  left shift and or in original as many times as needed
 */
 void
-afbPadPixmap(PixmapPtr pPixmap)
+afbPadPixmap(pPixmap)
+	PixmapPtr pPixmap;
 {
-	int width = pPixmap->drawable.width;
-	int h;
-	PixelType mask;
-	PixelType *p;
-	PixelType bits;		/* real pattern bits */
-	int i;
+	register int width = pPixmap->drawable.width;
+	register int h;
+	register PixelType mask;
+	register PixelType *p;
+	register PixelType bits;		/* real pattern bits */
+	register int i;
 	int d;
 	int rep;						/* repeat count for pattern */
 
@@ -182,10 +190,12 @@ afbPadPixmap(PixmapPtr pPixmap)
  * left.
  */
 void
-afbXRotatePixmap(PixmapPtr pPix, int rw)
+afbXRotatePixmap(pPix, rw)
+	PixmapPtr		pPix;
+	register int rw;
 {
-	PixelType		*pw, *pwFinal;
-	PixelType		t;
+	register PixelType		*pw, *pwFinal;
+	register PixelType		t;
 
 	if (pPix == NullPixmap)
 		return;
@@ -216,7 +226,9 @@ afbXRotatePixmap(PixmapPtr pPix, int rw)
    works on any width.
  */
 void
-afbYRotatePixmap(PixmapPtr pPix, int rh)
+afbYRotatePixmap(pPix, rh)
+	register PixmapPtr		pPix;
+	int		rh;
 {
 	int nbyDown;		/* bytes to move down to row 0; also offset of
 								row rh */
@@ -251,9 +263,11 @@ afbYRotatePixmap(PixmapPtr pPix, int rh)
 }
 
 void
-afbCopyRotatePixmap(PixmapPtr psrcPix, PixmapPtr *ppdstPix, int xrot, int yrot)
+afbCopyRotatePixmap(psrcPix, ppdstPix, xrot, yrot)
+	register PixmapPtr psrcPix, *ppdstPix;
+	int		xrot, yrot;
 {
-	PixmapPtr pdstPix;
+	register PixmapPtr pdstPix;
 
 	if ((pdstPix = *ppdstPix) &&
 		(pdstPix->devKind == psrcPix->devKind) &&
diff --git a/programs/Xserver/cfb/cfbpixmap.c b/programs/Xserver/cfb/cfbpixmap.c
index 3721d6ee8..852dfd0ab 100644
--- a/programs/Xserver/cfb/cfbpixmap.c
+++ b/programs/Xserver/cfb/cfbpixmap.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.6tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,6 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.5tsi Exp $ */
 /* pixmap management
    written by drewry, september 1986
 
@@ -62,7 +62,11 @@ SOFTWARE.
 extern CfbBits endtab[];
 
 PixmapPtr
-cfbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
+cfbCreatePixmap (pScreen, width, height, depth)
+    ScreenPtr	pScreen;
+    int		width;
+    int		height;
+    int		depth;
 {
     PixmapPtr pPixmap;
     int datasize;
@@ -99,7 +103,8 @@ cfbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
 }
 
 Bool
-cfbDestroyPixmap(PixmapPtr pPixmap)
+cfbDestroyPixmap(pPixmap)
+    PixmapPtr pPixmap;
 {
     if(--pPixmap->refcnt)
 	return TRUE;
@@ -108,9 +113,10 @@ cfbDestroyPixmap(PixmapPtr pPixmap)
 }
 
 PixmapPtr
-cfbCopyPixmap(PixmapPtr pSrc)
+cfbCopyPixmap(pSrc)
+    register PixmapPtr	pSrc;
 {
-    PixmapPtr	pDst;
+    register PixmapPtr	pDst;
     int		size;
     ScreenPtr pScreen;
 
@@ -138,14 +144,15 @@ cfbCopyPixmap(PixmapPtr pSrc)
       left shift and or in original as many times as needed
 */
 void
-cfbPadPixmap(PixmapPtr pPixmap)
+cfbPadPixmap(pPixmap)
+    PixmapPtr pPixmap;
 {
-    int width = (pPixmap->drawable.width) * (pPixmap->drawable.bitsPerPixel);
-    int h;
-    CfbBits mask;
-    CfbBits *p;
-    CfbBits bits; /* real pattern bits */
-    int i;
+    register int width = (pPixmap->drawable.width) * (pPixmap->drawable.bitsPerPixel);
+    register int h;
+    register CfbBits mask;
+    register CfbBits *p;
+    register CfbBits bits; /* real pattern bits */
+    register int i;
     int rep;                    /* repeat count for pattern */
  
     if (width >= PGSZ)
@@ -181,8 +188,8 @@ cfbPadPixmap(PixmapPtr pPixmap)
 /*
  * cfb debugging routine -- assumes pixmap is 1 byte deep 
  */
-static void
-cfbdumppixmap(PixmapPtr pPix)
+static cfbdumppixmap(pPix)
+    PixmapPtr	pPix;
 {
     unsigned int *pw;
     char *psrc, *pdst;
@@ -222,10 +229,12 @@ cfbdumppixmap(PixmapPtr pPix)
  * left.
  */
 void
-cfbXRotatePixmap(PixmapPtr pPix, int rw)
+cfbXRotatePixmap(pPix, rw)
+    PixmapPtr	pPix;
+    register int rw;
 {
-    CfbBits	*pw, *pwFinal;
-    CfbBits	t;
+    register CfbBits	*pw, *pwFinal;
+    register CfbBits	t;
     int				rot;
 
     if (pPix == NullPixmap)
@@ -257,7 +266,7 @@ cfbXRotatePixmap(PixmapPtr pPix, int rw)
     {
         ErrorF("cfb internal error: trying to rotate odd-sized pixmap.\n");
 #ifdef notdef
-	CfbBits *pwTmp;
+	register CfbBits *pwTmp;
 	int size, tsize;
 
 	tsize = PixmapBytePad(pPix->drawable.width - rot, pPix->drawable.depth);
@@ -289,7 +298,9 @@ cfbXRotatePixmap(PixmapPtr pPix, int rw)
    works on any width.
  */
 void
-cfbYRotatePixmap(PixmapPtr pPix, int rh)
+cfbYRotatePixmap(pPix, rh)
+    register PixmapPtr	pPix;
+    int	rh;
 {
     int nbyDown;	/* bytes to move down to row 0; also offset of
 			   row rh */
@@ -327,9 +338,11 @@ cfbYRotatePixmap(PixmapPtr pPix, int rh)
 }
 
 void
-cfbCopyRotatePixmap(PixmapPtr psrcPix, PixmapPtr *ppdstPix, int xrot, int yrot)
+cfbCopyRotatePixmap(psrcPix, ppdstPix, xrot, yrot)
+    register PixmapPtr psrcPix, *ppdstPix;
+    int	xrot, yrot;
 {
-    PixmapPtr pdstPix;
+    register PixmapPtr pdstPix;
 
     if ((pdstPix = *ppdstPix) &&
 	(pdstPix->devKind == psrcPix->devKind) &&
diff --git a/programs/Xserver/dix/pixmap.c b/programs/Xserver/dix/pixmap.c
index 963d05177..e26f03635 100644
--- a/programs/Xserver/dix/pixmap.c
+++ b/programs/Xserver/dix/pixmap.c
@@ -25,7 +25,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.6tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.5tsi Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
@@ -47,8 +47,15 @@ from The Open Group.
 
 /* callable by ddx */
 PixmapPtr
-GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
-		       int bitsPerPixel, int devKind, pointer pPixData)
+GetScratchPixmapHeader(pScreen, width, height, depth, bitsPerPixel, devKind,
+		       pPixData)
+    ScreenPtr   pScreen;
+    int		width;
+    int		height;
+    int		depth;
+    int		bitsPerPixel;
+    int		devKind;
+    pointer     pPixData;
 {
     PixmapPtr pPixmap = pScreen->pScratchPixmap;
 
@@ -70,7 +77,8 @@ GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
 
 /* callable by ddx */
 void
-FreeScratchPixmapHeader(PixmapPtr pPixmap)
+FreeScratchPixmapHeader(pPixmap)
+    PixmapPtr pPixmap;
 {
     if (pPixmap)
     {
@@ -86,7 +94,8 @@ FreeScratchPixmapHeader(PixmapPtr pPixmap)
 
 
 Bool
-CreateScratchPixmapsForScreen(int scrnum)
+CreateScratchPixmapsForScreen(scrnum)
+    int scrnum;
 {
     /* let it be created on first use */
     screenInfo.screens[scrnum]->pScratchPixmap = NULL;
@@ -95,7 +104,8 @@ CreateScratchPixmapsForScreen(int scrnum)
 
 
 void
-FreeScratchPixmapsForScreen(int scrnum)
+FreeScratchPixmapsForScreen(scrnum)
+    int scrnum;
 {
     FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap);
 }
@@ -103,7 +113,9 @@ FreeScratchPixmapsForScreen(int scrnum)
 
 /* callable by ddx */
 PixmapPtr
-AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
+AllocatePixmap(pScreen, pixDataSize)
+    ScreenPtr pScreen;
+    int pixDataSize;
 {
     PixmapPtr pPixmap;
 #ifdef PIXPRIV
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index 6c875ecc0..d5f40281e 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,333 +1,5 @@
-XFree86 4.5.99.12 (xx September 2005)
- 144. Fix `xvidtune -timeout <n>` (#8295, Evil Mr Henry).
- 143. Make Viewport widgets inherit screen dimensions from their parent at
-      widget initialisation time, in addition to widget realisation
-      (Bugzilla #1614, Alexander Pohoyda).
- 142. Fix for CERT Vulnerability Note VU#102441 (Marc La France).
- 141. Avoid /tmp files in NetBSD.cf's man page creation (Jeremy C. Reed).
- 140. Add a new layout property to Xaw's tree widget (Bugzilla #1609,
-      Alexander Pohoyda).
- 139. Fix some man page typos (Bugzilla #1610, Alexander Pohoyda).
-
-XFree86 4.5.99.11 (8 September 2005)
- 138. Fix DirectColor visual colormap issues at 16bpp in the i830 driver.
-      (Alan Hourihane).
- 137. Sync the accelerator before calling AdjustFrame to avoid lockups in
-      the i830 driver (Alan Hourihane).
- 136. Add a Compose keycode to fix build problem introduced by change #123
-      (#8240, Bang Jun-Young).
- 135. Implement a workaround in generic int10 to allow unaligned I/O access
-      specific to VMWare's second-generation emulated adapter (Marc La France).
- 134. Add a tooltip to xbiff that shows the number of messages in a mail
-      folder (Bugzilla #1607, Alexander Pohoyda).
- 133. Fix problems with Xaw's Label widget when using XChar2b strings
-      (Bugzilla #1606, Alexander Pohoyda).
- 132. Fix SEGV that can occur under certain builds of glibc 2.3.4 and up, when
-      linux/int10 attempts to determine kernel support for the vm86() system
-      call.  This completes the implementation of change #316 in 4.4.99.901
-      (Marc La France).
- 131. Fix generic int10 memory accesses on little-endian systems
-      (Marc La France).
- 130. Add loader infrastructure to implement inter-module version checks and
-      use it as part of a rework of VBE information blocks (Marc La France).
- 129. The xf8_32wid module is only used by the sunffb driver, so don't include
-      it in non-SPARC static server builds (Marc La France).
- 128. The xf24_32bpp module is now no longer used by any XFree86-provided
-      driver, so don't include it in static server builds (Marc La France).
- 127. Clean up INCLUDES in various drivers' Imakefile's (Marc La France).
- 126. Remove cfb from the i740, nsc, s3virge, siliconmotion and via drivers
-      (Marc La France).
- 125. Remove cruft in siliconmotion and via drivers that only partially allowed
-      them to be compiled with other XFree86 versions (Marc La France).
-
-XFree86 4.5.99.10 (23 August 2005)
- 124. Add basic ACPI Linux support so that events can be passed to the driver.
-      (Alan Hourihane).
- 123. Merge in NetBSD version of os-support/bsd/bsd_KeyMap.c (Michael Macallan,
-      Marc La France).
- 122. In the vesa driver, do not call VBE to save/restore adapter state if the
-      mode on server entry is not one reported by VBE (i.e. is a VGA or OEM
-      mode).  This prevents hangs under certain video BIOS'es (Marc La France).
- 121. Change the vesa and vgahw modules' saving and restoring of video memory
-      for the mode on server entry to be less prone to bus lockouts
-      (Marc La France).
- 120. Change the vesa driver to save and restore more video memory contents
-      for the mode on server entry (Marc La France).
- 119. Fix vesa driver's mapping of video memory apertures (Marc La France).
- 118. Experimental change to cause the vesa driver to ignore sync tolerances in
-      XF86Config monitor sections when the monitor is detected through DDC to
-      be a digital panel, relying instead on any BIOS ability to reject or
-      adjust mode timings to accomodate the panel (Marc La France).
- 117. Endianness changes to the vesa driver (Marc La France).
- 116. Fix VBE's reporting of video memory size, and zero out return area before
-      calling VBE to retrieve video mode information (Marc La France).
- 115. Change a message to indicate whether or not a monitor's sync tolerance(s)
-      is/are derived from DDC information (Marc La France).
- 114. Revert to the use of /dev/console, rather than /dev/fb, as the console
-      device on all SunOS variants (Marc La France).
- 113. Endianness fix in VBESetVBEMode()  (Marc La France).
- 112. Remove obsolete VBE functions that have not been compiled in for quite
-      some time (Marc La France).
- 111. Endianness fix for colour expansion in siliconmotion driver
-      (Mark Vojkovich, Bob Peterson).
-
-XFree86 4.5.99.9 (8 August 2005)
- 110. VBE-related cleanups in sis and xgi drivers (Marc La France).
- 109. s3 driver changes:  remove its unused interface to vbe and cleanup its
-      use of int10 (Marc La France).
- 108. Fix memory leak in vesa driver (Marc La France).
- 107. Fix endianness in savage driver's VBE support and remove this driver's
-      private definition of VBE structures (Marc La France).
- 106. Xterm patch #204 (Thomas Dickey).
- 105. More endianness fixes for the vbe module (Marc La France).
- 104. Add a "ConnectedDevice" option to the via driver to force selection of
-      output devices (Damian Janusz Gruszka).
- 103. Fix XAA's support for TRIPLE_BITS_24BPP on big-endian systems
-      (Marc La France).
- 102. Fix unaligned access in XAA's handling of 24bpp (Marc La France).
- 101. Fix atimisc's support of 24bpp on big-endian systems (Marc La France).
- 100. Insulate various common layer functions against out-of-bounds entity
-      indices (Marc La France).
-  99. Prevent the sharing of a PCI entity by more than one driver
-      (Marc La France).
-  98. Change autoconfiguration to include PCI and SBUS BusIDs in generated
-      device sections (Marc La France).
-
-XFree86 4.5.99.8 (23 July 2005)
-  97. Fix setxkbmap segfault (Miguel González Cuadrado).
-  96. Fix textmode restore on x86/Solaris 8 and later;  and a number of other
-      SunOS cleanups (Marc La France, adapted from Alan Coopersmith).
-  95. Add a '-noinput' option to Xnest, allowing it to be run in a view-only
-      mode (Bugzilla #87, James Ascroft-Leigh).
-  94. Add a new "f.totalzoom" function to twm that zooms windows to cover the
-      whole area of a screen with no window decoration visible (Bugzilla #1602,
-      Alexander Pohoyda).
-  93. Fix an xfd bug that prevents it from properly paging through xft fonts
-      beyond 0xFFFF (Bugzilla #1603, James Cloos).
-  92. Mesa build fixes for NetBSD/sparc64 (Bugzilla #1604, Luke Mewburn).
-  91. Preliminary port of SBUS drivers to SunOS variants.  This also allows for
-      multihead using a mix of SBUS and PCI devices (Marc La France).
-  90. Change OS-specific module subdirectory name for all SunOS variants from
-      "solaris" to "sunos" (Marc La France).
-
-XFree86 4.5.99.7 (8 July 2005)
-  89. Xterm patch #203 (Thomas Dickey).
-  88. Remove most remaining references to PEX and XIE (Marc La France).
-  87. Fix Xvideo when operating in one line mode and video is pushed off
-      the top of the screen. Also some fixes for Xvideo skew in certain
-      resolutions in the i830 driver (Alan Hourihane).
-  86. Make mga 8+24 honour the default visual (Bugzilla #1600,
-      Andrew Aitchison).
-  85. Make the AMD64/x86_64 platform tests consistent throughout the source
-      tree (David Dawes, Bugzilla #1599, reported by Dejan Lesjak).
-  84. Add support to check the in-built VESA mode list in the i830 driver
-      (Alan Hourihane).
-  83. Fix an xfs bug introduced when the syslog support was added that prevents
-      exit on fatal errors (David Dawes).
-  82. Modify the font server transport messages to go through xfs's logging
-      mechanisms (Bugzilla #1598, David Dawes, reported by Newsh).
-
-XFree86 4.5.99.6 (23 June 2005)
-  81. Updates to the handling of the X server RGB database:
-       - Ignore space, '-' and '_' characters as well as case when
-         matching colour names, and remove the unnecessary duplicates in
-         rgb.txt.
-       - Allow a built-in copy of the RGB database to be included in the
-         X servers as a fallback for when the rgb.txt file cannot be found.
-       - Remove support for DBM-compiled RGB database files.
-      (David Dawes).
-  80. Fix a problem where VT switching back to TinyX servers was failing due to
-      blocking on keyboard read (David Dawes).
-  79. Add imake parameters to select which font renders get linked into the
-      TinyX servers (David Dawes).
-  78. Several fixes for XKB:
-       - Off-by-one errors in XKBMAlloc.c.
-       - Shrink tables instead of only growing them.
-       - Fix various vmodmap vs modmap cut and paste bugs.
-       - Improve synthesized core X events for reporting XKB changes to
-         XKB-unaware clients.
-      (Michal Maruska).
-  77. Make I/O error handling more reliable on SPARC (Marc La France)
-  76. Port of the magictouch driver for XFree86 4.x (Bruno Schwander).
-  75. Add multimedia keysyms for the Inspiron 6000 laptop to the "inspiron"
-      set (Bugzilla #1592, Aaron Solochek).
-  74. Fix potential infinite loop in xdm when the "willing" command fails
-      to produce any output (Bugzilla #1595, David Dawes, reported by
-      Olaf Seibert).
-  73. Remove a bogus check for DRM 1.2 for resume functionality as it's
-      been present since 1.1 in the i830 driver (Alan Hourihane).
-  72. Fix the mode validation such that using function 5f05 to set 
-      the refresh rate works again in the i830 driver (Alan Hourihane).
-
-XFree86 4.5.99.5 (8 June 2005)
-  71. Fix for GENENA register handling in ATIProbe()  (Marc La France).
-  70. Fix text restoration when display switching has been activated
-      and we could be potentially on a different display than the
-      initial one in the i830 driver (Alan Hourihane).
-  69. Change atimisc driver on big-endian systems to allow depth 24 even if
-      a big-endian aperture is not available, by swapping RGB masks
-      (Marc La France).
-  68. Fix long-standing off-by-one bug in the setting of RGB offsets when the
-      driver supplies RGB masks (Marc La France).
-  67. Improve the support for selecting which library components get built
-      (David Dawes).
-  66. Fix some offset, pitch and overlay scaler size problems with
-      the video overlay. Solves various spontaneous lockups in the i830
-      driver (Alan Hourihane).
-  65. Restore accuracy of atimisc's clock probe despite certain I/O errors
-      (Marc La France).
-  64. ATIProbe() and atimisc changes:
-      - Port to common layer's domain scheme;
-      - Replace AVOID_CPIO and AVOID_NON_PCI architecture-specific #define's
-        with run-time checks and implement new common layer infrastructure to
-        allow this to happen;
-      - Replace endianness compile-time checks with run-time ones;
-      - Deal with certain spurious I/O errors;
-      - No longer consider IOBase when matching adapters to device sections
-      This re-instates support for all ATI adapters on all architectures
-      supported by the common layer (Marc La France).
-  63. Make sparse I/O masks more portable throughout the server
-      (Marc La France).
-  62. int10 changes:
-      - Intercept "raw" requests for PCI configuration space from video BIOS'es
-        on all architectures;
-      - Fix typo that produced an incorrect message for int 15h emulation;
-      - Handle unaligned I/O requests gracefully;
-      - Be more tolerant of spurious I/O errors
-      (Marc La France).
-  61. Tweak xf86InterceptSignals()'s interface (Marc La France).
-  60. Add option to the mmapr & mmapw utilities to allow unaligned accesses for
-      testing purposes (Marc La France).
-  59. Ensure signals are trapped during -configure or -probe (Marc La France).
-  58. Re-implement Alpha kludge in x86emu's ops.c to be more portable
-      (Marc La France).
-  57. Fix for auto-detection of Sun mice on Linux/SPARC (Marc La France).
-  56. Fix (some of) the vbe module's endianness bugs (Marc La France).
-  55. Fix endianness bug in xf4bpp;  This is actually faster on all
-      architectures (Marc La Framce).
-  54. Add Intel(R) i945G support to the i830 driver (Tungsten Graphics).
-  53. Change the sequence on how refresh rates are set in the i830 driver.
-      This works much better with custom modelines (Alan Hourihane).
-  52. Update 'X -configure' to detect when wscons support should be used
-      for the keyboard on NetBSD, and improve the handling of Sun-specific
-      keys (Michael Macallan).
-  51. Fix a bug in xmessage's handling of escapes in button labels
-      (Bugzilla #1591, Timothy Musson).
-
-XFree86 4.5.99.4 (23 May 2005)
-  50. Add rotation to the i830 driver (Helmar Spangenberg).
-  49. Changes for the i830 driver.
-      - Much better display switching support for mobile chipsets using
-        the Fn+F? combination keys.
-      - Add DirectColor support.
-      - Add gamma correction support.
-      (Alan Hourihane).
-  48. Support the Intel E7221 server chipset in the i830 driver.
-      (Alan Hourihane).
-  47. Allow environment variables to be used in twm menu names (Bugzilla #1590,
-      Alexander Pohoyda).
-  46. Add a new function to twm to allow the window text title to be changed
-      interactively (Bugzilla #1078, Alexander Pohoyda).
-  45. Use the Xaw tooltip to display the date in xclock (Bugzilla #1589,
-      Alexander Pohoyda).
-  44. Cleanup the build for some extension modules (David Dawes).
-
-XFree86 4.5.99.3 (11 May 2005)
-  43. Extend the tip resource for Xaw's simpleWidgetClass to allow
-      a function to be called before the tip is created.  This allows
-      the tip label to be modified each time a tip is displayed
-      (Bugzilla #1586, Alexander Pohoyda).
-  42. Modify the fontconfig library to use getpwnam/getpwuid to find the
-      home directory when $HOME is not set (Bugzilla #1582, David Dawes,
-      reported by Denis Vlasenko).
-  41. Xterm patch #202 (Thomas Dickey).
-  40. Some XGI driver cleanups and build/warning fixes (David Dawes).
-  39. Initial version of XGI driver for Volari V5, V8, Z7 (Bugzilla #1550,
-      Jong Lin, XGI).
-  38. Fix minor formatting glitch in generated XF86Config files
-      (Marc La France).
-  37. Add a definition for EFI PCI ROM images (Marc La France).
-  36. Further refinements to the emulation of VGA routing through Simba bridges
-      (Marc La France).
-  35. Change trident driver to not wait for vertical retrace on PC98 systems
-      (Satoshi Kimura).
-  34. Add screen-to-screen copy, solid fill and CPU-to-screen colour expansion
-      acceleration to the suncg6 driver (Michael Macallan).
-  33. Cause GCC to warn about format string problems even in modules, and fix
-      the warnings that result (Marc La France).
-  32. Fix buglet in the decoding of I/O forwarding by Cardbus bridges
-      (Marc La France).
-  31. Fix buglet relating to the forwarding of 64-bit memory addresses by
-      PCI-to-PCI bridges on 32-bit systems (Marc La France).
-  30. Don't call a screen's PointerMoved entry if a DGA mode is active on that
-      screen (Marc La France).
-  29. Allow a static server's -configure to generate an XF86Config for the
-      loader server (Marc La France).
-  28. Replace lib/font/fontfile/decompress.c with a version derived from
-      the BSD src/usr.bin/compress/zopen.c (Thorsten Glasser).
-  27. Revert the MGA HALlib MGASetDisplayStart interface back to
-      HALSetDisplayStart (#7577, Peter Breitenlohner).
-  26. Updates to mkfontscale's handling of font weights (#7596,
-      James Richard Tyrer).
-  25. Experimental DPMS support for GeForce4 and newer laptops in the nv
-      driver (Mark Vojkovich).
-
-XFree86 4.5.99.2 (23 April 2005)
-  24. Xterm patch #201 (Thomas Dickey).
-  23. Fix an uninitialised pointer dereference in Xt/Initialize.c on WIN32
-      platforms that happens if $HOME is set in the environment
-      (Bugzilla #1580, Dave Williss).
-  22. Fix a bug in XKB group adjustment (Ivan Pascal, reported Bugzilla #1566).
-  21. Replace the macintosh/fr map with the "fr_new" map, release 4
-      (Bugzilla #1574, Étienne Bersac).
-  20. Fix some cases in the Darwin build where a variable is declared static
-      and later as extern (Bugzilla #1576, Jordan Frank).
-  19. Reduce the Mystique's SYSCLK from 197MHz to 166MHz, allowing the
-      higher clock to be used when the "OverclockMem" option is activated.
-      This fixes instability seen on some Mystique cards, and removes the
-      need for the 4.4.0 workaround in MGAStormSync() (based on
-      Bugzilla #1575, #1577, Khong Jye Liew).
-
-XFree86 4.5.99.1 (8 April 2005)
-  18. Check the VESA BIOS scanline requirements and adjust the 
-      displayWidth accordingly. Fixes an assumption that the screen width
-      was always used as the displayWidth in the i830 driver (Alan Hourihane).
-  17. Refine VGA routing emulation through Sun's Simba P2P bridges
-      (Marc La France).
-  16. Tentative fix for loader server on Linux/SPARC 2.6 kernels
-      (Marc La France).
-  15. Extend mmapr & mmapw utilities on Linux to allow specification of which
-      PCI address space (I/O or memory) to mmap (Marc La France).
-  14. Given Xinerama must be explicitly requested, allow it to initialise even
-      when there's only one screen to combine (Marc La France).
-  13. Cause the server to FatalError() when Xinerama attempts to create a
-      screen whose root depth has no visuals, causing Xlib to segfault
-      (Marc La France).
-  12. Clean up XFree86 server links (Marc La France).
-  11. Start reworking build under xc/doc (Marc La France).
-  10. Move test suite documentation from xc/doc to test/xsuite/doc
-      (Marc La France).
-   9. Modify the handling of preferred EDID modes to allow user-specified
-      modes that are larger than the preferred mode (David Dawes).
-   8. Build and warning cleanups and fixes (David Dawes).
-   7. Fix some bad alignment problems when allocating memory from
-      the end of AGP space in the i830 driver (Alan Hourihane).
-   6. Document pswrap's -f option (David Dawes, Bugzilla #1570, reported by
-      Luke Mewburn).
-   5. Fix a problem where pswrap generates a bogus .c file when the -h
-      option is not used (Bugzilla #1569, Christos Zoulas,
-      reported by Luke Mewburn).
-   4. Add support for relocation type 10 for Alpha to the ELF loader
-      (FreeBSD PR 73257, Ken Stailey, Bugzilla #1568, reported by Will L G).
-   3. Some changes to the default behaviour of BSD's xf86OpenConsole:
-       - Don't detach the controlling tty when it isn't a console device.
-       - Enable the initial switch to VT 1 workaround only when it is known
-         to be needed.
-      (David Dawes).
-   2. Improve the default setting for BuildModuleInSubdir to handle more
-      cases that need it set (David Dawes).
-   1. Fix i830 bug where the DDC-probed parameters are not applied before
-      modes are selected (David Dawes).
+XFree86 4.5.1 (xx xxx 200x)
+ 364. Fix for CERT Vulnerability Note VU#102441 (Marc La France).
 
 XFree86 4.5.0 (16 March 2005)
  363. Readability updates for the BUILD and RELNOTES docs
@@ -19786,7 +19458,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3595 2005/09/14 16:01:55 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3471 2005/03/17 01:11:52 dawes Exp $
 
 
 
diff --git a/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c b/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c
index 10437dda3..9041b326f 100644
--- a/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c
+++ b/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.6tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.5tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -69,6 +69,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XConsortium: ppcPixmap.c /main/5 1996/02/21 17:58:00 kaleb $ */
 
 #include "xf4bpp.h"
 #include "servermd.h"
@@ -77,9 +78,13 @@ SOFTWARE.
 #include "scrnintstr.h"
 
 PixmapPtr
-xf4bppCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
+xf4bppCreatePixmap( pScreen, width, height, depth )
+    ScreenPtr	pScreen ;
+    int		width ;
+    int		height ;
+    int		depth ;
 {
-    PixmapPtr pPixmap  = (PixmapPtr)NULL;
+    register PixmapPtr pPixmap  = (PixmapPtr)NULL;
     int size ;
     
     TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ;
@@ -117,9 +122,10 @@ xf4bppCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
 }
 
 PixmapPtr
-xf4bppCopyPixmap(PixmapPtr pSrc)
+xf4bppCopyPixmap(pSrc)
+    register PixmapPtr	pSrc;
 {
-    PixmapPtr	pDst;
+    register PixmapPtr	pDst;
     int		size;
 
     TRACE(("xf4bppCopyPixmap(pSrc=0x%x)\n", pSrc)) ;
diff --git a/programs/Xserver/mfb/mfbpixmap.c b/programs/Xserver/mfb/mfbpixmap.c
index b3c989da6..4e62e0e55 100644
--- a/programs/Xserver/mfb/mfbpixmap.c
+++ b/programs/Xserver/mfb/mfbpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbpixmap.c,v 1.3tsi Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -65,7 +65,11 @@ SOFTWARE.
 #ifndef LOWMEMFTPT
 
 PixmapPtr
-mfbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
+mfbCreatePixmap (pScreen, width, height, depth)
+    ScreenPtr	pScreen;
+    int		width;
+    int		height;
+    int		depth;
 {
     PixmapPtr pPixmap;
     int datasize;
@@ -104,7 +108,8 @@ mfbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
 #endif /* ifndef LOWMEMFTPT */
 
 Bool
-mfbDestroyPixmap(PixmapPtr pPixmap)
+mfbDestroyPixmap(pPixmap)
+    PixmapPtr pPixmap;
 {
     if(--pPixmap->refcnt)
 	return TRUE;
@@ -114,9 +119,10 @@ mfbDestroyPixmap(PixmapPtr pPixmap)
 
 
 PixmapPtr
-mfbCopyPixmap(PixmapPtr pSrc)
+mfbCopyPixmap(pSrc)
+    register PixmapPtr	pSrc;
 {
-    PixmapPtr	pDst;
+    register PixmapPtr	pDst;
     int		size;
     ScreenPtr pScreen;
 
@@ -143,14 +149,15 @@ mfbCopyPixmap(PixmapPtr pSrc)
       left shift and or in original as many times as needed
 */
 void
-mfbPadPixmap(PixmapPtr pPixmap)
+mfbPadPixmap(pPixmap)
+    PixmapPtr pPixmap;
 {
-    int width = pPixmap->drawable.width;
-    int h;
-    PixelType mask;
-    PixelType *p;
-    PixelType bits;	/* real pattern bits */
-    int i;
+    register int width = pPixmap->drawable.width;
+    register int h;
+    register PixelType mask;
+    register PixelType *p;
+    register PixelType bits;	/* real pattern bits */
+    register int i;
     int rep;			/* repeat count for pattern */
 
     if (width >= PPW)
@@ -182,10 +189,12 @@ mfbPadPixmap(PixmapPtr pPixmap)
  * left.
  */
 void
-mfbXRotatePixmap(PixmapPtr pPix, int rw)
+mfbXRotatePixmap(pPix, rw)
+    PixmapPtr	pPix;
+    register int rw;
 {
-    PixelType	*pw, *pwFinal;
-    PixelType	t;
+    register PixelType	*pw, *pwFinal;
+    register PixelType	t;
 
     if (pPix == NullPixmap)
         return;
@@ -220,7 +229,9 @@ mfbXRotatePixmap(PixmapPtr pPix, int rw)
    works on any width.
  */
 void
-mfbYRotatePixmap(PixmapPtr pPix, int rh)
+mfbYRotatePixmap(pPix, rh)
+    register PixmapPtr	pPix;
+    int	rh;
 {
     int nbyDown;	/* bytes to move down to row 0; also offset of
 			   row rh */
@@ -251,9 +262,11 @@ mfbYRotatePixmap(PixmapPtr pPix, int rh)
 }
 
 void
-mfbCopyRotatePixmap(PixmapPtr psrcPix, PixmapPtr *ppdstPix, int xrot, int yrot)
+mfbCopyRotatePixmap(psrcPix, ppdstPix, xrot, yrot)
+    register PixmapPtr psrcPix, *ppdstPix;
+    int	xrot, yrot;
 {
-    PixmapPtr pdstPix;
+    register PixmapPtr pdstPix;
 
     if ((pdstPix = *ppdstPix) &&
 	(pdstPix->devKind == psrcPix->devKind) &&