gdi32: ExtTextOut on a path with bitmap font selected shouldn't fail.
This just leads to empty path generated. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
1886ef1419
commit
3e9da621a2
|
@ -1594,7 +1594,7 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC
|
|||
void *outline;
|
||||
|
||||
dwSize = GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity);
|
||||
if (dwSize == GDI_ERROR) return FALSE;
|
||||
if (dwSize == GDI_ERROR) continue;
|
||||
|
||||
/* add outline only if char is printable */
|
||||
if(dwSize)
|
||||
|
|
|
@ -2439,7 +2439,6 @@ static void test_emf_ExtTextOut_on_path(void)
|
|||
ok(ret, "BeginPath error %d\n", GetLastError());
|
||||
|
||||
ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx);
|
||||
todo_wine
|
||||
ok(ret, "ExtTextOut error %d\n", GetLastError());
|
||||
|
||||
ret = EndPath(hdcDisplay);
|
||||
|
@ -2455,7 +2454,7 @@ todo_wine
|
|||
ok(ret, "BeginPath error %d\n", GetLastError());
|
||||
|
||||
ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx);
|
||||
todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError());
|
||||
ok(ret, "ExtTextOut error %d\n", GetLastError());
|
||||
|
||||
ret = EndPath(hdcMetafile);
|
||||
ok(ret, "EndPath error %d\n", GetLastError());
|
||||
|
@ -2514,7 +2513,6 @@ todo_wine
|
|||
ok(ret, "BeginPath error %d\n", GetLastError());
|
||||
|
||||
ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx);
|
||||
todo_wine
|
||||
ok(ret, "ExtTextOut error %d\n", GetLastError());
|
||||
|
||||
ret = EndPath(hdcMetafile);
|
||||
|
|
Loading…
Reference in New Issue