Nikolay Sivov : dwrite/layout: Remove unnecessary argument check from GetPairKerning().
Alexandre Julliard
julliard at winehq.org
Fri Feb 19 17:20:09 CST 2021
Module: wine
Branch: master
Commit: 7129b3e14dbd59d9ece355830c2003f5135be12f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7129b3e14dbd59d9ece355830c2003f5135be12f
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Feb 19 12:03:46 2021 +0300
dwrite/layout: Remove unnecessary argument check from GetPairKerning().
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 | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 5dcf62d4690..7b9d521c29a 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -4062,9 +4062,6 @@ static HRESULT WINAPI dwritetextlayout1_GetPairKerning(IDWriteTextLayout4 *iface
TRACE("%p, %u, %p, %p.\n", iface, position, is_pairkerning_enabled, r);
- if (position >= layout->len)
- return S_OK;
-
range = get_layout_range_by_pos(layout, position);
*is_pairkerning_enabled = range->pair_kerning;
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index bff95ca3bb6..8d74056af2f 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -6337,11 +6337,10 @@ todo_wine
value = FALSE;
hr = IDWriteTextLayout1_GetPairKerning(layout1, 10, &value, &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);
ok(!!value, "Unexpected value %d.\n", value);
- }
+
range.startPosition = 0;
range.length = ~0u;
hr = IDWriteTextLayout1_SetPairKerning(layout1, FALSE, range);
More information about the wine-cvs
mailing list