marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Fix reference equality condition. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Nikolay Sivov 2016-05-05 14:35:23 +03:00 committed by Alexandre Julliard
parent ca99107daa
commit bda5f57008
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/dwrite/font.c
View File

@ -5416,7 +5416,9 @@ static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference *iface, IDW
if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file)))
return FALSE;
ret = is_same_fontfile(This->file, file);
ret = is_same_fontfile(This->file, file) &&
This->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) &&
This->simulations == IDWriteFontFaceReference_GetSimulations(ref);
IDWriteFontFile_Release(file);
return ret;

17
dlls/dwrite/tests/font.c
View File

@ -5853,6 +5853,7 @@ static void test_CreateFontFaceReference(void)
UINT32 index;
WCHAR *path;
HRESULT hr;
BOOL ret;
factory = create_factory();
@ -5923,7 +5924,23 @@ todo_wine
IDWriteFontFace3_Release(fontface);
IDWriteFontFace3_Release(fontface1);
/* reference equality */
ret = IDWriteFontFaceReference_Equals(ref, ref1);
ok(ret, "got %d\n", ret);
IDWriteFontFaceReference_Release(ref1);
hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 1, DWRITE_FONT_SIMULATIONS_NONE, &ref1);
ok(hr == S_OK, "got 0x%08x\n", hr);
ret = IDWriteFontFaceReference_Equals(ref, ref1);
ok(!ret, "got %d\n", ret);
IDWriteFontFaceReference_Release(ref1);
hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, DWRITE_FONT_SIMULATIONS_BOLD, &ref1);
ok(hr == S_OK, "got 0x%08x\n", hr);
ret = IDWriteFontFaceReference_Equals(ref, ref1);
ok(!ret, "got %d\n", ret);
IDWriteFontFaceReference_Release(ref1);
IDWriteFontFaceReference_Release(ref);
/* create reference from a file */