Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetPixelFormat().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a4bcae0bf77c86e4a55029f5b8ea81be03cd1ec2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a4bcae0bf77c86e4a55029f5b8...

Author: Henri Verbeet 
Date:   Tue Jul 21 08:39:09 2015 +0200

d2d1: Implement d2d_d3d_render_target_GetPixelFormat().

---

dlls/d2d1/d2d1_private.h  | 1 +
 dlls/d2d1/render_target.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index 377c72a..0c564fa 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -79,6 +79,7 @@ struct d2d_d3d_render_target
     D2D1_DRAWING_STATE_DESCRIPTION drawing_state;
     IDWriteRenderingParams *text_rendering_params;

+    D2D1_PIXEL_FORMAT format;
     D2D1_SIZE_U pixel_size;
     struct d2d_clip_stack clip_stack;
     float dpi_x;
diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c
index 736e062..e939fef 100644
--- a/dlls/d2d1/render_target.c
+++ b/dlls/d2d1/render_target.c
@@ -1182,10 +1182,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget
 static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface,
         D2D1_PIXEL_FORMAT *format)
 {
-    FIXME("iface %p, format %p stub!\n", iface, format);
+    struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface);
+
+    TRACE("iface %p, format %p.\n", iface, format);

-    format->format = DXGI_FORMAT_UNKNOWN;
-    format->alphaMode = D2D1_ALPHA_MODE_UNKNOWN;
+    *format = render_target->format;
     return format;
 }

@@ -1784,6 +1785,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target,
         goto err;
     }

+    render_target->format = desc->pixelFormat;
     render_target->pixel_size.width = surface_desc.Width;
     render_target->pixel_size.height = surface_desc.Height;
     render_target->drawing_state.transform = identity;