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>

gdi32: ExtTextOut on a path with bitmap font selected shouldn't fail.
3e9da621 · Dmitry Timoshkov · Alexandre Julliard · 1886ef14 · 3e9da621 · 3e9da621
Commit 3e9da621 authored Nov 29, 2018 by Dmitry Timoshkov Committed by Alexandre Julliard Nov 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

path.c dlls/gdi32/path.c +1 -1

metafile.c dlls/gdi32/tests/metafile.c +1 -3

No files found.
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -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)

--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -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);