Piotr Caban : wineps: Fix download font escapement.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d225fb8e715c2adf66ff7a3094a737ea1fceaa88
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d225fb8e715c2adf66ff7a3094a737e...

Author: Piotr Caban 
Date:   Mon May 22 21:06:25 2023 +0200

wineps: Fix download font escapement.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54956

---

dlls/wineps.drv/download.c | 8 +++-----
 dlls/wineps.drv/psdrv.h    | 3 ---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c
index 80cf4a0c13f..2197a96027a 100644
--- a/dlls/wineps.drv/download.c
+++ b/dlls/wineps.drv/download.c
@@ -258,7 +258,6 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical)
     LOGFONTW lf;
     UINT ppem;
     XFORM xform;
-    INT escapement;

assert(ctx->font.fontloc == Download);

@@ -281,7 +280,7 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical)

if(GetGraphicsMode(ctx->hdc) == GM_COMPATIBLE)
     {
-        if (xform.eM22 < 0) ctx->font.escapement = -ctx->font.escapement;
+        if (xform.eM22 < 0) lf.lfEscapement = -lf.lfEscapement;
         xform.eM11 = xform.eM22 = fabs(xform.eM22);
         xform.eM21 = xform.eM12 = 0;
     }
@@ -327,11 +326,10 @@ BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical)
         }
     }

-    escapement = ctx->font.escapement;
     if (vertical)
-        escapement += 900;
+        lf.lfEscapement += 900;

-    PSDRV_WriteSetFont(ctx, ps_name, ctx->font.size, escapement,
+    PSDRV_WriteSetFont(ctx, ps_name, ctx->font.size, lf.lfEscapement,
                         is_fake_italic( ctx->hdc ));

HeapFree(GetProcessHeap(), 0, ps_name);
diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h
index 09b3a57b76c..6173bdfc413 100644
--- a/dlls/wineps.drv/psdrv.h
+++ b/dlls/wineps.drv/psdrv.h
@@ -289,9 +289,6 @@ typedef struct {
     matrix              size;
     PSCOLOR             color;
     enum fontset        set;    /* Have we done a setfont yet */
-
-  /* These are needed by PSDRV_ExtTextOut */
-    int                 escapement;
 } PSFONT;

typedef struct {