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
c8a2ab09
Commit
c8a2ab09
authored
Dec 06, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Use IDWriteFactory7 for analyzer.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8cd44ecf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
analyzer.c
dlls/dwrite/analyzer.c
+11
-11
dwrite_private.h
dlls/dwrite/dwrite_private.h
+2
-2
main.c
dlls/dwrite/main.c
+2
-2
No files found.
dlls/dwrite/analyzer.c
View file @
c8a2ab09
...
...
@@ -238,7 +238,7 @@ struct dwrite_fontfallback
{
IDWriteFontFallback1
IDWriteFontFallback1_iface
;
LONG
refcount
;
IDWriteFactory
5
*
factory
;
IDWriteFactory
7
*
factory
;
IDWriteFontCollection1
*
systemcollection
;
struct
fallback_mapping
*
mappings
;
UINT32
mappings_count
;
...
...
@@ -248,7 +248,7 @@ struct dwrite_fontfallback_builder
{
IDWriteFontFallbackBuilder
IDWriteFontFallbackBuilder_iface
;
LONG
refcount
;
IDWriteFactory
5
*
factory
;
IDWriteFactory
7
*
factory
;
struct
fallback_mapping
*
mappings
;
size_t
size
;
size_t
count
;
...
...
@@ -1956,7 +1956,7 @@ static ULONG WINAPI fontfallback_AddRef(IDWriteFontFallback1 *iface)
TRACE
(
"%p.
\n
"
,
iface
);
return
IDWriteFactory
5
_AddRef
(
fallback
->
factory
);
return
IDWriteFactory
7
_AddRef
(
fallback
->
factory
);
}
static
ULONG
WINAPI
fontfallback_Release
(
IDWriteFontFallback1
*
iface
)
...
...
@@ -1965,7 +1965,7 @@ static ULONG WINAPI fontfallback_Release(IDWriteFontFallback1 *iface)
TRACE
(
"%p.
\n
"
,
fallback
);
return
IDWriteFactory
5
_Release
(
fallback
->
factory
);
return
IDWriteFactory
7
_Release
(
fallback
->
factory
);
}
static
int
compare_mapping_range
(
const
void
*
a
,
const
void
*
b
)
...
...
@@ -2174,7 +2174,7 @@ static const IDWriteFontFallback1Vtbl fontfallbackvtbl =
fontfallback1_MapCharacters
,
};
HRESULT
create_system_fontfallback
(
IDWriteFactory
5
*
factory
,
IDWriteFontFallback1
**
ret
)
HRESULT
create_system_fontfallback
(
IDWriteFactory
7
*
factory
,
IDWriteFontFallback1
**
ret
)
{
struct
dwrite_fontfallback
*
fallback
;
...
...
@@ -2188,7 +2188,7 @@ HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback
fallback
->
factory
=
factory
;
fallback
->
mappings
=
(
struct
fallback_mapping
*
)
fontfallback_neutral_data
;
fallback
->
mappings_count
=
ARRAY_SIZE
(
fontfallback_neutral_data
);
IDWriteFactory5_GetSystemFontCollection
(
fallback
->
factory
,
FALSE
,
&
fallback
->
systemcollection
,
FALSE
);
IDWriteFactory5_GetSystemFontCollection
(
(
IDWriteFactory5
*
)
fallback
->
factory
,
FALSE
,
&
fallback
->
systemcollection
,
FALSE
);
*
ret
=
&
fallback
->
IDWriteFontFallback1_iface
;
...
...
@@ -2221,7 +2221,7 @@ static ULONG WINAPI customfontfallback_Release(IDWriteFontFallback1 *iface)
if
(
!
refcount
)
{
IDWriteFactory
5
_Release
(
fallback
->
factory
);
IDWriteFactory
7
_Release
(
fallback
->
factory
);
heap_free
(
fallback
);
}
...
...
@@ -2310,7 +2310,7 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac
heap_free
(
mapping
->
locale
);
}
IDWriteFactory
5
_Release
(
fallbackbuilder
->
factory
);
IDWriteFactory
7
_Release
(
fallbackbuilder
->
factory
);
heap_free
(
fallbackbuilder
->
mappings
);
heap_free
(
fallbackbuilder
);
}
...
...
@@ -2383,7 +2383,7 @@ static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallback
fallback
->
IDWriteFontFallback1_iface
.
lpVtbl
=
&
customfontfallbackvtbl
;
fallback
->
refcount
=
1
;
fallback
->
factory
=
fallbackbuilder
->
factory
;
IDWriteFactory
5
_AddRef
(
fallback
->
factory
);
IDWriteFactory
7
_AddRef
(
fallback
->
factory
);
*
ret
=
(
IDWriteFontFallback
*
)
&
fallback
->
IDWriteFontFallback1_iface
;
return
S_OK
;
...
...
@@ -2399,7 +2399,7 @@ static const IDWriteFontFallbackBuilderVtbl fontfallbackbuildervtbl =
fontfallbackbuilder_CreateFontFallback
,
};
HRESULT
create_fontfallback_builder
(
IDWriteFactory
5
*
factory
,
IDWriteFontFallbackBuilder
**
ret
)
HRESULT
create_fontfallback_builder
(
IDWriteFactory
7
*
factory
,
IDWriteFontFallbackBuilder
**
ret
)
{
struct
dwrite_fontfallback_builder
*
builder
;
...
...
@@ -2412,7 +2412,7 @@ HRESULT create_fontfallback_builder(IDWriteFactory5 *factory, IDWriteFontFallbac
builder
->
IDWriteFontFallbackBuilder_iface
.
lpVtbl
=
&
fontfallbackbuildervtbl
;
builder
->
refcount
=
1
;
builder
->
factory
=
factory
;
IDWriteFactory
5
_AddRef
(
builder
->
factory
);
IDWriteFactory
7
_AddRef
(
builder
->
factory
);
*
ret
=
&
builder
->
IDWriteFontFallbackBuilder_iface
;
return
S_OK
;
...
...
dlls/dwrite/dwrite_private.h
View file @
c8a2ab09
...
...
@@ -258,9 +258,9 @@ extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE
extern
HRESULT
create_colorglyphenum
(
FLOAT
,
FLOAT
,
const
DWRITE_GLYPH_RUN
*
,
const
DWRITE_GLYPH_RUN_DESCRIPTION
*
,
DWRITE_MEASURING_MODE
,
const
DWRITE_MATRIX
*
,
UINT32
,
IDWriteColorGlyphRunEnumerator
**
)
DECLSPEC_HIDDEN
;
extern
BOOL
lb_is_newline_char
(
WCHAR
)
DECLSPEC_HIDDEN
;
extern
HRESULT
create_system_fontfallback
(
IDWriteFactory
5
*
factory
,
IDWriteFontFallback1
**
fallback
)
DECLSPEC_HIDDEN
;
extern
HRESULT
create_system_fontfallback
(
IDWriteFactory
7
*
factory
,
IDWriteFontFallback1
**
fallback
)
DECLSPEC_HIDDEN
;
extern
void
release_system_fontfallback
(
IDWriteFontFallback1
*
fallback
)
DECLSPEC_HIDDEN
;
extern
HRESULT
create_fontfallback_builder
(
IDWriteFactory
5
*
,
IDWriteFontFallbackBuilder
**
)
DECLSPEC_HIDDEN
;
extern
HRESULT
create_fontfallback_builder
(
IDWriteFactory
7
*
factory
,
IDWriteFontFallbackBuilder
**
builder
)
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
(
IDWriteFactory7
*
factory
,
IDWriteFontFile
*
file
,
UINT32
face_index
,
...
...
dlls/dwrite/main.c
View file @
c8a2ab09
...
...
@@ -1337,7 +1337,7 @@ static HRESULT WINAPI dwritefactory2_GetSystemFontFallback(IDWriteFactory7 *ifac
if
(
!
factory
->
fallback
)
{
HRESULT
hr
=
create_system_fontfallback
(
(
IDWriteFactory5
*
)
iface
,
&
factory
->
fallback
);
HRESULT
hr
=
create_system_fontfallback
(
iface
,
&
factory
->
fallback
);
if
(
FAILED
(
hr
))
return
hr
;
}
...
...
@@ -1352,7 +1352,7 @@ static HRESULT WINAPI dwritefactory2_CreateFontFallbackBuilder(IDWriteFactory7 *
{
TRACE
(
"%p, %p.
\n
"
,
iface
,
fallbackbuilder
);
return
create_fontfallback_builder
(
(
IDWriteFactory5
*
)
iface
,
fallbackbuilder
);
return
create_fontfallback_builder
(
iface
,
fallbackbuilder
);
}
static
HRESULT
WINAPI
dwritefactory2_TranslateColorGlyphRun
(
IDWriteFactory7
*
iface
,
FLOAT
originX
,
FLOAT
originY
,
...
...
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