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
a51c15ff
Commit
a51c15ff
authored
Sep 15, 2023
by
Jeff Smith
Committed by
Alexandre Julliard
Sep 19, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdiplus: Fix GdipCreateFont character set initialization.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=34789
parent
13174a2f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
font.c
dlls/gdiplus/font.c
+1
-0
font.c
dlls/gdiplus/tests/font.c
+2
-4
No files found.
dlls/gdiplus/font.c
View file @
a51c15ff
...
@@ -173,6 +173,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily,
...
@@ -173,6 +173,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily,
lfw
.
lfItalic
=
style
&
FontStyleItalic
;
lfw
.
lfItalic
=
style
&
FontStyleItalic
;
lfw
.
lfUnderline
=
style
&
FontStyleUnderline
;
lfw
.
lfUnderline
=
style
&
FontStyleUnderline
;
lfw
.
lfStrikeOut
=
style
&
FontStyleStrikeout
;
lfw
.
lfStrikeOut
=
style
&
FontStyleStrikeout
;
lfw
.
lfCharSet
=
DEFAULT_CHARSET
;
hfont
=
CreateFontIndirectW
(
&
lfw
);
hfont
=
CreateFontIndirectW
(
&
lfw
);
hdc
=
CreateCompatibleDC
(
0
);
hdc
=
CreateCompatibleDC
(
0
);
...
...
dlls/gdiplus/tests/font.c
View file @
a51c15ff
...
@@ -204,13 +204,12 @@ static void test_createfont_charset(void)
...
@@ -204,13 +204,12 @@ static void test_createfont_charset(void)
static
const
struct
{
static
const
struct
{
LPCWSTR
family_name
;
LPCWSTR
family_name
;
BYTE
char_set
;
BYTE
char_set
;
BOOL
todo
;
}
td
[]
=
}
td
[]
=
{
{
{
L"Tahoma"
,
ANSI_CHARSET
},
{
L"Tahoma"
,
ANSI_CHARSET
},
{
L"Symbol"
,
SYMBOL_CHARSET
},
{
L"Symbol"
,
SYMBOL_CHARSET
},
{
L"Marlett"
,
SYMBOL_CHARSET
,
TRUE
},
{
L"Marlett"
,
SYMBOL_CHARSET
},
{
L"Wingdings"
,
SYMBOL_CHARSET
,
TRUE
},
{
L"Wingdings"
,
SYMBOL_CHARSET
},
};
};
hdc
=
CreateCompatibleDC
(
0
);
hdc
=
CreateCompatibleDC
(
0
);
...
@@ -243,7 +242,6 @@ static void test_createfont_charset(void)
...
@@ -243,7 +242,6 @@ static void test_createfont_charset(void)
expect
(
0
,
lf
.
lfItalic
);
expect
(
0
,
lf
.
lfItalic
);
expect
(
0
,
lf
.
lfUnderline
);
expect
(
0
,
lf
.
lfUnderline
);
expect
(
0
,
lf
.
lfStrikeOut
);
expect
(
0
,
lf
.
lfStrikeOut
);
todo_wine_if
(
td
[
i
].
todo
)
ok
(
td
[
i
].
char_set
==
lf
.
lfCharSet
||
ok
(
td
[
i
].
char_set
==
lf
.
lfCharSet
||
(
td
[
i
].
char_set
==
ANSI_CHARSET
&&
lf
.
lfCharSet
==
GetTextCharset
(
hdc
)),
(
td
[
i
].
char_set
==
ANSI_CHARSET
&&
lf
.
lfCharSet
==
GetTextCharset
(
hdc
)),
"got %#x
\n
"
,
lf
.
lfCharSet
);
"got %#x
\n
"
,
lf
.
lfCharSet
);
...
...
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