Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
de597208
Commit
de597208
authored
Sep 11, 2012
by
Qian Hong
Committed by
Alexandre Julliard
Sep 11, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Fixed get_name_table_entry for symbol fonts.
parent
84954c0d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
freetype.c
dlls/gdi32/freetype.c
+1
-2
font.c
dlls/gdi32/tests/font.c
+1
-3
No files found.
dlls/gdi32/freetype.c
View file @
de597208
...
...
@@ -1146,7 +1146,7 @@ static BOOL get_name_table_entry(FT_Face ft_face, FT_SfntName *req)
if
(
!
pFT_Get_Sfnt_Name
(
ft_face
,
name_index
,
&
name
))
{
if
((
name
.
platform_id
==
req
->
platform_id
)
&&
(
name
.
encoding_id
==
req
->
encoding_id
)
&&
(
(
name
.
encoding_id
==
TT_MS_ID_UNICODE_CS
)
||
(
name
.
encoding_id
==
TT_MS_ID_SYMBOL_CS
)
)
&&
(
name
.
language_id
==
req
->
language_id
)
&&
(
name
.
name_id
==
req
->
name_id
))
{
...
...
@@ -1168,7 +1168,6 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort langua
FT_SfntName
name
;
name
.
platform_id
=
TT_PLATFORM_MICROSOFT
;
name
.
encoding_id
=
TT_MS_ID_UNICODE_CS
;
name
.
language_id
=
language_id
;
name
.
name_id
=
name_id
;
...
...
dlls/gdi32/tests/font.c
View file @
de597208
...
...
@@ -4151,9 +4151,7 @@ static void test_fullname2_helper(const char *Family)
ok
(
ret
,
"UNIQUE_ID (full name) could not be read
\n
"
);
WideCharToMultiByte
(
CP_ACP
,
0
,
bufW
,
-
1
,
bufA
,
buf_size
,
NULL
,
FALSE
);
otmStr
=
(
LPSTR
)
otm
+
(
UINT_PTR
)
otm
->
otmpFullName
;
if
(
efnd
.
elf
[
i
].
elfLogFont
.
lfCharSet
==
SYMBOL_CHARSET
)
todo_wine
ok
(
!
lstrcmpA
(
otmStr
,
bufA
),
"UNIQUE ID (full name) doesn't match: returned %s, expect %s
\n
"
,
otmStr
,
bufA
);
else
ok
(
!
lstrcmpA
(
otmStr
,
bufA
),
"UNIQUE ID (full name) doesn't match: returned %s, expect %s
\n
"
,
otmStr
,
bufA
);
ok
(
!
lstrcmpA
(
otmStr
,
bufA
),
"UNIQUE ID (full name) doesn't match: returned %s, expect %s
\n
"
,
otmStr
,
bufA
);
SelectObject
(
hdc
,
of
);
DeleteObject
(
hfont
);
...
...
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