Release v5.12.1

.github/FUNDING.yml

@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-#patreon: # Replace with a single Patreon username
-#open_collective: # Replace with a single Open Collective username
-#ko_fi: # Replace with a single Ko-fi username
-#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-#liberapay: # Replace with a single Liberapay username
-#issuehunt: # Replace with a single IssueHunt username
-#otechie: # Replace with a single Otechie username
-
-patreon: winestaging

.github/workflows/macOS.yml

@@ -1,68 +0,0 @@
-name: MacOS
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  wine-staging:
-    # https://github.com/actions/runner-images/issues/9741
-    runs-on:  macos-13
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install dependencies
-        run: |
-          brew install --cask xquartz
-          brew install  autoconf \
-                        bison \
-                        gphoto2 \
-                        gstreamer \
-                        mingw-w64 \
-                        molten-vk \
-                        sdl2
-
-      - name: Add bison & krb5 to $PATH
-        run: |
-          set -eu
-          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
-
-      - name: Get upstream-commit
-        run: |
-          mkdir $GITHUB_WORKSPACE/wine
-          cd wine
-          git init
-          git fetch https://gitlab.winehq.org/wine/wine.git $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit) --depth=1
-          git checkout $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit)
-
-      - name: Run patchinstall.py --all
-        run: |
-          cd wine
-          $GITHUB_WORKSPACE/staging/patchinstall.py DESTDIR=. --all
-
-      - name: Configure wine
-        env:
-          # We need to tell the linker to add brew & Xquarts to the rpath stack.
-          LDFLAGS: "-Wl,-rpath,/usr/local/lib -Wl,-rpath,/opt/X11/lib"
-          # Use an older deployment target to avoid new dyld behaviors.
-          MACOSX_DEPLOYMENT_TARGET: "10.14"
-        run: |
-          cd $GITHUB_WORKSPACE/wine
-          ./configure   --enable-win64 \
-                        --without-alsa \
-                        --without-capi \
-                        --without-dbus \
-                        --without-oss \
-                        --without-pulse \
-                        --without-udev \
-                        --without-v4l2 \
-                        --x-include=/opt/X11/include \
-                        --x-lib=/opt/X11/lib
-
-      - name: Build wine64
-        run: |
-          cd $GITHUB_WORKSPACE/wine
-          make -j$(sysctl -n hw.ncpu 2>/dev/null)

.gitignore

@@ -1,2 +1,3 @@
 staging/wine
 *.pyc
+.patchupdate.cache

README.md

