From e59aa0f1d0d6b201347b73bc662d82c00b89bc85 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 30 May 2015 17:00:52 +0000 Subject: [PATCH] [WIN32K] Apply some bits of Wine commit 88acc9c8 by Akihiro Sagawa: Don't modify output glyph metrics unless the function succeeds. CORE-9746 svn path=/trunk/; revision=67972 --- reactos/win32ss/gdi/ntgdi/freetype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c index 9a69acc3277..882857b435c 100644 --- a/reactos/win32ss/gdi/ntgdi/freetype.c +++ b/reactos/win32ss/gdi/ntgdi/freetype.c @@ -2027,11 +2027,11 @@ ftGdiGetGlyphOutline( IntUnLockFreeType; - if (pgm) RtlCopyMemory(pgm, &gm, sizeof(GLYPHMETRICS)); if (iFormat == GGO_METRICS) { DPRINT("GGO_METRICS Exit!\n"); + *pgm = gm; return 1; /* FIXME */ } @@ -2234,6 +2234,7 @@ ftGdiGetGlyphOutline( } DPRINT("ftGdiGetGlyphOutline END and needed %lu\n", needed); + *pgm = gm; return needed; }