Commit 863d29ca authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

win32u: Get rid of a special case for non-scalable fonts in NtGdiGetCharABCWidthsW().

parent 31fd0701
......@@ -1186,7 +1186,7 @@ static void test_GetCharABCWidths(void)
ok(!ret, "GetCharABCWidthsW should have failed\n");
ret = GetCharABCWidthsW(hdc, 'a', 'a', abc);
ok(!ret, "GetCharABCWidthsW should have failed\n");
ok(ret || broken(!ret) /* < win10 */, "GetCharABCWidthsW should have succeeded\n");
ret = GetCharABCWidthsFloatW(NULL, 'a', 'a', abcf);
ok(!ret, "GetCharABCWidthsFloatW should have failed\n");
......
......@@ -6243,7 +6243,6 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars
PHYSDEV dev;
unsigned int i, count = last;
BOOL ret;
TEXTMETRICW tm;
if (!dc) return FALSE;
......@@ -6260,17 +6259,6 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars
}
else
{
if (flags & NTGDI_GETCHARABCWIDTHS_INT)
{
/* unlike float variant, this one is supposed to fail on non-scalable fonts */
dev = GET_DC_PHYSDEV( dc, pGetTextMetrics );
if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR))
{
release_dc_ptr( dc );
return FALSE;
}
}
if (!chars) count = last - first + 1;
dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths );
ret = dev->funcs->pGetCharABCWidths( dev, first, count, chars, buffer );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment