diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index 78de0a6ae88..6319252612c 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -370,6 +370,9 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name,
 
     hdc = GetDC(0);
     lstrcpynW(lfw.lfFaceName, name, sizeof(WCHAR) * LF_FACESIZE);
+    lfw.lfCharSet = DEFAULT_CHARSET;
+    lfw.lfEscapement = lfw.lfOrientation = 0;
+
     hFont = CreateFontIndirectW (&lfw);
     hfont_old = SelectObject(hdc, hFont);
 
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 59a8d532177..1aed45fc731 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -76,6 +76,8 @@ static void test_createfont(void)
         expect (i, unit);
         GdipDeleteFont(font);
     }
+
+    GdipDeleteFontFamily(fontfamily);
 }
 
 static void test_logfont(void)