Justin Chevrier : gdiplus: Handle UnitWorld in GdipGetFontHeightGivenDPI.

[Alexandre Julliard]

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

Author: Justin Chevrier 
Date:   Thu Mar 25 20:27:21 2010 -0400

gdiplus: Handle UnitWorld in GdipGetFontHeightGivenDPI.

---

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 fda5428..6e58f98 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -489,6 +489,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi,
     switch (font->unit)
     {
         case UnitPixel:
+        case UnitWorld:
             *height = font_height;
             break;
         case UnitPoint:
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index ec45bf7..1bf2c1e 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -381,8 +381,8 @@ static void test_heightgivendpi(void)
     stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitWorld, &font);
     expect(Ok, stat);
     stat = GdipGetFontHeightGivenDPI(font, 96, &height);
-    todo_wine expect(Ok, stat);
-    todo_wine expectf((REAL)34.497070, height);
+    expect(Ok, stat);
+    expectf((REAL)34.497070, height);
     GdipDeleteFont(font);

height = 12345;