Nikolay Sivov : dwrite: Forward GetGdiCompatibleMetrics() to newer call.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Feb 3 10:01:13 CST 2015
Module: wine
Branch: master
Commit: fbeb8295842669c865000bf0953687b77f56a401
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbeb8295842669c865000bf0953687b77f56a401
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Feb 3 11:20:06 2015 +0300
dwrite: Forward GetGdiCompatibleMetrics() to newer call.
---
dlls/dwrite/font.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index d0c109d..c949687 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -556,8 +556,17 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleMetrics(IDWriteFontFace2 *i
DWRITE_MATRIX const *transform, DWRITE_FONT_METRICS *metrics)
{
struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface);
- FIXME("(%p)->(%f %f %p %p): stub\n", This, emSize, pixels_per_dip, transform, metrics);
- return E_NOTIMPL;
+ DWRITE_FONT_METRICS1 metrics1;
+ HRESULT hr;
+
+ TRACE("(%p)->(%.2f %.2f %p %p)\n", This, emSize, pixels_per_dip, transform, metrics);
+
+ hr = IDWriteFontFace2_GetGdiCompatibleMetrics(iface, emSize, pixels_per_dip, transform, &metrics1);
+ if (FAILED(hr))
+ return hr;
+
+ memcpy(metrics, &metrics1, sizeof(*metrics));
+ return hr;
}
static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFace2 *iface, FLOAT emSize, FLOAT pixels_per_dip,
More information about the wine-cvs
mailing list