gdi32/tests: Fix the expected GetTextMetrics() results on recent Windows.
This commit is contained in:
parent
3bd1d1c60d
commit
525835897b
1 changed files with 10 additions and 7 deletions
|
@ -6527,7 +6527,7 @@ static void test_max_height(void)
|
|||
DeleteObject(SelectObject(hdc, hfont_old));
|
||||
|
||||
/* test the largest value */
|
||||
lf.lfHeight = -((1 << 16) - 1);
|
||||
lf.lfHeight = -((1 << 14) - 1);
|
||||
hfont = CreateFontIndirectA(&lf);
|
||||
hfont_old = SelectObject(hdc, hfont);
|
||||
memset(&tm, 0, sizeof(tm));
|
||||
|
@ -6547,12 +6547,15 @@ static void test_max_height(void)
|
|||
hfont_old = SelectObject(hdc, hfont);
|
||||
memset(&tm, 0, sizeof(tm));
|
||||
r = GetTextMetricsA(hdc, &tm);
|
||||
ok(r, "GetTextMetrics failed\n");
|
||||
ok(tm.tmHeight == tm1.tmHeight,
|
||||
"expected 1 ppem value (%ld), got %ld\n", tm1.tmHeight, tm.tmHeight);
|
||||
ok(tm.tmAveCharWidth == tm1.tmAveCharWidth,
|
||||
"expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth);
|
||||
DeleteObject(SelectObject(hdc, hfont_old));
|
||||
if (r)
|
||||
{
|
||||
ok(r, "GetTextMetrics failed\n");
|
||||
ok(tm.tmHeight == tm1.tmHeight,
|
||||
"expected 1 ppem value (%ld), got %ld\n", tm1.tmHeight, tm.tmHeight);
|
||||
ok(tm.tmAveCharWidth == tm1.tmAveCharWidth,
|
||||
"expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth);
|
||||
DeleteObject(SelectObject(hdc, hfont_old));
|
||||
}
|
||||
winetest_pop_context();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue