01/01: [WIN32SS][FONT] Change the type of 2nd argument of IntRequestFontSize

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e1a099cd109e6c54d795e...

commit 5e1a099cd109e6c54d795ecdd377a9450d3f1721
Author:     Katayama Hirofumi MZ [e-mail]
AuthorDate: Sat Jul 28 23:37:03 2018 +0900
Commit:     Mark Jansen [e-mail]
CommitDate: Sun Jul 29 13:11:18 2018 +0200

[WIN32SS][FONT] Change the type of 2nd argument of IntRequestFontSize
---
 win32ss/gdi/ntgdi/freetype.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index 4ae74fced1..efc3ad316a 100644
--- a/win32ss/gdi/ntgdi/freetype.c
+++ b/win32ss/gdi/ntgdi/freetype.c
@@ -2995,9 +2995,10 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b
 }

static INT
-IntRequestFontSize(PDC dc, FT_Face face, LONG Width, LONG Height)
+IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG Width, LONG Height)
 {
     FT_Size_RequestRec  req;
+    FT_Face face = FontGDI->SharedFace->Face;

if (Width < 0)
         Width = -Width;
@@ -3079,7 +3080,7 @@ TextIntUpdateSize(PDC dc,

plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;

-    error = IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+    error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);

if (bDoLock)
         IntUnLockFreeType();
@@ -3918,7 +3919,7 @@ ftGdiGetTextMetricsW(

Face = FontGDI->SharedFace->Face;
         IntLockFreeType();
-        Error = IntRequestFontSize(dc, Face, plf->lfWidth, plf->lfHeight);
+        Error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
         FtSetCoordinateTransform(Face, DC_pmxWorldToDevice(dc));
         IntUnLockFreeType();
         if (0 != Error)
@@ -6085,7 +6086,7 @@ NtGdiGetCharABCWidthsW(

plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
     IntLockFreeType();
-    IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+    IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
     FtSetCoordinateTransform(face, pmxWorldToDevice);

for (i = FirstChar; i < FirstChar+Count; i++)
@@ -6281,7 +6282,7 @@ NtGdiGetCharWidthW(

plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
     IntLockFreeType();
-    IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+    IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
     FtSetCoordinateTransform(face, pmxWorldToDevice);

for (i = FirstChar; i < FirstChar+Count; i++)