diff --git a/patches/Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch b/patches/Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch deleted file mode 100644 index 5e577cfc..00000000 --- a/patches/Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1d2744df97beb00c40ae4c9d307334f4fe0c253d Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner <sebastian@fds-team.de> -Date: Sun, 31 Jul 2016 00:01:52 +0200 -Subject: include: Avoid shift overflow warning. - ---- - include/d3dtypes.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/d3dtypes.h b/include/d3dtypes.h -index 75aee55..8a884a8 100644 ---- a/include/d3dtypes.h -+++ b/include/d3dtypes.h -@@ -53,7 +53,7 @@ typedef LONG D3DFIXED; - #define RGBA_GETRED(rgb) (((rgb) >> 16) & 0xff) - #define RGBA_GETGREEN(rgb) (((rgb) >> 8) & 0xff) - #define RGBA_GETBLUE(rgb) ((rgb) & 0xff) --#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))) -+#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))) - - #define D3DRGB(r, g, b) \ - (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255)) --- -2.9.0 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 4d2ffdf0..5964232d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2398,11 +2398,10 @@ 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, -# | include/wine/rbtree.h, include/winnt.h, tools/makedep.c +# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.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/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 patch_apply Compiler_Warnings/0020-amstream-Avoid-implicit-cast-of-interface-pointer.patch @@ -2418,7 +2417,6 @@ 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 '+ { "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 },'; echo '+ { "Sebastian Lackner", "amstream: Avoid implicit cast of interface pointer.", 1 },';