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
9ec6fd85
Commit
9ec6fd85
authored
Mar 30, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Return CreateStreamFromKey() failure code from Analyze().
parent
8abed244
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
font.c
dlls/dwrite/font.c
+4
-2
font.c
dlls/dwrite/tests/font.c
+2
-3
No files found.
dlls/dwrite/font.c
View file @
9ec6fd85
...
...
@@ -1715,10 +1715,12 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat
if
(
FAILED
(
hr
))
break
;
/* failed font files are skipped */
hr
=
IDWriteFontFile_Analyze
(
file
,
&
supported
,
&
file_type
,
&
face_type
,
&
face_count
);
if
(
FAILED
(
hr
)
||
!
supported
||
face_count
==
0
)
{
TRACE
(
"unsupported font (
0x%08x, %d, %u)
\n
"
,
hr
,
supported
,
face_count
);
TRACE
(
"unsupported font (
%p, 0x%08x, %d, %u)
\n
"
,
file
,
hr
,
supported
,
face_count
);
IDWriteFontFile_Release
(
file
);
hr
=
S_OK
;
continue
;
}
...
...
@@ -2080,7 +2082,7 @@ static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSup
hr
=
IDWriteFontFileLoader_CreateStreamFromKey
(
This
->
loader
,
This
->
reference_key
,
This
->
key_size
,
&
stream
);
if
(
FAILED
(
hr
))
return
S_OK
;
return
hr
;
hr
=
opentype_analyze_font
(
stream
,
numberOfFaces
,
fontFileType
,
fontFaceType
,
isSupportedFontType
);
...
...
dlls/dwrite/tests/font.c
View file @
9ec6fd85
...
...
@@ -1814,15 +1814,14 @@ static void test_CreateCustomFontFileReference(void)
face_type
=
DWRITE_FONT_FACE_TYPE_TRUETYPE
;
support
=
TRUE
;
count
=
1
;
IDWriteFontFile_Analyze
(
file
,
&
support
,
&
file_type
,
&
face_type
,
&
count
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IDWriteFontFile_Analyze
(
file
,
&
support
,
&
file_type
,
&
face_type
,
&
count
);
ok
(
hr
==
0x8faecafe
,
"got 0x%08x
\n
"
,
hr
);
ok
(
support
==
FALSE
,
"got %i
\n
"
,
support
);
ok
(
file_type
==
DWRITE_FONT_FILE_TYPE_UNKNOWN
,
"got %i
\n
"
,
file_type
);
ok
(
face_type
==
DWRITE_FONT_FACE_TYPE_UNKNOWN
,
"got %i
\n
"
,
face_type
);
ok
(
count
==
0
,
"got %i
\n
"
,
count
);
hr
=
IDWriteFactory_CreateFontFace
(
factory
,
DWRITE_FONT_FACE_TYPE_CFF
,
1
,
&
file
,
0
,
0
,
&
face
);
todo_wine
ok
(
hr
==
0x8faecafe
,
"got 0x%08x
\n
"
,
hr
);
IDWriteFontFile_Release
(
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