Henri Verbeet : d2d1: Implement d2d_text_renderer_DrawGlyphRun().
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jun 16 10:13:13 CDT 2015
Module: wine
Branch: master
Commit: 1fd0cf680f701b53873048a8ed7da5a6df2e1f53
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd0cf680f701b53873048a8ed7da5a6df2e1f53
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Jun 15 22:30:09 2015 +0200
d2d1: Implement d2d_text_renderer_DrawGlyphRun().
---
dlls/d2d1/render_target.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c
index 3870295..9e99156 100644
--- a/dlls/d2d1/render_target.c
+++ b/dlls/d2d1/render_target.c
@@ -1293,12 +1293,27 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende
float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode,
const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect)
{
- FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, "
- "measuring_mode %#x, glyph_run %p, desc %p, effect %p stub!\n",
+ struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface);
+ D2D1_POINT_2F baseline_origin = {baseline_origin_x, baseline_origin_y};
+ struct d2d_draw_text_layout_ctx *context = ctx;
+
+ TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, "
+ "measuring_mode %#x, glyph_run %p, desc %p, effect %p.\n",
iface, ctx, baseline_origin_x, baseline_origin_y,
measuring_mode, glyph_run, desc, effect);
- return E_NOTIMPL;
+ if (desc)
+ FIXME("Ignoring glyph run description %p.\n", desc);
+ if (effect)
+ FIXME("Ignoring effect %p.\n", effect);
+ if (context->options)
+ FIXME("Ignoring options %#x.\n", context->options);
+
+ TRACE("%s\n", debugstr_wn(desc->string, desc->stringLength));
+ ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface,
+ baseline_origin, glyph_run, context->brush, measuring_mode);
+
+ return S_OK;
}
static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx,
More information about the wine-cvs
mailing list