From 9b90e95d65d2bfb2299d28b2a8dbc16c9539da30 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 4 Mar 2004 03:55:52 +0000
Subject: [PATCH] Avoid direct accesses to the xformWorld2Vport DC field.

---
 dlls/x11drv/text.c    |  2 +-
 dlls/x11drv/xrender.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/x11drv/text.c b/dlls/x11drv/text.c
index 4b0fbf18fd5..59adf3d5a60 100644
--- a/dlls/x11drv/text.c
+++ b/dlls/x11drv/text.c
@@ -290,7 +290,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags,
 	    long ve_we;
 	    unsigned short err = 0;
 
-	    ve_we = (LONG)(physDev->dc->xformWorld2Vport.eM11 * 0x10000);
+	    ve_we = X11DRV_XWStoDS( physDev, 0x10000 );
 
 	    while (i < count)
 	    {
diff --git a/dlls/x11drv/xrender.c b/dlls/x11drv/xrender.c
index b308047aadf..b43f84755a1 100644
--- a/dlls/x11drv/xrender.c
+++ b/dlls/x11drv/xrender.c
@@ -53,8 +53,8 @@ static XRenderPictFormat *mono_format; /* format of mono bitmap */
 typedef struct
 {
     LOGFONTW lf;
-    XFORM  xform; /* this is dum as we don't care about offsets */
-    DWORD hash;
+    SIZE     devsize;  /* size in device coords */
+    DWORD    hash;
 } LFANDSIZE;
 
 #define INITIAL_REALIZED_BUF_SIZE 128
@@ -225,7 +225,7 @@ sym_not_found:
 static BOOL fontcmp(LFANDSIZE *p1, LFANDSIZE *p2)
 {
   if(p1->hash != p2->hash) return TRUE;
-  if(memcmp(&p1->xform, &p2->xform, sizeof(p1->xform))) return TRUE;
+  if(memcmp(&p1->devsize, &p2->devsize, sizeof(p1->devsize))) return TRUE;
   if(memcmp(&p1->lf, &p2->lf, offsetof(LOGFONTW, lfFaceName))) return TRUE;
   return strcmpW(p1->lf.lfFaceName, p2->lf.lfFaceName);
 }
@@ -425,8 +425,8 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz)
   DWORD hash = 0, *ptr;
   int i;
 
-  for(ptr = (DWORD*)&plfsz->xform; ptr < (DWORD*)(&plfsz->xform + 1); ptr++)
-    hash ^= *ptr;
+  hash ^= plfsz->devsize.cx;
+  hash ^= plfsz->devsize.cy;
   for(i = 0, ptr = (DWORD*)&plfsz->lf; i < 7; i++, ptr++)
     hash ^= *ptr;
   for(i = 0, ptr = (DWORD*)&plfsz->lf.lfFaceName; i < LF_FACESIZE/2; i++, ptr++) {
@@ -465,7 +465,8 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont)
     TRACE("h=%ld w=%ld weight=%ld it=%d charset=%d name=%s\n",
 	  lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight,
 	  lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName));
-    lfsz.xform = physDev->dc->xformWorld2Vport;
+    lfsz.devsize.cx = X11DRV_XWStoDS( physDev, lfsz.lf.lfWidth );
+    lfsz.devsize.cy = X11DRV_YWStoDS( physDev, lfsz.lf.lfHeight );
     lfsz_calc_hash(&lfsz);
 
     EnterCriticalSection(&xrender_cs);
-- 
2.11.4.GIT