Skip to content

W
wine-winehq
Commit 4b0f2eb6 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

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

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 68cfa3a4
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
dlls/dwrite/layout.c
View file @ 4b0f2eb6
......@@ -3403,9 +3403,6 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayou
TRACE("%p, %u, %p, %p.\n", iface, position, collection, r);
if (position >= layout->len)
return S_OK;
range = get_layout_range_by_pos(layout, position);
*collection = range->collection;
if (*collection)
......
dlls/dwrite/tests/layout.c
View file @ 4b0f2eb6
......@@ -5973,8 +5973,8 @@ if (SUCCEEDED(hr))
static void test_layout_range_length(void)
{
IDWriteFontCollection *collection, *collection2;
IDWriteInlineObject *sign, *object;
IDWriteFontCollection *collection;
IDWriteTypography *typography;
DWRITE_FONT_STRETCH stretch;
IDWriteTextLayout1 *layout1;
......@@ -6305,6 +6305,14 @@ static void test_layout_range_length(void)
hr = IDWriteTextLayout_SetFontCollection(layout, NULL, range);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
range.startPosition = range.length = 0;
collection2 = NULL;
hr = IDWriteTextLayout_GetFontCollection(layout, 10, &collection2, &range);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(range.length == ~0u, "Unexpected range length %u.\n", range.length);
if (collection2)
IDWriteFontCollection_Release(collection2);
IDWriteFontCollection_Release(collection);
if (SUCCEEDED(IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout1, (void **)&layout1)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment