diff --git a/patches/Compiler_Warnings/0001-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch b/patches/Compiler_Warnings/0001-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch new file mode 100644 index 00000000..00336067 --- /dev/null +++ b/patches/Compiler_Warnings/0001-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch @@ -0,0 +1,39 @@ +From 0cd3973a47317aff488c63eeb33ddedb2cba2b50 Mon Sep 17 00:00:00 2001 +From: Hans Leidekker +Date: Sat, 15 Oct 2016 17:27:41 +0200 +Subject: include: Avoid duplicate definition of PEVENT_FILTER_DESCRIPTOR. + +--- + include/evntrace.h | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/include/evntrace.h b/include/evntrace.h +index b54cd11..bb1ce03 100644 +--- a/include/evntrace.h ++++ b/include/evntrace.h +@@ -248,16 +248,14 @@ typedef struct _EVENT_TRACE_PROPERTIES + ULONG LoggerNameOffset; + } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; + +-typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR; +- + typedef struct _ENABLE_TRACE_PARAMETERS + { +- ULONG Version; +- ULONG EnableProperty; +- ULONG ControlFlags; +- GUID SourceId; +- PEVENT_FILTER_DESCRIPTOR EnableFilterDesc; +- ULONG FilterDescCount; ++ ULONG Version; ++ ULONG EnableProperty; ++ ULONG ControlFlags; ++ GUID SourceId; ++ struct _EVENT_FILTER_DESCRIPTOR *EnableFilterDesc; ++ ULONG FilterDescCount; + } ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS; + + #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0) +-- +2.9.0 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e44a4cce..2cd0e056 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2395,10 +2395,11 @@ fi # | * 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/layout.c, # | dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, -# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, include/d3dtypes.h, include/wine/list.h, +# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, include/d3dtypes.h, include/evntrace.h, 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-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch patch_apply Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.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 @@ -2415,6 +2416,7 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0030-vbscript-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch ( + echo '+ { "Hans Leidekker", "include: Avoid duplicate definition of PEVENT_FILTER_DESCRIPTOR.", 1 },'; echo '+ { "Sebastian Lackner", "include: Avoid shift overflow warning.", 1 },'; echo '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },'; echo '+ { "Sebastian Lackner", "dsound: Avoid implicit cast of interface pointer.", 1 },';