Release v10.0-rc5

Squashed to release + update.

.github/workflows/macOS.yml

@@ -7,17 +7,20 @@ on:
 
 jobs:
   wine-staging:
-    runs-on:  macos-latest
+    # https://github.com/actions/runner-images/issues/9741
+    runs-on:  macos-13
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
           brew install --cask xquartz
-          brew install  bison \
+          brew install  autoconf \
+                        bison \
                         gphoto2 \
-                        gst-plugins-base \
+                        gstreamer \
+                        gcenx/wine/libinotify-kqueue \
                         mingw-w64 \
                         molten-vk \
                         sdl2
@@ -33,7 +36,7 @@ jobs:
           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 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
@@ -52,7 +55,6 @@ jobs:
                         --without-alsa \
                         --without-capi \
                         --without-dbus \
-                        --without-inotify \
                         --without-oss \
                         --without-pulse \
                         --without-udev \

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
-

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

@@ -1,39 +0,0 @@
-From 70f66b0d785f8acd7400642e1b325ad3b082399f Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 8 Jun 2021 11:22:48 +1000
-Subject: [PATCH] rpcrt4: Avoid implicit cast of interface pointer.
-
----
- dlls/rpcrt4/ndr_marshall.c | 2 +-
- dlls/rpcrt4/ndr_typelib.c  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
-index 5ed6b6364ec..50eb42b166c 100644
---- a/dlls/rpcrt4/ndr_marshall.c
-+++ b/dlls/rpcrt4/ndr_marshall.c
-@@ -6998,7 +6998,7 @@ static unsigned char *WINAPI NdrContextHandleMarshall(
-     }
-     else
-     {
--        NDR_SCONTEXT ctxt = CONTAINING_RECORD(pMemory, struct _NDR_SCONTEXT, userContext);
-+        NDR_SCONTEXT ctxt = CONTAINING_RECORD((void * const*)pMemory, struct _NDR_SCONTEXT, userContext);
-         NDR_RUNDOWN rundown = pStubMsg->StubDesc->apfnNdrRundownRoutines[pFormat[2]];
-         NdrServerContextNewMarshall(pStubMsg, ctxt, rundown, pFormat);
-     }
-diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c
-index 352f71fa68b..508d208b730 100644
---- a/dlls/rpcrt4/ndr_typelib.c
-+++ b/dlls/rpcrt4/ndr_typelib.c
-@@ -1451,7 +1451,7 @@ struct typelib_stub
- 
- static ULONG WINAPI typelib_stub_Release(IRpcStubBuffer *iface)
- {
--    struct typelib_stub *stub = CONTAINING_RECORD(iface, struct typelib_stub, stub.stub_buffer);
-+    struct typelib_stub *stub = CONTAINING_RECORD((CStdStubBuffer *)iface, struct typelib_stub, stub.stub_buffer);
-     ULONG refcount = InterlockedDecrement(&stub->stub.stub_buffer.RefCount);
- 
-     TRACE("(%p) decreasing refs to %ld\n", stub, refcount);
--- 
-2.43.0
-

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

@@ -1,25 +0,0 @@
-From c4364bffe2f1b1e6755314296d40bcd544d52161 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 23:01:48 +0100
-Subject: [PATCH] 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 0ede0cfd6ba..eb0da452904 100644
---- a/dlls/vbscript/vbdisp.c
-+++ b/dlls/vbscript/vbdisp.c
-@@ -500,7 +500,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.43.0
-

patches/Compiler_Warnings/0017-wbemdisp-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,34 +0,0 @@
-From 947fb9823f81a34e14e70a16b4688a89918d4791 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 8 Jun 2021 11:38:46 +1000
-Subject: [PATCH] wbemdisp: Avoid implicit cast of interface pointer.
-
----
- dlls/wbemdisp/locator.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c
-index c3e0c86f4ae..70f94a0d02b 100644
---- a/dlls/wbemdisp/locator.c
-+++ b/dlls/wbemdisp/locator.c
-@@ -1657,7 +1657,7 @@ static struct object *unsafe_object_impl_from_IDispatch(IDispatch *iface)
-         FIXME( "External implementations are not supported.\n" );
-         return NULL;
-     }
--    return CONTAINING_RECORD(iface, struct object, ISWbemObject_iface);
-+    return CONTAINING_RECORD((ISWbemObject *)iface, struct object, ISWbemObject_iface);
- }
- 
- static HRESULT SWbemObject_create( struct services *services, IWbemClassObject *wbem_object,
-@@ -3492,7 +3492,7 @@ static struct namedvalueset *unsafe_valueset_impl_from_IDispatch(IDispatch *ifac
-         FIXME( "External implementations are not supported.\n" );
-         return NULL;
-     }
--    return CONTAINING_RECORD(iface, struct namedvalueset, ISWbemNamedValueSet_iface);
-+    return CONTAINING_RECORD((ISWbemNamedValueSet*)iface, struct namedvalueset, ISWbemNamedValueSet_iface);
- }
- 
- HRESULT SWbemNamedValueSet_create( void **obj )
--- 
-2.43.0
-

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

@@ -1,61 +0,0 @@
-From 67330ded6cb4bddafa1432760621135f8f5c6f1c 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 4edfaa69d77..f721aa7fedb 100644
---- a/dlls/windowscodecs/info.c
-+++ b/dlls/windowscodecs/info.c
-@@ -198,7 +198,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,
-@@ -682,7 +682,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,
-@@ -973,7 +973,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,
-@@ -1186,7 +1186,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,
-@@ -1496,7 +1496,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,
--- 
-2.43.0
-

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

@@ -1,25 +0,0 @@
-From 39e0e98ac136913907f404ad2c2f304717b7208f Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 2 Jul 2017 22:32:45 +0200
-Subject: [PATCH] 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 a96c2139eca..333c2defe90 100644
---- a/dlls/wsdapi/msgparams.c
-+++ b/dlls/wsdapi/msgparams.c
-@@ -48,7 +48,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.43.0
-