Jeff Smith : gdiplus: Fix GdipCreateFont character set initialization.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a51c15ff720f414fe383b62a3047a4208d489bb8
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a51c15ff720f414fe383b62a3047a42...

Author: Jeff Smith 
Date:   Fri Sep 15 23:25:22 2023 -0500

gdiplus: Fix GdipCreateFont character set initialization.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34789

---

dlls/gdiplus/font.c       | 1 +
 dlls/gdiplus/tests/font.c | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index 7bd60750e6d..081fddf7c5d 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -173,6 +173,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily,
     lfw.lfItalic = style & FontStyleItalic;
     lfw.lfUnderline = style & FontStyleUnderline;
     lfw.lfStrikeOut = style & FontStyleStrikeout;
+    lfw.lfCharSet = DEFAULT_CHARSET;

hfont = CreateFontIndirectW(&lfw);
     hdc = CreateCompatibleDC(0);
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 7a9d50c8c2e..8f0bbce0eb4 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -204,13 +204,12 @@ static void test_createfont_charset(void)
     static const struct {
         LPCWSTR family_name;
         BYTE char_set;
-        BOOL todo;
     } td[] =
     {
         {L"Tahoma", ANSI_CHARSET},
         {L"Symbol", SYMBOL_CHARSET},
-        {L"Marlett", SYMBOL_CHARSET, TRUE},
-        {L"Wingdings", SYMBOL_CHARSET, TRUE},
+        {L"Marlett", SYMBOL_CHARSET},
+        {L"Wingdings", SYMBOL_CHARSET},
     };

hdc = CreateCompatibleDC(0);
@@ -243,7 +242,6 @@ static void test_createfont_charset(void)
             expect(0, lf.lfItalic);
             expect(0, lf.lfUnderline);
             expect(0, lf.lfStrikeOut);
-            todo_wine_if(td[i].todo)
             ok(td[i].char_set == lf.lfCharSet ||
                 (td[i].char_set == ANSI_CHARSET && lf.lfCharSet == GetTextCharset(hdc)),
                 "got %#x\n", lf.lfCharSet);