Henri Verbeet : d2d1: Implement d2d_factory_CreateDrawingStateBlock().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Feb 18 10:39:29 2015 +0100

d2d1: Implement d2d_factory_CreateDrawingStateBlock().

---

 dlls/d2d1/Makefile.in    |   1 +
 dlls/d2d1/d2d1_private.h |   9 ++++
 dlls/d2d1/factory.c      |  14 +++++-
 dlls/d2d1/state_block.c  | 123 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 145 insertions(+), 2 deletions(-)

diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in
index 1e829da..2828bac 100644
--- a/dlls/d2d1/Makefile.in
+++ b/dlls/d2d1/Makefile.in
@@ -8,6 +8,7 @@ C_SRCS = \
 	factory.c \
 	mesh.c \
 	render_target.c \
+	state_block.c \
 	stroke.c \
 	wic_render_target.c
 
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index 72c1c57..42694d2 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -170,4 +170,13 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target
         D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN;
 struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN;
 
+struct d2d_state_block
+{
+    ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface;
+    LONG refcount;
+};
+
+void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc,
+        IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN;
+
 #endif /* __WINE_D2D1_PRIVATE_H */
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index 27370c1..918fa13 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -165,10 +165,20 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor
         const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params,
         ID2D1DrawingStateBlock **state_block)
 {
-    FIXME("iface %p, desc %p, text_rendering_params %p, state_block %p stub!\n",
+    struct d2d_state_block *object;
+
+    TRACE("iface %p, desc %p, text_rendering_params %p, state_block %p.\n",
             iface, desc, text_rendering_params, state_block);
 
-    return E_NOTIMPL;
+    if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
+        return E_OUTOFMEMORY;
+
+    d2d_state_block_init(object, desc, text_rendering_params);
+
+    TRACE("Created state block %p.\n", object);
+    *state_block = &object->ID2D1DrawingStateBlock_iface;
+
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface,
diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
new file mode 100644
index 0000000..4aa8cd4
--- /dev/null
+++ b/dlls/d2d1/state_block.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015 Henri Verbeet 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 inline struct d2d_state_block *impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface)
+{
+    return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_state_block_QueryInterface(ID2D1DrawingStateBlock *iface, REFIID iid, void **out)
+{
+    TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+    if (IsEqualGUID(iid, &IID_ID2D1DrawingStateBlock)
+            || IsEqualGUID(iid, &IID_ID2D1Resource)
+            || IsEqualGUID(iid, &IID_IUnknown))
+    {
+        ID2D1DrawingStateBlock_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_state_block_AddRef(ID2D1DrawingStateBlock *iface)
+{
+    struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface);
+    ULONG refcount = InterlockedIncrement(&state_block->refcount);
+
+    TRACE("%p increasing refcount to %u.\n", iface, refcount);
+
+    return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *iface)
+{
+    struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface);
+    ULONG refcount = InterlockedDecrement(&state_block->refcount);
+
+    TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+
+    if (!refcount)
+        HeapFree(GetProcessHeap(), 0, state_block);
+
+    return refcount;
+}
+
+static void STDMETHODCALLTYPE d2d_state_block_GetFactory(ID2D1DrawingStateBlock *iface, ID2D1Factory **factory)
+{
+    FIXME("iface %p, factory %p stub!\n", iface, factory);
+
+    *factory = NULL;
+}
+
+static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBlock *iface,
+        D2D1_DRAWING_STATE_DESCRIPTION *desc)
+{
+    FIXME("iface %p, desc %p stub!\n", iface, desc);
+}
+
+static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBlock *iface,
+        const D2D1_DRAWING_STATE_DESCRIPTION *desc)
+{
+    FIXME("iface %p, desc %p stub!\n", iface, desc);
+}
+
+static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1DrawingStateBlock *iface,
+        IDWriteRenderingParams *text_rendering_params)
+{
+    FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params);
+}
+
+static void STDMETHODCALLTYPE d2d_state_block_GetTextRenderingParams(ID2D1DrawingStateBlock *iface,
+        IDWriteRenderingParams **text_rendering_params)
+{
+    FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params);
+}
+
+static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl =
+{
+    d2d_state_block_QueryInterface,
+    d2d_state_block_AddRef,
+    d2d_state_block_Release,
+    d2d_state_block_GetFactory,
+    d2d_state_block_GetDescription,
+    d2d_state_block_SetDescription,
+    d2d_state_block_SetTextRenderingParams,
+    d2d_state_block_GetTextRenderingParams,
+};
+
+void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc,
+        IDWriteRenderingParams *text_rendering_params)
+{
+    FIXME("Ignoring state block properties.\n");
+
+    state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl;
+    state_block->refcount = 1;
+}