diff --git a/patches/Compiler_Warnings/0003-d2d1-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0003-d2d1-Avoid-implicit-cast-of-interface-pointer.patch
index 4474420f..60a48738 100644
--- a/patches/Compiler_Warnings/0003-d2d1-Avoid-implicit-cast-of-interface-pointer.patch
+++ b/patches/Compiler_Warnings/0003-d2d1-Avoid-implicit-cast-of-interface-pointer.patch
@@ -1,4 +1,4 @@
-From ef7171d2eb01b4b8aaf8c4c608ceebd698d96e3c Mon Sep 17 00:00:00 2001
+From b0fb00cbd4ec71e184cf066a4f30002d646ceebe Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:54:26 +0100
 Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
@@ -8,11 +8,13 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
  dlls/d2d1/brush.c              |  8 ++++----
  dlls/d2d1/d2d1_private.h       |  2 +-
  dlls/d2d1/dc_render_target.c   |  2 +-
+ dlls/d2d1/device.c             |  2 +-
+ dlls/d2d1/effect.c             | 10 +++++-----
  dlls/d2d1/geometry.c           | 12 ++++++------
  dlls/d2d1/hwnd_render_target.c |  2 +-
  dlls/d2d1/state_block.c        |  2 +-
  dlls/d2d1/stroke.c             |  2 +-
- 8 files changed, 16 insertions(+), 16 deletions(-)
+ 10 files changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
 index e5048611519..8e031290528 100644
@@ -66,10 +68,10 @@ index 75cd72b5b9f..314123373b7 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface,
 diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
-index c0ac5ba9a44..e171c1c6bd8 100644
+index 58507fd2c0b..c2c7026052c 100644
 --- a/dlls/d2d1/d2d1_private.h
 +++ b/dlls/d2d1/d2d1_private.h
-@@ -697,7 +697,7 @@ struct d2d_factory
+@@ -702,7 +702,7 @@ struct d2d_factory
  
  static inline struct d2d_factory *unsafe_impl_from_ID2D1Factory(ID2D1Factory *iface)
  {
@@ -91,6 +93,57 @@ index aa0c715baa5..31389b15cf8 100644
  }
  
  static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
+diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
+index 75da15c99a5..cf2fb530466 100644
+--- a/dlls/d2d1/device.c
++++ b/dlls/d2d1/device.c
+@@ -4516,7 +4516,7 @@ struct d2d_device *unsafe_impl_from_ID2D1Device(ID2D1Device1 *iface)
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (ID2D1Device1Vtbl *)&d2d_device_vtbl);
+-    return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device6_iface);
++    return CONTAINING_RECORD((ID2D1Device6*)iface, struct d2d_device, ID2D1Device6_iface);
+ }
+ 
+ void d2d_device_init(struct d2d_device *device, struct d2d_factory *factory, IDXGIDevice *dxgi_device)
+diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c
+index cebc492d895..a5e33c0ad9b 100644
+--- a/dlls/d2d1/effect.c
++++ b/dlls/d2d1/effect.c
+@@ -22,28 +22,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
+ 
+ static inline struct d2d_transform *impl_from_ID2D1OffsetTransform(ID2D1OffsetTransform *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface);
++    return CONTAINING_RECORD((ID2D1TransformNode*)iface, struct d2d_transform, ID2D1TransformNode_iface);
+ }
+ 
+ static inline struct d2d_transform *impl_from_ID2D1BlendTransform(ID2D1BlendTransform *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface);
++    return CONTAINING_RECORD((ID2D1TransformNode*)iface, struct d2d_transform, ID2D1TransformNode_iface);
+ }
+ 
+ static inline struct d2d_transform *impl_from_ID2D1BorderTransform(ID2D1BorderTransform *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface);
++    return CONTAINING_RECORD((ID2D1TransformNode*)iface, struct d2d_transform, ID2D1TransformNode_iface);
+ }
+ 
+ static inline struct d2d_transform *impl_from_ID2D1BoundsAdjustmentTransform(
+         ID2D1BoundsAdjustmentTransform *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_transform, ID2D1TransformNode_iface);
++    return CONTAINING_RECORD((ID2D1TransformNode*)iface, struct d2d_transform, ID2D1TransformNode_iface);
+ }
+ 
+ static inline struct d2d_vertex_buffer *impl_from_ID2D1VertexBuffer(ID2D1VertexBuffer *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_vertex_buffer, ID2D1VertexBuffer_iface);
++    return CONTAINING_RECORD((ID2D1VertexBuffer*)iface, struct d2d_vertex_buffer, ID2D1VertexBuffer_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_vertex_buffer_QueryInterface(ID2D1VertexBuffer *iface,
 diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
 index 3da3ad2e65b..849a2cd2762 100644
 --- a/dlls/d2d1/geometry.c