diff --git a/patches/Compiler_Warnings/0033-evr-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0033-evr-Avoid-implicit-cast-of-interface-pointer.patch deleted file mode 100644 index 5ae4c4b5..00000000 --- a/patches/Compiler_Warnings/0033-evr-Avoid-implicit-cast-of-interface-pointer.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b4586e37df817f205c8bebe319b4765dea5c62d5 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 24 Sep 2017 19:21:06 +0200 -Subject: evr: Avoid implicit cast of interface pointer. - ---- - dlls/evr/evr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c -index c2d2933211e..5533f38a649 100644 ---- a/dlls/evr/evr.c -+++ b/dlls/evr/evr.c -@@ -136,7 +136,7 @@ static const IUnknownVtbl evr_inner_vtbl = - - static inline evr_filter *impl_from_IBaseFilter(IBaseFilter *iface) - { -- return CONTAINING_RECORD(iface, evr_filter, filter); -+ return CONTAINING_RECORD(iface, evr_filter, filter.IBaseFilter_iface); - } - - static HRESULT WINAPI filter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) --- -2.14.1 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b2a476a0..1a621278 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "7d77d330a5b60be918dbf17d9d9ca357d93bff29" + echo "4d5c874f42e27ac992f361c71490985d7553571a" } # Show version information @@ -2020,9 +2020,9 @@ fi # | Modified files: # | * dlls/d2d1/bitmap.c, dlls/d2d1/brush.c, dlls/d2d1/dc_render_target.c, dlls/d2d1/device.c, dlls/d2d1/geometry.c, # | dlls/d2d1/hwnd_render_target.c, dlls/d2d1/state_block.c, dlls/d3d11/view.c, dlls/d3d8/texture.c, dlls/d3d9/texture.c, -# | dlls/ddraw/viewport.c, dlls/dwrite/font.c, dlls/dwrite/layout.c, dlls/evr/evr.c, dlls/msxml3/schema.c, -# | dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, dlls/windowscodecs/info.c, dlls/wsdapi/msgparams.c, -# | include/wine/list.h, include/wine/rbtree.h, include/winnt.h +# | dlls/ddraw/viewport.c, dlls/dwrite/font.c, dlls/dwrite/layout.c, dlls/msxml3/schema.c, dlls/oleaut32/oleaut.c, +# | dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, dlls/windowscodecs/info.c, dlls/wsdapi/msgparams.c, include/wine/list.h, +# | include/wine/rbtree.h, include/winnt.h # | if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0001-windowscodecs-Avoid-implicit-cast-of-interface-point.patch @@ -2038,7 +2038,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 patch_apply Compiler_Warnings/0032-wsdapi-Avoid-implicit-cast-of-interface-pointer.patch - patch_apply Compiler_Warnings/0033-evr-Avoid-implicit-cast-of-interface-pointer.patch ( printf '%s\n' '+ { "Alistair Leslie-Hughes", "windowscodecs: Avoid implicit cast of interface pointer.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "d2d1: Avoid implicit cast of interface pointer.", 1 },'; @@ -2053,7 +2052,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then printf '%s\n' '+ { "Sebastian Lackner", "vbscript: Avoid implicit cast of interface pointer.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "include: Check element type in CONTAINING_RECORD and similar macros.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "wsdapi: Avoid implicit cast of interface pointer.", 1 },'; - printf '%s\n' '+ { "Sebastian Lackner", "evr: Avoid implicit cast of interface pointer.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch b/patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch index bbb0ff13..ac749783 100644 --- a/patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch +++ b/patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch @@ -1,4 +1,4 @@ -From bee8746cd94c609317194df846542a4a4ce8330a Mon Sep 17 00:00:00 2001 +From 40ee70592246e1351d6fe6994a1ba01c12fd567e Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 8 Aug 2018 20:00:15 -0500 Subject: [PATCH] ntdll: Add a stub implementation of Wow64Transition. @@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Add a stub implementation of Wow64Transition. 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 5c75f0c..f4eac57 100644 +index 13cbaf6b265..2a07dc97cb7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -3889,18 +3889,20 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +@@ -3985,18 +3985,20 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) return TRUE; } @@ -24,7 +24,7 @@ index 5c75f0c..f4eac57 100644 void __wine_process_init(void) { + static const WCHAR wow64cpuW[] = {'w','o','w','6','4','c','p','u','.','d','l','l',0}; - static const WCHAR kernel32W[] = {'C',':','\\','w','i','n','d','o','w','s','\\', + static const WCHAR kernel32W[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'k','e','r','n','e','l','3','2','.','d','l','l',0}; static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; @@ -34,7 +34,7 @@ index 5c75f0c..f4eac57 100644 NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; -@@ -3928,6 +3930,13 @@ void __wine_process_init(void) +@@ -4024,6 +4026,13 @@ void __wine_process_init(void) MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1); } @@ -49,10 +49,10 @@ index 5c75f0c..f4eac57 100644 if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name, 0, (void **)&init_func )) != STATUS_SUCCESS) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 415e868..343ab66 100644 +index 164feae327c..9dc59e300bd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -1048,6 +1048,7 @@ +@@ -1049,6 +1049,7 @@ @ stdcall WinSqmIsOptedIn() @ stdcall WinSqmSetDWORD(ptr long long) @ stdcall WinSqmStartSession(ptr long long) @@ -61,5 +61,5 @@ index 415e868..343ab66 100644 @ stdcall -private ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall -private ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm -- -1.9.1 +2.17.1