Adam Petaccia : gdiplus: Implement GdipGetCellAscent.

[Alexandre Julliard]

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

Author: Adam Petaccia 
Date:   Thu Jul  3 14:26:53 2008 -0400

gdiplus: Implement GdipGetCellAscent.

---

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

diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index 4e443cf..bead434 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -516,13 +516,14 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily)
     return Ok;
 }

-GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, INT style, UINT16 * CellAscent)
+GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family,
+        INT style, UINT16* CellAscent)
 {
     if (!(family && CellAscent)) return InvalidParameter;

-    FIXME("stub!\n");
+    *CellAscent = family->tmw.tmAscent;

-    return NotImplemented;
+    return Ok;
 }

GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, INT style, UINT16 * CellDescent)
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index e09c937..2160c9c 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -208,11 +208,14 @@ todo_wine
     stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
     expect(Ok, stat);
     ok(result == 2048, "Expected 2048, got %d\n", result);
+}
     result = 0;
     stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result);
     expect(Ok, stat);
     ok(result == 1854, "Expected 1854, got %d\n", result);
     result = 0;
+todo_wine
+{
     stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result);
     ok(result == 434, "Expected 434, got %d\n", result);
 }
@@ -229,11 +232,14 @@ todo_wine
     stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
     expect(Ok, stat);
     ok(result == 2048, "Expected 2048, got %d\n", result);
+}
     result = 0;
     stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result);
     expect(Ok, stat);
     ok(result == 1825, "Expected 1825, got %d\n", result);
     result = 0;
+todo_wine
+{
     stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result);
     ok(result == 443, "Expected 443 got %d\n", result);
 }