winex11.drv: Associate the real DC transformation with cached font data.

This matches what WineEngCreateFontInstance() does, and makes applications which set custom axes directions using different window/viewport extents display text correctly.

winex11.drv: Associate the real DC transformation with cached font data.
3e850b5b · Dmitry Timoshkov · Alexandre Julliard · a50546e5 · 3e850b5b · 3e850b5b
Commit 3e850b5b authored Jan 24, 2011 by Dmitry Timoshkov Committed by Alexandre Julliard Jan 24, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

xrender.c dlls/winex11.drv/xrender.c +5 -1

wingdi.h include/wingdi.h +1 -0

No files found.
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -1066,7 +1066,11 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont)
    lfsz.lf.lfWidth = abs( lfsz.lf.lfWidth );
    lfsz.devsize.cx = X11DRV_XWStoDS( physDev, lfsz.lf.lfWidth );
    lfsz.devsize.cy = X11DRV_YWStoDS( physDev, lfsz.lf.lfHeight );
-    GetWorldTransform( physDev->hdc, &lfsz.xform );
+
+    GetTransform( physDev->hdc, 0x204, &lfsz.xform );
+    TRACE("font transform %f %f %f %f\n", lfsz.xform.eM11, lfsz.xform.eM12,
+          lfsz.xform.eM21, lfsz.xform.eM22);
+
    /* Not used fields, would break hashing */
    lfsz.xform.eDx = lfsz.xform.eDy = 0;


--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -3590,6 +3590,7 @@ WINGDIAPI INT         WINAPI GetTextFaceW(HDC,INT,LPWSTR);
 WINGDIAPI BOOL        WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
 WINGDIAPI BOOL        WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
 #define                      GetTextMetrics WINELIB_NAME_AW(GetTextMetrics)
+WINGDIAPI BOOL        WINAPI GetTransform(HDC,DWORD,XFORM*);
 WINGDIAPI BOOL        WINAPI GetViewportExtEx(HDC,LPSIZE);
 WINGDIAPI BOOL        WINAPI GetViewportOrgEx(HDC,LPPOINT);
 WINGDIAPI BOOL        WINAPI GetWindowExtEx(HDC,LPSIZE);