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
0c507a17
Commit
0c507a17
authored
Nov 25, 2014
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 26, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Clarify read length values used with get_font_data().
parent
416527a6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
freetype.c
dlls/gdi32/freetype.c
+6
-4
No files found.
dlls/gdi32/freetype.c
View file @
0c507a17
...
...
@@ -4456,7 +4456,7 @@ typedef struct {
static
LONG
load_VDMX
(
GdiFont
*
font
,
LONG
height
)
{
WORD
hdr
[
3
]
,
tmp
;
WORD
hdr
[
3
];
VDMX_group
group
;
BYTE
devXRatio
,
devYRatio
;
USHORT
numRecs
,
numRatios
;
...
...
@@ -4464,7 +4464,7 @@ static LONG load_VDMX(GdiFont *font, LONG height)
LONG
ppem
=
0
;
int
i
;
result
=
get_font_data
(
font
,
MS_VDMX_TAG
,
0
,
hdr
,
6
);
result
=
get_font_data
(
font
,
MS_VDMX_TAG
,
0
,
hdr
,
sizeof
(
hdr
)
);
if
(
result
==
GDI_ERROR
)
/* no vdmx table present, use linear scaling */
return
ppem
;
...
...
@@ -4495,8 +4495,10 @@ static LONG load_VDMX(GdiFont *font, LONG height)
devYRatio
>=
ratio
.
yStartRatio
&&
devYRatio
<=
ratio
.
yEndRatio
))
{
WORD
tmp
;
offset
=
(
3
*
2
)
+
(
numRatios
*
4
)
+
(
i
*
2
);
get_font_data
(
font
,
MS_VDMX_TAG
,
offset
,
&
tmp
,
2
);
get_font_data
(
font
,
MS_VDMX_TAG
,
offset
,
&
tmp
,
sizeof
(
tmp
)
);
offset
=
GET_BE_WORD
(
tmp
);
break
;
}
...
...
@@ -4504,7 +4506,7 @@ static LONG load_VDMX(GdiFont *font, LONG height)
if
(
offset
==
-
1
)
return
0
;
if
(
get_font_data
(
font
,
MS_VDMX_TAG
,
offset
,
&
group
,
4
)
!=
GDI_ERROR
)
{
if
(
get_font_data
(
font
,
MS_VDMX_TAG
,
offset
,
&
group
,
sizeof
(
group
)
)
!=
GDI_ERROR
)
{
USHORT
recs
;
BYTE
startsz
,
endsz
;
WORD
*
vTable
;
...
...
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