gdiplus: Don't rely on an HDC in GdipGetFontHeight.

cb21d1ca · Vincent Povirk · Alexandre Julliard · 4fff9a7a · cb21d1ca
Commit cb21d1ca authored Oct 30, 2010 by Vincent Povirk Committed by Alexandre Julliard Nov 01, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

font.c dlls/gdiplus/font.c +6 -2

No files found.
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -452,12 +452,16 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font,
        GDIPCONST GpGraphics *graphics, REAL *height)
 {
    REAL dpi;
+    GpStatus stat;

    TRACE("%p %p %p\n", font, graphics, height);

-    dpi = GetDeviceCaps(graphics->hdc, LOGPIXELSY);
+    stat = GdipGetDpiY((GpGraphics*)graphics, &dpi);
+
+    if (stat == Ok)
+        stat = GdipGetFontHeightGivenDPI(font, dpi, height);

-    return GdipGetFontHeightGivenDPI(font, dpi, height);
+    return stat;
 }

 /*******************************************************************************