Release 1.8.3.

[dinput-DIPROP_USERNAME]
Removed patch to implement dinput device property DIPROP_USERNAME (accepted
upstream).

[kernel32-GetFinalPathNameByHandle]
Removed patch to add support for GetFinalPathNameByHandle (accepted upstream).

[ntoskrnl-Stubs]
Removed patches for KeDelayExecutionThread and PsRemoveLoadImageNotifyRoutine
stubs (accepted upstream).

[server-Parent_Process]
Removed patch to avoid holding reference on parent process in wineserver
(accepted upstream).

[wined3d-Geforce_425M]
Removed patch to add wined3d detection for GeForce GT 425M (accepted upstream).

[winscard-SCardListReaders]
Removed patch to add stub for winscard.SCardListReadersA/W (accepted upstream).

LICENSE.md

@@ -7,7 +7,7 @@ are part of **Wine Staging** and are licensed under the terms of the
 [LGPLv2.1](#gnu-lgpl-version-21), to stay compatible with Wine:
 
 ```
-Copyright (C) 2014-2017 the Wine Staging project authors.
+Copyright (C) 2014-2016 the Wine Staging project authors.
 
 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

README.md

@@ -13,7 +13,7 @@ Installation
 
 Ready-to-use packages for Wine Staging are available for a variety of Linux
 distributions and for Mac OS X. Just follow the
-[installation instructions](https://wine-staging.com/installation.html)
+[installation instructions](https://github.com/wine-compholio/wine-staging/wiki/Installation)
 for your operating system.
 
 On most distributions the `wine-staging` package is installed to
@@ -66,8 +66,7 @@ Configuration:
 
 Backends:
   --backend=patch      Use regular 'patch' utility to apply patches (default)
-  --backend=eapply     Use 'eapply' to apply patches (Gentoo only)
-  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
+  --backend=epatch     Use 'epatch' to apply patches (Gentoo only)
   --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/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch

@@ -1,26 +0,0 @@
-From 43628d9b1905396ff6442e4f1e07c9dd48739b19 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 14 Apr 2017 15:57:18 +0200
-Subject: ole32: Fix compilation with recent versions of gcc.
-
----
- dlls/ole32/storage32.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
-index 4fcfd9c362..2b23ab8eb8 100644
---- a/dlls/ole32/storage32.h
-+++ b/dlls/ole32/storage32.h
-@@ -526,6 +526,9 @@ StgStreamImpl* StgStreamImpl_Construct(
- /******************************************************************************
-  * Endian conversion macros
-  */
-+#undef htole32
-+#undef htole16
-+
- #ifdef WORDS_BIGENDIAN
- 
- #define htole32(x) RtlUlongByteSwap(x)
--- 
-2.12.2
-

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

@@ -1,26 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,75 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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

@@ -1,48 +0,0 @@
-From 744549e1ecc76c3764079d337c09445d01a3527e 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/font.c   | 4 ++--
- dlls/dwrite/layout.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index d9ddce0..0a90c20 100644
---- a/dlls/dwrite/font.c
-+++ b/dlls/dwrite/font.c
-@@ -1684,7 +1684,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
-     if (!iface)
-         return NULL;
-     assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
--    return CONTAINING_RECORD(iface, struct dwrite_font, IDWriteFont3_iface);
-+    return CONTAINING_RECORD((IDWriteFont3 *)iface, struct dwrite_font, IDWriteFont3_iface);
- }
- 
- static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -1692,7 +1692,7 @@ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace
-     if (!iface)
-         return NULL;
-     assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
--    return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface);
-+    return CONTAINING_RECORD((IDWriteFontFace4 *)iface, struct dwrite_fontface, IDWriteFontFace4_iface);
- }
- 
- void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
-diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 706ed4e..c76a909 100644
---- a/dlls/dwrite/layout.c
-+++ b/dlls/dwrite/layout.c
-@@ -5196,7 +5196,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.9.0
-

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

@@ -1,25 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,76 +0,0 @@
-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/Compiler_Warnings/definition

@@ -0,0 +1 @@
+Category: stable

patches/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch

@@ -0,0 +1,287 @@
+From 940f22fae1e118faab3aa2926d050ad3c84a3e79 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 11 Nov 2014 03:11:33 +0100
+Subject: ntdll: Implement emulation of SIDT instruction when using Exagear.
+
+---
+ configure.ac             |   8 ++
+ dlls/ntdll/signal_i386.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 231 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 92d78a2..c88a139 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp
+ AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
+ AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
+ AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]))
++AC_ARG_ENABLE(exagear-compat, AS_HELP_STRING([--enable-exagear-compat],[use workarounds for known problems in the Exagear emulator]))
+ 
+ AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
+             [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
+@@ -363,6 +364,13 @@ fi
+ WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false],
+                   [gettext tools not found (or too old), translations won't be built.])
+ 
++dnl **** Enable Exagear workarounds ****
++
++if test "x$enable_exagear_compat" = "xyes"
++then
++  AC_DEFINE(EXAGEAR_COMPAT, 1, [Define if you want to enable Exagear emulator workarounds])
++fi
++
+ dnl **** Check for some libraries ****
+ 
+ dnl Check for -li386 for NetBSD and OpenBSD
+diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
+index 5708aae..f27ce56 100644
+--- a/dlls/ntdll/signal_i386.c
++++ b/dlls/ntdll/signal_i386.c
+@@ -96,6 +96,14 @@ typedef struct
+     BYTE Reserved4[96];
+ } XMM_SAVE_AREA32;
+ 
++#include "pshpack1.h"
++struct idtr
++{
++    WORD  limit;
++    BYTE *base;
++};
++#include "poppack.h"
++
+ /***********************************************************************
+  * signal context platform-specific definitions
+  */
+@@ -1898,6 +1906,213 @@ static inline DWORD get_fpu_code( const CONTEXT *context )
+ }
+ 
+ 
++#ifdef EXAGEAR_COMPAT
++
++/***********************************************************************
++ *           INSTR_GetOperandAddr
++ *
++ * Return the address of an instruction operand (from the mod/rm byte).
++ */
++static BYTE *INSTR_GetOperandAddr( CONTEXT *context, const BYTE *instr,
++                                   int long_addr, int segprefix, int *len )
++{
++    int mod, rm, base = 0, index = 0, ss = 0, off;
++
++#define GET_VAL(val,type) \
++    { *val = *(type *)instr; instr += sizeof(type); *len += sizeof(type); }
++
++    *len = 0;
++    GET_VAL( &mod, BYTE );
++    rm = mod & 7;
++    mod >>= 6;
++
++    if (mod == 3)
++    {
++        switch(rm)
++        {
++        case 0: return (BYTE *)&context->Eax;
++        case 1: return (BYTE *)&context->Ecx;
++        case 2: return (BYTE *)&context->Edx;
++        case 3: return (BYTE *)&context->Ebx;
++        case 4: return (BYTE *)&context->Esp;
++        case 5: return (BYTE *)&context->Ebp;
++        case 6: return (BYTE *)&context->Esi;
++        case 7: return (BYTE *)&context->Edi;
++        }
++    }
++
++    if (long_addr)
++    {
++        if (rm == 4)
++        {
++            BYTE sib;
++            GET_VAL( &sib, BYTE );
++            rm = sib & 7;
++            ss = sib >> 6;
++            switch((sib >> 3) & 7)
++            {
++            case 0: index = context->Eax; break;
++            case 1: index = context->Ecx; break;
++            case 2: index = context->Edx; break;
++            case 3: index = context->Ebx; break;
++            case 4: index = 0; break;
++            case 5: index = context->Ebp; break;
++            case 6: index = context->Esi; break;
++            case 7: index = context->Edi; break;
++            }
++        }
++
++        switch(rm)
++        {
++        case 0: base = context->Eax; break;
++        case 1: base = context->Ecx; break;
++        case 2: base = context->Edx; break;
++        case 3: base = context->Ebx; break;
++        case 4: base = context->Esp; break;
++        case 5: base = context->Ebp; break;
++        case 6: base = context->Esi; break;
++        case 7: base = context->Edi; break;
++        }
++        switch (mod)
++        {
++        case 0:
++            if (rm == 5)  /* special case: ds:(disp32) */
++            {
++                GET_VAL( &base, DWORD );
++            }
++            break;
++
++        case 1:  /* 8-bit disp */
++            GET_VAL( &off, BYTE );
++            base += (signed char)off;
++            break;
++
++        case 2:  /* 32-bit disp */
++            GET_VAL( &off, DWORD );
++            base += (signed long)off;
++            break;
++        }
++    }
++    else  /* short address */
++    {
++        switch(rm)
++        {
++        case 0:  /* ds:(bx,si) */
++            base = LOWORD(context->Ebx) + LOWORD(context->Esi);
++            break;
++        case 1:  /* ds:(bx,di) */
++            base = LOWORD(context->Ebx) + LOWORD(context->Edi);
++            break;
++        case 2:  /* ss:(bp,si) */
++            base = LOWORD(context->Ebp) + LOWORD(context->Esi);
++            break;
++        case 3:  /* ss:(bp,di) */
++            base = LOWORD(context->Ebp) + LOWORD(context->Edi);
++            break;
++        case 4:  /* ds:(si) */
++            base = LOWORD(context->Esi);
++            break;
++        case 5:  /* ds:(di) */
++            base = LOWORD(context->Edi);
++            break;
++        case 6:  /* ss:(bp) */
++            base = LOWORD(context->Ebp);
++            break;
++        case 7:  /* ds:(bx) */
++            base = LOWORD(context->Ebx);
++            break;
++        }
++
++        switch(mod)
++        {
++        case 0:
++            if (rm == 6)  /* special case: ds:(disp16) */
++            {
++                GET_VAL( &base, WORD );
++            }
++            break;
++
++        case 1:  /* 8-bit disp */
++            GET_VAL( &off, BYTE );
++            base += (signed char)off;
++            break;
++
++        case 2:  /* 16-bit disp */
++            GET_VAL( &off, WORD );
++            base += (signed short)off;
++            break;
++        }
++        base &= 0xffff;
++    }
++    /* FIXME: we assume that all segments have a base of 0 */
++    return (BYTE *)(base + (index << ss));
++#undef GET_VAL
++}
++
++
++/***********************************************************************
++ *           check_invalid_instr
++ *
++ * Support for instructions not implemented by Exagear.
++ */
++static inline BOOL check_invalid_instr( CONTEXT *context )
++{
++    const BYTE *instr;
++    unsigned int prefix_count = 0;
++    int len, long_addr = 1;
++
++    if (!wine_ldt_is_system( context->SegCs )) return FALSE;
++    instr = (BYTE *)context->Eip;
++
++    for (;;) switch (*instr)
++    {
++    /* instruction prefixes */
++    case 0x2e:  /* %cs: */
++    case 0x36:  /* %ss: */
++    case 0x3e:  /* %ds: */
++    case 0x26:  /* %es: */
++    case 0x64:  /* %fs: */
++    case 0x65:  /* %gs: */
++    case 0x66:  /* opcode size */
++    case 0x67:  /* addr size */
++    case 0xf0:  /* lock */
++    case 0xf2:  /* repne */
++    case 0xf3:  /* repe */
++        if (++prefix_count >= 15) return FALSE;
++        if (*instr == 0x67) long_addr = !long_addr; /* addr size */
++        instr++;
++        continue;
++    case 0x0f: /* extended instruction */
++        switch (instr[1])
++        {
++        case 0x01:
++            if (((instr[2] >> 3) & 7) == 1) /* sidt m */
++            {
++                struct idtr ret;
++                BYTE *addr;
++
++                if ((instr[2] >> 6) == 3) return FALSE; /* loading to register not allowed */
++                addr = INSTR_GetOperandAddr( context, instr + 2, long_addr, 0, &len );
++
++                /* fake IDT structure */
++                ret.limit = 0xfff;
++                ret.base  = (void *)0xff000000;
++                memcpy(addr, &ret, sizeof(ret));
++
++                context->Eip += prefix_count + len + 2;
++                return TRUE;
++            }
++            break;
++        }
++        return FALSE;
++    default:
++        return FALSE;
++    }
++}
++
++#endif /* EXAGEAR_COMPAT */
++
++
+ /**********************************************************************
+  *		raise_segv_exception
+  */
+@@ -1907,6 +2122,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
+ 
+     switch(rec->ExceptionCode)
+     {
++#ifdef EXAGEAR_COMPAT
++    case EXCEPTION_ILLEGAL_INSTRUCTION:
++        {
++            if (check_invalid_instr( context ))
++                goto done;
++        }
++        break;
++#endif
+     case EXCEPTION_ACCESS_VIOLATION:
+         if (rec->NumberParameters == 2)
+         {
+-- 
+2.7.1
+

patches/Exagear/0002-ntdll-Fix-issues-with-write-watches-when-using-Exage.patch

@@ -0,0 +1,51 @@
+From 5a4827d5c16aefd82029583710b9032a2356917b Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 22 Nov 2014 05:49:30 +0100
+Subject: ntdll: Fix issues with write watches when using Exagear.
+
+---
+ dlls/ntdll/virtual.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
+index f7aae0b..3fa2027 100644
+--- a/dlls/ntdll/virtual.c
++++ b/dlls/ntdll/virtual.c
+@@ -1558,6 +1558,26 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
+     {
+         void *page = ROUND_ADDR( addr, page_mask );
+         BYTE *vprot = &view->prot[((const char *)page - (const char *)view->base) >> page_shift];
++#ifdef EXAGEAR_COMPAT
++        /* Exagear doesn't correctly set err, so always check for write watches, and
++         * retry after removing the VPROT_WRITEWATCH or VPROT_WRITECOPY flag. In
++         * contrary to the general implementation below this is not completely race-
++         * condition safe. When multiple threads trigger the write watch at the same
++         * time only the first thread will properly continue the execution, the rest
++         * will crash. */
++        if ((view->protect & VPROT_WRITEWATCH) && (*vprot & VPROT_WRITEWATCH))
++        {
++            *vprot &= ~VPROT_WRITEWATCH;
++            VIRTUAL_SetProt( view, page, page_size, *vprot );
++            if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
++        }
++        if (*vprot & VPROT_WRITECOPY)
++        {
++            *vprot = (*vprot & ~VPROT_WRITECOPY) | VPROT_WRITE;
++            VIRTUAL_SetProt( view, page, page_size, *vprot );
++            if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
++        }
++#else
+         if (err & EXCEPTION_WRITE_FAULT)
+         {
+             if ((view->protect & VPROT_WRITEWATCH) && (*vprot & VPROT_WRITEWATCH))
+@@ -1573,6 +1593,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
+             /* ignore fault if page is writable now */
+             if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
+         }
++#endif
+         if (!on_signal_stack && (*vprot & VPROT_GUARD))
+         {
+             VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD );
+-- 
+2.2.2
+