Dmitry Timoshkov : gdi32/tests: Skip the bitmap font max width test on not 96 dpi resolutions.

Alexandre Julliard julliard at winehq.org
Mon Jun 17 14:07:47 CDT 2013


Module: wine
Branch: master
Commit: 288f3be439a75a47377791cf84fa7d649989a298
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=288f3be439a75a47377791cf84fa7d649989a298

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Mon Jun 17 19:00:53 2013 +0900

gdi32/tests: Skip the bitmap font max width test on not 96 dpi resolutions.

---

 dlls/gdi32/tests/font.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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




More information about the wine-cvs mailing list