[7/18] gdiplus: save elements of font's style

Evan Stade estade at gmail.com
Tue Aug 14 20:59:35 CDT 2007


Hi,

this makes the constructor conform to the tests I just submitted

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

-- 
Evan Stade
-------------- next part --------------
diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index 0cec6fb..f48a624 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -44,6 +44,9 @@ GpStatus WINGDIPAPI GdipCreateFontFromLo
     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 100755
--- 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);
-- 
1.4.1


More information about the wine-patches mailing list