Release 1.9.19.

[windowscodecs-32bppGrayFloat]
Partially removed patches to implement support for WICPixelFormat32bppGrayFloat
(accepted upstream).

[windowscodecs-copypixels_to_24bppRGB]
Removed patch to avoid extra conversion step BGR->RGB when converting 32bpp
BGRA to 24bpp RGB (accepted upstream).

README.md

@@ -66,7 +66,8 @@ Configuration:
 
 Backends:
   --backend=patch      Use regular 'patch' utility to apply patches (default)
-  --backend=epatch     Use 'epatch' to apply patches (Gentoo only)
+  --backend=eapply     Use 'eapply' to apply patches (Gentoo only)
+  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
   --backend=git-am     Use 'git am' to apply patches
   --backend=git-apply  Use 'git apply' to apply patches
   --backend=stg        Import the patches using stacked git

patches/Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch

@@ -0,0 +1,25 @@
+From 1d2744df97beb00c40ae4c9d307334f4fe0c253d Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 31 Jul 2016 00:01:52 +0200
+Subject: include: Avoid shift overflow warning.
+
+---
+ include/d3dtypes.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/d3dtypes.h b/include/d3dtypes.h
+index 75aee55..8a884a8 100644
+--- a/include/d3dtypes.h
++++ b/include/d3dtypes.h
+@@ -53,7 +53,7 @@ typedef LONG D3DFIXED;
+ #define RGBA_GETRED(rgb)        (((rgb) >> 16) & 0xff)
+ #define RGBA_GETGREEN(rgb)      (((rgb) >> 8) & 0xff)
+ #define RGBA_GETBLUE(rgb)       ((rgb) & 0xff)
+-#define RGBA_MAKE(r, g, b, a)   ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
++#define RGBA_MAKE(r, g, b, a)   ((D3DCOLOR) (((DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
+ 
+ #define D3DRGB(r, g, b) \
+     (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255))
+-- 
+2.9.0
+

patches/Compiler_Warnings/0019-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/0020-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/0021-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/0022-d3d11-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From 23e0f029f1cc37d5d33bb39d5277371827b701aa 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 5e48965..70eae5e 100644
+--- a/dlls/d3d11/view.c
++++ b/dlls/d3d11/view.c
+@@ -2191,7 +2191,7 @@ 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);
+ }
+ 
+ /* ID3D11UnorderedAccessView methods */
+-- 
+2.8.0
+

patches/Compiler_Warnings/0023-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/0024-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/0025-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/0026-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/0027-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/0028-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/0029-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/0030-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/0031-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/advapi32-GetExplicitEntriesFromAclW/0001-advapi32-Implement-GetExplicitEntriesFromAclW.patch

@@ -0,0 +1,277 @@
+From cb383abcb7d36d739092a93c1f276895622b6806 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 28 Aug 2016 21:56:41 +0200
+Subject: advapi32: Implement GetExplicitEntriesFromAclW.
+
+---
+ dlls/advapi32/security.c       |  81 ++++++++++++++++++++++-
+ dlls/advapi32/tests/security.c | 142 +++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 221 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index 92a1789..c60aa4e 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -4202,8 +4202,85 @@ DWORD WINAPI GetExplicitEntriesFromAclA( PACL pacl, PULONG pcCountOfExplicitEntr
+ DWORD WINAPI GetExplicitEntriesFromAclW( PACL pacl, PULONG pcCountOfExplicitEntries,
+         PEXPLICIT_ACCESSW* pListOfExplicitEntries)
+ {
+-    FIXME("%p %p %p\n",pacl, pcCountOfExplicitEntries, pListOfExplicitEntries);
+-    return ERROR_CALL_NOT_IMPLEMENTED;
++    ACL_SIZE_INFORMATION sizeinfo;
++    EXPLICIT_ACCESSW* entries;
++    MAX_SID *sid_entries;
++    ACE_HEADER *ace;
++    NTSTATUS status;
++    int i;
++
++    FIXME("%p %p %p: semi-stub\n",pacl, pcCountOfExplicitEntries, pListOfExplicitEntries);
++
++    if (!pcCountOfExplicitEntries || !pListOfExplicitEntries)
++        return ERROR_INVALID_PARAMETER;
++
++    status = RtlQueryInformationAcl(pacl, &sizeinfo, sizeof(sizeinfo), AclSizeInformation);
++    if (status) return RtlNtStatusToDosError(status);
++
++    if (!sizeinfo.AceCount)
++    {
++        *pcCountOfExplicitEntries = 0;
++        *pListOfExplicitEntries = NULL;
++        return ERROR_SUCCESS;
++    }
++
++    entries = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, (sizeof(EXPLICIT_ACCESSW) + sizeof(MAX_SID)) * sizeinfo.AceCount);
++    if (!entries) return ERROR_OUTOFMEMORY;
++    sid_entries = (MAX_SID*)((char*)entries + sizeof(EXPLICIT_ACCESSW) * sizeinfo.AceCount);
++
++    for (i = 0; i < sizeinfo.AceCount; i++)
++    {
++        status = RtlGetAce(pacl, i, (void**)&ace);
++        if (status) goto error;
++
++        switch (ace->AceType)
++        {
++            case ACCESS_ALLOWED_ACE_TYPE:
++            {
++                ACCESS_ALLOWED_ACE *allow = (ACCESS_ALLOWED_ACE *)ace;
++                entries[i].grfAccessMode = GRANT_ACCESS;
++                entries[i].grfInheritance = ace->AceFlags;
++                entries[i].grfAccessPermissions = allow->Mask;
++
++                CopySid(sizeof(MAX_SID), (PSID)&sid_entries[i], (PSID)&allow->SidStart);
++                entries[i].Trustee.pMultipleTrustee = NULL;
++                entries[i].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
++                entries[i].Trustee.TrusteeForm = TRUSTEE_IS_SID;
++                entries[i].Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
++                entries[i].Trustee.ptstrName = (WCHAR *)&sid_entries[i];
++                break;
++            }
++
++            case ACCESS_DENIED_ACE_TYPE:
++            {
++                ACCESS_DENIED_ACE *deny = (ACCESS_DENIED_ACE *)ace;
++                entries[i].grfAccessMode = DENY_ACCESS;
++                entries[i].grfInheritance = ace->AceFlags;
++                entries[i].grfAccessPermissions = deny->Mask;
++
++                CopySid(sizeof(MAX_SID), (PSID)&sid_entries[i], (PSID)&deny->SidStart);
++                entries[i].Trustee.pMultipleTrustee = NULL;
++                entries[i].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
++                entries[i].Trustee.TrusteeForm = TRUSTEE_IS_SID;
++                entries[i].Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
++                entries[i].Trustee.ptstrName = (WCHAR *)&sid_entries[i];
++                break;
++            }
++
++            default:
++                FIXME("Unhandled ace type %d\n", ace->AceType);
++                entries[i].grfAccessMode = NOT_USED_ACCESS;
++                continue;
++        }
++    }
++
++    *pcCountOfExplicitEntries = sizeinfo.AceCount;
++    *pListOfExplicitEntries = entries;
++    return ERROR_SUCCESS;
++
++error:
++    LocalFree(entries);
++    return RtlNtStatusToDosError(status);
+ }
+ 
+ /******************************************************************************
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index cf104ab..2bcb108 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -133,6 +133,7 @@ static BOOL     (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*);
+ static void     (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ);
+ static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING);
+ static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID);
++static DWORD    (WINAPI *pGetExplicitEntriesFromAclW)(PACL,PULONG,PEXPLICIT_ACCESSW*);
+ 
+ static HMODULE hmod;
+ static int     myARGC;
+@@ -227,6 +228,7 @@ static void init(void)
+     pGetAce = (void *)GetProcAddress(hmod, "GetAce");
+     pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid");
+     pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority");
++    pGetExplicitEntriesFromAclW = (void *)GetProcAddress(hmod, "GetExplicitEntriesFromAclW");
+ 
+     myARGC = winetest_get_mainargs( &myARGV );
+ }
+@@ -6378,6 +6380,145 @@ static void test_pseudo_tokens(void)
+                  "Expected ERROR_NO_TOKEN, got %u\n", GetLastError());
+ }
+ 
++static void test_GetExplicitEntriesFromAclW(void)
++{
++    static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
++    SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
++    SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY };
++    PSID everyone_sid = NULL, users_sid = NULL;
++    EXPLICIT_ACCESSW access;
++    EXPLICIT_ACCESSW *access2;
++    PACL new_acl, old_acl = NULL;
++    ULONG count;
++    DWORD res;
++
++    if (!pGetExplicitEntriesFromAclW)
++    {
++        win_skip("GetExplicitEntriesFromAclW is not available\n");
++        return;
++    }
++
++    if (!pSetEntriesInAclW)
++    {
++        win_skip("SetEntriesInAclW is not available\n");
++        return;
++    }
++
++    old_acl = HeapAlloc(GetProcessHeap(), 0, 256);
++    res = InitializeAcl(old_acl, 256, ACL_REVISION);
++    if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
++    {
++        win_skip("ACLs not implemented - skipping tests\n");
++        HeapFree(GetProcessHeap(), 0, old_acl);
++        return;
++    }
++    ok(res, "InitializeAcl failed with error %d\n", GetLastError());
++
++    res = AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &everyone_sid);
++    ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError());
++
++    res = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID,
++                                   DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &users_sid);
++    ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError());
++
++    res = AddAccessAllowedAce(old_acl, ACL_REVISION, KEY_READ, users_sid);
++    ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError());
++
++    access2 = NULL;
++    res = pGetExplicitEntriesFromAclW(old_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 1, "Expected count == 1, got %d\n", count);
++    ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode);
++    ok(access2[0].grfAccessPermissions == KEY_READ, "Expected KEY_READ, got %d\n", access2[0].grfAccessPermissions);
++    ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm);
++    ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance);
++    ok(EqualSid(access2[0].Trustee.ptstrName, users_sid), "Expected equal SIDs\n");
++    LocalFree(access2);
++
++    access.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
++    access.Trustee.pMultipleTrustee = NULL;
++
++    access.grfAccessPermissions = KEY_WRITE;
++    access.grfAccessMode = GRANT_ACCESS;
++    access.grfInheritance = NO_INHERITANCE;
++    access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
++    access.Trustee.TrusteeForm = TRUSTEE_IS_SID;
++    access.Trustee.ptstrName = everyone_sid;
++    res = pSetEntriesInAclW(1, &access, old_acl, &new_acl);
++    ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
++    ok(new_acl != NULL, "returned acl was NULL\n");
++
++    access2 = NULL;
++    res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 2, "Expected count == 2, got %d\n", count);
++    ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode);
++    ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions);
++    ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN,
++       "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType);
++    ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm);
++    ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance);
++    ok(EqualSid(access2[0].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n");
++    LocalFree(access2);
++    LocalFree(new_acl);
++
++    access.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
++    res = pSetEntriesInAclW(1, &access, old_acl, &new_acl);
++    ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
++    ok(new_acl != NULL, "returned acl was NULL\n");
++
++    access2 = NULL;
++    res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 2, "Expected count == 2, got %d\n", count);
++    ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode);
++    ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions);
++    ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN,
++       "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType);
++    ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm);
++    ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance);
++    ok(EqualSid(access2[0].Trustee.ptstrName, everyone_sid), "Expected equal SIDs\n");
++    LocalFree(access2);
++    LocalFree(new_acl);
++
++    access.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
++    access.Trustee.ptstrName = (LPWSTR)wszCurrentUser;
++    res = pSetEntriesInAclW(1, &access, old_acl, &new_acl);
++    ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
++    ok(new_acl != NULL, "returned acl was NULL\n");
++
++    access2 = NULL;
++    res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 2, "Expected count == 2, got %d\n", count);
++    ok(access2[0].grfAccessMode == GRANT_ACCESS, "Expected GRANT_ACCESS, got %d\n", access2[0].grfAccessMode);
++    ok(access2[0].grfAccessPermissions == KEY_WRITE, "Expected KEY_WRITE, got %d\n", access2[0].grfAccessPermissions);
++    ok(access2[0].Trustee.TrusteeType == TRUSTEE_IS_UNKNOWN,
++       "Expected TRUSTEE_IS_UNKNOWN trustee type, got %d\n", access2[0].Trustee.TrusteeType);
++    ok(access2[0].Trustee.TrusteeForm == TRUSTEE_IS_SID, "Expected SID trustee, got %d\n", access2[0].Trustee.TrusteeForm);
++    ok(access2[0].grfInheritance == NO_INHERITANCE, "Expected NO_INHERITANCE, got %x\n", access2[0].grfInheritance);
++    LocalFree(access2);
++    LocalFree(new_acl);
++
++    access.grfAccessMode = REVOKE_ACCESS;
++    access.Trustee.TrusteeForm = TRUSTEE_IS_SID;
++    access.Trustee.ptstrName = users_sid;
++    res = pSetEntriesInAclW(1, &access, old_acl, &new_acl);
++    ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
++    ok(new_acl != NULL, "returned acl was NULL\n");
++
++    access2 = (void *)0xdeadbeef;
++    res = pGetExplicitEntriesFromAclW(new_acl, &count, &access2);
++    ok(res == ERROR_SUCCESS, "GetExplicitEntriesFromAclW failed with error %d\n", GetLastError());
++    ok(count == 0, "Expected count == 0, got %d\n", count);
++    ok(access2 == NULL, "access2 was not NULL\n");
++    LocalFree(new_acl);
++
++    FreeSid(users_sid);
++    FreeSid(everyone_sid);
++    HeapFree(GetProcessHeap(), 0, old_acl);
++}
++
+ START_TEST(security)
+ {
+     init();
+@@ -6424,4 +6565,5 @@ START_TEST(security)
+     test_system_security_access();
+     test_GetSidIdentifierAuthority();
+     test_pseudo_tokens();
++    test_GetExplicitEntriesFromAclW();
+ }
+-- 
+2.9.0
+

patches/advapi32-GetExplicitEntriesFromAclW/definition

@@ -0,0 +1 @@
+Fixes: Implement semi-stub for advapi32.GetExplicitEntriesFromAclW

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
-