Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.537
diff -u -2 -0 -r1.537 ChangeLog
--- xc/ChangeLog	23 Nov 2004 05:21:02 -0000	1.537
+++ xc/ChangeLog	23 Nov 2004 17:06:20 -0000
@@ -1,20 +1,31 @@
+2004-11-23 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/programs/Xserver/miext/damage/damage.c
+        Bugzilla #1204 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1204):
+        Fix X11 test suite (caused by DAMAGE layer) failure with Xvfb when
+        rendering text using |XDrawText*()| (XDrawText() tests 1, 3, 4, 27, 28,
+        29, 30, 34, 37, 39, 41, 43 and XDrawText16() tests 1, 3, 9, 10, 11, 12,
+        13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 34,
+        37, 39, 41, 43).
+        Patch by Hong Bo Peng <penghb@cn.ibm.com> and Stefan Dirsch
+        <sndirsch@suse.de>.
+
 2004-11-23  Alex Deucher  <agd5f@yahoo.com>
 
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c:
 	(SavageShowCursor), (SavageHideCursor), (SavageSetCursorPosition),
 	(SavageSetCursorColors):
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c:
 	(SavagePreInit):
 	- fix and enable HW Cursor on crtc2
 	- enable independant CLUT access
 	
 2004-11-22  Alex Deucher  <agd5f@yahoo.com>
 
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c:
 	(GetTileAperturePitch2000), (SavageSetGBD), (SavageSetGBD_2000):
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c:
 	(SavagePreInit):
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h:
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h:
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_streams.c:
 	(SavageInitStreams2000):
Index: xc/programs/Xserver/miext/damage/damage.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/miext/damage/damage.c,v
retrieving revision 1.11
diff -u -2 -0 -r1.11 damage.c
--- xc/programs/Xserver/miext/damage/damage.c	3 Sep 2004 16:18:23 -0000	1.11
+++ xc/programs/Xserver/miext/damage/damage.c	23 Nov 2004 17:06:51 -0000
@@ -1332,60 +1332,60 @@
 				       FONTGLYPHS(pGC->font));
 	else
 	    (*pGC->ops->PolyGlyphBlt)(pDrawable, pGC, x, y, n, charinfo,
 				      FONTGLYPHS(pGC->font));
     }
     DEALLOCATE_LOCAL(charinfo);
     return x + w;
 }
 
 static int
 damagePolyText8(DrawablePtr pDrawable,
 		GCPtr	    pGC,
 		int	    x,
 		int	    y,
 		int	    count,
 		char	    *chars)
 {
     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
 
     if (checkGCDamage (pDrawable, pGC))
-	damageText (pDrawable, pGC, x, y, (unsigned long) count, chars,
+	x = damageText (pDrawable, pGC, x, y, (unsigned long) count, chars,
 		    Linear8Bit, TT_POLY8);
     else
 	x = (*pGC->ops->PolyText8)(pDrawable, pGC, x, y, count, chars);
     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
     return x;
 }
 
 static int
 damagePolyText16(DrawablePtr	pDrawable,
 		 GCPtr		pGC,
 		 int		x,
 		 int		y,
 		 int		count,
 		 unsigned short	*chars)
 {
     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
 
     if (checkGCDamage (pDrawable, pGC))
-	damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
+	x = damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
 		    FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
 		    TT_POLY16);
     else
 	x = (*pGC->ops->PolyText16)(pDrawable, pGC, x, y, count, chars);
     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
     return x;
 }
 
 static void
 damageImageText8(DrawablePtr	pDrawable,
 		 GCPtr		pGC,
 		 int		x,
 		 int		y,
 		 int		count,
 		 char		*chars)
 {
     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
 
     if (checkGCDamage (pDrawable, pGC))
 	damageText (pDrawable, pGC, x, y, (unsigned long) count, chars,