@@ -33,11 +33,11 @@ of information about that is collected in the
 [WineHQ Wiki](http://wiki.winehq.org/BuildingWine).
 
 In order to apply all Wine Staging patches it is recommended to use the
-`patchinstall.py` utility which takes care of applying all patches in the
+`patchinstall.sh` utility which takes care of applying all patches in the
 correct order. For reference, the possible commandline arguments are:
 
 ```
-Usage: ./staging/patchinstall.py [DESTDIR=path] [-W patchset] [patchset ...]
+Usage: ./patchinstall.sh [DESTDIR=path] [--all] [-W patchset] [patchset ...]
 
 Autogenerated script to apply all Wine Staging patches on your Wine
 source tree.
@@ -55,14 +55,17 @@ 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=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
 ```
 
 If you want to apply *all* patches with the `patch` utility, the commandline
 should look similar to this:
 ```
-./staging/patchinstall.py DESTDIR="/path/to/wine" --all
+./patches/patchinstall.sh DESTDIR="/path/to/wine" --all
 ```
 
 Before you proceed with the compilation, please make sure that you installed all
@@ -76,32 +79,4 @@ Contributing
 
 For information on contributing to Wine-Staging, please see
 <https://wiki.winehq.org/Wine-Staging_Contributing>. Note that GitHub pull
-requests are strongly dispreferred, especially for patches.
-
-Donations
----------
-
-wine-staging is a large set of experimental patches which provide various
-improvements to WINE, but are not quite suitable for upstreaming. This set of
-patches has been continuously managed for many years by a small group of
-volunteers. The way this works is that we often review patches attached to
-various bug reports found at https://bugs.winehq.org/ which may fix bugs, but
-may not be quite suitable to be upstreamed due to needing some cleanup or more
-proper implementation. In the event that this happens, we add the patches to
-wine-staging instead, and keep them updated and maintained as well as attempt to
-clean them up to be upstreamed. We also both write and verify patches which fix
-various bugs that may not have patches, and in turn allow them run better using
-WINE. This includes testing on various hardware, games and applications.
-
-Any expenses for applications, games, or hardware which we do not own comes out
-of pocket. In order to alleviate these expenses, we are now accepting donations.
-This in turn allows us to continue to perform testing, provide fixes, and get
-them upstreamed, ultimately aiming to provide a better experience for all WINE
-users. All of our work is provided publicly for free and can be found at
-<https://gitlab.winehq.org/wine/wine-staging>. We do not expect to be paid for
-any of the work provided, nor will donators receive any special benefits or
-compensation.
-
-Donations are recieved through Patreon. Anyone interested may donate here:
-
-https://www.patreon.com/winestaging
+requests are strongly dispreferred, especially for patches.

patches/Compiler_Warnings/0001-windowscodecs-Avoid-implicit-cast-of-interface-point.patch

@@ -0,0 +1,61 @@
+From fc5c0462f64e0976d596bd726da4d7f0e4857384 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 19 Sep 2018 09:03:19 +1000
+Subject: [PATCH] windowscodecs: Avoid implicit cast of interface pointer.
+
+---
+ dlls/windowscodecs/info.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c
+index 0a86266..8c81574 100644
+--- a/dlls/windowscodecs/info.c
++++ b/dlls/windowscodecs/info.c
+@@ -222,7 +222,7 @@ typedef struct {
+ 
+ static inline BitmapDecoderInfo *impl_from_IWICBitmapDecoderInfo(IWICBitmapDecoderInfo *iface)
+ {
+-    return CONTAINING_RECORD(iface, BitmapDecoderInfo, base.IWICComponentInfo_iface);
++    return CONTAINING_RECORD((IWICComponentInfo*)iface, BitmapDecoderInfo, base.IWICComponentInfo_iface);
+ }
+ 
+ static HRESULT WINAPI BitmapDecoderInfo_QueryInterface(IWICBitmapDecoderInfo *iface, REFIID iid,
+@@ -713,7 +713,7 @@ typedef struct {
+ 
+ static inline BitmapEncoderInfo *impl_from_IWICBitmapEncoderInfo(IWICBitmapEncoderInfo *iface)
+ {
+-    return CONTAINING_RECORD(iface, BitmapEncoderInfo, base.IWICComponentInfo_iface);
++    return CONTAINING_RECORD((IWICComponentInfo*)iface, BitmapEncoderInfo, base.IWICComponentInfo_iface);
+ }
+ 
+ static HRESULT WINAPI BitmapEncoderInfo_QueryInterface(IWICBitmapEncoderInfo *iface, REFIID iid,
+@@ -1005,7 +1005,7 @@ typedef struct {
+ 
+ static inline FormatConverterInfo *impl_from_IWICFormatConverterInfo(IWICFormatConverterInfo *iface)
+ {
+-    return CONTAINING_RECORD(iface, FormatConverterInfo, base.IWICComponentInfo_iface);
++    return CONTAINING_RECORD((IWICComponentInfo*)iface, FormatConverterInfo, base.IWICComponentInfo_iface);
+ }
+ 
+ static HRESULT WINAPI FormatConverterInfo_QueryInterface(IWICFormatConverterInfo *iface, REFIID iid,
+@@ -1219,7 +1219,7 @@ typedef struct {
+ 
+ static inline PixelFormatInfo *impl_from_IWICPixelFormatInfo2(IWICPixelFormatInfo2 *iface)
+ {
+-    return CONTAINING_RECORD(iface, PixelFormatInfo, base.IWICComponentInfo_iface);
++    return CONTAINING_RECORD((IWICComponentInfo*)iface, PixelFormatInfo, base.IWICComponentInfo_iface);
+ }
+ 
+ static HRESULT WINAPI PixelFormatInfo_QueryInterface(IWICPixelFormatInfo2 *iface, REFIID iid,
+@@ -1531,7 +1531,7 @@ static struct metadata_container *get_metadata_container(MetadataReaderInfo *inf
+ 
+ static inline MetadataReaderInfo *impl_from_IWICMetadataReaderInfo(IWICMetadataReaderInfo *iface)
+ {
+-    return CONTAINING_RECORD(iface, MetadataReaderInfo, base.IWICComponentInfo_iface);
++    return CONTAINING_RECORD((IWICComponentInfo*)iface, MetadataReaderInfo, base.IWICComponentInfo_iface);
+ }
+ 
+ static HRESULT WINAPI MetadataReaderInfo_QueryInterface(IWICMetadataReaderInfo *iface,
+-- 
+1.9.1
+

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

@@ -0,0 +1,145 @@
+From a0211ba2069af11a64588a49222dcdcce1d805be Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:54:26 +0100
+Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
+
+---
+ dlls/d2d1/bitmap.c             | 2 +-
+ dlls/d2d1/brush.c              | 8 ++++----
+ dlls/d2d1/dc_render_target.c   | 2 +-
+ dlls/d2d1/geometry.c           | 8 ++++----
+ dlls/d2d1/hwnd_render_target.c | 2 +-
+ dlls/d2d1/state_block.c        | 2 +-
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
+index bc958e50a1..76ecc7f02a 100644
+--- a/dlls/d2d1/bitmap.c
++++ b/dlls/d2d1/bitmap.c
+@@ -617,5 +617,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl);
+-    return CONTAINING_RECORD(iface, struct d2d_bitmap, ID2D1Bitmap1_iface);
++    return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface);
+ }
+diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
+index 80fc0f5331..a612e683b6 100644
+--- a/dlls/d2d1/brush.c
++++ b/dlls/d2d1/brush.c
+@@ -253,7 +253,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,
+@@ -396,7 +396,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
+ 
+ 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,
+@@ -583,7 +583,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
+ 
+ static inline struct d2d_brush *impl_from_ID2D1RadialGradientBrush(ID2D1RadialGradientBrush *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
++    return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_radial_gradient_brush_QueryInterface(ID2D1RadialGradientBrush *iface,
+@@ -815,7 +815,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
+ 
+ static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *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(ID2D1BitmapBrush1 *iface,
+diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
+index 47aa99697d..0efa3ebeaf 100644
+--- a/dlls/d2d1/dc_render_target.c
++++ b/dlls/d2d1/dc_render_target.c
+@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
+ 
+ static inline struct d2d_dc_render_target *impl_from_IUnknown(IUnknown *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_dc_render_target, ID2D1DCRenderTarget_iface);
++    return CONTAINING_RECORD((ID2D1DCRenderTarget*)iface, struct d2d_dc_render_target, ID2D1DCRenderTarget_iface);
+ }
+ 
+ static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
+diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
+index 79850f1c20..b9b6a32f76 100644
+--- a/dlls/d2d1/geometry.c
++++ b/dlls/d2d1/geometry.c
+@@ -2982,7 +2982,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)
+@@ -3502,7 +3502,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factor
+ 
+ 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,
+@@ -3841,7 +3841,7 @@ fail:
+ 
+ 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,
+@@ -4122,7 +4122,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2
+ 
+ static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
++    return CONTAINING_RECORD( (ID2D1Geometry*)iface, struct d2d_geometry, ID2D1Geometry_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface,
+diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
+index 625f101eaa..f3626c42ce 100644
+--- a/dlls/d2d1/hwnd_render_target.c
++++ b/dlls/d2d1/hwnd_render_target.c
+@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
+ 
+ static inline struct d2d_hwnd_render_target *impl_from_IUnknown(IUnknown *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_hwnd_render_target, ID2D1HwndRenderTarget_iface);
++    return CONTAINING_RECORD((ID2D1HwndRenderTarget*)iface, struct d2d_hwnd_render_target, ID2D1HwndRenderTarget_iface);
+ }
+ 
+ static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown)
+diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
+index e3175146a6..b66752983e 100644
+--- a/dlls/d2d1/state_block.c
++++ b/dlls/d2d1/state_block.c
+@@ -187,5 +187,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl);
+-    return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
++    return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
+ }
+-- 
+2.17.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 3dd0480317fe0ed3951daf1cf5757204d11a1ae5 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:55:12 +0100
+Subject: [PATCH] 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 d3662f8..ebc3413 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 void STDMETHODCALLTYPE srv_wined3d_object_destroyed(void *parent)
+-- 
+1.9.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,48 @@
+From 7529755fcc41fda650aac6b27f34438354435d34 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 21:58:40 +0100
+Subject: [PATCH] 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 9280b5d32..2f0974a4c 100644
+--- a/dlls/dwrite/font.c
++++ b/dlls/dwrite/font.c
+@@ -1887,7 +1887,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);
+ }
+ 
+ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -1895,7 +1895,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
+-    return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace5_iface);
++    return CONTAINING_RECORD((IDWriteFontFace5 *)iface, struct dwrite_fontface, IDWriteFontFace5_iface);
+ }
+ 
+ static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface)
+diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
+index b9321157a..76ea23ba6 100644
+--- a/dlls/dwrite/layout.c
++++ b/dlls/dwrite/layout.c
+@@ -5895,7 +5895,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
+ static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
+ {
+     return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
+-        CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
++        CONTAINING_RECORD((IDWriteTextFormat3 *)iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
+ }
+ 
+ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
+-- 
+2.24.0
+

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,77 @@
+From a349cc8bdcc3a083ea507dbbdeba9053e3a338e4 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Tue, 22 Mar 2016 23:08:30 +0100
+Subject: [PATCH] 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 b4d681fe0f3..287ad394fae 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 8aae29c8c10..330b3e8fbc9 100644
+--- a/include/wine/rbtree.h
++++ b/include/wine/rbtree.h
+@@ -23,8 +23,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 46e17c546a7..d5c65d2017b 100644
+--- a/include/winnt.h
++++ b/include/winnt.h
+@@ -793,8 +793,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+ #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
+ #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(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
+ 
+ #define ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0]))
+ #ifdef __WINESRC__
+-- 
+2.26.2
+

patches/Compiler_Warnings/0032-wsdapi-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,25 @@
+From 814a4e7a4cad942e284a4828927dd0b67938af33 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 2 Jul 2017 22:32:45 +0200
+Subject: wsdapi: Avoid implicit cast of interface pointer.
+
+---
+ dlls/wsdapi/msgparams.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c
+index a7a2f0a73b3..47a77138709 100644
+--- a/dlls/wsdapi/msgparams.c
++++ b/dlls/wsdapi/msgparams.c
+@@ -45,7 +45,7 @@ static inline IWSDMessageParametersImpl *impl_from_IWSDMessageParameters(IWSDMes
+ 
+ static inline IWSDUdpMessageParametersImpl *impl_from_IWSDUdpMessageParameters(IWSDUdpMessageParameters *iface)
+ {
+-    return CONTAINING_RECORD(iface, IWSDUdpMessageParametersImpl, base.IWSDMessageParameters_iface);
++    return CONTAINING_RECORD((IWSDMessageParameters *)iface, IWSDUdpMessageParametersImpl, base.IWSDMessageParameters_iface);
+ }
+ 
+ /* IWSDMessageParameters implementation */
+-- 
+2.13.1
+

patches/Compiler_Warnings/definition

@@ -0,0 +1 @@
+Fixes: Fixes compile warnings.

patches/Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch

@@ -0,0 +1,41 @@
+From 32ae090ad4a99862a420cfe44847d8e2905cdde7 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 21 Dec 2013 23:57:02 +0100
+Subject: winex11: Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command
+
+---
+ dlls/winex11.drv/init.c   |    3 +++
+ dlls/winex11.drv/x11drv.h |    3 ++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
+index 5a7d316..68d3f96 100644
+--- a/dlls/winex11.drv/init.c
++++ b/dlls/winex11.drv/init.c
+@@ -440,6 +440,9 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
+                     return TRUE;
+                 }
+                 break;
++            case X11DRV_FLUSH_GDI_DISPLAY:
++                XFlush( gdi_display );
++                return TRUE;
+             default:
+                 break;
+             }
+diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
+index 9008db6..85dd2a5 100644
+--- a/dlls/winex11.drv/x11drv.h
++++ b/dlls/winex11.drv/x11drv.h
+@@ -277,7 +277,8 @@ enum x11drv_escape_codes
+     X11DRV_GET_DRAWABLE,     /* get current drawable for a DC */
+     X11DRV_START_EXPOSURES,  /* start graphics exposures */
+     X11DRV_END_EXPOSURES,    /* end graphics exposures */
+-    X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */
++    X11DRV_FLUSH_GL_DRAWABLE, /* flush changes made to the gl drawable */
++    X11DRV_FLUSH_GDI_DISPLAY /* flush the gdi display */
+ };
+ 
+ struct x11drv_escape_set_drawable
+-- 
+1.7.9.5
+

patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch

@@ -0,0 +1,46 @@
+From 40630c14377561e90a4be405d2124338002a88f7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Fri, 2 May 2014 20:46:19 +0200
+Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
+
+---
+ dlls/user32/message.c   | 2 +-
+ dlls/user32/tests/msg.c | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/user32/message.c b/dlls/user32/message.c
+index 1336865112a..cbe9920384f 100644
+--- a/dlls/user32/message.c
++++ b/dlls/user32/message.c
+@@ -4496,7 +4496,7 @@ UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMER
+ 
+     if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE );
+ 
+-    timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM );
++    timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM );
+ 
+     SERVER_START_REQ( set_win_timer )
+     {
+diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
+index c0ba5834cf9..a6bc158e8a7 100644
+--- a/dlls/user32/tests/msg.c
++++ b/dlls/user32/tests/msg.c
+@@ -10282,6 +10282,7 @@ static void test_timers(void)
+     start = GetTickCount();
+     while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
+         DispatchMessageA(&msg);
++todo_wine
+     ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
+        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
+        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
+@@ -10352,6 +10353,7 @@ static void test_timers_no_wnd(void)
+     start = GetTickCount();
+     while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
+         DispatchMessageA(&msg);
++todo_wine
+     ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
+        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
+        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */,
+-- 
+2.17.1
+