Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetInlineObject().

Alexandre Julliard julliard at winehq.org
Fri Feb 19 17:20:09 CST 2021


Module: wine
Branch: master
Commit: 352df1151636e580113171b4bbd79a4b761556f5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=352df1151636e580113171b4bbd79a4b761556f5

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Feb 19 12:03:47 2021 +0300

dwrite/layout: Remove unnecessary argument check from GetInlineObject().

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

---

 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;




More information about the wine-cvs mailing list