commit b7679da9a7c4d2c9ec6796d74447e98abe69047a
author Justin Chevrier <jchevrier@gmail.com> Thu Mar 25 20:27:21 2010 -0400
committer Alexandre Julliard <julliard@winehq.org> Fri Mar 26 10:31:25 2010 +0100
tree 02f7640c27bd47c90173f0efe5e68d386ad58eb6
parent cf5c16c49e9a3477f6d90c7d012f7b35e126b066

gdiplus: Handle UnitWorld in GdipGetFontHeightGivenDPI.

dlls/gdiplus/font.c

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 @@
     switch (font->unit)
     {
         case UnitPixel:
+        case UnitWorld:
             *height = font_height;
             break;
         case UnitPoint:

dlls/gdiplus/tests/font.c

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 @@
     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;