From bcf5899a3c28372234c264f70ead44ccc6c7e6da Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 27 Jan 2021 11:19:17 +1100 Subject: [PATCH] Drop ntdll-Interrupt-0x2e patchset The program itself later updated not to use that interrupt, and nobody seems to have an old copy of it. --- ...tch-windows-int-0x2e-syscall-on-i386.patch | 28 ------------------- patches/ntdll-Interrupt-0x2e/definition | 1 - patches/patchinstall.sh | 16 ----------- 3 files changed, 45 deletions(-) delete mode 100644 patches/ntdll-Interrupt-0x2e/0001-ntdll-Catch-windows-int-0x2e-syscall-on-i386.patch delete mode 100644 patches/ntdll-Interrupt-0x2e/definition diff --git a/patches/ntdll-Interrupt-0x2e/0001-ntdll-Catch-windows-int-0x2e-syscall-on-i386.patch b/patches/ntdll-Interrupt-0x2e/0001-ntdll-Catch-windows-int-0x2e-syscall-on-i386.patch deleted file mode 100644 index 9b7aab80..00000000 --- a/patches/ntdll-Interrupt-0x2e/0001-ntdll-Catch-windows-int-0x2e-syscall-on-i386.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a35e75bfe3a6358885e756396c8597d7b60be6e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 19 Mar 2017 19:08:34 +0100 -Subject: [PATCH] ntdll: Catch windows int 0x2e syscall on i386. - ---- - dlls/ntdll/unix/signal_i386.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c -index 60a47d53ba8..5cc92ab0ced 100644 ---- a/dlls/ntdll/unix/signal_i386.c -+++ b/dlls/ntdll/unix/signal_i386.c -@@ -1749,6 +1749,11 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, vo - rec->ExceptionInformation[2] = context->Edx; - setup_raise_exception( sigcontext, stack, rec, xcontext ); - return TRUE; -+ case 0x2e: -+ FIXME("unimplemented syscall handler for %#x\n", context->Eax); -+ EAX_sig(sigcontext) = STATUS_INVALID_SYSTEM_SERVICE; -+ EIP_sig(sigcontext) += 2; -+ return TRUE; - default: - return FALSE; - } --- -2.28.0 - diff --git a/patches/ntdll-Interrupt-0x2e/definition b/patches/ntdll-Interrupt-0x2e/definition deleted file mode 100644 index cc8161e9..00000000 --- a/patches/ntdll-Interrupt-0x2e/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [42647] Implement stub handler for int 0x2e diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9fa25695..93306618 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -168,7 +168,6 @@ patch_enable_all () enable_ntdll_HashLinks="$1" enable_ntdll_Heap_Improvements="$1" enable_ntdll_Hide_Wine_Exports="$1" - enable_ntdll_Interrupt_0x2e="$1" enable_ntdll_Junction_Points="$1" enable_ntdll_Manifest_Range="$1" enable_ntdll_NtAccessCheck="$1" @@ -593,9 +592,6 @@ patch_enable () ntdll-Hide_Wine_Exports) enable_ntdll_Hide_Wine_Exports="$2" ;; - ntdll-Interrupt-0x2e) - enable_ntdll_Interrupt_0x2e="$2" - ;; ntdll-Junction_Points) enable_ntdll_Junction_Points="$2" ;; @@ -3274,18 +3270,6 @@ if test "$enable_ntdll_Hide_Wine_Exports" -eq 1; then patch_apply ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch fi -# Patchset ntdll-Interrupt-0x2e -# | -# | This patchset fixes the following Wine bugs: -# | * [#42647] Implement stub handler for int 0x2e -# | -# | Modified files: -# | * dlls/ntdll/unix/signal_i386.c -# | -if test "$enable_ntdll_Interrupt_0x2e" -eq 1; then - patch_apply ntdll-Interrupt-0x2e/0001-ntdll-Catch-windows-int-0x2e-syscall-on-i386.patch -fi - # Patchset ntdll-Manifest_Range # | # | This patchset fixes the following Wine bugs: