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
f6230530
Commit
f6230530
authored
Feb 03, 2009
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Feb 03, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11.drv: The MAT2 parameter of GetGlyphOutline is mandatory.
parent
118c75a8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
opengl.c
dlls/winex11.drv/opengl.c
+4
-2
xrender.c
dlls/winex11.drv/xrender.c
+4
-5
No files found.
dlls/winex11.drv/opengl.c
View file @
f6230530
...
...
@@ -1902,7 +1902,8 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
wine_tsx11_unlock
();
for
(
glyph
=
first
;
glyph
<
first
+
count
;
glyph
++
)
{
unsigned
int
needed_size
=
GetGlyphOutline_ptr
(
hdc
,
glyph
,
GGO_BITMAP
,
&
gm
,
0
,
NULL
,
NULL
);
static
const
MAT2
identity
=
{
{
0
,
1
},{
0
,
0
},{
0
,
0
},{
0
,
1
}
};
unsigned
int
needed_size
=
GetGlyphOutline_ptr
(
hdc
,
glyph
,
GGO_BITMAP
,
&
gm
,
0
,
NULL
,
&
identity
);
unsigned
int
height
,
width_int
;
TRACE
(
"Glyph : %3d / List : %d
\n
"
,
glyph
,
listBase
);
...
...
@@ -1920,7 +1921,8 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
bitmap
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
size
);
gl_bitmap
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
size
);
}
if
(
GetGlyphOutline_ptr
(
hdc
,
glyph
,
GGO_BITMAP
,
&
gm
,
size
,
bitmap
,
NULL
)
==
GDI_ERROR
)
goto
error
;
if
(
GetGlyphOutline_ptr
(
hdc
,
glyph
,
GGO_BITMAP
,
&
gm
,
size
,
bitmap
,
&
identity
)
==
GDI_ERROR
)
goto
error
;
if
(
TRACE_ON
(
wgl
))
{
unsigned
int
height
,
width
,
bitmask
;
unsigned
char
*
bitmap_
=
bitmap
;
...
...
dlls/winex11.drv/xrender.c
View file @
f6230530
...
...
@@ -666,6 +666,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
XRenderPictFormat
pf
;
unsigned
long
pf_mask
;
static
const
char
zero
[
4
];
static
const
MAT2
identity
=
{
{
0
,
1
},{
0
,
0
},{
0
,
0
},{
0
,
1
}
};
switch
(
format
)
{
case
AA_Grey
:
...
...
@@ -691,15 +692,13 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
break
;
}
buflen
=
GetGlyphOutlineW
(
physDev
->
hdc
,
glyph
,
ggo_format
,
&
gm
,
0
,
NULL
,
NULL
);
buflen
=
GetGlyphOutlineW
(
physDev
->
hdc
,
glyph
,
ggo_format
,
&
gm
,
0
,
NULL
,
&
identity
);
if
(
buflen
==
GDI_ERROR
)
{
if
(
format
!=
AA_None
)
{
format
=
AA_None
;
entry
->
aa_default
=
AA_None
;
ggo_format
=
GGO_GLYPH_INDEX
|
GGO_BITMAP
;
buflen
=
GetGlyphOutlineW
(
physDev
->
hdc
,
glyph
,
ggo_format
,
&
gm
,
0
,
NULL
,
NULL
);
buflen
=
GetGlyphOutlineW
(
physDev
->
hdc
,
glyph
,
ggo_format
,
&
gm
,
0
,
NULL
,
&
identity
);
}
if
(
buflen
==
GDI_ERROR
)
{
WARN
(
"GetGlyphOutlineW failed
\n
"
);
...
...
@@ -800,7 +799,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
buf
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
buflen
);
GetGlyphOutlineW
(
physDev
->
hdc
,
glyph
,
ggo_format
,
&
gm
,
buflen
,
buf
,
NULL
);
GetGlyphOutlineW
(
physDev
->
hdc
,
glyph
,
ggo_format
,
&
gm
,
buflen
,
buf
,
&
identity
);
formatEntry
->
realized
[
glyph
]
=
TRUE
;
TRACE
(
"buflen = %d. Got metrics: %dx%d adv=%d,%d origin=%d,%d
\n
"
,
...
...
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