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
7ccf31bd
Commit
7ccf31bd
authored
Sep 14, 2011
by
Aric Stewart
Committed by
Alexandre Julliard
Sep 14, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
usp10: Set fNoGlyphIndex only if the fonts has no opentype/truetype tables.
parent
429bac4c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
usp10.c
dlls/usp10/usp10.c
+3
-5
usp10_internal.h
dlls/usp10/usp10_internal.h
+1
-0
No files found.
dlls/usp10/usp10.c
View file @
7ccf31bd
...
@@ -427,6 +427,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc)
...
@@ -427,6 +427,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc)
heap_free
(
sc
);
heap_free
(
sc
);
return
E_INVALIDARG
;
return
E_INVALIDARG
;
}
}
sc
->
sfnt
=
(
GetFontData
(
hdc
,
MS_MAKE_TAG
(
'h'
,
'e'
,
'a'
,
'd'
),
0
,
NULL
,
0
)
!=
GDI_ERROR
);
*
psc
=
sc
;
*
psc
=
sc
;
TRACE
(
"<- %p
\n
"
,
sc
);
TRACE
(
"<- %p
\n
"
,
sc
);
return
S_OK
;
return
S_OK
;
...
@@ -1747,11 +1748,8 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc,
...
@@ -1747,11 +1748,8 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc,
((
ScriptCache
*
)
*
psc
)
->
userScript
=
tagScript
;
((
ScriptCache
*
)
*
psc
)
->
userScript
=
tagScript
;
((
ScriptCache
*
)
*
psc
)
->
userLang
=
tagLangSys
;
((
ScriptCache
*
)
*
psc
)
->
userLang
=
tagLangSys
;
/* set fNoGlyphIndex for symbolic, and device fonts or non truetype fonts */
/* set fNoGlyphIndex non truetype/opentype fonts */
if
(
!
psa
->
fNoGlyphIndex
&&
if
(
!
psa
->
fNoGlyphIndex
&&
!
((
ScriptCache
*
)
*
psc
)
->
sfnt
)
(
!
(
get_cache_pitch_family
(
psc
)
&
TMPF_TRUETYPE
)
||
(
get_cache_pitch_family
(
psc
)
&
TMPF_DEVICE
)
||
(((
ScriptCache
*
)
*
psc
)
->
tm
.
tmCharSet
==
SYMBOL_CHARSET
)))
psa
->
fNoGlyphIndex
=
TRUE
;
psa
->
fNoGlyphIndex
=
TRUE
;
/* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */
/* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */
...
...
dlls/usp10/usp10_internal.h
View file @
7ccf31bd
...
@@ -85,6 +85,7 @@ typedef struct {
...
@@ -85,6 +85,7 @@ typedef struct {
typedef
struct
{
typedef
struct
{
LOGFONTW
lf
;
LOGFONTW
lf
;
TEXTMETRICW
tm
;
TEXTMETRICW
tm
;
BOOL
sfnt
;
WORD
*
glyphs
[
GLYPH_MAX
/
GLYPH_BLOCK_SIZE
];
WORD
*
glyphs
[
GLYPH_MAX
/
GLYPH_BLOCK_SIZE
];
ABC
*
widths
[
GLYPH_MAX
/
GLYPH_BLOCK_SIZE
];
ABC
*
widths
[
GLYPH_MAX
/
GLYPH_BLOCK_SIZE
];
LPVOID
GSUB_Table
;
LPVOID
GSUB_Table
;
...
...
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