From d388288e2e6c7f910ace6e1a0bf50864b095920c Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 3 Dec 2019 15:57:36 +1100 Subject: [PATCH] Updated Compiler_Warnings --- ...d-implicit-cast-of-interface-pointer.patch | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch index 6be179c8..97cdf667 100644 --- a/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch +++ b/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch @@ -1,4 +1,4 @@ -From c8f9b712a946fac79af1290d14c1d31d0a8f0c10 Mon Sep 17 00:00:00 2001 +From a0211ba2069af11a64588a49222dcdcce1d805be Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 22 Mar 2016 21:54:26 +0100 Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer. @@ -7,16 +7,16 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer. dlls/d2d1/bitmap.c | 2 +- dlls/d2d1/brush.c | 8 ++++---- dlls/d2d1/dc_render_target.c | 2 +- - dlls/d2d1/geometry.c | 6 +++--- + dlls/d2d1/geometry.c | 8 ++++---- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/state_block.c | 2 +- - 6 files changed, 11 insertions(+), 11 deletions(-) + 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c -index 39e81192f77..52810211701 100644 +index bc958e50a1..76ecc7f02a 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c -@@ -623,5 +623,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) +@@ -617,5 +617,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) if (!iface) return NULL; assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl); @@ -24,7 +24,7 @@ index 39e81192f77..52810211701 100644 + return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface); } diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c -index 21abf1456ab..1030884c2b7 100644 +index 80fc0f5331..a612e683b6 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -253,7 +253,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, @@ -64,7 +64,7 @@ index 21abf1456ab..1030884c2b7 100644 static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface, diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c -index 310c5412967..9d9168dc8ee 100644 +index 47aa99697d..0efa3ebeaf 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -77,7 +77,7 @@ index 310c5412967..9d9168dc8ee 100644 static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c -index 91ce32c28e7..da4a1f2d3ee 100644 +index 79850f1c20..b9b6a32f76 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2982,7 +2982,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = @@ -89,7 +89,7 @@ index 91ce32c28e7..da4a1f2d3ee 100644 } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out) -@@ -3498,7 +3498,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory +@@ -3502,7 +3502,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factor static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface) { @@ -98,7 +98,7 @@ index 91ce32c28e7..da4a1f2d3ee 100644 } static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface, -@@ -3833,7 +3833,7 @@ fail: +@@ -3841,7 +3841,7 @@ fail: static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface) { @@ -107,8 +107,17 @@ index 91ce32c28e7..da4a1f2d3ee 100644 } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface, +@@ -4122,7 +4122,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 + + static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface) + { +- return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface); ++ return CONTAINING_RECORD( (ID2D1Geometry*)iface, struct d2d_geometry, ID2D1Geometry_iface); + } + + static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c -index 625f101eaa7..f3626c42cee 100644 +index 625f101eaa..f3626c42ce 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -121,7 +130,7 @@ index 625f101eaa7..f3626c42cee 100644 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 e3175146a64..b66752983e6 100644 +index e3175146a6..b66752983e 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -187,5 +187,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat @@ -132,5 +141,5 @@ index e3175146a64..b66752983e6 100644 + return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface); } -- -2.20.1 +2.17.1