[PATCH v2 7/8] d2d1: Add a d3d device reference to effect context.

[Ziqing Hui]

Signed-off-by: Ziqing Hui <zhui at codeweavers.com>
---
 dlls/d2d1/d2d1_private.h | 3 ++-
 dlls/d2d1/device.c       | 2 +-
 dlls/d2d1/effect.c       | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index 8f8ffc5fd0e..8b7b0b7a3d5 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -575,10 +575,11 @@ struct d2d_effect_context
 
     ID2D1Factory *factory;
     ID2D1DeviceContext *device_context;
+    ID3D11Device1 *d3d_device;
 };
 
 void d2d_effect_context_init(struct d2d_effect_context *effect_context,
-        ID2D1DeviceContext *device_context) DECLSPEC_HIDDEN;
+        struct d2d_device_context *device_context) DECLSPEC_HIDDEN;
 
 struct d2d_effect_info
 {
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 03195c8c557..80badcddaac 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1897,7 +1897,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont
 
     if (!(effect_context = heap_alloc_zero(sizeof(*effect_context))))
         return E_OUTOFMEMORY;
-    d2d_effect_context_init(effect_context, iface);
+    d2d_effect_context_init(effect_context, context);
 
     hr = ID2D1EffectContext_CreateEffect(&effect_context->ID2D1EffectContext_iface, effect_id, effect);
 
diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c
index 566a4cf1523..60597919c91 100644
--- a/dlls/d2d1/effect.c
+++ b/dlls/d2d1/effect.c
@@ -37,6 +37,7 @@ static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1Effec
 
 static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context)
 {
+    ID3D11Device1_Release(effect_context->d3d_device);
     ID2D1DeviceContext_Release(effect_context->device_context);
     ID2D1Factory_Release(effect_context->factory);
 }
@@ -307,12 +308,13 @@ static const ID2D1EffectContextVtbl d2d_effect_context_vtbl =
     d2d_effect_context_IsBufferPrecisionSupported,
 };
 
-void d2d_effect_context_init(struct d2d_effect_context *effect_context, ID2D1DeviceContext *device_context)
+void d2d_effect_context_init(struct d2d_effect_context *effect_context, struct d2d_device_context *device_context)
 {
     effect_context->ID2D1EffectContext_iface.lpVtbl = &d2d_effect_context_vtbl;
     effect_context->refcount = 1;
-    ID2D1DeviceContext_GetFactory(device_context, &effect_context->factory);
-    ID2D1DeviceContext_AddRef(effect_context->device_context = device_context);
+    ID2D1Factory_AddRef(effect_context->factory = device_context->factory);
+    ID2D1DeviceContext_AddRef(effect_context->device_context = &device_context->ID2D1DeviceContext_iface);
+    ID3D11Device1_AddRef(effect_context->d3d_device = device_context->d3d_device);
 }
 
 static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface)
-- 
2.25.1