Release 1.9.11.

The patchset was initially added for 64-bit MSYS2, however it seems to
break various other applications. Disable it until a better solution is
found.

patches/Compiler_Warnings/0002-dsound-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,26 @@
+From de9dbd542143b13741886c3e4b9f96ffcbfaa432 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 16 Mar 2016 05:46:33 +0100
+Subject: dsound: Avoid implicit cast of interface pointer.
+
+Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
+---
+ dlls/dsound/primary.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
+index 3f8a478..6f280f8 100644
+--- a/dlls/dsound/primary.c
++++ b/dlls/dsound/primary.c
+@@ -626,7 +626,7 @@ out:
+ static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer(IDirectSoundBuffer *iface)
+ {
+     /* IDirectSoundBuffer and IDirectSoundBuffer8 use the same iface. */
+-    return CONTAINING_RECORD(iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface);
++    return CONTAINING_RECORD((IDirectSoundBuffer8 *)iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface);
+ }
+ 
+ /* This sets this format for the primary buffer only */
+-- 
+2.7.1
+

patches/Compiler_Warnings/0003-amstream-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From 83d96cdd81553544c79527c2aed329e96938af64 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:54:01 +0100
+Subject: amstream: Avoid implicit cast of interface pointer.
+
+---
+ dlls/amstream/mediastreamfilter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c
+index d0c6714..3f0397a 100644
+--- a/dlls/amstream/mediastreamfilter.c
++++ b/dlls/amstream/mediastreamfilter.c
+@@ -70,7 +70,7 @@ typedef struct {
+ 
+ static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface)
+ {
+-    return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter);
++    return CONTAINING_RECORD((IBaseFilter *)iface, IMediaStreamFilterImpl, filter.IBaseFilter_iface);
+ }
+ 
+ static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt)
+-- 
+2.7.1
+

