From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/d2d1/bitmap.c | 10 ++++++---- dlls/d2d1/d2d1_private.h | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index e07987ae5fa..c6ab60c1bc4 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -158,7 +158,8 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap1 *iface, ID3D11Device *device; D3D11_BOX box;
- TRACE("iface %p, dst_point %p, bitmap %p, src_rect %p.\n", iface, dst_point, bitmap, src_rect); + TRACE("iface %p, dst_point %s, bitmap %p, src_rect %s.\n", iface, + debug_d2d_point_2u(dst_point), bitmap, debug_d2d_rect_u(src_rect));
if (src_rect) { @@ -189,8 +190,8 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap1 *i ID2D1Image *target = NULL; HRESULT hr;
- TRACE("iface %p, dst_point %p, render_target %p, src_rect %s.\n", iface, dst_point, - render_target, debug_d2d_rect_u(src_rect)); + TRACE("iface %p, dst_point %s, render_target %p, src_rect %s.\n", iface, + debug_d2d_point_2u(dst_point), render_target, debug_d2d_rect_u(src_rect));
if (FAILED(hr = ID2D1RenderTarget_QueryInterface(render_target, &IID_ID2D1DeviceContext, (void **)&device_context))) @@ -224,7 +225,8 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, ID3D11Device *device; D3D11_BOX box;
- TRACE("iface %p, dst_rect %p, src_data %p, pitch %u.\n", iface, dst_rect, src_data, pitch); + TRACE("iface %p, dst_rect %s, src_data %p, pitch %u.\n", iface, debug_d2d_rect_u(dst_rect), + src_data, pitch);
if (dst_rect) { diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 473ca763374..24116bbe41a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -1037,6 +1037,13 @@ static inline const char *debug_d2d_point_2l(const D2D1_POINT_2L *point) return wine_dbg_sprintf("{%ld, %ld}", point->x, point->y); }
+static inline const char *debug_d2d_point_2u(const D2D1_POINT_2U *point) +{ + if (!point) + return "(null)"; + return wine_dbg_sprintf("{%u, %u}", point->x, point->y); +} + static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) { if (!rect)