Huw Davies : gdi32/tests: Don't test the height that is 1. 75 times the original font height. This is unscaled in winnt yet doubled in win9x.

[Alexandre Julliard]

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

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Mon Feb 23 11:46:21 2009 +0000

gdi32/tests: Don't test the height that is 1.75 times the original font height. This is unscaled in winnt yet doubled in win9x.

---

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

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 5b50a14..041a742 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -354,7 +354,9 @@ static void test_bitmap_font(void)
         nearest_height = scale * height_orig;
         /* Only jump to the next height if the difference <= 25% original height */
         if (scale > 2 && nearest_height - i > height_orig / 4) scale--;
-        /* The jump between unscaled and doubled is delayed by 1 */
+        /* The jump between unscaled and doubled is delayed by 1 in winnt+ but not in win9x,
+           so we'll not test this particular height. */
+        else if(scale == 2 && nearest_height - i == (height_orig / 4)) continue;
         else if(scale == 2 && nearest_height - i > (height_orig / 4 - 1)) scale--;
         old_hfont = SelectObject(hdc, hfont);
         test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale);