From e4a11b16639179734e1d9f12ab4605dcbfa21a27 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 4 Aug 2020 10:43:36 +1000 Subject: [PATCH] Rebase against 18d7bc985990c1022a9f42d20cc819ba141af5cb. --- ...k-to-system-ping-when-ICMP-permissio.patch | 18 +++---- patches/patchinstall.sh | 52 +------------------ ...-a-new-alloc_handle-object-callback..patch | 34 +++++------- patches/xactengine-initial/definition | 2 +- staging/upstream-commit | 2 +- 5 files changed, 25 insertions(+), 83 deletions(-) diff --git a/patches/iphlpapi-System_Ping/0001-iphlpapi-Fallback-to-system-ping-when-ICMP-permissio.patch b/patches/iphlpapi-System_Ping/0001-iphlpapi-Fallback-to-system-ping-when-ICMP-permissio.patch index 062b2bde..b8b2d080 100644 --- a/patches/iphlpapi-System_Ping/0001-iphlpapi-Fallback-to-system-ping-when-ICMP-permissio.patch +++ b/patches/iphlpapi-System_Ping/0001-iphlpapi-Fallback-to-system-ping-when-ICMP-permissio.patch @@ -1,4 +1,4 @@ -From 04aceb5470fc9ca9133f7a6269144eb7aa8d6a10 Mon Sep 17 00:00:00 2001 +From 6ecb74571f99faaaf558bf10fc7f626c0c58dc24 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 13 Jun 2015 05:03:54 +0200 Subject: [PATCH] iphlpapi: Fallback to system ping when ICMP permissions are @@ -6,11 +6,11 @@ Subject: [PATCH] iphlpapi: Fallback to system ping when ICMP permissions are Based on an idea by Bruno Jesus. --- - dlls/iphlpapi/icmp.c | 256 +++++++++++++++++++++++++++++++++++++++++++++++++-- + dlls/iphlpapi/icmp.c | 256 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 250 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c -index 0dc2f12..da3850b 100644 +index 8e425ea68ed..1f55356c047 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -5,6 +5,7 @@ @@ -49,7 +49,7 @@ index 0dc2f12..da3850b 100644 #define USE_WS_PREFIX -@@ -212,6 +219,7 @@ DWORD WINAPI Icmp6SendEcho2( +@@ -213,6 +220,7 @@ DWORD WINAPI Icmp6SendEcho2( */ HANDLE WINAPI IcmpCreateFile(VOID) { @@ -57,8 +57,8 @@ index 0dc2f12..da3850b 100644 icmp_t* icp; int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); -@@ -220,15 +228,14 @@ HANDLE WINAPI IcmpCreateFile(VOID) - /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ +@@ -222,15 +230,14 @@ HANDLE WINAPI IcmpCreateFile(VOID) + non-privileged ICMP via SOCK_DGRAM type. */ sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); } - if (sid < 0) { @@ -77,7 +77,7 @@ index 0dc2f12..da3850b 100644 SetLastError(IP_NO_RESOURCES); return INVALID_HANDLE_VALUE; } -@@ -250,11 +257,242 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) +@@ -252,11 +259,242 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) return FALSE; } @@ -321,7 +321,7 @@ index 0dc2f12..da3850b 100644 /*********************************************************************** * IcmpSendEcho (IPHLPAPI.@) -@@ -308,6 +546,12 @@ DWORD WINAPI IcmpSendEcho( +@@ -310,6 +548,12 @@ DWORD WINAPI IcmpSendEcho( return 0; } @@ -335,5 +335,5 @@ index 0dc2f12..da3850b 100644 id=getpid() & 0xFFFF; seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; -- -1.9.1 +2.27.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f003f71b..890e42db 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "70b735760e2e89db11aa76ab3956ea0d1f6e40d4" + echo "18d7bc985990c1022a9f42d20cc819ba141af5cb" } # Show version information @@ -333,7 +333,6 @@ patch_enable_all () enable_ws2_32_getaddrinfo="$1" enable_ws2_32_getsockopt="$1" enable_wtsapi32_EnumerateProcesses="$1" - enable_xactengine_initial="$1" } # Enable or disable a specific patchset @@ -1090,9 +1089,6 @@ patch_enable () wtsapi32-EnumerateProcesses) enable_wtsapi32_EnumerateProcesses="$2" ;; - xactengine-initial) - enable_xactengine_initial="$2" - ;; *) return 1 ;; @@ -6310,52 +6306,6 @@ if test "$enable_wtsapi32_EnumerateProcesses" -eq 1; then ) >> "$patchlist" fi -# Patchset xactengine-initial -# | -# | This patchset fixes the following Wine bugs: -# | * [#31476] Support Bully Scholarship Edition xactengine3_1.dll. -# | * [#38615] DSA: Drakensang Demo fails on IXACTEngine::Initialize -# | * [#41030] Pac-Man Museum requires xactengine3_7 -# | * [#41045] Captain Morgane requires xactengine3_4 -# | * [#48684] BlazBlue: Calamity Trigger requires for xactengine 3.3 interface. -# | -# | Modified files: -# | * configure.ac, dlls/x3daudio1_7/Makefile.in, dlls/xactengine3_0/Makefile.in, dlls/xactengine3_0/xactengine3_0.spec, -# | dlls/xactengine3_1/Makefile.in, dlls/xactengine3_1/xactengine3_1.spec, dlls/xactengine3_2/Makefile.in, -# | dlls/xactengine3_2/xactengine3_2.spec, dlls/xactengine3_3/Makefile.in, dlls/xactengine3_3/xactengine3_3.spec, -# | dlls/xactengine3_4/Makefile.in, dlls/xactengine3_4/xactengine3_4.spec, dlls/xactengine3_5/Makefile.in, -# | dlls/xactengine3_5/xactengine3_5.spec, dlls/xactengine3_6/Makefile.in, dlls/xactengine3_6/xactengine3_6.spec, -# | dlls/xactengine3_7/Makefile.in, dlls/xactengine3_7/xactengine3_7.spec, dlls/xaudio2_7/Makefile.in, -# | dlls/xaudio2_7/tests/Makefile.in, dlls/xaudio2_7/tests/globals.xgs, dlls/xaudio2_7/tests/rsrc.rc, -# | dlls/xaudio2_7/tests/xact.c, dlls/xaudio2_7/tests/xaudio2.c, dlls/xaudio2_7/xact_classes.idl, dlls/xaudio2_7/xact_dll.c -# | -if test "$enable_xactengine_initial" -eq 1; then - patch_apply xactengine-initial/0002-xaudio2-Add-support-for-xactengine3.patch - patch_apply xactengine-initial/0003-xaudio2_7-Support-older-XACT3Engine-interfaces.patch - patch_apply xactengine-initial/0004-xaudio2_7-IXACT3Engine-Initialize-return-valid-error.patch - patch_apply xactengine-initial/0005-xaudio2_7-IXACT3Engine-CreateSoundBank-return-correc.patch - patch_apply xactengine-initial/0006-xaudio2_7-Always-return-S_OK-in-IXACT34Cue-Destroy.patch - patch_apply xactengine-initial/0007-xaudio2_7-Dont-cast-interface-pointers.patch - patch_apply xactengine-initial/0009-xaudio2_7-unwrap-structure-based-of-it-s-type.patch - patch_apply xactengine-initial/0010-xaudio2_7-Correct-callback-to-windows-function.patch - patch_apply xactengine-initial/0011-xaudio2_7-Initial-IXACT3Engine-tests.patch - patch_apply xactengine-initial/0013-xaudio2_7-Trace-FAudio-version-being-used.patch - patch_apply xactengine-initial/0016-xaudio2_7-tests-Add-more-tests.patch - ( - printf '%s\n' '+ { "Ethan Lee", "xaudio2: Add support for xactengine3.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Support older XACT3Engine interfaces.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: IXACT3Engine Initialize return valid error code.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: IXACT3Engine CreateSoundBank return correct HRESULT values.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Always return S_OK in IXACT34Cue Destroy.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Dont cast interface pointers.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Unwrap structure based of it'\''s type.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Correct callback to windows function.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Initial IXACT3Engine tests.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7: Trace FAudio version being used.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "xaudio2_7/tests: Add more tests.", 1 },'; - ) >> "$patchlist" -fi - if test "$enable_patchlist" -eq 1; then diff --git a/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch b/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch index 6f39ea99..52f8278c 100644 --- a/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch +++ b/patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch @@ -1,4 +1,4 @@ -From f8ff8733e9ea1e6862af0ce59b211153f83c5a93 Mon Sep 17 00:00:00 2001 +From cf009030929280ae6c4190be2fd4a5a48157a38e Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 4 Dec 2015 10:36:47 +0100 Subject: [PATCH] server: Introduce a new alloc_handle object callback. (v2) @@ -19,7 +19,7 @@ Signed-off-by: Sebastian Lackner server/file.c | 1 + server/handle.c | 13 +++++++++++-- server/hook.c | 1 + - server/mailslot.c | 3 +++ + server/mailslot.c | 2 ++ server/mapping.c | 3 +++ server/mutex.c | 1 + server/named_pipe.c | 7 ++++++- @@ -38,7 +38,7 @@ Signed-off-by: Sebastian Lackner server/timer.c | 1 + server/token.c | 1 + server/winstation.c | 2 ++ - 33 files changed, 78 insertions(+), 4 deletions(-) + 33 files changed, 77 insertions(+), 4 deletions(-) diff --git a/server/async.c b/server/async.c index 03994e8fac2..9feafd01847 100644 @@ -109,7 +109,7 @@ index db04727b93b..e72a155eeeb 100644 completion_destroy /* destroy */ }; diff --git a/server/console.c b/server/console.c -index 2785669deb2..4dc1eab78d7 100644 +index 53910b3f46e..0290ef425d4 100644 --- a/server/console.c +++ b/server/console.c @@ -99,6 +99,7 @@ static const struct object_ops console_input_ops = @@ -120,7 +120,7 @@ index 2785669deb2..4dc1eab78d7 100644 no_close_handle, /* close_handle */ console_input_destroy /* destroy */ }; -@@ -156,6 +157,7 @@ static const struct object_ops console_input_events_ops = +@@ -157,6 +158,7 @@ static const struct object_ops console_input_events_ops = NULL, /* unlink_name */ console_input_events_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ @@ -128,7 +128,7 @@ index 2785669deb2..4dc1eab78d7 100644 no_close_handle, /* close_handle */ console_input_events_destroy /* destroy */ }; -@@ -236,6 +238,7 @@ static const struct object_ops screen_buffer_ops = +@@ -237,6 +239,7 @@ static const struct object_ops screen_buffer_ops = NULL, /* unlink_name */ screen_buffer_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ @@ -136,7 +136,7 @@ index 2785669deb2..4dc1eab78d7 100644 no_close_handle, /* close_handle */ screen_buffer_destroy /* destroy */ }; -@@ -282,6 +285,7 @@ static const struct object_ops console_device_ops = +@@ -283,6 +286,7 @@ static const struct object_ops console_device_ops = default_unlink_name, /* unlink_name */ console_device_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ @@ -241,10 +241,10 @@ index d339d85aa45..a78d73d9e78 100644 no_destroy /* destroy */ }; diff --git a/server/fd.c b/server/fd.c -index fbfbe64a631..9e4ee358fe2 100644 +index de94d3a92ad..a224bc65996 100644 --- a/server/fd.c +++ b/server/fd.c -@@ -221,6 +221,7 @@ static const struct object_ops fd_ops = +@@ -227,6 +227,7 @@ static const struct object_ops fd_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ @@ -252,7 +252,7 @@ index fbfbe64a631..9e4ee358fe2 100644 no_close_handle, /* close_handle */ fd_destroy /* destroy */ }; -@@ -261,6 +262,7 @@ static const struct object_ops device_ops = +@@ -267,6 +268,7 @@ static const struct object_ops device_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ @@ -260,7 +260,7 @@ index fbfbe64a631..9e4ee358fe2 100644 no_close_handle, /* close_handle */ device_destroy /* destroy */ }; -@@ -300,6 +302,7 @@ static const struct object_ops inode_ops = +@@ -306,6 +308,7 @@ static const struct object_ops inode_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ @@ -268,7 +268,7 @@ index fbfbe64a631..9e4ee358fe2 100644 no_close_handle, /* close_handle */ inode_destroy /* destroy */ }; -@@ -341,6 +344,7 @@ static const struct object_ops file_lock_ops = +@@ -347,6 +350,7 @@ static const struct object_ops file_lock_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ @@ -346,7 +346,7 @@ index ec6be582482..c2a26eb4dff 100644 hook_table_destroy /* destroy */ }; diff --git a/server/mailslot.c b/server/mailslot.c -index 781e6f3141a..6f0321393e2 100644 +index 58d650cbb25..8cb941fa459 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -89,6 +89,7 @@ static const struct object_ops mailslot_ops = @@ -365,14 +365,6 @@ index 781e6f3141a..6f0321393e2 100644 fd_close_handle, /* close_handle */ mail_writer_destroy /* destroy */ }; -@@ -204,6 +206,7 @@ static const struct object_ops mailslot_device_ops = - default_unlink_name, /* unlink_name */ - mailslot_device_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ -+ no_alloc_handle, /* alloc_handle */ - fd_close_handle, /* close_handle */ - mailslot_device_destroy /* destroy */ - }; diff --git a/server/mapping.c b/server/mapping.c index 6e74f5b770f..fc93e7cd7be 100644 --- a/server/mapping.c diff --git a/patches/xactengine-initial/definition b/patches/xactengine-initial/definition index caa59804..d2893d79 100644 --- a/patches/xactengine-initial/definition +++ b/patches/xactengine-initial/definition @@ -3,4 +3,4 @@ Fixes: [38615] DSA: Drakensang Demo fails on IXACTEngine::Initialize Fixes: [41030] Pac-Man Museum requires xactengine3_7 Fixes: [41045] Captain Morgane requires xactengine3_4 Fixes: [48684] BlazBlue: Calamity Trigger requires for xactengine 3.3 interface. - +Disabled: True diff --git a/staging/upstream-commit b/staging/upstream-commit index 60e0016f..86f1d46f 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -70b735760e2e89db11aa76ab3956ea0d1f6e40d4 +18d7bc985990c1022a9f42d20cc819ba141af5cb