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
042b39a8
Commit
042b39a8
authored
Oct 02, 2013
by
Akihiro Sagawa
Committed by
Alexandre Julliard
Oct 02, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Fix the B spacing value of empty glyph.
parent
af759e30
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
freetype.c
dlls/gdi32/freetype.c
+1
-1
font.c
dlls/gdi32/tests/font.c
+14
-3
No files found.
dlls/gdi32/freetype.c
View file @
042b39a8
...
...
@@ -6525,7 +6525,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
lpgm
->
gmptGlyphOrigin
.
x
=
origin_x
>>
6
;
lpgm
->
gmptGlyphOrigin
.
y
=
origin_y
>>
6
;
abc
->
abcA
=
left
>>
6
;
abc
->
abcB
=
width
;
abc
->
abcB
=
lpgm
->
gmBlackBoxX
;
abc
->
abcC
=
adv
-
abc
->
abcA
-
abc
->
abcB
;
TRACE
(
"%u,%u,%s,%d,%d
\n
"
,
lpgm
->
gmBlackBoxX
,
lpgm
->
gmBlackBoxY
,
...
...
dlls/gdi32/tests/font.c
View file @
042b39a8
...
...
@@ -1298,11 +1298,22 @@ static void test_GetCharABCWidths(void)
DeleteObject
(
hfont
);
}
ReleaseDC
(
NULL
,
hdc
);
memset
(
&
lf
,
0
,
sizeof
(
lf
));
strcpy
(
lf
.
lfFaceName
,
"Tahoma"
);
lf
.
lfHeight
=
20
;
hfont
=
CreateFontIndirectA
(
&
lf
);
/* test empty glyph's metrics */
hfont
=
SelectObject
(
hdc
,
hfont
);
ret
=
pGetCharABCWidthsFloatW
(
hdc
,
' '
,
' '
,
abcf
);
ok
(
ret
,
"GetCharABCWidthsFloatW should have succeeded
\n
"
);
ok
(
abcf
[
0
].
abcfB
==
1
.
0
,
"got %f
\n
"
,
abcf
[
0
].
abcfB
);
ret
=
pGetCharABCWidthsW
(
hdc
,
' '
,
' '
,
abcw
);
ok
(
ret
,
"GetCharABCWidthsW should have succeeded
\n
"
);
ok
(
abcw
[
0
].
abcB
==
1
,
"got %u
\n
"
,
abcw
[
0
].
abcB
);
DeleteObject
(
SelectObject
(
hdc
,
hfont
));
ReleaseDC
(
NULL
,
hdc
);
trace
(
"ABC sign test for a variety of transforms:
\n
"
);
hfont
=
CreateFontIndirectA
(
&
lf
);
...
...
@@ -1318,7 +1329,7 @@ static void test_GetCharABCWidths(void)
ret
=
pGetCharABCWidthsI
(
hdc
,
0
,
1
,
glyphs
,
abc
);
ok
(
ret
,
"GetCharABCWidthsI should have succeeded
\n
"
);
ret
=
pGetCharABCWidthsW
(
hdc
,
'i'
,
'i'
,
abcw
);
ok
(
ret
,
"GetCharABCWidths
I
should have succeeded
\n
"
);
ok
(
ret
,
"GetCharABCWidths
W
should have succeeded
\n
"
);
ret
=
pGetCharABCWidthsFloatW
(
hdc
,
'i'
,
'i'
,
abcf
);
ok
(
ret
,
"GetCharABCWidthsFloatW should have succeeded
\n
"
);
...
...
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