[PATCH 3/5] d2d1: Implement d2d_state_block_GetFactory().
Henri Verbeet
hverbeet at codeweavers.com
Fri Jul 31 02:46:30 CDT 2015
---
dlls/d2d1/d2d1_private.h | 5 +++--
dlls/d2d1/factory.c | 2 +-
dlls/d2d1/state_block.c | 12 ++++++++----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index cf98ff8..3c49c7b 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -200,12 +200,13 @@ struct d2d_state_block
ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface;
LONG refcount;
+ ID2D1Factory *factory;
D2D1_DRAWING_STATE_DESCRIPTION drawing_state;
IDWriteRenderingParams *text_rendering_params;
};
-void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc,
- IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN;
+void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *factory,
+ const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN;
struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) DECLSPEC_HIDDEN;
enum d2d_geometry_state
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index b2d5dd0..ae40b1f 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -199,7 +199,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
- d2d_state_block_init(object, desc, text_rendering_params);
+ d2d_state_block_init(object, iface, desc, text_rendering_params);
TRACE("Created state block %p.\n", object);
*state_block = &object->ID2D1DrawingStateBlock_iface;
diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
index 83fd162..90195fe 100644
--- a/dlls/d2d1/state_block.c
+++ b/dlls/d2d1/state_block.c
@@ -68,6 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i
{
if (state_block->text_rendering_params)
IDWriteRenderingParams_Release(state_block->text_rendering_params);
+ ID2D1Factory_Release(state_block->factory);
HeapFree(GetProcessHeap(), 0, state_block);
}
@@ -76,9 +77,11 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i
static void STDMETHODCALLTYPE d2d_state_block_GetFactory(ID2D1DrawingStateBlock *iface, ID2D1Factory **factory)
{
- FIXME("iface %p, factory %p stub!\n", iface, factory);
+ struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface);
+
+ TRACE("iface %p, factory %p.\n", iface, factory);
- *factory = NULL;
+ ID2D1Factory_AddRef(*factory = state_block->factory);
}
static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBlock *iface,
@@ -138,8 +141,8 @@ static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl =
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)
+void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *factory,
+ const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params)
{
static const D2D1_MATRIX_3X2_F identity =
{
@@ -150,6 +153,7 @@ void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWIN
state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl;
state_block->refcount = 1;
+ ID2D1Factory_AddRef(state_block->factory = factory);
if (desc)
state_block->drawing_state = *desc;
else
--
2.1.4
More information about the wine-patches
mailing list