[ros-diffs] [akhaldi] 67972: [WIN32K] Apply some bits of Wine commit 88acc9c8 by Akihiro Sagawa: Don't modify output glyph metrics unless the function succeeds. CORE-9746

[akhaldi]

Author: akhaldi
Date: Sat May 30 17:00:52 2015
New Revision: 67972

URL: http://svn.reactos.org/svn/reactos?rev=67972&view=rev
Log:
[WIN32K] Apply some bits of Wine commit 88acc9c8 by Akihiro Sagawa: Don't 
modify output glyph metrics unless the function succeeds. CORE-9746

Modified:
    trunk/reactos/win32ss/gdi/ntgdi/freetype.c

Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype.c?rev=67972&r1=67971&r2=67972&view=diff
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/freetype.c  [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c  [iso-8859-1] Sat May 30 
17:00:52 2015
@@ -2027,11 +2027,11 @@
 
     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 @@
     }
 
     DPRINT("ftGdiGetGlyphOutline END and needed %lu\n", needed);
+    *pgm = gm;
     return needed;
 }