exception in xfont.c

Since April 2 I've been getting the following exception.

wine: Unhandled exception, starting debugger...
err:seh:EXC_DefaultHandling Unhandled exception code c0000005 flags 0 addr 0x400f001a

The below patch is the one that causes the problem.

diff --exclude=CVS -urN 20040401/winex/graphics/x11drv/xfont.c 20040402/winex/graphics/x11drv/xfont.c
--- 20040401/winex/graphics/x11drv/xfont.c      2004-03-24 10:30:41.000000000 -0800
+++ 20040402/winex/graphics/x11drv/xfont.c      2004-04-08 18:31:15.000000000 -0700
@@ -2942,6 +2942,12 @@

   res = XFONT_GetPointResolution( log_pixels_x, log_pixels_y );

+  if(X11DRV_XRender_Installed)
+  {
+    XTextCaps |= TC_VA_ABLE | TC_SF_X_YINDEP;
+    return XTextCaps;
+  }
+
   x_pattern = XFONT_GetXFontPattern(&x_count);

   TRACE("Font Mapper: initializing %i fonts [logical dpi=%i, default dpi=%i]\n",
@@ -3035,9 +3041,6 @@
   RAW_ASCENT  = TSXInternAtom(gdi_display, "RAW_ASCENT", TRUE);
   RAW_DESCENT = TSXInternAtom(gdi_display, "RAW_DESCENT", TRUE);

-  if(X11DRV_XRender_Installed)
-    XTextCaps |= TC_VA_ABLE;
-
   return XTextCaps;
 }

Unfortunately I've been busy enough that this is the first chance I've had to find exactly what change causes the exception is and don't really have time to delve any deeper.  Hopefully there's an easy fix for it.

-- 

<Douglas Leonard>
<[email protected]>