diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index 6a2fae1ed7..00e68b3cfa 100644
--- a/win32ss/gdi/ntgdi/freetype.c
+++ b/win32ss/gdi/ntgdi/freetype.c
@@ -1886,6 +1886,8 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI,
     TM->tmAscent = FontGDI->tmAscent;
     TM->tmDescent = FontGDI->tmDescent;
     TM->tmHeight = TM->tmAscent + TM->tmDescent;
+    TM->tmDescent = (32 - Face->size->metrics.descender) >> 6;
+    TM->tmAscent = TM->tmHeight - TM->tmDescent;
     TM->tmInternalLeading = FontGDI->tmInternalLeading;
 
     /* MSDN says: