Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
bda5f570
Commit
bda5f570
authored
May 05, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 05, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Fix reference equality condition.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ca99107d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
font.c
dlls/dwrite/font.c
+3
-1
font.c
dlls/dwrite/tests/font.c
+17
-0
No files found.
dlls/dwrite/font.c
View file @
bda5f570
...
...
@@ -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
;
...
...
dlls/dwrite/tests/font.c
View file @
bda5f570
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment