From a246130f81262b6421257dddc51edf6bad9d8ae4 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 9 Oct 2019 08:38:54 +1100 Subject: [PATCH] Rebase against 89d9bcb1f19a03ffafa9a93a5f32049b4bfdaa00 --- ...id-implicit-cast-of-interface-pointer.patch | 18 +++++++++--------- patches/patchinstall.sh | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch index cdc3b9a3..142c2c40 100644 --- a/patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch +++ b/patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch @@ -1,4 +1,4 @@ -From 5e4c31d0796f2e559889d4f84cdb571130217e7d Mon Sep 17 00:00:00 2001 +From 14f3c7debf91be0e5b36299f330541f3146d00ca Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 22 Mar 2016 21:58:40 +0100 Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer. @@ -9,10 +9,10 @@ Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer. 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c -index f50133d..1bc7b59 100644 +index be9ff88fe44..44c4426c9ff 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c -@@ -1815,7 +1815,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface) +@@ -1781,7 +1781,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface) if (!iface) return NULL; assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl); @@ -21,7 +21,7 @@ index f50133d..1bc7b59 100644 } struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) -@@ -1823,7 +1823,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) +@@ -1789,7 +1789,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) if (!iface) return NULL; assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl); @@ -31,18 +31,18 @@ index f50133d..1bc7b59 100644 void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c -index f27fe9f..ee1eb5a 100644 +index b9c712cd7fb..358d13963a7 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c -@@ -5622,7 +5622,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = { +@@ -5715,7 +5715,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl = static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface) { return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ? -- CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL; -+ CONTAINING_RECORD((IDWriteTextFormat2 *)iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL; +- CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL; ++ CONTAINING_RECORD((IDWriteTextFormat3 *)iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL; } HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, -- -1.9.1 +2.23.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 4fc7196f..6c852857 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "15bf3eee2cf05ce98011458fc5e715f4524c4ebd" + echo "89d9bcb1f19a03ffafa9a93a5f32049b4bfdaa00" } # Show version information