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.

This commit is contained in:
Huw Davies 2009-02-23 11:46:21 +00:00 committed by Alexandre Julliard
parent 2159580e4f
commit 5b183a208f
1 changed files with 3 additions and 1 deletions

View File

@ -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);