Release 1.8.5.

[kernel32-CompareStringEx]
Removed patch to silence repeated CompareStringEx FIXME (fixed upstream).

[kernel32-QT_Environment_Variables]
Removed patch to avoid inheriting QT_* environment variables (accepted upstream).

[services-SERVICE_FILE_SYSTEM_DRIVER]
Removed patch to start SERVICE_FILE_SYSTEM_DRIVER services with winedevice
(accepted upstream).

[winspool.drv-SetPrinterW]
Removed patch to handle case 8 in SetPrinterW (fixed upstream).

.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,66 +0,0 @@
-name: MacOS
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  wine-staging:
-    runs-on:  macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install dependencies
-        run: |
-          brew install --cask xquartz
-          brew install  bison \
-                        gphoto2 \
-                        gst-plugins-base \
-                        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 git://source.winehq.org/git/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 wine64
-        env:
-          LDFLAGS: "-Wl,-rpath,/opt/X11/lib"
-          # Avoid weird linker errors with Xcode 10 and later
-          MACOSX_DEPLOYMENT_TARGET: "10.14"
-        run: |
-          cd $GITHUB_WORKSPACE/wine
-          ./configure   --enable-win64 \
-                        --without-alsa \
-                        --without-capi \
-                        --without-dbus \
-                        --without-inotify \
-                        --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

LICENSE.md

@@ -7,9 +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) 2018 Alistair Leslie-Hughes, Zebediah Figura
-Copyright (C) 2019-2020 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman
+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

@@ -6,14 +6,15 @@ features, which have not been integrated into the development branch yet. The
 idea of Wine Staging is to provide experimental features faster to end users and
 to give developers the possibility to discuss and improve their patches before
 they are integrated into the main branch. More information about Wine Staging
