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
ef5daa9a
Commit
ef5daa9a
authored
Jul 31, 2012
by
Aric Stewart
Committed by
Alexandre Julliard
Aug 13, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
usp10: Cache OUTLINETEXTMETRICW in addition to TEXTMETRICW.
parent
552db7aa
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
usp10.c
dlls/usp10/usp10.c
+9
-0
usp10_internal.h
dlls/usp10/usp10_internal.h
+1
-0
No files found.
dlls/usp10/usp10.c
View file @
ef5daa9a
...
...
@@ -788,6 +788,7 @@ static inline BOOL set_cache_glyph_widths(SCRIPT_CACHE *psc, WORD glyph, ABC *ab
static
HRESULT
init_script_cache
(
const
HDC
hdc
,
SCRIPT_CACHE
*
psc
)
{
ScriptCache
*
sc
;
int
size
;
if
(
!
psc
)
return
E_INVALIDARG
;
if
(
*
psc
)
return
S_OK
;
...
...
@@ -799,6 +800,13 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc)
heap_free
(
sc
);
return
E_INVALIDARG
;
}
size
=
GetOutlineTextMetricsW
(
hdc
,
0
,
NULL
);
if
(
size
)
{
sc
->
otm
=
heap_alloc
(
size
);
sc
->
otm
->
otmSize
=
size
;
GetOutlineTextMetricsW
(
hdc
,
size
,
sc
->
otm
);
}
if
(
!
GetObjectW
(
GetCurrentObject
(
hdc
,
OBJ_FONT
),
sizeof
(
LOGFONTW
),
&
sc
->
lf
))
{
heap_free
(
sc
);
...
...
@@ -998,6 +1006,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc)
heap_free
(((
ScriptCache
*
)
*
psc
)
->
scripts
[
i
].
languages
);
}
heap_free
(((
ScriptCache
*
)
*
psc
)
->
scripts
);
heap_free
(((
ScriptCache
*
)
*
psc
)
->
otm
);
heap_free
(
*
psc
);
*
psc
=
NULL
;
}
...
...
dlls/usp10/usp10_internal.h
View file @
ef5daa9a
...
...
@@ -159,6 +159,7 @@ typedef struct {
typedef
struct
{
LOGFONTW
lf
;
TEXTMETRICW
tm
;
OUTLINETEXTMETRICW
*
otm
;
BOOL
sfnt
;
CacheGlyphPage
*
page
[
0x10
];
ABC
*
widths
[
GLYPH_MAX
/
GLYPH_BLOCK_SIZE
];
...
...
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