From 352df1151636e580113171b4bbd79a4b761556f5 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 19 Feb 2021 12:03:47 +0300 Subject: [PATCH] dwrite/layout: Remove unnecessary argument check from GetInlineObject(). Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/dwrite/layout.c | 3 --- dlls/dwrite/tests/layout.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7b9d521c29a..3793f1ed8cb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3542,9 +3542,6 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout4 *iface TRACE("%p, %u, %p, %p.\n", iface, position, object, r); - if (position >= layout->len) - return S_OK; - range = get_layout_range_by_pos(layout, position); *object = range->object; if (*object) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8d74056af2f..b37cdfbf5ba 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6224,11 +6224,9 @@ todo_wine object = NULL; hr = IDWriteTextLayout_GetInlineObject(layout, 10, &object, &range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(range.startPosition == 10 && range.length == ~0u - 10, "Unexpected range (%u, %u).\n", range.startPosition, range.length); - if (object) - IDWriteInlineObject_Release(object); + IDWriteInlineObject_Release(object); range.startPosition = 0; range.length = ~0u;