-can also be found [on the WineHQ wiki](https://wiki.winehq.org/Wine-Staging).
+can also be found on our website [wine-staging.com](http://wine-staging.com).
 
 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://wiki.winehq.org/Download) for your operating system.
+distributions and for Mac OS X. Just follow the
+[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
 `/opt/wine-staging`, such that multiple Wine versions can be installed in
@@ -21,7 +22,17 @@ parallel. If this is the case for your distribution, you will have to type
 `/opt/wine-staging/bin/wine` instead of just `wine`. The same also applies for
 other wine-specific programs like `winecfg`. To learn more about how to use
 Wine Staging, please take a look at the
-[usage instructions](https://wiki.winehq.org/Wine-Staging_Usage).
+[usage instructions](https://github.com/wine-compholio/wine-staging/wiki/Usage).
+
+Reporting bugs
+--------------
+
+Since WineConf 2015 Wine Staging is an official part of WineHQ, which means you
+can report problems directly at https://bugs.winehq.org/. Most of the time bugs
+found in Wine Staging also turn out to be present in the development branch, so
+its recommended to open your bug in the "Wine" product, unless you are sure its
+really "Wine Staging" specific. For problems with our binary packages, please
+also open a bug report there.
 
 Building
 --------
@@ -33,11 +44,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,53 +66,36 @@ 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
 additional build dependencies required for the Wine Staging features you are
 interested in (check output of `./configure`). More information about building
 Wine Staging, optional build dependencies, and hints for packagers are collected
-in our [Wiki](https://wiki.winehq.org/Wine-Staging).
+in our [Wiki](https://github.com/wine-compholio/wine-staging/wiki/Packaging).
 
 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
+Wine Staging mainly concentrates on experimental features and patches which are
+difficult to get into the development branch. If you have a very simple bug fix
+including tests, there is usually no need to send it to Wine Staging. You can
+directly contribute it to the
+[development branch](http://wiki.winehq.org/SubmittingPatches). However, if you
+already tried that without success, or are working on such a complex area that
+you do not really think its ready for inclusion, you might want to submit it to
+our Staging tree. Please open a patch submission request on
+[bugs.wine-staging.com](https://bugs.wine-staging.com/) including the patch.
+More information is also available in our
+[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Contributing).

patches/Compiler_Warnings/0001-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch

@@ -0,0 +1,81 @@
+From 35e7be609df3c37eded9a3fd117ba0cef02f24c7 Mon Sep 17 00:00:00 2001
+From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
+Date: Fri, 8 Aug 2014 19:33:14 -0600
+Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
+
+---
+ dlls/d3d9/tests/visual.c     | 2 +-
+ dlls/netapi32/netapi32.c     | 2 +-
+ dlls/winealsa.drv/mmdevdrv.c | 2 +-
+ dlls/wined3d/glsl_shader.c   | 2 +-
+ tools/makedep.c              | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
+index 55140c6..2facbfb 100644
+--- a/dlls/d3d9/tests/visual.c
++++ b/dlls/d3d9/tests/visual.c
+@@ -12034,7 +12034,7 @@ static void yuv_layout_test(void)
+     IDirect3D9 *d3d;
+     D3DCOLOR color;
+     DWORD ref_color;
+-    BYTE *buf, *chroma_buf, *u_buf, *v_buf;
++    BYTE *buf, *chroma_buf, *u_buf = NULL, *v_buf = NULL;
+     UINT width = 20, height = 16;
+     IDirect3DDevice9 *device;
+     ULONG refcount;
+diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
+index bb61e7f..cf4c466 100644
+--- a/dlls/netapi32/netapi32.c
++++ b/dlls/netapi32/netapi32.c
+@@ -780,7 +780,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne
+ static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err )
+ {
+     char *server = NULL;
+-    unsigned char *info;
++    unsigned char *info = NULL;
+     NET_API_STATUS status;
+ 
+     if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY;
+diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
+index 14eac39..ebff9f1 100644
+--- a/dlls/winealsa.drv/mmdevdrv.c
++++ b/dlls/winealsa.drv/mmdevdrv.c
+@@ -359,7 +359,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha
+ {
+     WCHAR *ret;
+     const WCHAR *prefix;
+-    DWORD len_wchars = 0, chunk1_len, copied = 0, prefix_len;
++    DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len;
+ 
+     static const WCHAR dashW[] = {' ','-',' ',0};
+     static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;
+diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
+index 44e7090..429ae90 100644
+--- a/dlls/wined3d/glsl_shader.c
++++ b/dlls/wined3d/glsl_shader.c
+@@ -6893,7 +6893,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
+     GLuint vs_id = 0;
+     GLuint gs_id = 0;
+     GLuint ps_id = 0;
+-    struct list *ps_list, *vs_list;
++    struct list *ps_list = NULL, *vs_list = NULL;
+     WORD attribs_map;
+     struct wined3d_string_buffer *tmp_name;
+ 
+diff --git a/tools/makedep.c b/tools/makedep.c
+index d8cf2f5..280f62f 100644
+--- a/tools/makedep.c
++++ b/tools/makedep.c
+@@ -1559,7 +1559,7 @@ static const char *get_make_variable( const struct makefile *make, const char *n
+ static char *get_expanded_make_variable( const struct makefile *make, const char *name )
+ {
+     const char *var;
+-    char *p, *end, *expand, *tmp;
++    char *p, *end, *expand, *tmp = NULL;
+ 
+     var = get_make_variable( make, name );
+     if (!var) return NULL;
+-- 
+2.6.2
+

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

@@ -1,77 +0,0 @@
-From 71506110590b572bf0872c5810ac9023e4c0f60f 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 2e1d95f3fd4..c20b3eae4ca 100644
---- a/include/wine/list.h
-+++ b/include/wine/list.h
-@@ -264,7 +264,13 @@ static inline void list_move_slice_tail( struct list *dst, struct list *begin, s
- 
- /* 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 81367f3f7c4..a751d0d806f 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 RB_ENTRY_VALUE(element, type, field) \
--    ((type *)((char *)(element) - offsetof(type, field)))
-+#ifdef __GNUC__
-+# define RB_ENTRY_VALUE(element, type, field) ({       \
-+     const typeof(((type *)0)->field) *__ptr = (element);   \
-+     (type *)((char *)__ptr - offsetof(type, field)); })
-+#else
-+# define RB_ENTRY_VALUE(element, type, field) \
-+     ((type *)((char *)(element) - offsetof(type, field)))
-+#endif
- 
- struct rb_entry
- {
-diff --git a/include/winnt.h b/include/winnt.h
-index 620e70189be..8da479ec0a2 100644
---- a/include/winnt.h
-+++ b/include/winnt.h
-@@ -883,8 +883,14 @@ typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER {
- #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.43.0
-

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

@@ -1,25 +0,0 @@
-From 31ad180c1c96e6e9a2e666ebbe90c3d8b78cefa4 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 16 Feb 2024 11:01:45 +1100
-Subject: [PATCH] combase: Avoid implicit cast of interface pointer.
-
----
- dlls/combase/string.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/combase/string.c b/dlls/combase/string.c
-index 1345870cf2f..dda6ab78141 100644
---- a/dlls/combase/string.c
-+++ b/dlls/combase/string.c
-@@ -55,7 +55,7 @@ static inline struct hstring_private *impl_from_HSTRING(HSTRING string)
- 
- static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *header)
- {
--    return CONTAINING_RECORD(header, struct hstring_private, header);
-+    return CONTAINING_RECORD((struct hstring_header*)header, struct hstring_private, header);
- }
- 
- static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer)
--- 
-2.43.0
-

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

@@ -1,191 +0,0 @@
-From 683fab1d88342c11a52ac3b919964837e6f36823 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/d2d1_private.h       |  2 +-
- dlls/d2d1/dc_render_target.c   |  2 +-
- dlls/d2d1/geometry.c           | 12 ++++++------
- dlls/d2d1/hwnd_render_target.c |  2 +-
- dlls/d2d1/state_block.c        |  2 +-
- dlls/d2d1/stroke.c             |  2 +-
- 8 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
-index e5048611519..8e031290528 100644
---- a/dlls/d2d1/bitmap.c
-+++ b/dlls/d2d1/bitmap.c
-@@ -771,5 +771,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 75cd72b5b9f..314123373b7 100644
---- a/dlls/d2d1/brush.c
-+++ b/dlls/d2d1/brush.c
-@@ -259,7 +259,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,
-@@ -402,7 +402,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,
-@@ -589,7 +589,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,
-@@ -821,7 +821,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/d2d1_private.h b/dlls/d2d1/d2d1_private.h
-index dced9847390..e86e1945bdd 100644
---- a/dlls/d2d1/d2d1_private.h
-+++ b/dlls/d2d1/d2d1_private.h
-@@ -697,7 +697,7 @@ struct d2d_factory
- 
- static inline struct d2d_factory *unsafe_impl_from_ID2D1Factory(ID2D1Factory *iface)
- {
--    return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory3_iface);
-+    return CONTAINING_RECORD((ID2D1Factory3*)iface, struct d2d_factory, ID2D1Factory3_iface);
- }
- 
- void d2d_effects_init_builtins(struct d2d_factory *factory);
-diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
-index aa0c715baa5..31389b15cf8 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 3da3ad2e65b..849a2cd2762 100644
---- a/dlls/d2d1/geometry.c
-+++ b/dlls/d2d1/geometry.c
-@@ -3373,7 +3373,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
- 
- static inline struct d2d_geometry *impl_from_ID2D1PathGeometry1(ID2D1PathGeometry1 *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(ID2D1PathGeometry1 *iface, REFIID iid, void **out)
-@@ -3974,7 +3974,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
- 
- static inline struct d2d_geometry *impl_from_ID2D1EllipseGeometry(ID2D1EllipseGeometry *iface)
- {
--    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
-+    return CONTAINING_RECORD((ID2D1Geometry*)iface, struct d2d_geometry, ID2D1Geometry_iface);
- }
- 
- static HRESULT STDMETHODCALLTYPE d2d_ellipse_geometry_QueryInterface(ID2D1EllipseGeometry *iface,
-@@ -4246,7 +4246,7 @@ fail:
- 
- 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,
-@@ -4662,7 +4662,7 @@ fail:
- 
- static inline struct d2d_geometry *impl_from_ID2D1RoundedRectangleGeometry(ID2D1RoundedRectangleGeometry *iface)
- {
--    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
-+    return CONTAINING_RECORD((ID2D1Geometry*)iface, struct d2d_geometry, ID2D1Geometry_iface);
- }
- 
- static HRESULT STDMETHODCALLTYPE d2d_rounded_rectangle_geometry_QueryInterface(ID2D1RoundedRectangleGeometry *iface,
-@@ -4958,7 +4958,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,
-@@ -5242,7 +5242,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *
- 
- 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 7f16ff00d4e..e19228ba0ab 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 770c165fd90..a3b48095436 100644
---- a/dlls/d2d1/state_block.c
-+++ b/dlls/d2d1/state_block.c
-@@ -191,5 +191,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
-         WARN("Unexpected state block vtbl %p.\n", iface->lpVtbl);
-         return NULL;
-     }
--    return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
-+    return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
- }
-diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c
-index fc12d4eb972..c4b2da64f7b 100644
---- a/dlls/d2d1/stroke.c
-+++ b/dlls/d2d1/stroke.c
-@@ -196,7 +196,7 @@ struct d2d_stroke_style *unsafe_impl_from_ID2D1StrokeStyle(ID2D1StrokeStyle *ifa
-     if (!iface)
-         return NULL;
-     assert((const struct ID2D1StrokeStyle1Vtbl *)iface->lpVtbl == &d2d_stroke_style_vtbl);
--    return CONTAINING_RECORD(iface, struct d2d_stroke_style, ID2D1StrokeStyle1_iface);
-+    return CONTAINING_RECORD((ID2D1StrokeStyle1*)iface, struct d2d_stroke_style, ID2D1StrokeStyle1_iface);
- }
- 
- HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory,
--- 
-2.43.0
-

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

@@ -1,37 +0,0 @@
-From 1d3dc9e4b9f3f31f17dec135133da104f2dff251 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 21:55:00 +0100
-Subject: [PATCH] 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 b1ad3c09039..6ce4536ad1e 100644
---- a/dlls/d3d8/texture.c
-+++ b/dlls/d3d8/texture.c
-@@ -81,17 +81,17 @@ static void d3d8_texture_preload(struct d3d8_texture *texture)
- 
- 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.43.0
-

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

@@ -1,37 +0,0 @@
-From 70be1153428218646fb36ede2bf8d5954a157325 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 4de7d2eb99e..9a4ab3601e3 100644
---- a/dlls/d3d9/texture.c
-+++ b/dlls/d3d9/texture.c
-@@ -77,17 +77,17 @@ static void d3d9_texture_preload(struct d3d9_texture *texture)
- 
- 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);
- }
- 
- /* wined3d critical section must be taken by the caller. */
--- 
-2.43.0
-

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

@@ -1,133 +0,0 @@
-From f99279cb9f1d4135a54b1df6791fc05616b4334a Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 8 Jun 2021 09:34:28 +1000
-Subject: [PATCH] d3d10: Avoid implicit cast of interface pointer.
-
----
- dlls/d3d10/effect.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
-index 26394510945..b46f89e01e7 100644
---- a/dlls/d3d10/effect.c
-+++ b/dlls/d3d10/effect.c
-@@ -137,7 +137,7 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1
- 
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable(ID3D10EffectShaderVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static struct d3d10_effect_variable * d3d10_array_get_element(struct d3d10_effect_variable *v,
-@@ -5978,7 +5978,7 @@ static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl =
- /* ID3D10EffectVariable methods */
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectConstantBuffer(ID3D10EffectConstantBuffer *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_constant_buffer_IsValid(ID3D10EffectConstantBuffer *iface)
-@@ -6429,7 +6429,7 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab
- 
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectScalarVariable(ID3D10EffectScalarVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_scalar_variable_IsValid(ID3D10EffectScalarVariable *iface)
-@@ -6767,7 +6767,7 @@ static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_
- 
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVectorVariable(ID3D10EffectVectorVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_vector_variable_IsValid(ID3D10EffectVectorVariable *iface)
-@@ -7256,7 +7256,7 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable
- 
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectMatrixVariable(ID3D10EffectMatrixVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_matrix_variable_IsValid(ID3D10EffectMatrixVariable *iface)
-@@ -7546,7 +7546,7 @@ static const struct ID3D10EffectMatrixVariableVtbl d3d10_effect_matrix_variable_
- 
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectStringVariable(ID3D10EffectStringVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD( (ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_string_variable_IsValid(ID3D10EffectStringVariable *iface)
-@@ -7783,7 +7783,7 @@ static void set_shader_resource_variable(ID3D10ShaderResourceView **src, ID3D10S
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderResourceVariable(
-         ID3D10EffectShaderResourceVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_IsValid(ID3D10EffectShaderResourceVariable *iface)
-@@ -8045,7 +8045,7 @@ static const struct ID3D10EffectShaderResourceVariableVtbl d3d10_effect_shader_r
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectRenderTargetViewVariable(
-         ID3D10EffectRenderTargetViewVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD( (ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_render_target_view_variable_IsValid(
-@@ -8277,7 +8277,7 @@ static const struct ID3D10EffectRenderTargetViewVariableVtbl d3d10_effect_render
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectDepthStencilViewVariable(
-         ID3D10EffectDepthStencilViewVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_depth_stencil_view_variable_IsValid(
-@@ -8907,7 +8907,7 @@ static const struct ID3D10EffectShaderVariableVtbl d3d10_effect_shader_variable_
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectBlendVariable(
-         ID3D10EffectBlendVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_blend_variable_IsValid(ID3D10EffectBlendVariable *iface)
-@@ -9146,7 +9146,7 @@ static const struct ID3D10EffectBlendVariableVtbl d3d10_effect_blend_variable_vt
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectDepthStencilVariable(
-         ID3D10EffectDepthStencilVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_IsValid(ID3D10EffectDepthStencilVariable *iface)
-@@ -9387,7 +9387,7 @@ static const struct ID3D10EffectDepthStencilVariableVtbl d3d10_effect_depth_sten
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectRasterizerVariable(
-         ID3D10EffectRasterizerVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_IsValid(ID3D10EffectRasterizerVariable *iface)
-@@ -9626,7 +9626,7 @@ static const struct ID3D10EffectRasterizerVariableVtbl d3d10_effect_rasterizer_v
- static inline struct d3d10_effect_variable *impl_from_ID3D10EffectSamplerVariable(
-         ID3D10EffectSamplerVariable *iface)
- {
--    return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
-+    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
- }
- 
- static BOOL STDMETHODCALLTYPE d3d10_effect_sampler_variable_IsValid(ID3D10EffectSamplerVariable *iface)
--- 
-2.43.0
-

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

@@ -1,25 +0,0 @@
-From bab45b9b71bac540d36487f0b8493885b6564a81 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 21:54:48 +0100
-Subject: [PATCH] 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 228bed0ed66..23df10c0ab7 100644
---- a/dlls/d3d11/view.c
-+++ b/dlls/d3d11/view.c
-@@ -2282,7 +2282,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.43.0
-

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

@@ -1,34 +0,0 @@
-From 10ddc46a1bf1865e44e774ea586907be94bc35b5 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 21:58:30 +0100
-Subject: [PATCH] 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 4eda2fe4763..fa6c85c134f 100644
---- a/dlls/ddraw/viewport.c
-+++ b/dlls/ddraw/viewport.c
-@@ -1216,7 +1216,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)
-@@ -1224,7 +1224,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.43.0
-

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

@@ -1,57 +0,0 @@
-From 06c5b910cd509293e27aa9eb35460bf0cebb973c 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   | 6 +++---
- dlls/dwrite/format.c | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index 2028440ca8e..3f1ace1533f 100644
---- a/dlls/dwrite/font.c
-+++ b/dlls/dwrite/font.c
-@@ -2530,7 +2530,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)
-@@ -2538,7 +2538,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)
-@@ -8101,7 +8101,7 @@ static struct dwrite_fontset *unsafe_impl_from_IDWriteFontSet(IDWriteFontSet *if
-     if (!iface)
-         return NULL;
-     assert(iface->lpVtbl == (IDWriteFontSetVtbl *)&fontsetvtbl);
--    return CONTAINING_RECORD(iface, struct dwrite_fontset, IDWriteFontSet3_iface);
-+    return CONTAINING_RECORD((IDWriteFontSet3*)iface, struct dwrite_fontset, IDWriteFontSet3_iface);
- }
- 
- static HRESULT fontset_create_entry(IDWriteFontFile *file, DWRITE_FONT_FACE_TYPE face_type,
-diff --git a/dlls/dwrite/format.c b/dlls/dwrite/format.c
-index 01a6dfd06c9..4f00af818bd 100644
---- a/dlls/dwrite/format.c
-+++ b/dlls/dwrite/format.c
-@@ -708,7 +708,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
- 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_text_format(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight,
--- 
-2.43.0
-

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

@@ -1,25 +0,0 @@
-From 8f905b6f5651f2235d172ddb7ce204c7ab580ab2 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 8 Jun 2021 09:46:25 +1000
-Subject: [PATCH] dxgi: Avoid implicit cast of interface pointer.
-
----
- dlls/dxgi/output.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
-index e828ed0d9d8..2c212a24821 100644
---- a/dlls/dxgi/output.c
-+++ b/dlls/dxgi/output.c
-@@ -708,7 +708,7 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface)
-     if (!iface)
-         return NULL;
-     assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl);
--    return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput6_iface);
-+    return CONTAINING_RECORD((IDXGIOutput6*)iface, struct dxgi_output, IDXGIOutput6_iface);
- }
- 
- static void dxgi_output_init(struct dxgi_output *output, unsigned int output_idx,
--- 
-2.43.0
-

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

@@ -1,25 +0,0 @@
-From ed00c39aedbabebc7c183f7436d599aa585fed5f Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 8 Jun 2021 09:57:01 +1000
-Subject: [PATCH] msctf: Avoid implicit cast of interface pointer.
-
----
- dlls/msctf/range.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c
-index 413cf91c185..f2ed2bfea25 100644
---- a/dlls/msctf/range.c
-+++ b/dlls/msctf/range.c
-@@ -54,7 +54,7 @@ static inline Range *impl_from_ITfRangeACP(ITfRangeACP *iface)
- 
- static Range *unsafe_impl_from_ITfRange(ITfRange *iface)
- {
--    return CONTAINING_RECORD(iface, Range, ITfRangeACP_iface);
-+    return CONTAINING_RECORD((ITfRangeACP*)iface, Range, ITfRangeACP_iface);
- }
- 
- static void Range_Destructor(Range *This)
--- 
-2.43.0
-

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

@@ -1,25 +0,0 @@
-From bef907129f3713252caf456b94c007a55c1b20c4 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 22:28:09 +0100
-Subject: [PATCH] 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 3760019ce2e..89959d45272 100644
---- a/dlls/msxml3/schema.c
-+++ b/dlls/msxml3/schema.c
-@@ -794,7 +794,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.43.0
-

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

@@ -1,34 +0,0 @@
-From 1cf6a0a8f0349f0899cafaf9a82f41a8710ec2a9 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 8 Jun 2021 09:10:37 +1000
-Subject: [PATCH] ntdll: Avoid implicit cast of interface pointer.
-
----
- dlls/ntdll/unix/virtual.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 2b6ce543531..a7ee01f96ee 100644
---- a/dlls/ntdll/unix/virtual.c
-+++ b/dlls/ntdll/unix/virtual.c
-@@ -3792,7 +3792,7 @@ NTSTATUS virtual_clear_tls_index( ULONG index )
-         server_enter_uninterrupted_section( &virtual_mutex, &sigset );
-         LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry )
-         {
--            TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch );
-+            TEB *teb = CONTAINING_RECORD( (GDI_TEB_BATCH *)thread_data, TEB, GdiTebBatch );
- #ifdef _WIN64
-             WOW_TEB *wow_teb = get_wow_teb( teb );
-             if (wow_teb) wow_teb->TlsSlots[index] = 0;
-@@ -3810,7 +3810,7 @@ NTSTATUS virtual_clear_tls_index( ULONG index )
-         server_enter_uninterrupted_section( &virtual_mutex, &sigset );
-         LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry )
-         {
--            TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch );
-+            TEB *teb = CONTAINING_RECORD( (GDI_TEB_BATCH *)thread_data, TEB, GdiTebBatch );
- #ifdef _WIN64
-             WOW_TEB *wow_teb = get_wow_teb( teb );
-             if (wow_teb)
--- 
-2.43.0
-

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

@@ -1,25 +0,0 @@
-From a1d2164ba730ab8e53370a45bc75f5a214e8168f Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 22:28:23 +0100
-Subject: [PATCH] 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 1ba638597f8..44979ea5b1f 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.43.0
-