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
c98f40e2
Commit
c98f40e2
authored
Feb 09, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 10, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Fix otmfsSelection to have bold style set in case of bold simulation.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
90eb2601
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
freetype.c
dlls/gdi32/freetype.c
+2
-0
font.c
dlls/gdi32/tests/font.c
+14
-1
No files found.
dlls/gdi32/freetype.c
View file @
c98f40e2
...
...
@@ -7850,6 +7850,8 @@ static BOOL get_outline_text_metrics(GdiFont *font)
font
->
potm
->
otmfsSelection
=
pOS2
->
fsSelection
;
if
(
font
->
fake_italic
)
font
->
potm
->
otmfsSelection
|=
1
;
if
(
font
->
fake_bold
)
font
->
potm
->
otmfsSelection
|=
1
<<
5
;
font
->
potm
->
otmfsType
=
pOS2
->
fsType
;
font
->
potm
->
otmsCharSlopeRise
=
pHori
->
caret_Slope_Rise
;
font
->
potm
->
otmsCharSlopeRun
=
pHori
->
caret_Slope_Run
;
...
...
dlls/gdi32/tests/font.c
View file @
c98f40e2
...
...
@@ -2144,9 +2144,22 @@ static void test_GetOutlineTextMetrics(void)
LPSTR
unset_ptr
;
UINT
fsSelection
;
/* check fsSelection field with
oblique
simulation */
/* check fsSelection field with
bold
simulation */
memset
(
&
lf
,
0
,
sizeof
(
lf
));
strcpy
(
lf
.
lfFaceName
,
"Wingdings"
);
lf
.
lfCharSet
=
SYMBOL_CHARSET
;
/* regular face */
fsSelection
=
get_font_fsselection
(
&
lf
);
ok
((
fsSelection
&
(
1
<<
5
))
==
0
,
"got 0x%x
\n
"
,
fsSelection
);
/* face with bold simulation */
lf
.
lfWeight
=
FW_BOLD
;
fsSelection
=
get_font_fsselection
(
&
lf
);
ok
((
fsSelection
&
(
1
<<
5
))
!=
0
,
"got 0x%x
\n
"
,
fsSelection
);
/* check fsSelection field with oblique simulation */
memset
(
&
lf
,
0
,
sizeof
(
lf
));
strcpy
(
lf
.
lfFaceName
,
"Tahoma"
);
lf
.
lfHeight
=
-
13
;
lf
.
lfWeight
=
FW_NORMAL
;
...
...
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