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
520aa9f5
Commit
520aa9f5
authored
Mar 18, 2007
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Mar 19, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11.drv: In the case requested glyphs do not present in the font fail…
winex11.drv: In the case requested glyphs do not present in the font fail gracefully instead of asserting.
parent
637a6116
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
freetype.c
dlls/gdi32/freetype.c
+1
-1
xrender.c
dlls/winex11.drv/xrender.c
+7
-2
No files found.
dlls/gdi32/freetype.c
View file @
520aa9f5
...
...
@@ -3398,7 +3398,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format,
err
=
pFT_Load_Glyph
(
ft_face
,
glyph_index
,
load_flags
);
if
(
err
)
{
FIXME
(
"FT_Load_Glyph on index %x returns %d
\n
"
,
glyph_index
,
err
);
WARN
(
"FT_Load_Glyph on index %x returns %d
\n
"
,
glyph_index
,
err
);
return
GDI_ERROR
;
}
...
...
dlls/winex11.drv/xrender.c
View file @
520aa9f5
...
...
@@ -655,7 +655,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
NULL
);
}
if
(
buflen
==
GDI_ERROR
)
{
ERR
(
"GetGlyphOutlineW failed
\n
"
);
WARN
(
"GetGlyphOutlineW failed
\n
"
);
return
FALSE
;
}
TRACE
(
"Turning off antialiasing for this monochrome font
\n
"
);
...
...
@@ -1258,7 +1258,12 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
UploadGlyph
(
physDev
,
wstr
[
idx
],
antialias
);
}
}
assert
(
formatEntry
);
if
(
!
formatEntry
)
{
WARN
(
"could not upload requested glyphs
\n
"
);
LeaveCriticalSection
(
&
xrender_cs
);
goto
done_unlock
;
}
TRACE
(
"Writing %s at %d,%d
\n
"
,
debugstr_wn
(
wstr
,
count
),
physDev
->
dc_rect
.
left
+
x
,
physDev
->
dc_rect
.
top
+
y
);
...
...
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