Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
9250a3ab
Commit
9250a3ab
authored
Apr 25, 2022
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 25, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Implement GetFontFamilyModel().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e32f5946
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
font.c
dlls/dwrite/font.c
+9
-5
No files found.
dlls/dwrite/font.c
View file @
9250a3ab
...
@@ -333,6 +333,7 @@ struct dwrite_fontcollection
...
@@ -333,6 +333,7 @@ struct dwrite_fontcollection
LONG
refcount
;
LONG
refcount
;
IDWriteFactory7
*
factory
;
IDWriteFactory7
*
factory
;
DWRITE_FONT_FAMILY_MODEL
family_model
;
struct
dwrite_fontfamily_data
**
family_data
;
struct
dwrite_fontfamily_data
**
family_data
;
size_t
size
;
size_t
size
;
size_t
count
;
size_t
count
;
...
@@ -3438,9 +3439,11 @@ static HRESULT WINAPI dwritefontcollection2_GetMatchingFonts(IDWriteFontCollecti
...
@@ -3438,9 +3439,11 @@ static HRESULT WINAPI dwritefontcollection2_GetMatchingFonts(IDWriteFontCollecti
static
DWRITE_FONT_FAMILY_MODEL
WINAPI
dwritefontcollection2_GetFontFamilyModel
(
IDWriteFontCollection3
*
iface
)
static
DWRITE_FONT_FAMILY_MODEL
WINAPI
dwritefontcollection2_GetFontFamilyModel
(
IDWriteFontCollection3
*
iface
)
{
{
FIXME
(
"%p.
\n
"
,
iface
);
struct
dwrite_fontcollection
*
collection
=
impl_from_IDWriteFontCollection3
(
iface
);
TRACE
(
"%p.
\n
"
,
iface
);
return
DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE
;
return
collection
->
family_model
;
}
}
static
HRESULT
WINAPI
dwritefontcollection2_GetFontSet
(
IDWriteFontCollection3
*
iface
,
IDWriteFontSet1
**
fontset
)
static
HRESULT
WINAPI
dwritefontcollection2_GetFontSet
(
IDWriteFontCollection3
*
iface
,
IDWriteFontSet1
**
fontset
)
...
@@ -3525,12 +3528,13 @@ static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collectio
...
@@ -3525,12 +3528,13 @@ static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collectio
}
}
static
HRESULT
init_font_collection
(
struct
dwrite_fontcollection
*
collection
,
IDWriteFactory7
*
factory
,
static
HRESULT
init_font_collection
(
struct
dwrite_fontcollection
*
collection
,
IDWriteFactory7
*
factory
,
BOOL
is_system
)
DWRITE_FONT_FAMILY_MODEL
family_model
,
BOOL
is_system
)
{
{
collection
->
IDWriteFontCollection3_iface
.
lpVtbl
=
is_system
?
&
systemfontcollectionvtbl
:
&
fontcollectionvtbl
;
collection
->
IDWriteFontCollection3_iface
.
lpVtbl
=
is_system
?
&
systemfontcollectionvtbl
:
&
fontcollectionvtbl
;
collection
->
refcount
=
1
;
collection
->
refcount
=
1
;
collection
->
factory
=
factory
;
collection
->
factory
=
factory
;
IDWriteFactory7_AddRef
(
collection
->
factory
);
IDWriteFactory7_AddRef
(
collection
->
factory
);
collection
->
family_model
=
family_model
;
return
S_OK
;
return
S_OK
;
}
}
...
@@ -4637,7 +4641,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat
...
@@ -4637,7 +4641,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat
if
(
!
(
collection
=
calloc
(
1
,
sizeof
(
*
collection
))))
if
(
!
(
collection
=
calloc
(
1
,
sizeof
(
*
collection
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
hr
=
init_font_collection
(
collection
,
factory
,
is_system
);
hr
=
init_font_collection
(
collection
,
factory
,
DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE
,
is_system
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
free
(
collection
);
free
(
collection
);
...
@@ -5089,7 +5093,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3
...
@@ -5089,7 +5093,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3
if
(
!
(
collection
=
calloc
(
1
,
sizeof
(
*
collection
))))
if
(
!
(
collection
=
calloc
(
1
,
sizeof
(
*
collection
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
hr
=
init_font_collection
(
collection
,
factory
,
FALSE
);
hr
=
init_font_collection
(
collection
,
factory
,
DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE
,
FALSE
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
free
(
collection
);
free
(
collection
);
...
...
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