diff --git a/patches/d2d1-ID2D1Factory1/0001-d2d1-Use-ID2D1Factory2-in-d2d_geometry.patch b/patches/d2d1-ID2D1Factory1/0001-d2d1-Use-ID2D1Factory2-in-d2d_geometry.patch index f6177e46..f026b4a5 100644 --- a/patches/d2d1-ID2D1Factory1/0001-d2d1-Use-ID2D1Factory2-in-d2d_geometry.patch +++ b/patches/d2d1-ID2D1Factory1/0001-d2d1-Use-ID2D1Factory2-in-d2d_geometry.patch @@ -1,4 +1,4 @@ -From 7be7006fb497490d61c283f419d73c13ef532ccf Mon Sep 17 00:00:00 2001 +From 52881b705610614842e0d06a5c1d1e27f6656491 Mon Sep 17 00:00:00 2001 From: Lucian Poston Date: Thu, 3 May 2018 00:38:06 -0700 Subject: [PATCH] d2d1: Use ID2D1Factory2 in d2d_geometry @@ -13,7 +13,7 @@ Signed-off-by: Lucian Poston 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h -index 2e42d6d550..1cacb6c1a9 100644 +index 2e42d6d5503..1cacb6c1a94 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -426,7 +426,7 @@ struct d2d_geometry @@ -43,7 +43,7 @@ index 2e42d6d550..1cacb6c1a9 100644 struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c -index 48a2efb96b..a1bc6dd296 100644 +index 48a2efb96b8..a1bc6dd296c 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -138,7 +138,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor @@ -83,7 +83,7 @@ index 48a2efb96b..a1bc6dd296 100644 TRACE("Created path geometry %p.\n", object); *geometry = (ID2D1PathGeometry *)&object->ID2D1Geometry_iface; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c -index 23049d015e..79850f1c20 100644 +index 8bd612cdae4..f54d7840b74 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2338,15 +2338,15 @@ static void d2d_geometry_cleanup(struct d2d_geometry *geometry) @@ -154,8 +154,8 @@ index 23049d015e..79850f1c20 100644 +HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factory, const D2D1_RECT_F *rect) { struct d2d_face *f; - D2D1_POINT_2F *v; -@@ -3895,10 +3903,14 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform + D2D1_POINT_2F *v, v0p, v0n, v1p, v1n, v2p, v2n, v3p, v3n; +@@ -3904,10 +3912,14 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform ID2D1Factory **factory) { struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); @@ -171,7 +171,7 @@ index 23049d015e..79850f1c20 100644 } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetBounds(ID2D1TransformedGeometry *iface, -@@ -4091,7 +4103,7 @@ static const struct ID2D1TransformedGeometryVtbl d2d_transformed_geometry_vtbl = +@@ -4100,7 +4112,7 @@ static const struct ID2D1TransformedGeometryVtbl d2d_transformed_geometry_vtbl = d2d_transformed_geometry_GetTransform, }; @@ -180,7 +180,7 @@ index 23049d015e..79850f1c20 100644 ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) { struct d2d_geometry *src_impl; -@@ -4167,11 +4179,15 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_Release(ID2D1GeometryGroup *if +@@ -4176,11 +4188,15 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_Release(ID2D1GeometryGroup *if static void STDMETHODCALLTYPE d2d_geometry_group_GetFactory(ID2D1GeometryGroup *iface, ID2D1Factory **factory) { @@ -197,7 +197,7 @@ index 23049d015e..79850f1c20 100644 } static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetBounds(ID2D1GeometryGroup *iface, -@@ -4347,7 +4363,7 @@ static const struct ID2D1GeometryGroupVtbl d2d_geometry_group_vtbl = +@@ -4356,7 +4372,7 @@ static const struct ID2D1GeometryGroupVtbl d2d_geometry_group_vtbl = d2d_geometry_group_GetSourceGeometries, }; diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d43774d6..f1f72673 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "da816802e022e8aa8eb197de94e18305a92766c1" + echo "84f2ce5139bb840ee2cf381d039d3787a0cdf2b6" } # Show version information