Evan Stade : gdiplus: Save elements of font's style.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 62cae5ab39e31e4ffeb14e3c9495ae25fb247961
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=62cae5ab39e31e4ffeb14e3c94...

Author: Evan Stade 
Date:   Tue Aug 14 18:59:35 2007 -0700

gdiplus: Save elements of font's style.

---

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

diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index 77ee274..7d2e14a 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -43,6 +43,9 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,
     memcpy(&(*font)->lfw.lfFaceName, logfont->lfFaceName, LF_FACESIZE *
            sizeof(WCHAR));
     (*font)->lfw.lfHeight = logfont->lfHeight;
+    (*font)->lfw.lfItalic = logfont->lfItalic;
+    (*font)->lfw.lfUnderline = logfont->lfUnderline;
+    (*font)->lfw.lfStrikeOut = logfont->lfStrikeOut;

hfont = CreateFontIndirectW(&(*font)->lfw);
     oldfont = SelectObject(hdc, hfont);
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 0bd3f91..71e6f9a 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -79,11 +79,9 @@ static void test_logfont(void)
     expect(0, lfw2.lfEscapement);
     expect(0, lfw2.lfOrientation);
     ok((lfw2.lfWeight >= 100) && (lfw2.lfWeight <= 900), "Expected weight to be set\n");
-    todo_wine{
-        expect(TRUE, lfw2.lfItalic);
-        expect(TRUE, lfw2.lfUnderline);
-        expect(TRUE, lfw2.lfStrikeOut);
-    }
+    expect(TRUE, lfw2.lfItalic);
+    expect(TRUE, lfw2.lfUnderline);
+    expect(TRUE, lfw2.lfStrikeOut);
     expect(0, lfw2.lfCharSet);
     expect(0, lfw2.lfOutPrecision);
     expect(0, lfw2.lfClipPrecision);