gdiplus: Handle UnitWorld in GdipGetFontHeightGivenDPI.

This commit is contained in:
Justin Chevrier 2010-03-25 20:27:21 -04:00 committed by Alexandre Julliard
parent cf5c16c49e
commit b7679da9a7
2 changed files with 3 additions and 2 deletions

View File

@ -489,6 +489,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi,
switch (font->unit) switch (font->unit)
{ {
case UnitPixel: case UnitPixel:
case UnitWorld:
*height = font_height; *height = font_height;
break; break;
case UnitPoint: case UnitPoint:

View File

@ -381,8 +381,8 @@ static void test_heightgivendpi(void)
stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitWorld, &font); stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitWorld, &font);
expect(Ok, stat); expect(Ok, stat);
stat = GdipGetFontHeightGivenDPI(font, 96, &height); stat = GdipGetFontHeightGivenDPI(font, 96, &height);
todo_wine expect(Ok, stat); expect(Ok, stat);
todo_wine expectf((REAL)34.497070, height); expectf((REAL)34.497070, height);
GdipDeleteFont(font); GdipDeleteFont(font);
height = 12345; height = 12345;