[PATCH 2/3] dwrite/gdiinterop: Always return valid bounds from DrawGlyphRun on success.

[Tingzhong Luo]

From: Tingzhong Luo

Signed-off-by: Nikolay Sivov 
---
 dlls/dwrite/gdiinterop.c | 4 ++++
 dlls/dwrite/tests/font.c | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c
index 5b542d93e32..5326096f9f7 100644
--- a/dlls/dwrite/gdiinterop.c
+++ b/dlls/dwrite/gdiinterop.c
@@ -479,6 +479,10 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac

free(bitmap);
     }
+    else if (bbox_ret)
+    {
+        *bbox_ret = bounds;
+    }

IDWriteGlyphRunAnalysis_Release(analysis);

diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 642bfc31c74..d299d994273 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -1513,7 +1513,6 @@ static void test_CreateBitmapRenderTarget(void)
     hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, -500.0f, -500.0f, DWRITE_MEASURING_MODE_GDI_NATURAL,
        &run, params, RGB(255, 0, 0), &box);
     ok(hr == S_OK, "Failed to draw a run, hr %#lx.\n", hr);
-    todo_wine
     ok(!IsRectEmpty(&box), "Got unexpected rectangle %s.\n", wine_dbgstr_rect(&box));

IDWriteRenderingParams_Release(params);