diff --git a/patches/Compiler_Warnings/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch b/patches/Compiler_Warnings/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch new file mode 100644 index 00000000..0f52e86c --- /dev/null +++ b/patches/Compiler_Warnings/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch @@ -0,0 +1,37 @@ +From 9d0f651d9cb5c3ae68810e37dd6030373c7aeab6 Mon Sep 17 00:00:00 2001 +From: Nils Kuhnhenn +Date: Wed, 24 Aug 2016 19:56:00 +0200 +Subject: oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro. + +--- + dlls/oleaut32/typelib.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c +index b9318fba423..5a6dad496ed 100644 +--- a/dlls/oleaut32/typelib.c ++++ b/dlls/oleaut32/typelib.c +@@ -4830,10 +4830,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) + if (!ref) + { + TLBImpLib *pImpLib, *pImpLibNext; +- TLBRefType *ref_type; ++ TLBRefType *ref_type, *ref_type_next; + TLBString *tlbstr, *tlbstr_next; + TLBGuid *tlbguid, *tlbguid_next; +- void *cursor2; + int i; + + /* remove cache entry */ +@@ -4883,7 +4882,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) + heap_free(pImpLib); + } + +- LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) ++ LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) + { + list_remove(&ref_type->entry); + heap_free(ref_type); +-- +2.13.1 + diff --git a/patches/Compiler_Warnings/0011-gdiplus-Initialize-containers-list-in-GdipCloneImage.patch b/patches/Compiler_Warnings/0011-gdiplus-Initialize-containers-list-in-GdipCloneImage.patch new file mode 100644 index 00000000..d8e1ed0c --- /dev/null +++ b/patches/Compiler_Warnings/0011-gdiplus-Initialize-containers-list-in-GdipCloneImage.patch @@ -0,0 +1,24 @@ +From 380543910f8912374a13b9773738e018bd638341 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Sun, 11 Jun 2017 02:42:47 +0200 +Subject: gdiplus: Initialize containers list in GdipCloneImage. + +--- + dlls/gdiplus/image.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c +index ce2194317ff..b28606e916c 100644 +--- a/dlls/gdiplus/image.c ++++ b/dlls/gdiplus/image.c +@@ -1339,6 +1339,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) + result->unit = metafile->unit; + result->metafile_type = metafile->metafile_type; + result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL); ++ list_init(&result->containers); + + if (!result->hemf) + { +-- +2.13.1 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index fb548ab2..c771d8d2 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2644,11 +2644,11 @@ fi # | Modified files: # | * dlls/amstream/mediastreamfilter.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, dlls/d3d8/texture.c, # | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/font.c, -# | dlls/dwrite/layout.c, dlls/fusion/tests/asmenum.c, dlls/fusion/tests/asmname.c, dlls/kernel32/oldconfig.c, -# | dlls/kernel32/tests/heap.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/ole32/storage32.h, -# | dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/rsaenh/rsaenh.c, dlls/shell32/shfldr_fs.c, dlls/vbscript/vbdisp.c, -# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, dlls/ws2_32/tests/sock.c, include/wine/list.h, -# | include/wine/rbtree.h, include/winnt.h, tools/makedep.c +# | dlls/dwrite/layout.c, dlls/fusion/tests/asmenum.c, dlls/fusion/tests/asmname.c, dlls/gdiplus/image.c, +# | dlls/kernel32/oldconfig.c, dlls/kernel32/tests/heap.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, +# | dlls/ole32/storage32.h, dlls/oleaut32/oleaut.c, dlls/oleaut32/typelib.c, dlls/rpcrt4/cstub.c, dlls/rsaenh/rsaenh.c, +# | dlls/shell32/shfldr_fs.c, dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, +# | dlls/ws2_32/tests/sock.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h, tools/makedep.c # | if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch @@ -2659,6 +2659,8 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0007-rsaenh-tests-Avoid-compiler-warnings-with-GCC-7.patch patch_apply Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch patch_apply Compiler_Warnings/0009-ws2_32-tests-Work-around-an-incorrect-detection-in-G.patch + patch_apply Compiler_Warnings/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch + patch_apply Compiler_Warnings/0011-gdiplus-Initialize-containers-list-in-GdipCloneImage.patch patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch patch_apply Compiler_Warnings/0019-dsound-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0020-amstream-Avoid-implicit-cast-of-interface-pointer.patch @@ -2682,6 +2684,8 @@ if test "$enable_Compiler_Warnings" -eq 1; then printf '%s\n' '+ { "Sebastian Lackner", "rsaenh/tests: Avoid compiler warnings with GCC 7.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "kernel32: Avoid compiler warnings with GCC 7.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "ws2_32/tests: Work around an incorrect detection in GCC 7.", 1 },'; + printf '%s\n' '+ { "Nils Kuhnhenn", "oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.", 1 },'; + printf '%s\n' '+ { "Sebastian Lackner", "gdiplus: Initialize containers list in GdipCloneImage.", 1 },'; printf '%s\n' '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "dsound: Avoid implicit cast of interface pointer.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "amstream: Avoid implicit cast of interface pointer.", 1 },';