[WIN32K]

 - Enable commented freetype call: set font face size and coordinate transformation matrix
Patch by Huw Campbell, reviewed by a gazillion of people.
CORE-4657 #resolve #comment committed in r63933, a million thanks

svn path=/trunk/; revision=63933

diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c
index aa2d36f..17d7bcf 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/freetype.c
+++ b/reactos/win32ss/gdi/ntgdi/freetype.c
@@ -1600,12 +1600,12 @@ ftGdiGetGlyphOutline(
         }
     }
 
         }
     }
 

-//  FT_Set_Pixel_Sizes(ft_face,
-//                     TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth,
+    FT_Set_Pixel_Sizes(ft_face,
+                       TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth,

     /* FIXME: Should set character height if neg */
     /* FIXME: Should set character height if neg */

-//                     (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ?
-//                      dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
-//    FtSetCoordinateTransform(face, DC_pmxWorldToDevice(dc));
+                       (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ?
+                        dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
+    FtSetCoordinateTransform(ft_face, DC_pmxWorldToDevice(dc));

 
     TEXTOBJ_UnlockText(TextObj);
 
 
     TEXTOBJ_UnlockText(TextObj);
 


@@ -3674,6 +3674,7 @@ GreExtTextOutW(
         }
         else
         {
         }
         else
         {

+            // FIXME this should probably be a matrix transform with TextTop as well.

             Scale = pdcattr->mxWorldToDevice.efM11;
             if (_FLOATOBJ_Equal0(&Scale))
                 FLOATOBJ_Set1(&Scale);
             Scale = pdcattr->mxWorldToDevice.efM11;
             if (_FLOATOBJ_Equal0(&Scale))
                 FLOATOBJ_Set1(&Scale);