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
4215984d
Commit
4215984d
authored
Dec 05, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Use IDWriteFactory7 for fontface reference object.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7e665fd2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
13 deletions
+10
-13
dwrite_private.h
dlls/dwrite/dwrite_private.h
+1
-1
font.c
dlls/dwrite/font.c
+6
-6
main.c
dlls/dwrite/main.c
+3
-6
No files found.
dlls/dwrite/dwrite_private.h
View file @
4215984d
...
...
@@ -262,7 +262,7 @@ extern void release_system_fontfallback(IDWriteFontFallback1 *fallback) DECLSPEC
extern
HRESULT
create_fontfallback_builder
(
IDWriteFactory5
*
,
IDWriteFontFallbackBuilder
**
)
DECLSPEC_HIDDEN
;
extern
HRESULT
create_matching_font
(
IDWriteFontCollection
*
,
const
WCHAR
*
,
DWRITE_FONT_WEIGHT
,
DWRITE_FONT_STYLE
,
DWRITE_FONT_STRETCH
,
IDWriteFont
**
)
DECLSPEC_HIDDEN
;
extern
HRESULT
create_fontfacereference
(
IDWriteFactory
5
*
factory
,
IDWriteFontFile
*
file
,
UINT32
face_index
,
extern
HRESULT
create_fontfacereference
(
IDWriteFactory
7
*
factory
,
IDWriteFontFile
*
file
,
UINT32
face_index
,
DWRITE_FONT_SIMULATIONS
simulations
,
DWRITE_FONT_AXIS_VALUE
const
*
axis_values
,
UINT32
axis_values_count
,
IDWriteFontFaceReference1
**
reference
)
DECLSPEC_HIDDEN
;
extern
HRESULT
factory_get_cached_fontface
(
IDWriteFactory5
*
,
IDWriteFontFile
*
const
*
,
UINT32
,
DWRITE_FONT_SIMULATIONS
,
...
...
dlls/dwrite/font.c
View file @
4215984d
...
...
@@ -233,7 +233,7 @@ struct dwrite_fontfacereference
USHORT
simulations
;
DWRITE_FONT_AXIS_VALUE
*
axis_values
;
UINT32
axis_values_count
;
IDWriteFactory
5
*
factory
;
IDWriteFactory
7
*
factory
;
};
struct
dwrite_fontresource
...
...
@@ -6082,7 +6082,7 @@ static ULONG WINAPI fontfacereference_Release(IDWriteFontFaceReference1 *iface)
if
(
!
refcount
)
{
IDWriteFontFile_Release
(
reference
->
file
);
IDWriteFactory
5
_Release
(
reference
->
factory
);
IDWriteFactory
7
_Release
(
reference
->
factory
);
heap_free
(
reference
->
axis_values
);
heap_free
(
reference
);
}
...
...
@@ -6116,7 +6116,7 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon
if
(
FAILED
(
hr
))
return
hr
;
hr
=
IDWriteFactory
5
_CreateFontFace
(
reference
->
factory
,
face_type
,
1
,
&
reference
->
file
,
reference
->
index
,
hr
=
IDWriteFactory
7
_CreateFontFace
(
reference
->
factory
,
face_type
,
1
,
&
reference
->
file
,
reference
->
index
,
simulations
,
&
fontface
);
if
(
SUCCEEDED
(
hr
))
{
...
...
@@ -6182,7 +6182,7 @@ static HRESULT WINAPI fontfacereference_GetFontFile(IDWriteFontFaceReference1 *i
if
(
FAILED
(
hr
))
return
hr
;
hr
=
IDWriteFactory
5
_CreateCustomFontFileReference
(
reference
->
factory
,
key
,
key_size
,
loader
,
file
);
hr
=
IDWriteFactory
7
_CreateCustomFontFileReference
(
reference
->
factory
,
key
,
key_size
,
loader
,
file
);
IDWriteFontFileLoader_Release
(
loader
);
return
hr
;
...
...
@@ -6295,7 +6295,7 @@ static const IDWriteFontFaceReference1Vtbl fontfacereferencevtbl =
fontfacereference1_GetFontAxisValues
,
};
HRESULT
create_fontfacereference
(
IDWriteFactory
5
*
factory
,
IDWriteFontFile
*
file
,
UINT32
index
,
HRESULT
create_fontfacereference
(
IDWriteFactory
7
*
factory
,
IDWriteFontFile
*
file
,
UINT32
index
,
DWRITE_FONT_SIMULATIONS
simulations
,
DWRITE_FONT_AXIS_VALUE
const
*
axis_values
,
UINT32
axis_values_count
,
IDWriteFontFaceReference1
**
ret
)
{
...
...
@@ -6314,7 +6314,7 @@ HRESULT create_fontfacereference(IDWriteFactory5 *factory, IDWriteFontFile *file
object
->
refcount
=
1
;
object
->
factory
=
factory
;
IDWriteFactory
5
_AddRef
(
object
->
factory
);
IDWriteFactory
7
_AddRef
(
object
->
factory
);
object
->
file
=
file
;
IDWriteFontFile_AddRef
(
object
->
file
);
object
->
index
=
index
;
...
...
dlls/dwrite/main.c
View file @
4215984d
...
...
@@ -1443,8 +1443,7 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference_(IDWriteFactory7 *i
{
TRACE
(
"%p, %p, %u, %x, %p.
\n
"
,
iface
,
file
,
index
,
simulations
,
reference
);
return
create_fontfacereference
((
IDWriteFactory5
*
)
iface
,
file
,
index
,
simulations
,
NULL
,
0
,
(
IDWriteFontFaceReference1
**
)
reference
);
return
create_fontfacereference
(
iface
,
file
,
index
,
simulations
,
NULL
,
0
,
(
IDWriteFontFaceReference1
**
)
reference
);
}
static
HRESULT
WINAPI
dwritefactory3_CreateFontFaceReference
(
IDWriteFactory7
*
iface
,
WCHAR
const
*
path
,
...
...
@@ -1463,8 +1462,7 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *if
return
hr
;
}
hr
=
create_fontfacereference
((
IDWriteFactory5
*
)
iface
,
file
,
index
,
simulations
,
NULL
,
0
,
(
IDWriteFontFaceReference1
**
)
reference
);
hr
=
create_fontfacereference
(
iface
,
file
,
index
,
simulations
,
NULL
,
0
,
(
IDWriteFontFaceReference1
**
)
reference
);
IDWriteFontFile_Release
(
file
);
return
hr
;
}
...
...
@@ -1664,8 +1662,7 @@ static HRESULT WINAPI dwritefactory6_CreateFontFaceReference(IDWriteFactory7 *if
TRACE
(
"%p, %p, %u, %#x, %p, %u, %p.
\n
"
,
iface
,
file
,
face_index
,
simulations
,
axis_values
,
axis_values_count
,
reference
);
return
create_fontfacereference
((
IDWriteFactory5
*
)
iface
,
file
,
face_index
,
simulations
,
axis_values
,
axis_values_count
,
reference
);
return
create_fontfacereference
(
iface
,
file
,
face_index
,
simulations
,
axis_values
,
axis_values_count
,
reference
);
}
static
HRESULT
WINAPI
dwritefactory6_CreateFontResource
(
IDWriteFactory7
*
iface
,
IDWriteFontFile
*
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