dwrite: Explicitly check rendering parameters pointer passed to DrawGlyphRun().

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Explicitly check rendering parameters pointer passed to DrawGlyphRun().
cef8a52d · Nikolay Sivov · Alexandre Julliard · 1e5b9d36 · cef8a52d · cef8a52d
Commit cef8a52d authored Jul 17, 2017 by Nikolay Sivov Committed by Alexandre Julliard Jul 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

gdiinterop.c dlls/dwrite/gdiinterop.c +3 -0

font.c dlls/dwrite/tests/font.c +0 -1

No files found.
--- a/dlls/dwrite/gdiinterop.c
+++ b/dlls/dwrite/gdiinterop.c
@@ -328,6 +328,9 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac
    if (!This->dib.ptr)
        return S_OK;

+    if (!params)
+        return E_INVALIDARG;
+
    if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace2, (void **)&fontface2))) {
        WARN("Failed to get IDWriteFontFace2 interface, hr %#x.\n", hr);
        return hr;

--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -1337,7 +1337,6 @@ static void test_CreateBitmapRenderTarget(void)

    hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_NATURAL,
        &run, NULL, RGB(255, 0, 0), NULL);
-todo_wine
    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);

    hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1,