diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index 3d94d78868..2928318655 100644
--- a/win32ss/gdi/ntgdi/freetype.c
+++ b/win32ss/gdi/ntgdi/freetype.c
@@ -4184,8 +4184,8 @@ TextIntGetTextExtentPoint(PDC dc,
         String++;
     }
     ASSERT(FontGDI->Magic == FONTGDI_MAGIC);
-    ascender = FontGDI->tmAscent; /* Units above baseline */
-    descender = FontGDI->tmDescent; /* Units below baseline */
+    ascender = (face->size->metrics.ascender + 32) >> 6; /* Units above baseline */
+    descender = (32 - face->size->metrics.descender) >> 6; /* Units below baseline */
     IntUnLockFreeType();
 
     Size->cx = (TotalWidth64 + 32) >> 6;