patches/Compiler_Warnings/0004-d2d1-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,75 @@
+From 929eaf5dcdca040cd82141ad5ddfdcbc6c5f4a03 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:54:26 +0100
+Subject: d2d1: Avoid implicit cast of interface pointer.
+
+---
+ dlls/d2d1/brush.c    | 6 +++---
+ dlls/d2d1/geometry.c | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
+index aa92318..19b0993 100644
+--- a/dlls/d2d1/brush.c
++++ b/dlls/d2d1/brush.c
+@@ -181,7 +181,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
+ 
+ static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
++    return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface,
+@@ -318,7 +318,7 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
+ 
+ static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
++    return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface,
+@@ -476,7 +476,7 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1Factory *facto
+ 
+ static inline struct d2d_brush *impl_from_ID2D1BitmapBrush(ID2D1BitmapBrush *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
++    return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush *iface,
+diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
+index 9fa1783..125c610 100644
+--- a/dlls/d2d1/geometry.c
++++ b/dlls/d2d1/geometry.c
+@@ -2022,7 +2022,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
+ 
+ static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
++    return CONTAINING_RECORD((ID2D1Geometry *)iface, struct d2d_geometry, ID2D1Geometry_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
+@@ -2283,7 +2283,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
+ 
+ static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
++    return CONTAINING_RECORD((ID2D1Geometry *)iface, struct d2d_geometry, ID2D1Geometry_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface,
+@@ -2531,7 +2531,7 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory
+ 
+ static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
++    return CONTAINING_RECORD((ID2D1Geometry *)iface, struct d2d_geometry, ID2D1Geometry_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface,
+-- 
+2.7.1
+

patches/Compiler_Warnings/0005-d3d11-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,23 @@
+From 71e593294e868bafa0b0b45c2694d7c0dceb0d64 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:54:48 +0100
+Subject: d3d11: Avoid implicit cast of interface pointer.
+
+---
+ dlls/d3d11/view.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
+index 1d9b766..78fc1ad 100644
+--- a/dlls/d3d11/view.c
++++ b/dlls/d3d11/view.c
+@@ -1559,5 +1559,5 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D1
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (ID3D10ShaderResourceViewVtbl *)&d3d10_shader_resource_view_vtbl);
+-    return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView1_iface);
++    return CONTAINING_RECORD((ID3D10ShaderResourceView1 *)iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView1_iface);
+ }
+-- 
+2.7.1
+

patches/Compiler_Warnings/0006-d3d8-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,37 @@
+From 0913c58ca5a15868fa72c883d46db1f0038a2e22 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:55:00 +0100
+Subject: d3d8: Avoid implicit cast of interface pointer.
+
+---
+ dlls/d3d8/texture.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
+index 7ed79a5..62463ba 100644
+--- a/dlls/d3d8/texture.c
++++ b/dlls/d3d8/texture.c
+@@ -23,17 +23,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
+ 
+ static inline struct d3d8_texture *impl_from_IDirect3DTexture8(IDirect3DTexture8 *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
++    return CONTAINING_RECORD((IDirect3DBaseTexture8 *)iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
+ }
+ 
+ static inline struct d3d8_texture *impl_from_IDirect3DCubeTexture8(IDirect3DCubeTexture8 *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
++    return CONTAINING_RECORD((IDirect3DBaseTexture8 *)iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
+ }
+ 
+ static inline struct d3d8_texture *impl_from_IDirect3DVolumeTexture8(IDirect3DVolumeTexture8 *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
++    return CONTAINING_RECORD((IDirect3DBaseTexture8 *)iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
+ }
+ 
+ static HRESULT WINAPI d3d8_texture_2d_QueryInterface(IDirect3DTexture8 *iface, REFIID riid, void **out)
+-- 
+2.7.1
+

patches/Compiler_Warnings/0007-d3d9-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,37 @@
+From cd3c63b259a711abf4e6e06f975e47f82b5b3e1b Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:55:12 +0100
+Subject: d3d9: Avoid implicit cast of interface pointer.
+
+---
+ dlls/d3d9/texture.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
+index 07bd83e..4e50093 100644
+--- a/dlls/d3d9/texture.c
++++ b/dlls/d3d9/texture.c
+@@ -25,17 +25,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
+ 
+ static inline struct d3d9_texture *impl_from_IDirect3DTexture9(IDirect3DTexture9 *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
++    return CONTAINING_RECORD((IDirect3DBaseTexture9 *)iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
+ }
+ 
+ static inline struct d3d9_texture *impl_from_IDirect3DCubeTexture9(IDirect3DCubeTexture9 *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
++    return CONTAINING_RECORD((IDirect3DBaseTexture9 *)iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
+ }
+ 
+ static inline struct d3d9_texture *impl_from_IDirect3DVolumeTexture9(IDirect3DVolumeTexture9 *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
++    return CONTAINING_RECORD((IDirect3DBaseTexture9 *)iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
+ }
+ 
+ static HRESULT WINAPI d3d9_texture_2d_QueryInterface(IDirect3DTexture9 *iface, REFIID riid, void **out)
+-- 
+2.7.1
+

patches/Compiler_Warnings/0008-ddraw-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,34 @@
+From ff2e84fd4c6c12b5e9e6c9d793b71159295b1e01 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:58:30 +0100
+Subject: ddraw: Avoid implicit cast of interface pointer.
+
+---
+ dlls/ddraw/viewport.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
+index 5ebc41e..4f61d10 100644
+--- a/dlls/ddraw/viewport.c
++++ b/dlls/ddraw/viewport.c
+@@ -1121,7 +1121,7 @@ struct d3d_viewport *unsafe_impl_from_IDirect3DViewport2(IDirect3DViewport2 *ifa
+     /* IDirect3DViewport and IDirect3DViewport3 use the same iface. */
+     if (!iface) return NULL;
+     assert(iface->lpVtbl == (IDirect3DViewport2Vtbl *)&d3d_viewport_vtbl);
+-    return CONTAINING_RECORD(iface, struct d3d_viewport, IDirect3DViewport3_iface);
++    return CONTAINING_RECORD((IDirect3DViewport3 *)iface, struct d3d_viewport, IDirect3DViewport3_iface);
+ }
+ 
+ struct d3d_viewport *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface)
+@@ -1129,7 +1129,7 @@ struct d3d_viewport *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface
+     /* IDirect3DViewport and IDirect3DViewport3 use the same iface. */
+     if (!iface) return NULL;
+     assert(iface->lpVtbl == (IDirect3DViewportVtbl *)&d3d_viewport_vtbl);
+-    return CONTAINING_RECORD(iface, struct d3d_viewport, IDirect3DViewport3_iface);
++    return CONTAINING_RECORD((IDirect3DViewport3 *)iface, struct d3d_viewport, IDirect3DViewport3_iface);
+ }
+ 
+ void d3d_viewport_init(struct d3d_viewport *viewport, struct ddraw *ddraw)
+-- 
+2.7.1
+

patches/Compiler_Warnings/0009-dwrite-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From 869fbc7190eb77e027be4bcd98d938198189c3dd Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:58:40 +0100
+Subject: dwrite: Avoid implicit cast of interface pointer.
+
+---
+ dlls/dwrite/layout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
+index 38b5e32..24f4abc 100644
+--- a/dlls/dwrite/layout.c
++++ b/dlls/dwrite/layout.c
+@@ -5115,7 +5115,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+ static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
+ {
+     return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
+-        CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL;
++        CONTAINING_RECORD((IDWriteTextFormat2 *)iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL;
+ }
+ 
+ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
+-- 
+2.7.1
+

patches/Compiler_Warnings/0010-msxml3-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From 665373effeadbf44f75dd15b6ea27ebec0fd7190 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 22:28:09 +0100
+Subject: msxml3: Avoid implicit cast of interface pointer.
+
+---
+ dlls/msxml3/schema.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
+index f92130a..03d24b2 100644
+--- a/dlls/msxml3/schema.c
++++ b/dlls/msxml3/schema.c
+@@ -809,7 +809,7 @@ static inline schema_cache* impl_from_IXMLDOMSchemaCollection2(IXMLDOMSchemaColl
+ 
+ static inline schema_cache* impl_from_IXMLDOMSchemaCollection(IXMLDOMSchemaCollection* iface)
+ {
+-    return CONTAINING_RECORD(iface, schema_cache, IXMLDOMSchemaCollection2_iface);
++    return CONTAINING_RECORD((IXMLDOMSchemaCollection2 *)iface, schema_cache, IXMLDOMSchemaCollection2_iface);
+ }
+ 
+ static inline schema_cache* unsafe_impl_from_IXMLDOMSchemaCollection(IXMLDOMSchemaCollection *iface)
+-- 
+2.7.1
+

patches/Compiler_Warnings/0011-oleaut32-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From 60ab37cc3ba6cb771fccc187ea87b669ac83dc80 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 22:28:23 +0100
+Subject: oleaut32: Avoid implicit cast of interface pointer.
+
+---
+ dlls/oleaut32/oleaut.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
+index 742e63f..8dae150 100644
+--- a/dlls/oleaut32/oleaut.c
++++ b/dlls/oleaut32/oleaut.c
+@@ -117,7 +117,7 @@ static inline size_t bstr_alloc_size(size_t size)
+ 
+ static inline bstr_t *bstr_from_str(BSTR str)
+ {
+-    return CONTAINING_RECORD(str, bstr_t, u.str);
++    return CONTAINING_RECORD((void *)str, bstr_t, u.str);
+ }
+ 
+ static inline bstr_cache_entry_t *get_cache_entry_from_idx(unsigned cache_idx)
+-- 
+2.7.1
+

patches/Compiler_Warnings/0012-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From e35d665256d08ebccee30361867ba57f790d519f Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 23:01:32 +0100
+Subject: rpcrt4: Avoid implicit cast of interface pointer.
+
+---
+ dlls/rpcrt4/cstub.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c
+index 838ed03..992c235 100644
+--- a/dlls/rpcrt4/cstub.c
++++ b/dlls/rpcrt4/cstub.c
+@@ -59,7 +59,7 @@ typedef struct
+ 
+ static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface )
+ {
+-    return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer);
++    return CONTAINING_RECORD((void *)iface, cstdstubbuffer_delegating_t, stub_buffer);
+ }
+ 
+ HRESULT CStdStubBuffer_Construct(REFIID riid,
+-- 
+2.7.1
+

patches/Compiler_Warnings/0013-vbscript-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From 1806798cf9b186d2c788f5a94074d0d6fa426f9e Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 23:01:48 +0100
+Subject: vbscript: Avoid implicit cast of interface pointer.
+
+---
+ dlls/vbscript/vbdisp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
+index 9c0c4c1..daed7ec 100644
+--- a/dlls/vbscript/vbdisp.c
++++ b/dlls/vbscript/vbdisp.c
+@@ -555,7 +555,7 @@ static IDispatchExVtbl DispatchExVtbl = {
+ static inline vbdisp_t *unsafe_impl_from_IDispatch(IDispatch *iface)
+ {
+     return iface->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl
+-        ? CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface)
++        ? CONTAINING_RECORD((IDispatchEx *)iface, vbdisp_t, IDispatchEx_iface)
+         : NULL;
+ }
+ 
+-- 
+2.7.1
+

patches/Compiler_Warnings/0014-include-Check-element-type-in-CONTAINING_RECORD-and-.patch

@@ -0,0 +1,76 @@
+From 59f0bb786dc3ec4e77cb43ea4410743ecd317bbf Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 23:08:30 +0100
+Subject: include: Check element type in CONTAINING_RECORD and similar macros.
+
+---
+ include/wine/list.h   | 10 ++++++++--
+ include/wine/rbtree.h | 10 ++++++++--
+ include/winnt.h       | 10 ++++++++--
+ 3 files changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/include/wine/list.h b/include/wine/list.h
+index b4d681f..287ad39 100644
+--- a/include/wine/list.h
++++ b/include/wine/list.h
+@@ -228,7 +228,13 @@ static inline void list_move_head( struct list *dst, struct list *src )
+ 
+ /* get pointer to object containing list element */
+ #undef LIST_ENTRY
+-#define LIST_ENTRY(elem, type, field) \
+-    ((type *)((char *)(elem) - offsetof(type, field)))
++#ifdef __GNUC__
++# define LIST_ENTRY(elem, type, field) ({               \
++     const typeof(((type *)0)->field) *__ptr = (elem);  \
++     (type *)((char *)__ptr - offsetof(type, field)); })
++#else
++# define LIST_ENTRY(elem, type, field) \
++     ((type *)((char *)(elem) - offsetof(type, field)))
++#endif
+ 
+ #endif  /* __WINE_SERVER_LIST_H */
+diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
+index 13452d9..554d239 100644
+--- a/include/wine/rbtree.h
++++ b/include/wine/rbtree.h
+@@ -22,8 +22,14 @@
+ #ifndef __WINE_WINE_RBTREE_H
+ #define __WINE_WINE_RBTREE_H
+ 
+-#define WINE_RB_ENTRY_VALUE(element, type, field) \
+-    ((type *)((char *)(element) - offsetof(type, field)))
++#ifdef __GNUC__
++# define WINE_RB_ENTRY_VALUE(element, type, field) ({       \
++     const typeof(((type *)0)->field) *__ptr = (element);   \
++     (type *)((char *)__ptr - offsetof(type, field)); })
++#else
++# define WINE_RB_ENTRY_VALUE(element, type, field) \
++     ((type *)((char *)(element) - offsetof(type, field)))
++#endif
+ 
+ struct wine_rb_entry
+ {
+diff --git a/include/winnt.h b/include/winnt.h
+index 559a719..4a711f4 100644
+--- a/include/winnt.h
++++ b/include/winnt.h
+@@ -753,8 +753,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+ 
+ #define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field))
+ 
+-#define CONTAINING_RECORD(address, type, field) \
+-  ((type *)((PCHAR)(address) - offsetof(type, field)))
++#ifdef __GNUC__
++# define CONTAINING_RECORD(address, type, field) ({     \
++   const typeof(((type *)0)->field) *__ptr = (address); \
++   (type *)((PCHAR)__ptr - offsetof(type, field)); })
++#else
++# define CONTAINING_RECORD(address, type, field) \
++   ((type *)((PCHAR)(address) - offsetof(type, field)))
++#endif
+ 
+ /* Types */
+ 
+-- 
+2.7.1
+

patches/Staging/0004-loader-Add-commandline-option-check-libs.patch

@@ -1,16 +1,16 @@
-From e71a6c24c41e3d390a81aac1986938a1db71f9e6 Mon Sep 17 00:00:00 2001
+From 41863fd8fdf3a885efa93359a538e4e74258fb30 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 28 May 2014 19:50:51 +0200
 Subject: loader: Add commandline option --check-libs.
 
 ---
  include/wine/library.h |   2 +
- libs/wine/config.c     | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
- libs/wine/loader.c     |  36 ++++++++++++++++
+ libs/wine/config.c     | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libs/wine/loader.c     |  36 ++++++++++++++
  libs/wine/wine.def     |   2 +
  libs/wine/wine.map     |   2 +
- loader/main.c          |  50 +++++++++++++++++++++-
- 6 files changed, 203 insertions(+), 1 deletion(-)
+ loader/main.c          |  50 +++++++++++++++++++-
+ 6 files changed, 215 insertions(+), 1 deletion(-)
 
 diff --git a/include/wine/library.h b/include/wine/library.h
 index fae73fe..7395a11 100644
@@ -33,14 +33,17 @@ index fae73fe..7395a11 100644
  extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
  extern int wine_dlclose( void *handle, char *error, size_t errorsize );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 5262c76..7acf51b 100644
+index 12f4a67..be9f401 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -444,6 +444,118 @@ const char *wine_get_build_dir(void)
+@@ -443,6 +443,130 @@ const char *wine_get_build_dir(void)
      return build_dir;
  }
  
 +const char *wine_libs[] = {
++#ifdef SONAME_LIBCAIRO
++    SONAME_LIBCAIRO,
++#endif
 +#ifdef SONAME_LIBCAPI20
 +    SONAME_LIBCAPI20,
 +#endif
@@ -65,9 +68,15 @@ index 5262c76..7acf51b 100644
 +#ifdef SONAME_LIBGNUTLS
 +    SONAME_LIBGNUTLS,
 +#endif
++#ifdef SONAME_LIBGOBJECT_2_0
++    SONAME_LIBGOBJECT_2_0,
++#endif
 +#ifdef SONAME_LIBGSM
 +    SONAME_LIBGSM,
 +#endif
++#ifdef SONAME_LIBGTK_3
++    SONAME_LIBGTK_3,
++#endif
 +#ifdef SONAME_LIBHAL
 +    SONAME_LIBHAL,
 +#endif
@@ -116,6 +125,9 @@ index 5262c76..7acf51b 100644
 +#ifdef SONAME_LIBX11
 +    SONAME_LIBX11,
 +#endif
++#ifdef SONAME_LIBX11_XCB
++    SONAME_LIBX11_XCB,
++#endif
 +#ifdef SONAME_LIBXCOMPOSITE
 +    SONAME_LIBXCOMPOSITE,
 +#endif
@@ -156,10 +168,10 @@ index 5262c76..7acf51b 100644
  const char *wine_get_server_dir(void)
  {
 diff --git a/libs/wine/loader.c b/libs/wine/loader.c
-index 3591ede..2718857 100644
+index b5b32cc..1453a82 100644
 --- a/libs/wine/loader.c
 +++ b/libs/wine/loader.c
-@@ -1043,6 +1043,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
+@@ -1041,6 +1041,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
  }
  
  /***********************************************************************
@@ -243,7 +255,7 @@ index 7cb2918..72ffed8 100644
      wine_get_sortkey;
      wine_get_ss;
 diff --git a/loader/main.c b/loader/main.c
-index fa0efa2..e96363d 100644
+index 343ea26..44804e1 100644
 --- a/loader/main.c
 +++ b/loader/main.c
 @@ -36,6 +36,12 @@
@@ -318,5 +330,5 @@ index fa0efa2..e96363d 100644
  
  
 -- 
-2.3.1
+2.7.1
 

patches/amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch

@@ -1,88 +0,0 @@
-From 4d0e6bbc00bd49b8dcfce494bd7380c49f58f92b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 28 Jul 2015 18:21:20 +0200
-Subject: amstream: Implement IAMMediaStream::GetMultiMediaStream.
-
----
- dlls/amstream/mediastream.c | 40 ++++++++++++++++++++++++++++++++--------
- 1 file changed, 32 insertions(+), 8 deletions(-)
-
-diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
-index 947be1e..e4e15d7 100644
---- a/dlls/amstream/mediastream.c
-+++ b/dlls/amstream/mediastream.c
-@@ -110,9 +110,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre
- {
-     DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface);
- 
--    FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
-+    TRACE("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
- 
--    return S_FALSE;
-+    if (!multi_media_stream)
-+        return E_POINTER;
-+
-+    IMultiMediaStream_AddRef(This->parent);
-+    *multi_media_stream = This->parent;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
-@@ -271,9 +277,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiM
- {
-     DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
- 
--    FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
-+    TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
- 
--    return S_FALSE;
-+    if (!ppMultiMediaStream)
-+        return E_POINTER;
-+
-+    IMultiMediaStream_AddRef(This->parent);
-+    *ppMultiMediaStream = This->parent;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface,
-@@ -511,9 +523,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA
- {
-     AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface);
- 
--    FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
-+    TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
- 
--    return S_FALSE;
-+    if (!multi_media_stream)
-+        return E_POINTER;
-+
-+    IMultiMediaStream_AddRef(This->parent);
-+    *multi_media_stream = This->parent;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
-@@ -672,9 +690,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream
- {
-     AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
- 
--    FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream);
-+    TRACE("(%p/%p)->(%p)\n", iface, This, multimedia_stream);
- 
--    return S_FALSE;
-+    if (!multimedia_stream)
-+        return E_POINTER;
-+
-+    IMultiMediaStream_AddRef(This->parent);
-+    *multimedia_stream = This->parent;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface,
--- 
-2.4.5
-

patches/amstream-GetMultiMediaStream/definition

@@ -1 +0,0 @@
-Fixes: [37090] Implement AMStream GetMultiMediaStream functions

patches/api-ms-win-Stub_DLLs/0020-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 1ab24ab7e6d2ef9915e7881bc36853edfc52d1ee Mon Sep 17 00:00:00 2001
+From 06fc57e35f3424d17d8e3cb61692d594691674f4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:10:37 +0100
 Subject: ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
@@ -33,12 +33,12 @@ index 0000000..18a0b1f
 +MODULE    = ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll
 diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec
 new file mode 100644
-index 0000000..9d2af72
+index 0000000..ffb8f5b
 --- /dev/null
 +++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec
 @@ -0,0 +1,20 @@
 +@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW
-+@ stub DisplayConfigGetDeviceInfo
++@ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo
 +@ stub DisplayConfigSetDeviceInfo
 +@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW
 +@ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors
@@ -48,20 +48,20 @@ index 0000000..9d2af72
 +@ stdcall GetMonitorInfoW(long ptr) user32.GetMonitorInfoW
 +@ stdcall GetSysColor(long) user32.GetSysColor
 +@ stdcall GetSystemMetrics(long) user32.GetSystemMetrics
-+@ stub IsProcessDPIAware
++@ stdcall IsProcessDPIAware() user32.IsProcessDPIAware
 +@ stdcall MonitorFromPoint(int64 long) user32.MonitorFromPoint
 +@ stdcall MonitorFromRect(ptr long) user32.MonitorFromRect
 +@ stdcall MonitorFromWindow(long long) user32.MonitorFromWindow
-+@ stub QueryDisplayConfig
++@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) user32.QueryDisplayConfig
 +@ stdcall SetProcessDPIAware() user32.SetProcessDPIAware
 +@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
 +@ stdcall SystemParametersInfoA(long long ptr long) user32.SystemParametersInfoA
 +@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index f482264..b364446 100755
+index 43b8dc2..af88f8b 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -278,6 +278,7 @@ my @dll_groups =
+@@ -281,6 +281,7 @@ my @dll_groups =
    "api-ms-win-rtcore-ntuser-window-l1-1-0",
    "ext-ms-win-ntuser-mouse-l1-1-0",
    "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
@@ -70,5 +70,5 @@ index f482264..b364446 100755
   [
    "version",
 -- 
-2.6.4
+2.7.1
 

patches/api-ms-win-Stub_DLLs/0024-kernelbase-Add-stub-for-QuirkIsEnabled3.patch

@@ -1,4 +1,4 @@
-From d1cb153363aec82f8b7c5dbb0f382880e01fc2d4 Mon Sep 17 00:00:00 2001
+From d0688788458f243ccef2c337d7ab8f59ead75a3b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 4 Feb 2016 06:19:57 +0100
 Subject: kernelbase: Add stub for QuirkIsEnabled3.
@@ -23,16 +23,16 @@ index 54ce373..1485512 100644
  @ stub QuirkIsEnabledForPackage2
  @ stub QuirkIsEnabledForProcess
 diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index 83fff3e..dbba3cc 100644
+index 8fdb80d..c0b2594 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
-@@ -1188,7 +1188,7 @@
+@@ -1189,7 +1189,7 @@
  @ stub QuirkGetData2
- @ stub QuirkGetData
+ @ stdcall QuirkIsEnabled(ptr)
  @ stub QuirkIsEnabled2
 -@ stub QuirkIsEnabled3
 +@ stdcall QuirkIsEnabled3(ptr ptr)
- @ stdcall QuirkIsEnabled(ptr)
+ @ stub QuirkIsEnabledForPackage
  @ stub QuirkIsEnabledForPackage2
  @ stub QuirkIsEnabledForPackage3
 diff --git a/dlls/kernelbase/misc.c b/dlls/kernelbase/misc.c
@@ -54,5 +54,5 @@ index be1591a..e703e6d 100644
 +    return FALSE;
 +}
 -- 
-2.7.0
+2.7.1
 

patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch

@@ -0,0 +1,133 @@
+From 4a8b29b5a4c923cec3a78bd9f43e0fc736721cd7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Tue, 12 Apr 2016 01:00:02 +0200
+Subject: feclient: Add stub dll.
+
+---
+ configure.ac                |  1 +
+ dlls/feclient/Makefile.in   |  4 ++++
+ dlls/feclient/feclient.spec | 36 ++++++++++++++++++++++++++++++++++++
+ dlls/feclient/main.c        | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 86 insertions(+)
+ create mode 100644 dlls/feclient/Makefile.in
+ create mode 100644 dlls/feclient/feclient.spec
+ create mode 100644 dlls/feclient/main.c
+
+diff --git a/configure.ac b/configure.ac
+index 98bb7d7..39097d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2957,6 +2957,7 @@ WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
+ WINE_CONFIG_DLL(faultrep,,[implib])
+ WINE_CONFIG_TEST(dlls/faultrep/tests)
++WINE_CONFIG_DLL(feclient)
+ WINE_CONFIG_DLL(fltlib)
+ WINE_CONFIG_DLL(fltmgr.sys)
+ WINE_CONFIG_DLL(fntcache)
+diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in
+new file mode 100644
+index 0000000..d3eeefb
+--- /dev/null
++++ b/dlls/feclient/Makefile.in
+@@ -0,0 +1,4 @@
++MODULE    = feclient.dll
++
++C_SRCS = \
++	main.c
+diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec
+new file mode 100644
+index 0000000..3620b85
+--- /dev/null
++++ b/dlls/feclient/feclient.spec
+@@ -0,0 +1,36 @@
++@ stub EdpContainerizeFile
++@ stub EdpCredentialCreate
++@ stub EdpCredentialDelete
++@ stub EdpCredentialExists
++@ stub EdpCredentialQuery
++@ stub EdpDecontainerizeFile
++@ stub EdpDplPolicyEnabledForUser
++@ stub EdpDplUpgradePinInfo
++@ stub EdpDplUpgradeVerifyUser
++@ stub EdpDplUserCredentialsSet
++@ stub EdpDplUserUnlockComplete
++@ stub EdpDplUserUnlockStart
++@ stub EdpFree
++@ stub EdpGetContainerIdentity
++@ stub EdpGetCredServiceState
++@ stub EdpQueryCredServiceInfo
++@ stub EdpQueryDplEnforcedPolicyOwnerIds
++@ stub EdpQueryRevokedPolicyOwnerIds
++@ stub EdpRmsClearKeys
++@ stub EdpSetCredServiceInfo
++@ stub EfsClientCloseFileRaw
++@ stub EfsClientDecryptFile
++@ stub EfsClientDuplicateEncryptionInfo
++@ stub EfsClientEncryptFileEx
++@ stub EfsClientFileEncryptionStatus
++@ stub EfsClientFreeProtectorList
++@ stub EfsClientGetEncryptedFileVersion
++@ stub EfsClientOpenFileRaw
++@ stub EfsClientQueryProtectors
++@ stub EfsClientReadFileRaw
++@ stub EfsClientWriteFileRaw
++@ stub EfsClientWriteFileWithHeaderRaw
++@ stub EfsUtilGetCurrentKey
++@ stub FeClientInitialize
++@ stub GetLockSessionUnwrappedKey
++@ stub GetLockSessionWrappedKey
+diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c
+new file mode 100644
+index 0000000..91aed70
+--- /dev/null
++++ b/dlls/feclient/main.c
+@@ -0,0 +1,45 @@
++/*
++ * feclient API
++ *
++ * Copyright 2016 Michael Müller
++ *
++ * 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 <stdarg.h>
++
++#include "windef.h"
++#include "winbase.h"
++#include "wine/debug.h"
++
++WINE_DEFAULT_DEBUG_CHANNEL(feclient);
++
++BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
++{
++    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
++
++    switch (reason)
++    {
++        case DLL_WINE_PREATTACH:
++            return FALSE;    /* prefer native version */
++        case DLL_PROCESS_ATTACH:
++            DisableThreadLibraryCalls(instance);
++            break;
++    }
++
++    return TRUE;
++}
+-- 
+2.7.1
+