[PATCH] d2d1: Initial implementation of DC render target
Nikolay Sivov
nsivov at codeweavers.com
Thu Sep 8 10:51:25 CDT 2016
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/d2d1/Makefile.in | 3 +-
dlls/d2d1/d2d1_private.h | 16 +
dlls/d2d1/dc_render_target.c | 875 +++++++++++++++++++++++++++++++++++++++++++
dlls/d2d1/factory.c | 50 ++-
dlls/d2d1/render_target.c | 36 ++
dlls/d2d1/tests/d2d1.c | 11 +-
6 files changed, 976 insertions(+), 15 deletions(-)
create mode 100644 dlls/d2d1/dc_render_target.c
diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in
index 8a6618d..06f7bde 100644
--- a/dlls/d2d1/Makefile.in
+++ b/dlls/d2d1/Makefile.in
@@ -1,11 +1,12 @@
MODULE = d2d1.dll
IMPORTLIB = d2d1
-IMPORTS = d3d10_1 dxguid uuid
+IMPORTS = d3d10_1 dxguid uuid gdi32
DELAYIMPORTS = dwrite
C_SRCS = \
bitmap.c \
brush.c \
+ dc_render_target.c \
factory.c \
geometry.c \
mesh.c \
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index f0577ed..fa7e464 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -96,6 +96,7 @@ struct d2d_d3d_render_target
HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory,
IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN;
+HRESULT d2d_d3d_render_target_update_surface(ID2D1RenderTarget *render_target, IDXGISurface1 *surface) DECLSPEC_HIDDEN;
struct d2d_wic_render_target
{
@@ -115,6 +116,21 @@ struct d2d_wic_render_target
HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory,
ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN;
+struct d2d_dc_render_target
+{
+ ID2D1DCRenderTarget ID2D1DCRenderTarget_iface;
+ LONG refcount;
+
+ IDXGISurface1 *dxgi_surface;
+ ID2D1RenderTarget *dxgi_target;
+
+ RECT dst_rect;
+ HDC hdc;
+};
+
+HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID2D1Factory *factory,
+ ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN;
+
struct d2d_gradient
{
ID2D1GradientStopCollection ID2D1GradientStopCollection_iface;
diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
new file mode 100644
index 0000000..ae87a0d
--- /dev/null
+++ b/dlls/d2d1/dc_render_target.c
@@ -0,0 +1,875 @@
+/*
+ * Copyright 2014 Henri Verbeet for CodeWeavers
+ * Copyright 2016 Nikolay Sivov for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+#include "wine/port.h"
+
+#include "d2d1_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(d2d);
+
+static void sync_bitmap(struct d2d_dc_render_target *render_target)
+{
+ const RECT *dst_rect = &render_target->dst_rect;
+ RECT empty_rect;
+ HDC src_hdc;
+ HRESULT hr;
+
+ if (FAILED(hr = IDXGISurface1_GetDC(render_target->dxgi_surface, FALSE, &src_hdc)))
+ {
+ WARN("GetDC() failed, %#x.\n", hr);
+ return;
+ }
+
+ BitBlt(render_target->hdc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left,
+ dst_rect->bottom - dst_rect->top, src_hdc, 0, 0, SRCCOPY);
+
+ SetRectEmpty(&empty_rect);
+ IDXGISurface1_ReleaseDC(render_target->dxgi_surface, &empty_rect);
+}
+
+static inline struct d2d_dc_render_target *impl_from_ID2D1DCRenderTarget(ID2D1DCRenderTarget *iface)
+{
+ return CONTAINING_RECORD(iface, struct d2d_dc_render_target, ID2D1DCRenderTarget_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_QueryInterface(ID2D1DCRenderTarget *iface, REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_ID2D1DCRenderTarget)
+ || IsEqualGUID(iid, &IID_ID2D1RenderTarget)
+ || IsEqualGUID(iid, &IID_ID2D1Resource)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID2D1DCRenderTarget_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_dc_render_target_AddRef(ID2D1DCRenderTarget *iface)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+ ULONG refcount = InterlockedIncrement(&render_target->refcount);
+
+ TRACE("%p increasing refcount to %u.\n", iface, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget *iface)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+ ULONG refcount = InterlockedDecrement(&render_target->refcount);
+
+ TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+
+ if (!refcount)
+ {
+ ID2D1RenderTarget_Release(render_target->dxgi_target);
+ IDXGISurface1_Release(render_target->dxgi_surface);
+ HeapFree(GetProcessHeap(), 0, render_target);
+ }
+
+ return refcount;
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_GetFactory(ID2D1DCRenderTarget *iface, ID2D1Factory **factory)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, factory %p.\n", iface, factory);
+
+ ID2D1RenderTarget_GetFactory(render_target->dxgi_target, factory);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateBitmap(ID2D1DCRenderTarget *iface,
+ D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p.\n",
+ iface, size.width, size.height, src_data, pitch, desc, bitmap);
+
+ return ID2D1RenderTarget_CreateBitmap(render_target->dxgi_target, size, src_data, pitch, desc, bitmap);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateBitmapFromWicBitmap(ID2D1DCRenderTarget *iface,
+ IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n",
+ iface, bitmap_source, desc, bitmap);
+
+ return ID2D1RenderTarget_CreateBitmapFromWicBitmap(render_target->dxgi_target, bitmap_source, desc, bitmap);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateSharedBitmap(ID2D1DCRenderTarget *iface,
+ REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, iid %s, data %p, desc %p, bitmap %p.\n",
+ iface, debugstr_guid(iid), data, desc, bitmap);
+
+ return ID2D1RenderTarget_CreateSharedBitmap(render_target->dxgi_target, iid, data, desc, bitmap);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateBitmapBrush(ID2D1DCRenderTarget *iface,
+ ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc,
+ const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush **brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.\n",
+ iface, bitmap, bitmap_brush_desc, brush_desc, brush);
+
+ return ID2D1RenderTarget_CreateBitmapBrush(render_target->dxgi_target,
+ bitmap, bitmap_brush_desc, brush_desc, brush);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateSolidColorBrush(ID2D1DCRenderTarget *iface,
+ const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, color %p, desc %p, brush %p.\n", iface, color, desc, brush);
+
+ return ID2D1RenderTarget_CreateSolidColorBrush(render_target->dxgi_target, color, desc, brush);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateGradientStopCollection(ID2D1DCRenderTarget *iface,
+ const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode,
+ ID2D1GradientStopCollection **gradient)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n",
+ iface, stops, stop_count, gamma, extend_mode, gradient);
+
+ return ID2D1RenderTarget_CreateGradientStopCollection(render_target->dxgi_target,
+ stops, stop_count, gamma, extend_mode, gradient);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateLinearGradientBrush(ID2D1DCRenderTarget *iface,
+ const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ ID2D1GradientStopCollection *gradient, ID2D1LinearGradientBrush **brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p.\n",
+ iface, gradient_brush_desc, brush_desc, gradient, brush);
+
+ return ID2D1RenderTarget_CreateLinearGradientBrush(render_target->dxgi_target,
+ gradient_brush_desc, brush_desc, gradient, brush);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateRadialGradientBrush(ID2D1DCRenderTarget *iface,
+ const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ ID2D1GradientStopCollection *gradient, ID2D1RadialGradientBrush **brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p.\n",
+ iface, gradient_brush_desc, brush_desc, gradient, brush);
+
+ return ID2D1RenderTarget_CreateRadialGradientBrush(render_target->dxgi_target,
+ gradient_brush_desc, brush_desc, gradient, brush);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateCompatibleRenderTarget(ID2D1DCRenderTarget *iface,
+ const D2D1_SIZE_F *size, const D2D1_SIZE_U *pixel_size, const D2D1_PIXEL_FORMAT *format,
+ D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options, ID2D1BitmapRenderTarget **render_target)
+{
+ struct d2d_dc_render_target *rt = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, size %p, pixel_size %p, format %p, options %#x, render_target %p,\n",
+ iface, size, pixel_size, format, options, render_target);
+
+ return ID2D1RenderTarget_CreateCompatibleRenderTarget(rt->dxgi_target,
+ size, pixel_size, format, options, render_target);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateLayer(ID2D1DCRenderTarget *iface,
+ const D2D1_SIZE_F *size, ID2D1Layer **layer)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, size %p, layer %p.\n", iface, size, layer);
+
+ return ID2D1RenderTarget_CreateLayer(render_target->dxgi_target, size, layer);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_CreateMesh(ID2D1DCRenderTarget *iface, ID2D1Mesh **mesh)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, mesh %p.\n", iface, mesh);
+
+ return ID2D1RenderTarget_CreateMesh(render_target->dxgi_target, mesh);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawLine(ID2D1DCRenderTarget *iface,
+ D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, p0 {%.8e, %.8e}, p1 {%.8e, %.8e}, brush %p, stroke_width %.8e, stroke_style %p.\n",
+ iface, p0.x, p0.y, p1.x, p1.y, brush, stroke_width, stroke_style);
+
+ ID2D1RenderTarget_DrawLine(render_target->dxgi_target, p0, p1, brush, stroke_width, stroke_style);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawRectangle(ID2D1DCRenderTarget *iface,
+ const D2D1_RECT_F *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, rect %p, brush %p, stroke_width %.8e, stroke_style %p.\n",
+ iface, rect, brush, stroke_width, stroke_style);
+
+ ID2D1RenderTarget_DrawRectangle(render_target->dxgi_target, rect, brush, stroke_width, stroke_style);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_FillRectangle(ID2D1DCRenderTarget *iface,
+ const D2D1_RECT_F *rect, ID2D1Brush *brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush);
+
+ ID2D1RenderTarget_FillRectangle(render_target->dxgi_target, rect, brush);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawRoundedRectangle(ID2D1DCRenderTarget *iface,
+ const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, rect %p, brush %p, stroke_width %.8e, stroke_style %p.\n",
+ iface, rect, brush, stroke_width, stroke_style);
+
+ ID2D1RenderTarget_DrawRoundedRectangle(render_target->dxgi_target, rect, brush, stroke_width, stroke_style);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_FillRoundedRectangle(ID2D1DCRenderTarget *iface,
+ const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush);
+
+ ID2D1RenderTarget_FillRoundedRectangle(render_target->dxgi_target, rect, brush);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawEllipse(ID2D1DCRenderTarget *iface,
+ const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, ellipse %p, brush %p, stroke_width %.8e, stroke_style %p.\n",
+ iface, ellipse, brush, stroke_width, stroke_style);
+
+ ID2D1RenderTarget_DrawEllipse(render_target->dxgi_target, ellipse, brush, stroke_width, stroke_style);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_FillEllipse(ID2D1DCRenderTarget *iface,
+ const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, ellipse %p, brush %p.\n", iface, ellipse, brush);
+
+ ID2D1RenderTarget_FillEllipse(render_target->dxgi_target, ellipse, brush);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawGeometry(ID2D1DCRenderTarget *iface,
+ ID2D1Geometry *geometry, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, geometry %p, brush %p, stroke_width %.8e, stroke_style %p.\n",
+ iface, geometry, brush, stroke_width, stroke_style);
+
+ ID2D1RenderTarget_DrawGeometry(render_target->dxgi_target, geometry, brush, stroke_width, stroke_style);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_FillGeometry(ID2D1DCRenderTarget *iface,
+ ID2D1Geometry *geometry, ID2D1Brush *brush, ID2D1Brush *opacity_brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, geometry %p, brush %p, opacity_brush %p.\n", iface, geometry, brush, opacity_brush);
+
+ ID2D1RenderTarget_FillGeometry(render_target->dxgi_target, geometry, brush, opacity_brush);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_FillMesh(ID2D1DCRenderTarget *iface,
+ ID2D1Mesh *mesh, ID2D1Brush *brush)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, mesh %p, brush %p.\n", iface, mesh, brush);
+
+ ID2D1RenderTarget_FillMesh(render_target->dxgi_target, mesh, brush);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_FillOpacityMask(ID2D1DCRenderTarget *iface,
+ ID2D1Bitmap *mask, ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content,
+ const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, mask %p, brush %p, content %#x, dst_rect %p, src_rect %p.\n",
+ iface, mask, brush, content, dst_rect, src_rect);
+
+ ID2D1RenderTarget_FillOpacityMask(render_target->dxgi_target,
+ mask, brush, content, dst_rect, src_rect);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawBitmap(ID2D1DCRenderTarget *iface,
+ ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity,
+ D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, bitmap %p, dst_rect %p, opacity %.8e, interpolation_mode %#x, src_rect %p.\n",
+ iface, bitmap, dst_rect, opacity, interpolation_mode, src_rect);
+
+ ID2D1RenderTarget_DrawBitmap(render_target->dxgi_target,
+ bitmap, dst_rect, opacity, interpolation_mode, src_rect);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawText(ID2D1DCRenderTarget *iface,
+ const WCHAR *string, UINT32 string_len, IDWriteTextFormat *text_format, const D2D1_RECT_F *layout_rect,
+ ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options, DWRITE_MEASURING_MODE measuring_mode)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, string %s, string_len %u, text_format %p, layout_rect %p, "
+ "brush %p, options %#x, measuring_mode %#x.\n",
+ iface, debugstr_wn(string, string_len), string_len, text_format, layout_rect,
+ brush, options, measuring_mode);
+
+ ID2D1RenderTarget_DrawText(render_target->dxgi_target, string, string_len,
+ text_format, layout_rect, brush, options, measuring_mode);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawTextLayout(ID2D1DCRenderTarget *iface,
+ D2D1_POINT_2F origin, IDWriteTextLayout *layout, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, origin {%.8e, %.8e}, layout %p, brush %p, options %#x.\n",
+ iface, origin.x, origin.y, layout, brush, options);
+
+ ID2D1RenderTarget_DrawTextLayout(render_target->dxgi_target, origin, layout, brush, options);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_DrawGlyphRun(ID2D1DCRenderTarget *iface,
+ D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush,
+ DWRITE_MEASURING_MODE measuring_mode)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, brush %p, measuring_mode %#x.\n",
+ iface, baseline_origin.x, baseline_origin.y, glyph_run, brush, measuring_mode);
+
+ ID2D1RenderTarget_DrawGlyphRun(render_target->dxgi_target,
+ baseline_origin, glyph_run, brush, measuring_mode);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_SetTransform(ID2D1DCRenderTarget *iface,
+ const D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ ID2D1RenderTarget_SetTransform(render_target->dxgi_target, transform);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_GetTransform(ID2D1DCRenderTarget *iface,
+ D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ ID2D1RenderTarget_GetTransform(render_target->dxgi_target, transform);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_SetAntialiasMode(ID2D1DCRenderTarget *iface,
+ D2D1_ANTIALIAS_MODE antialias_mode)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode);
+
+ ID2D1RenderTarget_SetAntialiasMode(render_target->dxgi_target, antialias_mode);
+}
+
+static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_dc_render_target_GetAntialiasMode(ID2D1DCRenderTarget *iface)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return ID2D1RenderTarget_GetAntialiasMode(render_target->dxgi_target);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_SetTextAntialiasMode(ID2D1DCRenderTarget *iface,
+ D2D1_TEXT_ANTIALIAS_MODE antialias_mode)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode);
+
+ ID2D1RenderTarget_SetTextAntialiasMode(render_target->dxgi_target, antialias_mode);
+}
+
+static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_dc_render_target_GetTextAntialiasMode(ID2D1DCRenderTarget *iface)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return ID2D1RenderTarget_GetTextAntialiasMode(render_target->dxgi_target);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_SetTextRenderingParams(ID2D1DCRenderTarget *iface,
+ IDWriteRenderingParams *text_rendering_params)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params);
+
+ ID2D1RenderTarget_SetTextRenderingParams(render_target->dxgi_target, text_rendering_params);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_GetTextRenderingParams(ID2D1DCRenderTarget *iface,
+ IDWriteRenderingParams **text_rendering_params)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params);
+
+ ID2D1RenderTarget_GetTextRenderingParams(render_target->dxgi_target, text_rendering_params);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_SetTags(ID2D1DCRenderTarget *iface, D2D1_TAG tag1, D2D1_TAG tag2)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, tag1 %s, tag2 %s.\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2));
+
+ ID2D1RenderTarget_SetTags(render_target->dxgi_target, tag1, tag2);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_GetTags(ID2D1DCRenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2);
+
+ ID2D1RenderTarget_GetTags(render_target->dxgi_target, tag1, tag2);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_PushLayer(ID2D1DCRenderTarget *iface,
+ const D2D1_LAYER_PARAMETERS *layer_parameters, ID2D1Layer *layer)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, layer_parameters %p, layer %p.\n", iface, layer_parameters, layer);
+
+ ID2D1RenderTarget_PushLayer(render_target->dxgi_target, layer_parameters, layer);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_PopLayer(ID2D1DCRenderTarget *iface)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ ID2D1RenderTarget_PopLayer(render_target->dxgi_target);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_Flush(ID2D1DCRenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+ HRESULT hr;
+
+ TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2);
+
+ hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2);
+ sync_bitmap(render_target);
+
+ return hr;
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_SaveDrawingState(ID2D1DCRenderTarget *iface,
+ ID2D1DrawingStateBlock *state_block)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, state_block %p.\n", iface, state_block);
+
+ ID2D1RenderTarget_SaveDrawingState(render_target->dxgi_target, state_block);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_RestoreDrawingState(ID2D1DCRenderTarget *iface,
+ ID2D1DrawingStateBlock *state_block)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, state_block %p.\n", iface, state_block);
+
+ ID2D1RenderTarget_RestoreDrawingState(render_target->dxgi_target, state_block);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_PushAxisAlignedClip(ID2D1DCRenderTarget *iface,
+ const D2D1_RECT_F *clip_rect, D2D1_ANTIALIAS_MODE antialias_mode)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, clip_rect %p, antialias_mode %#x.\n", iface, clip_rect, antialias_mode);
+
+ ID2D1RenderTarget_PushAxisAlignedClip(render_target->dxgi_target, clip_rect, antialias_mode);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_PopAxisAlignedClip(ID2D1DCRenderTarget *iface)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ ID2D1RenderTarget_PopAxisAlignedClip(render_target->dxgi_target);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_Clear(ID2D1DCRenderTarget *iface, const D2D1_COLOR_F *color)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, color %p.\n", iface, color);
+
+ ID2D1RenderTarget_Clear(render_target->dxgi_target, color);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_BeginDraw(ID2D1DCRenderTarget *iface)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ ID2D1RenderTarget_BeginDraw(render_target->dxgi_target);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_EndDraw(ID2D1DCRenderTarget *iface,
+ D2D1_TAG *tag1, D2D1_TAG *tag2)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+ HRESULT hr;
+
+ TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2);
+
+ if (!render_target->hdc)
+ return D2DERR_WRONG_STATE;
+
+ hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2);
+ sync_bitmap(render_target);
+
+ return hr;
+}
+
+static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_dc_render_target_GetPixelFormat(ID2D1DCRenderTarget *iface,
+ D2D1_PIXEL_FORMAT *format)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, format %p.\n", iface, format);
+
+ *format = ID2D1RenderTarget_GetPixelFormat(render_target->dxgi_target);
+ return format;
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_SetDpi(ID2D1DCRenderTarget *iface, float dpi_x, float dpi_y)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, dpi_x %.8e, dpi_y %.8e.\n", iface, dpi_x, dpi_y);
+
+ ID2D1RenderTarget_SetDpi(render_target->dxgi_target, dpi_x, dpi_y);
+}
+
+static void STDMETHODCALLTYPE d2d_dc_render_target_GetDpi(ID2D1DCRenderTarget *iface, float *dpi_x, float *dpi_y)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y);
+
+ ID2D1RenderTarget_GetDpi(render_target->dxgi_target, dpi_x, dpi_y);
+}
+
+static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_dc_render_target_GetSize(ID2D1DCRenderTarget *iface, D2D1_SIZE_F *size)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, size %p.\n", iface, size);
+
+ if (render_target->hdc)
+ *size = ID2D1RenderTarget_GetSize(render_target->dxgi_target);
+ else
+ size->width = size->height = 0.0f;
+
+ return size;
+}
+
+static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_dc_render_target_GetPixelSize(ID2D1DCRenderTarget *iface,
+ D2D1_SIZE_U *pixel_size)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, pixel_size %p.\n", iface, pixel_size);
+
+ if (render_target->hdc)
+ *pixel_size = ID2D1RenderTarget_GetPixelSize(render_target->dxgi_target);
+ else
+ pixel_size->width = pixel_size->height = 0;
+
+ return pixel_size;
+}
+
+static UINT32 STDMETHODCALLTYPE d2d_dc_render_target_GetMaximumBitmapSize(ID2D1DCRenderTarget *iface)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return ID2D1RenderTarget_GetMaximumBitmapSize(render_target->dxgi_target);
+}
+
+static BOOL STDMETHODCALLTYPE d2d_dc_render_target_IsSupported(ID2D1DCRenderTarget *iface,
+ const D2D1_RENDER_TARGET_PROPERTIES *desc)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+
+ TRACE("iface %p, desc %p.\n", iface, desc);
+
+ return ID2D1RenderTarget_IsSupported(render_target->dxgi_target, desc);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget *iface,
+ const HDC hdc, const RECT *rect)
+{
+ struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
+ D3D10_TEXTURE2D_DESC texture_desc;
+ IDXGISurface1 *dxgi_surface;
+ ID3D10Texture2D *texture;
+ ID3D10Device *device;
+ HRESULT hr;
+
+ TRACE("iface %p, hdc %p, rect %s.\n", iface, hdc, wine_dbgstr_rect(rect));
+
+ if (!hdc)
+ return E_INVALIDARG;
+
+ /* Recreate surface using specified size and original texture description. */
+ if (FAILED(hr = IDXGISurface1_QueryInterface(render_target->dxgi_surface, &IID_ID3D10Texture2D, (void **)&texture)))
+ {
+ WARN("Failed to get texture interface, hr %#x.\n", hr);
+ return hr;
+ }
+
+ ID3D10Texture2D_GetDesc(texture, &texture_desc);
+ ID3D10Texture2D_Release(texture);
+ texture_desc.Width = rect->right - rect->left;
+ texture_desc.Height = rect->bottom - rect->top;
+
+ if (FAILED(hr = IDXGISurface1_GetDevice(render_target->dxgi_surface, &IID_ID3D10Device, (void **)&device)))
+ {
+ WARN("Failed to get device from dxgi surface, hr %#x.\n", hr);
+ return hr;
+ }
+
+ hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture);
+ ID3D10Device_Release(device);
+ if (FAILED(hr))
+ {
+ WARN("Failed to create texture, hr %#x.\n", hr);
+ return hr;
+ }
+
+ hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void **)&dxgi_surface);
+ ID3D10Texture2D_Release(texture);
+ if (FAILED(hr))
+ {
+ WARN("Failed to get surface interface from a texture, hr %#x.\n", hr);
+ return hr;
+ }
+
+ /* Switch dxgi target to new surface. */
+ if (FAILED(hr = d2d_d3d_render_target_update_surface(render_target->dxgi_target, dxgi_surface)))
+ {
+ WARN("Failed to set new surface, hr %#x.\n", hr);
+ IDXGISurface1_Release(dxgi_surface);
+ return hr;
+ }
+
+ IDXGISurface1_Release(render_target->dxgi_surface);
+ render_target->dxgi_surface = dxgi_surface;
+
+ render_target->hdc = hdc;
+ render_target->dst_rect = *rect;
+
+ return hr;
+}
+
+static const struct ID2D1DCRenderTargetVtbl d2d_dc_render_target_vtbl =
+{
+ d2d_dc_render_target_QueryInterface,
+ d2d_dc_render_target_AddRef,
+ d2d_dc_render_target_Release,
+ d2d_dc_render_target_GetFactory,
+ d2d_dc_render_target_CreateBitmap,
+ d2d_dc_render_target_CreateBitmapFromWicBitmap,
+ d2d_dc_render_target_CreateSharedBitmap,
+ d2d_dc_render_target_CreateBitmapBrush,
+ d2d_dc_render_target_CreateSolidColorBrush,
+ d2d_dc_render_target_CreateGradientStopCollection,
+ d2d_dc_render_target_CreateLinearGradientBrush,
+ d2d_dc_render_target_CreateRadialGradientBrush,
+ d2d_dc_render_target_CreateCompatibleRenderTarget,
+ d2d_dc_render_target_CreateLayer,
+ d2d_dc_render_target_CreateMesh,
+ d2d_dc_render_target_DrawLine,
+ d2d_dc_render_target_DrawRectangle,
+ d2d_dc_render_target_FillRectangle,
+ d2d_dc_render_target_DrawRoundedRectangle,
+ d2d_dc_render_target_FillRoundedRectangle,
+ d2d_dc_render_target_DrawEllipse,
+ d2d_dc_render_target_FillEllipse,
+ d2d_dc_render_target_DrawGeometry,
+ d2d_dc_render_target_FillGeometry,
+ d2d_dc_render_target_FillMesh,
+ d2d_dc_render_target_FillOpacityMask,
+ d2d_dc_render_target_DrawBitmap,
+ d2d_dc_render_target_DrawText,
+ d2d_dc_render_target_DrawTextLayout,
+ d2d_dc_render_target_DrawGlyphRun,
+ d2d_dc_render_target_SetTransform,
+ d2d_dc_render_target_GetTransform,
+ d2d_dc_render_target_SetAntialiasMode,
+ d2d_dc_render_target_GetAntialiasMode,
+ d2d_dc_render_target_SetTextAntialiasMode,
+ d2d_dc_render_target_GetTextAntialiasMode,
+ d2d_dc_render_target_SetTextRenderingParams,
+ d2d_dc_render_target_GetTextRenderingParams,
+ d2d_dc_render_target_SetTags,
+ d2d_dc_render_target_GetTags,
+ d2d_dc_render_target_PushLayer,
+ d2d_dc_render_target_PopLayer,
+ d2d_dc_render_target_Flush,
+ d2d_dc_render_target_SaveDrawingState,
+ d2d_dc_render_target_RestoreDrawingState,
+ d2d_dc_render_target_PushAxisAlignedClip,
+ d2d_dc_render_target_PopAxisAlignedClip,
+ d2d_dc_render_target_Clear,
+ d2d_dc_render_target_BeginDraw,
+ d2d_dc_render_target_EndDraw,
+ d2d_dc_render_target_GetPixelFormat,
+ d2d_dc_render_target_SetDpi,
+ d2d_dc_render_target_GetDpi,
+ d2d_dc_render_target_GetSize,
+ d2d_dc_render_target_GetPixelSize,
+ d2d_dc_render_target_GetMaximumBitmapSize,
+ d2d_dc_render_target_IsSupported,
+ d2d_dc_render_target_BindDC,
+};
+
+HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID2D1Factory *factory,
+ ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc)
+{
+ D3D10_TEXTURE2D_DESC texture_desc;
+ ID3D10Texture2D *texture;
+ HRESULT hr;
+
+ render_target->ID2D1DCRenderTarget_iface.lpVtbl = &d2d_dc_render_target_vtbl;
+ render_target->refcount = 1;
+
+ /* Set with BindDC(). */
+ SetRectEmpty(&render_target->dst_rect);
+ render_target->hdc = NULL;
+
+ /* Dummy 1x1 texture, recreated on BindDC(). */
+ texture_desc.Width = 1;
+ texture_desc.Height = 1;
+ texture_desc.MipLevels = 1;
+ texture_desc.ArraySize = 1;
+
+ texture_desc.Format = desc->pixelFormat.format;
+ switch (texture_desc.Format)
+ {
+ case DXGI_FORMAT_B8G8R8A8_UNORM:
+ if (desc->pixelFormat.alphaMode == D2D1_ALPHA_MODE_PREMULTIPLIED
+ || desc->pixelFormat.alphaMode == D2D1_ALPHA_MODE_IGNORE)
+ break;
+
+ default:
+ FIXME("Unhandled format %#x, alpha mode %u.\n", texture_desc.Format, desc->pixelFormat.alphaMode);
+ return D2DERR_UNSUPPORTED_PIXEL_FORMAT;
+ }
+
+ texture_desc.SampleDesc.Count = 1;
+ texture_desc.SampleDesc.Quality = 0;
+ texture_desc.Usage = D3D10_USAGE_DEFAULT;
+ texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE;
+ texture_desc.CPUAccessFlags = 0;
+ texture_desc.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE;
+
+ if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture)))
+ {
+ WARN("Failed to create texture, hr %#x.\n", hr);
+ return hr;
+ }
+
+ hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void **)&render_target->dxgi_surface);
+ ID3D10Texture2D_Release(texture);
+ if (FAILED(hr))
+ {
+ WARN("Failed to get DXGI surface interface, hr %#x.\n", hr);
+ return hr;
+ }
+
+ if (FAILED(hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory,
+ (IDXGISurface *)render_target->dxgi_surface, desc, &render_target->dxgi_target)))
+ {
+ WARN("Failed to create DXGI surface render target, hr %#x.\n", hr);
+ IDXGISurface1_Release(render_target->dxgi_surface);
+ return hr;
+ }
+
+ return S_OK;
+}
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index d63add5..66ed25b 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -29,7 +29,7 @@ struct d2d_factory
ID2D1Factory ID2D1Factory_iface;
LONG refcount;
- ID3D10Device1 *wic_device;
+ ID3D10Device1 *device;
};
static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface)
@@ -74,8 +74,8 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface)
if (!refcount)
{
- if (factory->wic_device)
- ID3D10Device1_Release(factory->wic_device);
+ if (factory->device)
+ ID3D10Device1_Release(factory->device);
HeapFree(GetProcessHeap(), 0, factory);
}
@@ -223,11 +223,24 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor
return S_OK;
}
+static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1 **device)
+{
+ HRESULT hr = S_OK;
+
+ if (!factory->device && FAILED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, D3D10_CREATE_DEVICE_BGRA_SUPPORT,
+ D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &factory->device)))
+ WARN("Failed to create device, hr %#x.\n", hr);
+
+ *device = factory->device;
+ return hr;
+}
+
static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface,
IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target)
{
struct d2d_factory *factory = impl_from_ID2D1Factory(iface);
struct d2d_wic_render_target *object;
+ ID3D10Device1 *device;
HRESULT hr;
TRACE("iface %p, target %p, desc %p, render_target %p.\n", iface, target, desc, render_target);
@@ -235,15 +248,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
- if (!factory->wic_device && FAILED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL,
- D3D10_CREATE_DEVICE_BGRA_SUPPORT, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &factory->wic_device)))
+ if (FAILED(hr = d2d_factory_get_device(factory, &device)))
{
- WARN("Failed to create device, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
return hr;
}
- if (FAILED(hr = d2d_wic_render_target_init(object, iface, factory->wic_device, target, desc)))
+ if (FAILED(hr = d2d_wic_render_target_init(object, iface, device, target, desc)))
{
WARN("Failed to initialize render target, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
@@ -292,9 +303,30 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1
static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory *iface,
const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1DCRenderTarget **render_target)
{
- FIXME("iface %p, desc %p, render_target %p stub!\n", iface, desc, render_target);
+ struct d2d_factory *factory = impl_from_ID2D1Factory(iface);
+ struct d2d_dc_render_target *object;
+ ID3D10Device1 *device;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, desc %p, render_target %p.\n", iface, desc, render_target);
+
+ if (FAILED(hr = d2d_factory_get_device(factory, &device)))
+ return hr;
+
+ if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ if (FAILED(hr = d2d_dc_render_target_init(object, iface, device, desc)))
+ {
+ WARN("Failed to initialize render target, hr %#x.\n", hr);
+ HeapFree(GetProcessHeap(), 0, object);
+ return hr;
+ }
+
+ TRACE("Created render target %p.\n", object);
+ *render_target = &object->ID2D1DCRenderTarget_iface;
+
+ return S_OK;
}
static const struct ID2D1FactoryVtbl d2d_factory_vtbl =
diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c
index 5005840..6824e9f 100644
--- a/dlls/d2d1/render_target.c
+++ b/dlls/d2d1/render_target.c
@@ -2180,3 +2180,39 @@ err:
ID2D1Factory_Release(render_target->factory);
return hr;
}
+
+HRESULT d2d_d3d_render_target_update_surface(ID2D1RenderTarget *iface, IDXGISurface1 *surface)
+{
+ struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface);
+ DXGI_SURFACE_DESC surface_desc;
+ ID3D10RenderTargetView *view;
+ ID3D10Resource *resource;
+ HRESULT hr;
+
+ if (FAILED(hr = IDXGISurface1_GetDesc(surface, &surface_desc)))
+ {
+ WARN("Failed to get surface desc, hr %#x.\n", hr);
+ return hr;
+ }
+
+ if (FAILED(hr = IDXGISurface1_QueryInterface(surface, &IID_ID3D10Resource, (void **)&resource)))
+ {
+ WARN("Failed to get ID3D10Resource interface, hr %#x.\n", hr);
+ return hr;
+ }
+
+ hr = ID3D10Device_CreateRenderTargetView(render_target->device, resource, NULL, &view);
+ ID3D10Resource_Release(resource);
+ if (FAILED(hr))
+ {
+ WARN("Failed to create rendertarget view, hr %#x.\n", hr);
+ return hr;
+ }
+
+ render_target->pixel_size.width = surface_desc.Width;
+ render_target->pixel_size.height = surface_desc.Height;
+ ID3D10RenderTargetView_Release(render_target->view);
+ render_target->view = view;
+
+ return S_OK;
+}
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 0a81013..039650f 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -2663,6 +2663,7 @@ static void test_dc_target(void)
ID2D1Factory *factory;
FLOAT dpi_x, dpi_y;
D2D1_COLOR_F color;
+ D2D1_SIZE_U sizeu;
D2D1_SIZE_F size;
D2D1_TAG t1, t2;
unsigned int i;
@@ -2685,7 +2686,6 @@ static void test_dc_target(void)
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt);
- todo_wine
ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#x.\n", hr);
}
@@ -2697,14 +2697,16 @@ static void test_dc_target(void)
desc.usage = D2D1_RENDER_TARGET_USAGE_NONE;
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt);
-todo_wine
ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr);
-if (SUCCEEDED(hr))
-{
+
size = ID2D1DCRenderTarget_GetSize(rt);
ok(size.width == 0.0f, "got width %.08e.\n", size.width);
ok(size.height == 0.0f, "got height %.08e.\n", size.height);
+ sizeu = ID2D1DCRenderTarget_GetPixelSize(rt);
+ ok(sizeu.width == 0.0f, "got width %u.\n", sizeu.width);
+ ok(sizeu.height == 0.0f, "got height %u.\n", sizeu.height);
+
/* object creation methods work without BindDC() */
set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
@@ -2818,7 +2820,6 @@ if (SUCCEEDED(hr))
DeleteDC(hdc);
DeleteDC(hdc2);
ID2D1DCRenderTarget_Release(rt);
-}
ID2D1Factory_Release(factory);
}
--
2.9.3
More information about the wine-patches
mailing list