[1/3] gdi32: Skip the bitmap font max width test on not 96 dpi resolutions.

Dmitry Timoshkov dmitry at baikal.ru
Mon Jun 17 05:00:53 CDT 2013


Built-in bitmap fonts for 120 dpi and higher differ from Windows ones, and
max width test should not be performed in such configurations.
---
 dlls/gdi32/tests/font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 087d572..63fe909 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -976,7 +976,7 @@ static void test_bitmap_font_metrics(void)
 
                     /* Don't run the max char width test on System/ANSI_CHARSET.  We have extra characters in our font
                        that make the max width bigger */
-                    if(strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET)
+                    if ((strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) && tm.tmDigitizedAspectX == 96)
                         ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %d != %d\n", fd[i].face_name, height, tm.tmMaxCharWidth, fd[i].max_char_width);
                 }
                 else
-- 
1.8.3.1




More information about the wine-patches mailing list