[WIN32SS][FONT] Fix font metrics (#713)

[reactos.git] / win32ss / user / rtl / text.c

diff --git a/win32ss/user/rtl/text.c b/win32ss/user/rtl/text.c
index f278bff..9ab726c 100644 (file)
--- a/win32ss/user/rtl/text.c
+++ b/win32ss/user/rtl/text.c
@@ -163,11 +163,7 @@ static void TEXT_Ellipsify (HDC hdc, WCHAR *str, unsigned int max_len,
 {
     unsigned int len_ellipsis;
     unsigned int lo, mid, hi;
-#ifdef _WIN32K_
-    len_ellipsis = wcslen (ELLIPSISW);
-#else
     len_ellipsis = strlenW (ELLIPSISW);
-#endif
     if (len_ellipsis > max_len) len_ellipsis = max_len;
     if (*len_str > max_len - len_ellipsis)
         *len_str = max_len - len_ellipsis;
@@ -274,11 +270,7 @@ static void TEXT_PathEllipsify (HDC hdc, WCHAR *str, unsigned int max_len,
     int len_trailing;
     int len_under;
     WCHAR *lastBkSlash, *lastFwdSlash, *lastSlash;
-#ifdef _WIN32K_
-    len_ellipsis = wcslen (ELLIPSISW);
-#else
     len_ellipsis = strlenW (ELLIPSISW);
-#endif
     if (!max_len) return;
     if (len_ellipsis >= max_len) len_ellipsis = max_len - 1;
     if (*len_str + len_ellipsis >= max_len)
@@ -1165,8 +1157,10 @@ INT WINAPI DrawTextExWorker( HDC hdc,
                 }
                 else
                 {
-#endif
+                    y = rect->top + (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2;
+#else
                     y = rect->top + (rect->bottom - rect->top) / 2 + (invert_y ? (size.cy / 2) : (-size.cy / 2));
+#endif
 #ifdef __REACTOS__
                 }
             }