From 1e9c7533cbfe3d2eee010407b7e2aef2d43fc791 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 30 Jan 2023 12:16:14 -0600
Subject: [PATCH] ntdll-Placeholders: Add missing dependency on
 ntdll-WRITECOPY.

---
 patches/ntdll-Placeholders/definition |  1 +
 patches/patchinstall.sh               | 56 ++++++++++++++++-----------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/patches/ntdll-Placeholders/definition b/patches/ntdll-Placeholders/definition
index e69de29b..ee1b4c0d 100644
--- a/patches/ntdll-Placeholders/definition
+++ b/patches/ntdll-Placeholders/definition
@@ -0,0 +1 @@
+Depends: ntdll-WRITECOPY
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 06507e21..47e623ab 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -1199,6 +1199,13 @@ if test "$enable_ntdll_ForceBottomUpAlloc" -eq 1; then
 	enable_ntdll_Placeholders=1
 fi
 
+if test "$enable_ntdll_Placeholders" -eq 1; then
+	if test "$enable_ntdll_WRITECOPY" -gt 1; then
+		abort "Patchset ntdll-WRITECOPY disabled, but ntdll-Placeholders depends on that."
+	fi
+	enable_ntdll_WRITECOPY=1
+fi
+
 if test "$enable_fltmgr_sys_FltBuildDefaultSecurityDescriptor" -eq 1; then
 	if test "$enable_winedevice_Default_Drivers" -gt 1; then
 		abort "Patchset winedevice-Default_Drivers disabled, but fltmgr.sys-FltBuildDefaultSecurityDescriptor depends on that."
@@ -2072,8 +2079,33 @@ if test "$enable_ntdll_Exception" -eq 1; then
 	patch_apply ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch
 fi
 
+# Patchset ntdll-WRITECOPY
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#29384] Multiple applications expect correct handling of WRITECOPY memory protection (Voobly fails to launch Age of
+# | 	Empires II, MSYS2)
+# |
+# | Modified files:
+# |   *	dlls/kernel32/tests/virtual.c, dlls/ntdll/unix/loader.c, dlls/ntdll/unix/server.c, dlls/ntdll/unix/signal_arm.c,
+# | 	dlls/ntdll/unix/signal_arm64.c, dlls/ntdll/unix/signal_i386.c, dlls/ntdll/unix/signal_x86_64.c,
+# | 	dlls/ntdll/unix/unix_private.h, dlls/ntdll/unix/virtual.c, dlls/psapi/tests/psapi_main.c
+# |
+if test "$enable_ntdll_WRITECOPY" -eq 1; then
+	patch_apply ntdll-WRITECOPY/0001-ntdll-Trigger-write-watches-before-passing-userdata-.patch
+	patch_apply ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch
+	patch_apply ntdll-WRITECOPY/0004-ntdll-Properly-handle-PAGE_WRITECOPY-protection.-try.patch
+	patch_apply ntdll-WRITECOPY/0005-ntdll-Track-if-a-WRITECOPY-page-has-been-modified.patch
+	patch_apply ntdll-WRITECOPY/0006-ntdll-Support-WRITECOPY-on-x64.patch
+	patch_apply ntdll-WRITECOPY/0007-ntdll-Report-unmodified-WRITECOPY-pages-as-shared.patch
+	patch_apply ntdll-WRITECOPY/0008-ntdll-Fallback-to-copy-pages-for-WRITECOPY.patch
+	patch_apply ntdll-WRITECOPY/0009-kernel32-tests-psapi-tests-Update-tests.patch
+fi
+
 # Patchset ntdll-Placeholders
 # |
+# | This patchset has the following (direct or indirect) dependencies:
+# |   *	ntdll-WRITECOPY
+# |
 # | Modified files:
 # |   *	dlls/kernelbase/memory.c, dlls/kernelbase/tests/process.c, dlls/ntdll/tests/virtual.c, dlls/ntdll/unix/server.c,
 # | 	dlls/ntdll/unix/virtual.c, server/protocol.def
@@ -2101,7 +2133,7 @@ fi
 # Patchset ntdll-ForceBottomUpAlloc
 # |
 # | This patchset has the following (direct or indirect) dependencies:
-# |   *	ntdll-Placeholders
+# |   *	ntdll-WRITECOPY, ntdll-Placeholders
 # |
 # | This patchset fixes the following Wine bugs:
 # |   *	[#48175] AION (64 bit) - crashes in crysystem.dll.CryFree() due to high memory pointers allocated
@@ -2217,28 +2249,6 @@ if test "$enable_ntdll_Syscall_Emulation" -eq 1; then
 	patch_apply ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch
 fi
 
-# Patchset ntdll-WRITECOPY
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#29384] Multiple applications expect correct handling of WRITECOPY memory protection (Voobly fails to launch Age of
-# | 	Empires II, MSYS2)
-# |
-# | Modified files:
-# |   *	dlls/kernel32/tests/virtual.c, dlls/ntdll/unix/loader.c, dlls/ntdll/unix/server.c, dlls/ntdll/unix/signal_arm.c,
-# | 	dlls/ntdll/unix/signal_arm64.c, dlls/ntdll/unix/signal_i386.c, dlls/ntdll/unix/signal_x86_64.c,
-# | 	dlls/ntdll/unix/unix_private.h, dlls/ntdll/unix/virtual.c, dlls/psapi/tests/psapi_main.c
-# |
-if test "$enable_ntdll_WRITECOPY" -eq 1; then
-	patch_apply ntdll-WRITECOPY/0001-ntdll-Trigger-write-watches-before-passing-userdata-.patch
-	patch_apply ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch
-	patch_apply ntdll-WRITECOPY/0004-ntdll-Properly-handle-PAGE_WRITECOPY-protection.-try.patch
-	patch_apply ntdll-WRITECOPY/0005-ntdll-Track-if-a-WRITECOPY-page-has-been-modified.patch
-	patch_apply ntdll-WRITECOPY/0006-ntdll-Support-WRITECOPY-on-x64.patch
-	patch_apply ntdll-WRITECOPY/0007-ntdll-Report-unmodified-WRITECOPY-pages-as-shared.patch
-	patch_apply ntdll-WRITECOPY/0008-ntdll-Fallback-to-copy-pages-for-WRITECOPY.patch
-	patch_apply ntdll-WRITECOPY/0009-kernel32-tests-psapi-tests-Update-tests.patch
-fi
-
 # Patchset ntdll-ext4-case-folder
 # |
 # | This patchset fixes the following Wine bugs: