[Wine-patches] Revert "disable glyph cache for non 1C application (see eterbug #3101)" - fix eterbug #4039

[Konstantin Kondratyuk]

This commit is not actual for #3101, but crashes #4039

-- 
Best regards,
Konstantin Kondratyuk.
----------- следующая часть -----------
From 3f341d063035d92c61cae7e819895f2a3b0c87a3 Mon Sep 17 00:00:00 2001
From: Konstantin Kondratyuk <kondratyuk на etersoft.ru>
Date: Mon, 29 Jun 2009 12:04:20 +0400
Subject: [PATCH] Revert "disable glyph cache for non 1C application (see eterbug #3101)"
 This commit is not actual for #3101, but crashes #4039
 This reverts commit deaf0c662e7af21b599ce20578f32649575d6bb7.

---
 dlls/winex11.drv/xrender.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 3401171..f4b68ff 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -1217,9 +1217,6 @@ static int XRenderErrorHandler(Display *dpy, XErrorEvent *event, void *arg)
     return 1;
 }
 
-#include "wine/etersoft.h"
-
-
 /***********************************************************************
  *   X11DRV_XRender_ExtTextOut
  */
@@ -1243,9 +1240,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
     LOGFONTW lf;
     enum drawable_depth_type depth_type = (physDev->depth == 1) ? mono_drawable : color_drawable;
     Picture tile_pict = 0;
-    BOOL disable_cache;
-    LOADETER_FUNC(etersoft_1version);
-    disable_cache = !(etersoft_1version && etersoft_1version() );
 
     /* Do we need to disable antialiasing because of palette mode? */
     if( !physDev->bitmap || GetObjectW( physDev->bitmap->hbitmap, sizeof(bmp), &bmp ) != sizeof(bmp) ) {
@@ -1360,7 +1354,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
             if( disable_antialias == FALSE )
                 aa_type = entry->aa_default;
             formatEntry = entry->format[aa_type];
-        } else if( disable_cache || wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) {
+        } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) {
 	    UploadGlyph(physDev, wstr[idx], aa_type);
 	}
     }
-- 
1.6.3.2