From 0f52b315d6248faa9782a47dec27cd26f1bec14d Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 31 Dec 2019 09:07:59 +1100
Subject: [PATCH] Disable ntoskrnl-safedisc-2 patchset

https://bugs.winehq.org/show_bug.cgi?id=48341
https://bugs.winehq.org/show_bug.cgi?id=48379
---
 patches/ntoskrnl-safedisc-2/definition |  1 +
 patches/patchinstall.sh                | 23 -----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/patches/ntoskrnl-safedisc-2/definition b/patches/ntoskrnl-safedisc-2/definition
index 23a28ec17..e924c0bf0 100644
--- a/patches/ntoskrnl-safedisc-2/definition
+++ b/patches/ntoskrnl-safedisc-2/definition
@@ -1 +1,2 @@
 Fixes: [30155] Improve support for SafeDisc v2.05.030
+Disabled: True
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index b9801413a..b8edff4be 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -235,7 +235,6 @@ patch_enable_all ()
 	enable_ntdll_set_full_cpu_context="$1"
 	enable_ntdll_x86_64_SegDs="$1"
 	enable_ntoskrnl_Stubs="$1"
-	enable_ntoskrnl_safedisc_2="$1"
 	enable_nvapi_Stub_DLL="$1"
 	enable_nvcuda_CUDA_Support="$1"
 	enable_nvcuvid_CUDA_Video_Support="$1"
@@ -840,9 +839,6 @@ patch_enable ()
 		ntoskrnl-Stubs)
 			enable_ntoskrnl_Stubs="$2"
 			;;
-		ntoskrnl-safedisc-2)
-			enable_ntoskrnl_safedisc_2="$2"
-			;;
 		nvapi-Stub_DLL)
 			enable_nvapi_Stub_DLL="$2"
 			;;
@@ -5431,25 +5427,6 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset ntoskrnl-safedisc-2
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#30155] Improve support for SafeDisc v2.05.030
-# |
-# | Modified files:
-# |   *	dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/tests/ntoskrnl.c, server/device.c
-# |
-if test "$enable_ntoskrnl_safedisc_2" -eq 1; then
-	patch_apply ntoskrnl-safedisc-2/0001-ntoskrnl.exe-Return-driver-dispatch-result-to-caller.patch
-	patch_apply ntoskrnl-safedisc-2/0002-ntoskrnl.exe-Always-copy-the-buffer-for-non-METHOD_B.patch
-	patch_apply ntoskrnl-safedisc-2/0003-server-Delay-completing-a-synchronous-IRP.patch
-	(
-		printf '%s\n' '+    { "Chip Davis", "ntoskrnl.exe: Return driver dispatch result to caller.", 1 },';
-		printf '%s\n' '+    { "Chip Davis", "ntoskrnl.exe: Always copy the buffer for non-METHOD_BUFFERED ioctls.", 1 },';
-		printf '%s\n' '+    { "Chip Davis", "server: Delay completing a synchronous IRP.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset nvcuvid-CUDA_Video_Support
 # |
 # | This patchset has the following (direct or indirect) dependencies: