From e31ff0a923b14d02e2425acf187730e87ebbf252 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 17 May 2022 08:29:30 +1000 Subject: [PATCH] Rebase against 56d9ed83c14cd7d92076fc518d1a601fa3119b6b. --- ...d-implicit-cast-of-interface-pointer.patch | 38 +++++++++---------- patches/patchinstall.sh | 2 +- staging/upstream-commit | 2 +- 3 files changed, 21 insertions(+), 21 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 97cdf667..308db3a0 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 a0211ba2069af11a64588a49222dcdcce1d805be Mon Sep 17 00:00:00 2001 +From 92914d4648be5dd7ee62b35d3ca2fc7376d0dbd0 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. @@ -13,10 +13,10 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer. 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c -index bc958e50a1..76ecc7f02a 100644 +index 971e3c7ff6b..fcd96eb6374 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c -@@ -617,5 +617,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) +@@ -646,5 +646,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) if (!iface) return NULL; assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl); @@ -24,10 +24,10 @@ index bc958e50a1..76ecc7f02a 100644 + return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface); } diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c -index 80fc0f5331..a612e683b6 100644 +index b9a673fe54c..c5a52db6b01 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, +@@ -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) { @@ -36,7 +36,7 @@ index 80fc0f5331..a612e683b6 100644 } static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface, -@@ -396,7 +396,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F * +@@ -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) { @@ -45,7 +45,7 @@ index 80fc0f5331..a612e683b6 100644 } static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface, -@@ -583,7 +583,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, +@@ -589,7 +589,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, static inline struct d2d_brush *impl_from_ID2D1RadialGradientBrush(ID2D1RadialGradientBrush *iface) { @@ -54,7 +54,7 @@ index 80fc0f5331..a612e683b6 100644 } static HRESULT STDMETHODCALLTYPE d2d_radial_gradient_brush_QueryInterface(ID2D1RadialGradientBrush *iface, -@@ -815,7 +815,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, +@@ -821,7 +821,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *iface) { @@ -64,7 +64,7 @@ index 80fc0f5331..a612e683b6 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 47aa99697d..0efa3ebeaf 100644 +index e7e0fa57ed7..1166ae204c2 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,19 +77,19 @@ index 47aa99697d..0efa3ebeaf 100644 static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c -index 79850f1c20..b9b6a32f76 100644 +index e97bae0b54a..661387b570b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c -@@ -2982,7 +2982,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = +@@ -3356,7 +3356,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = - static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface) + 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(ID2D1PathGeometry *iface, REFIID iid, void **out) -@@ -3502,7 +3502,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factor + static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry1 *iface, REFIID iid, void **out) +@@ -4229,7 +4229,7 @@ fail: static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface) { @@ -98,7 +98,7 @@ index 79850f1c20..b9b6a32f76 100644 } static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface, -@@ -3841,7 +3841,7 @@ fail: +@@ -4941,7 +4941,7 @@ fail: static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface) { @@ -107,7 +107,7 @@ index 79850f1c20..b9b6a32f76 100644 } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface, -@@ -4122,7 +4122,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 +@@ -5225,7 +5225,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface) { @@ -117,7 +117,7 @@ index 79850f1c20..b9b6a32f76 100644 static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c -index 625f101eaa..f3626c42ce 100644 +index 4ce220bf433..32eeaf02c9f 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -130,7 +130,7 @@ index 625f101eaa..f3626c42ce 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 e3175146a6..b66752983e 100644 +index 114a3efd883..4f662be4549 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 @@ -141,5 +141,5 @@ index e3175146a6..b66752983e 100644 + return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface); } -- -2.17.1 +2.35.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 214a6ec7..8c784b31 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "b35faeb5035a8ed1480577a34603170fc0e2f901" + echo "56d9ed83c14cd7d92076fc518d1a601fa3119b6b" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 4679f976..1a57c413 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -b35faeb5035a8ed1480577a34603170fc0e2f901 +56d9ed83c14cd7d92076fc518d1a601fa3119b6b