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
1e554e87
Commit
1e554e87
authored
Jul 19, 2006
by
Ge van Geldorp
Committed by
Alexandre Julliard
Jul 21, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi: Use variables of correct size.
parent
41aefd8c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
freetype.c
dlls/gdi/freetype.c
+7
-7
No files found.
dlls/gdi/freetype.c
View file @
1e554e87
...
...
@@ -814,7 +814,7 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, DWORD flags)
CHARSETINFO
csi
;
TRACE
(
"pix_h %d charset %d dpi %dx%d pt %d
\n
"
,
winfnt_header
.
pixel_height
,
winfnt_header
.
charset
,
winfnt_header
.
vertical_resolution
,
winfnt_header
.
horizontal_resolution
,
winfnt_header
.
nominal_point_size
);
if
(
TranslateCharsetInfo
((
DWORD
*
)(
UINT
)
winfnt_header
.
charset
,
&
csi
,
TCI_SRCCHARSET
))
if
(
TranslateCharsetInfo
((
DWORD
*
)(
UINT
_PTR
)
winfnt_header
.
charset
,
&
csi
,
TCI_SRCCHARSET
))
memcpy
(
&
fs
,
&
csi
.
fs
,
sizeof
(
csi
.
fs
));
internal_leading
=
winfnt_header
.
internal_leading
;
}
...
...
@@ -1901,7 +1901,7 @@ static int get_nearest_charset(Face *face, int *cp)
DWORD
fs0
;
*
cp
=
acp
;
if
(
TranslateCharsetInfo
((
DWORD
*
)
acp
,
&
csi
,
TCI_SRCCODEPAGE
))
if
(
TranslateCharsetInfo
((
DWORD
*
)
(
INT_PTR
)
acp
,
&
csi
,
TCI_SRCCODEPAGE
))
if
(
csi
.
fs
.
fsCsb
[
0
]
&
face
->
fs
.
fsCsb
[
0
])
return
csi
.
ciCharset
;
...
...
@@ -2305,7 +2305,7 @@ GdiFont WineEngCreateFontInstance(DC *dc, HFONT hfont)
if
(
!
strcmpiW
(
lf
.
lfFaceName
,
SymbolW
))
lf
.
lfCharSet
=
SYMBOL_CHARSET
;
if
(
!
TranslateCharsetInfo
((
DWORD
*
)(
INT
)
lf
.
lfCharSet
,
&
csi
,
TCI_SRCCHARSET
))
{
if
(
!
TranslateCharsetInfo
((
DWORD
*
)(
INT
_PTR
)
lf
.
lfCharSet
,
&
csi
,
TCI_SRCCHARSET
))
{
switch
(
lf
.
lfCharSet
)
{
case
DEFAULT_CHARSET
:
csi
.
fs
.
fsCsb
[
0
]
=
0
;
...
...
@@ -2351,7 +2351,7 @@ GdiFont WineEngCreateFontInstance(DC *dc, HFONT hfont)
corresponding to the current ansi codepage */
if
(
!
csi
.
fs
.
fsCsb
[
0
])
{
INT
acp
=
GetACP
();
if
(
!
TranslateCharsetInfo
((
DWORD
*
)
acp
,
&
csi
,
TCI_SRCCODEPAGE
))
{
if
(
!
TranslateCharsetInfo
((
DWORD
*
)
(
INT_PTR
)
acp
,
&
csi
,
TCI_SRCCODEPAGE
))
{
FIXME
(
"TCI failed on codepage %d
\n
"
,
acp
);
csi
.
fs
.
fsCsb
[
0
]
=
0
;
}
else
...
...
@@ -3924,7 +3924,7 @@ DWORD WineEngGetFontData(GdiFont font, DWORD table, DWORD offset, LPVOID buf,
DWORD
cbData
)
{
FT_Face
ft_face
=
font
->
ft_face
;
DWORD
len
;
FT_ULong
len
;
FT_Error
err
;
TRACE
(
"font=%p, table=%08lx, offset=%08lx, buf=%p, cbData=%lx
\n
"
,
...
...
@@ -3947,7 +3947,7 @@ DWORD WineEngGetFontData(GdiFont font, DWORD table, DWORD offset, LPVOID buf,
if
(
pFT_Load_Sfnt_Table
)
{
/* make sure value of len is the value freetype says it needs */
if
(
buf
&&
len
)
{
DWORD
needed
=
0
;
FT_ULong
needed
=
0
;
err
=
pFT_Load_Sfnt_Table
(
ft_face
,
table
,
offset
,
NULL
,
&
needed
);
if
(
!
err
&&
needed
<
len
)
len
=
needed
;
}
...
...
@@ -3969,7 +3969,7 @@ DWORD WineEngGetFontData(GdiFont font, DWORD table, DWORD offset, LPVOID buf,
}
/* make sure value of len is the value freetype says it needs */
if
(
buf
&&
len
)
{
DWORD
needed
=
0
;
FT_ULong
needed
=
0
;
err
=
sfnt
->
load_any
(
tt_face
,
table
,
offset
,
NULL
,
&
needed
);
if
(
!
err
&&
needed
<
len
)
len
=
needed
;
}
...
...
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