Nikolay Sivov : dwrite: Forward IDWriteTextLayout::GetMetrics() to IDWriteTextLayout2::GetMetrics().
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 24 10:00:44 CDT 2015
Module: wine
Branch: master
Commit: 437fb07438c7d9eebd13520aa561dcffa3237a14
URL: http://source.winehq.org/git/wine.git/?a=commit;h=437fb07438c7d9eebd13520aa561dcffa3237a14
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sat Mar 21 19:27:21 2015 +0300
dwrite: Forward IDWriteTextLayout::GetMetrics() to IDWriteTextLayout2::GetMetrics().
---
dlls/dwrite/layout.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 56026fb..7a43566 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -1705,8 +1705,16 @@ static HRESULT WINAPI dwritetextlayout_GetLineMetrics(IDWriteTextLayout2 *iface,
static HRESULT WINAPI dwritetextlayout_GetMetrics(IDWriteTextLayout2 *iface, DWRITE_TEXT_METRICS *metrics)
{
struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface);
- FIXME("(%p)->(%p): stub\n", This, metrics);
- return E_NOTIMPL;
+ DWRITE_TEXT_METRICS1 metrics1;
+ HRESULT hr;
+
+ TRACE("(%p)->(%p)\n", This, metrics);
+
+ hr = IDWriteTextLayout2_GetMetrics(iface, &metrics1);
+ if (hr == S_OK)
+ memcpy(metrics, &metrics1, sizeof(*metrics));
+
+ return hr;
}
static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout2 *iface, DWRITE_OVERHANG_METRICS *overhangs)
More information about the wine-cvs
mailing list