diff --git a/patches/ntoskrnl-KeWaitForMultipleObjects/0001-include-Remove-several-duplicate-definitions-from-nt.patch b/patches/ntoskrnl-KeWaitForMultipleObjects/0001-include-Remove-several-duplicate-definitions-from-nt.patch new file mode 100644 index 00000000..6e326178 --- /dev/null +++ b/patches/ntoskrnl-KeWaitForMultipleObjects/0001-include-Remove-several-duplicate-definitions-from-nt.patch @@ -0,0 +1,35 @@ +From 0257e41671d17f7875cab2cdb0ae9fc3e7b071a8 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner <sebastian@fds-team.de> +Date: Tue, 27 Jan 2015 14:50:34 +0100 +Subject: include: Remove several duplicate definitions from ntdef.h. + +FIXME: Should they removed from winternl.h instead? Whats the proper way +to use both include files at the same time? +--- + include/ntdef.h | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/include/ntdef.h b/include/ntdef.h +index 83ecffd..8b35cef 100644 +--- a/include/ntdef.h ++++ b/include/ntdef.h +@@ -23,16 +23,6 @@ + extern "C" { + #endif + +-typedef enum _EVENT_TYPE { +- NotificationEvent, +- SynchronizationEvent +-} EVENT_TYPE; +- +-typedef enum _TIMER_TYPE { +- NotificationTimer, +- SynchronizationTimer +-} TIMER_TYPE; +- + typedef enum _WAIT_TYPE { + WaitAll, + WaitAny, +-- +2.2.1 + diff --git a/patches/ntoskrnl-KeWaitForMultipleObjects/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch b/patches/ntoskrnl-KeWaitForMultipleObjects/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch similarity index 97% rename from patches/ntoskrnl-KeWaitForMultipleObjects/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch rename to patches/ntoskrnl-KeWaitForMultipleObjects/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch index 6387dcf6..bce754a1 100644 --- a/patches/ntoskrnl-KeWaitForMultipleObjects/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch +++ b/patches/ntoskrnl-KeWaitForMultipleObjects/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch @@ -1,4 +1,4 @@ -From 58be1f49e04389722d967a139a337bf4524cccdd Mon Sep 17 00:00:00 2001 +From 763c686161d8d3c05edf7a508d0fd4f211de4587 Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish@gmail.com> Date: Wed, 24 Dec 2014 15:35:23 -0600 Subject: ntoskrnl.exe: add KeWaitForMultipleObjects stub diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 2730e9d4..3894608f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2264,11 +2264,13 @@ fi # Patchset ntoskrnl-KeWaitForMultipleObjects # | # | Modified files: -# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/ntddk.h +# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/ntddk.h, include/ntdef.h # | if test "$enable_ntoskrnl_KeWaitForMultipleObjects" -eq 1; then - patch_apply ntoskrnl-KeWaitForMultipleObjects/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch + patch_apply ntoskrnl-KeWaitForMultipleObjects/0001-include-Remove-several-duplicate-definitions-from-nt.patch + patch_apply ntoskrnl-KeWaitForMultipleObjects/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch ( + echo '+ { "Sebastian Lackner", "include: Remove several duplicate definitions from ntdef.h.", 1 },'; echo '+ { "Austin English", "ntoskrnl.exe: add KeWaitForMultipleObjects stub.", 1 },'; ) >> "$patchlist" fi