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
531219f8
Commit
531219f8
authored
Apr 15, 2010
by
Vincent Povirk
Committed by
Alexandre Julliard
Apr 16, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdiplus: Do not create FontFamilies for bitmap fonts.
parent
049aa8da
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
font.c
dlls/gdiplus/font.c
+4
-1
font.c
dlls/gdiplus/tests/font.c
+0
-3
No files found.
dlls/gdiplus/font.c
View file @
531219f8
...
@@ -521,7 +521,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi,
...
@@ -521,7 +521,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi,
static
INT
CALLBACK
is_font_installed_proc
(
const
LOGFONTW
*
elf
,
static
INT
CALLBACK
is_font_installed_proc
(
const
LOGFONTW
*
elf
,
const
TEXTMETRICW
*
ntm
,
DWORD
type
,
LPARAM
lParam
)
const
TEXTMETRICW
*
ntm
,
DWORD
type
,
LPARAM
lParam
)
{
{
if
(
!
ntm
)
if
(
!
ntm
||
type
==
RASTER_FONTTYPE
)
{
{
return
1
;
return
1
;
}
}
...
@@ -966,6 +966,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
...
@@ -966,6 +966,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
GpFontCollection
*
fonts
=
(
GpFontCollection
*
)
lParam
;
GpFontCollection
*
fonts
=
(
GpFontCollection
*
)
lParam
;
int
i
;
int
i
;
if
(
type
==
RASTER_FONTTYPE
)
return
1
;
/* skip duplicates */
/* skip duplicates */
for
(
i
=
0
;
i
<
fonts
->
count
;
i
++
)
for
(
i
=
0
;
i
<
fonts
->
count
;
i
++
)
if
(
strcmpiW
(
lfw
->
lfFaceName
,
fonts
->
FontFamilies
[
i
]
->
FamilyName
)
==
0
)
if
(
strcmpiW
(
lfw
->
lfFaceName
,
fonts
->
FontFamilies
[
i
]
->
FamilyName
)
==
0
)
...
...
dlls/gdiplus/tests/font.c
View file @
531219f8
...
@@ -192,12 +192,9 @@ static void test_fontfamily (void)
...
@@ -192,12 +192,9 @@ static void test_fontfamily (void)
expect
(
FontFamilyNotFound
,
stat
);
expect
(
FontFamilyNotFound
,
stat
);
/* Bitmap fonts are not found */
/* Bitmap fonts are not found */
todo_wine
{
stat
=
GdipCreateFontFamilyFromName
(
MSSansSerif
,
NULL
,
&
family
);
stat
=
GdipCreateFontFamilyFromName
(
MSSansSerif
,
NULL
,
&
family
);
expect
(
FontFamilyNotFound
,
stat
);
expect
(
FontFamilyNotFound
,
stat
);
if
(
stat
==
Ok
)
GdipDeleteFontFamily
(
family
);
if
(
stat
==
Ok
)
GdipDeleteFontFamily
(
family
);
}
stat
=
GdipCreateFontFamilyFromName
(
arial
,
NULL
,
&
family
);
stat
=
GdipCreateFontFamilyFromName
(
arial
,
NULL
,
&
family
);
if
(
stat
==
FontFamilyNotFound
)
if
(
stat
==
FontFamilyNotFound
)
...
...
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