Commit a51c15ff authored by Jeff Smith's avatar Jeff Smith Committed by Alexandre Julliard

gdiplus: Fix GdipCreateFont character set initialization.

parent 13174a2f
...@@ -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);
......
...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment