Nikolay Sivov : gdiplus: Fix Font test failure on charset mismatch.

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Tue Dec 16 05:10:48 2008 +0300

gdiplus: Fix Font test failure on charset mismatch.

---

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

diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index 220409b..22fd393 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -195,6 +195,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,

(*font)->lfw.lfHeight = -textmet.tmHeight;
     (*font)->lfw.lfWeight = textmet.tmWeight;
+    (*font)->lfw.lfCharSet = textmet.tmCharSet;

(*font)->height = 1; /* FIXME: need NEWTEXTMETRIC.ntmSizeEM here */
     (*font)->line_spacing = textmet.tmAscent + textmet.tmDescent + textmet.tmExternalLeading;
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 7ff5afc..125535d 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -134,7 +134,7 @@ static void test_logfont(void)
     expect(0, lfw2.lfItalic);
     expect(0, lfw2.lfUnderline);
     expect(0, lfw2.lfStrikeOut);
-    expect(0, lfw2.lfCharSet);
+    expect(GetTextCharset(hdc), lfw2.lfCharSet);
     expect(0, lfw2.lfOutPrecision);
     expect(0, lfw2.lfClipPrecision);
     expect(0, lfw2.lfQuality);
@@ -164,7 +164,7 @@ static void test_logfont(void)
     expect(TRUE, lfw2.lfItalic);
     expect(TRUE, lfw2.lfUnderline);
     expect(TRUE, lfw2.lfStrikeOut);
-    expect(0, lfw2.lfCharSet);
+    expect(GetTextCharset(hdc), lfw2.lfCharSet);
     expect(0, lfw2.lfOutPrecision);
     expect(0, lfw2.lfClipPrecision);
     expect(0, lfw2.lfQuality);