Adam Petaccia : gdiplus: Implement GdipGetCellDescent.
Alexandre Julliard
julliard at winehq.org
Mon Jul 7 09:19:42 CDT 2008
Module: wine
Branch: master
Commit: e96b07d73fe00ce39fa794fbc2eedf8eea812a0d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96b07d73fe00ce39fa794fbc2eedf8eea812a0d
Author: Adam Petaccia <adam at tpetaccia.com>
Date: Thu Jul 3 14:26:57 2008 -0400
gdiplus: Implement GdipGetCellDescent.
---
dlls/gdiplus/font.c | 7 ++++---
dlls/gdiplus/tests/font.c | 6 ------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index bead434..baba8e9 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -526,13 +526,14 @@ GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family,
return Ok;
}
-GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, INT style, UINT16 * CellDescent)
+GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family,
+ INT style, UINT16* CellDescent)
{
if (!(family && CellDescent)) return InvalidParameter;
- FIXME("stub!\n");
+ *CellDescent = family->tmw.tmDescent;
- return NotImplemented;
+ return Ok;
}
/*******************************************************************************
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 2160c9c..b1cb340 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -214,11 +214,8 @@ todo_wine
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);
-}
GdipDeleteFontFamily(FontFamily);
GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily);
@@ -238,11 +235,8 @@ todo_wine
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);
-}
GdipDeleteFontFamily(FontFamily);
}
More information about the wine-cvs
mailing list