Ilya Shpigor : gdi32: Additional checking in the test for font creation with the OEM charset.

[Alexandre Julliard]

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

Author: Ilya Shpigor 
Date:   Mon Jan 18 12:08:26 2010 +0300

gdi32: Additional checking in the test for font creation with the OEM charset.

---

dlls/gdi32/tests/font.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 904f0d0..87ca494 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -2848,7 +2848,7 @@ static void test_orientation(void)
 static void test_oemcharset(void)
 {
     HDC hdc;
-    LOGFONTA lf;
+    LOGFONTA lf, clf;
     HFONT hfont, old_hfont;
     int charset;

@@ -2863,7 +2863,12 @@ static void test_oemcharset(void)
     charset = GetTextCharset(hdc);
 todo_wine
     ok(charset == OEM_CHARSET, "expected %d charset, got %d\n", OEM_CHARSET, charset);
-    SelectObject(hdc, old_hfont);
+    hfont = SelectObject(hdc, old_hfont);
+    GetObjectA(hfont, sizeof(clf), &clf);
+    ok(!lstrcmpA(clf.lfFaceName, lf.lfFaceName), "expected %s face name, got %s\n", lf.lfFaceName, clf.lfFaceName);
+    ok(clf.lfPitchAndFamily == lf.lfPitchAndFamily, "expected %x family, got %x\n", lf.lfPitchAndFamily, clf.lfPitchAndFamily);
+    ok(clf.lfCharSet == lf.lfCharSet, "expected %d charset, got %d\n", lf.lfCharSet, clf.lfCharSet);
+    ok(clf.lfHeight == lf.lfHeight, "expected %d height, got %d\n", lf.lfHeight, clf.lfHeight);
     DeleteObject(hfont);
     DeleteDC(hdc);
 }