From 70c01d53853519c05d3358c58277d824fbb723d8 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 13 Mar 2015 18:43:39 +0100 Subject: [PATCH] ntoskrnl-Stubs: It is no longer necessary to remove duplicate definitions, this was already fixed upstream. --- ...everal-duplicate-definitions-from-nt.patch | 35 ------------------ ...e-add-KeWaitForMultipleObjects-stub.patch} | 0 ...stub-for-IoGetAttachedDeviceReferen.patch} | 0 ...stubs-for-ExAcquireFastMutexUnsafe-.patch} | 0 ...stubs-for-ObReferenceObjectByPointe.patch} | 0 ...Add-stub-for-KeDelayExecutionThread.patch} | 0 ...rnl.exe-Improve-KeReleaseMutex-stub.patch} | 0 ...-Improve-KeInitializeSemaphore-stub.patch} | 0 ...xe-Improve-KeInitializeTimerEx-stub.patch} | 0 ...ix-IoReleaseCancelSpinLock-argument.patch} | 0 ...stub-for-ExAcquireResourceExclusive.patch} | 0 ...stub-for-ExReleaseResourceForThread.patch} | 0 ...e-Add-stub-for-ExDeleteResourceLite.patch} | 0 ...ement-MmMapLockedPages-and-MmUnmapL.patch} | 0 ...rnl.exe-Implement-KeInitializeMutex.patch} | 0 ...skrnl.exe-Add-stub-for-ProbeForRead.patch} | 0 ...krnl.exe-Add-stub-for-ProbeForWrite.patch} | 0 patches/patchinstall.sh | 36 +++++++++---------- 18 files changed, 17 insertions(+), 54 deletions(-) delete mode 100644 patches/ntoskrnl-Stubs/0001-include-Remove-several-duplicate-definitions-from-nt.patch rename patches/ntoskrnl-Stubs/{0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch => 0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch} (100%) rename patches/ntoskrnl-Stubs/{0003-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch => 0002-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch} (100%) rename patches/ntoskrnl-Stubs/{0004-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch => 0003-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch} (100%) rename patches/ntoskrnl-Stubs/{0005-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch => 0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch} (100%) rename patches/ntoskrnl-Stubs/{0006-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch => 0005-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch} (100%) rename patches/ntoskrnl-Stubs/{0007-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch => 0006-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch} (100%) rename patches/ntoskrnl-Stubs/{0008-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch => 0007-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch} (100%) rename patches/ntoskrnl-Stubs/{0009-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch => 0008-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch} (100%) rename patches/ntoskrnl-Stubs/{0010-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch => 0009-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch} (100%) rename patches/ntoskrnl-Stubs/{0011-ntoskrnl.exe-Add-stub-for-ExAcquireResourceExclusive.patch => 0010-ntoskrnl.exe-Add-stub-for-ExAcquireResourceExclusive.patch} (100%) rename patches/ntoskrnl-Stubs/{0012-ntoskrnl.exe-Add-stub-for-ExReleaseResourceForThread.patch => 0011-ntoskrnl.exe-Add-stub-for-ExReleaseResourceForThread.patch} (100%) rename patches/ntoskrnl-Stubs/{0013-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch => 0012-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch} (100%) rename patches/ntoskrnl-Stubs/{0014-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch => 0013-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch} (100%) rename patches/ntoskrnl-Stubs/{0015-ntoskrnl.exe-Implement-KeInitializeMutex.patch => 0014-ntoskrnl.exe-Implement-KeInitializeMutex.patch} (100%) rename patches/ntoskrnl-Stubs/{0016-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch => 0015-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch} (100%) rename patches/ntoskrnl-Stubs/{0017-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch => 0016-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch} (100%) diff --git a/patches/ntoskrnl-Stubs/0001-include-Remove-several-duplicate-definitions-from-nt.patch b/patches/ntoskrnl-Stubs/0001-include-Remove-several-duplicate-definitions-from-nt.patch deleted file mode 100644 index 6e326178..00000000 --- a/patches/ntoskrnl-Stubs/0001-include-Remove-several-duplicate-definitions-from-nt.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0257e41671d17f7875cab2cdb0ae9fc3e7b071a8 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -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-Stubs/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch b/patches/ntoskrnl-Stubs/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch rename to patches/ntoskrnl-Stubs/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch diff --git a/patches/ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch b/patches/ntoskrnl-Stubs/0002-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch rename to patches/ntoskrnl-Stubs/0002-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch diff --git a/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch b/patches/ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch rename to patches/ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch diff --git a/patches/ntoskrnl-Stubs/0005-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch b/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0005-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch rename to patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch diff --git a/patches/ntoskrnl-Stubs/0006-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch b/patches/ntoskrnl-Stubs/0005-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0006-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch rename to patches/ntoskrnl-Stubs/0005-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch diff --git a/patches/ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch b/patches/ntoskrnl-Stubs/0006-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch rename to patches/ntoskrnl-Stubs/0006-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch diff --git a/patches/ntoskrnl-Stubs/0008-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch b/patches/ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0008-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch rename to patches/ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch diff --git a/patches/ntoskrnl-Stubs/0009-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch b/patches/ntoskrnl-Stubs/0008-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0009-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch rename to patches/ntoskrnl-Stubs/0008-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch diff --git a/patches/ntoskrnl-Stubs/0010-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch b/patches/ntoskrnl-Stubs/0009-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0010-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch rename to patches/ntoskrnl-Stubs/0009-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch diff --git a/patches/ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-stub-for-ExAcquireResourceExclusive.patch b/patches/ntoskrnl-Stubs/0010-ntoskrnl.exe-Add-stub-for-ExAcquireResourceExclusive.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-stub-for-ExAcquireResourceExclusive.patch rename to patches/ntoskrnl-Stubs/0010-ntoskrnl.exe-Add-stub-for-ExAcquireResourceExclusive.patch diff --git a/patches/ntoskrnl-Stubs/0012-ntoskrnl.exe-Add-stub-for-ExReleaseResourceForThread.patch b/patches/ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-stub-for-ExReleaseResourceForThread.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0012-ntoskrnl.exe-Add-stub-for-ExReleaseResourceForThread.patch rename to patches/ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-stub-for-ExReleaseResourceForThread.patch diff --git a/patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch b/patches/ntoskrnl-Stubs/0012-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch rename to patches/ntoskrnl-Stubs/0012-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch diff --git a/patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch b/patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch rename to patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch diff --git a/patches/ntoskrnl-Stubs/0015-ntoskrnl.exe-Implement-KeInitializeMutex.patch b/patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-KeInitializeMutex.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0015-ntoskrnl.exe-Implement-KeInitializeMutex.patch rename to patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-KeInitializeMutex.patch diff --git a/patches/ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch b/patches/ntoskrnl-Stubs/0015-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch rename to patches/ntoskrnl-Stubs/0015-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch diff --git a/patches/ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch b/patches/ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch similarity index 100% rename from patches/ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch rename to patches/ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7949d6a6..2b159078 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3094,28 +3094,26 @@ fi # | * [#38103] Process Hacker 2.x needs ntoskrnl.ProbeForRead # | # | Modified files: -# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/wdm.h, include/ntdef.h +# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/wdm.h # | if test "$enable_ntoskrnl_Stubs" -eq 1; then - patch_apply ntoskrnl-Stubs/0001-include-Remove-several-duplicate-definitions-from-nt.patch - patch_apply ntoskrnl-Stubs/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch - patch_apply ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch - patch_apply ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch - patch_apply ntoskrnl-Stubs/0005-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch - patch_apply ntoskrnl-Stubs/0006-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch - patch_apply ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch - patch_apply ntoskrnl-Stubs/0008-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch - patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch - patch_apply ntoskrnl-Stubs/0010-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch - patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-stub-for-ExAcquireResourceExclusive.patch - patch_apply ntoskrnl-Stubs/0012-ntoskrnl.exe-Add-stub-for-ExReleaseResourceForThread.patch - patch_apply ntoskrnl-Stubs/0013-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch - patch_apply ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch - patch_apply ntoskrnl-Stubs/0015-ntoskrnl.exe-Implement-KeInitializeMutex.patch - patch_apply ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch - patch_apply ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch + patch_apply ntoskrnl-Stubs/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch + patch_apply ntoskrnl-Stubs/0002-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch + patch_apply ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch + patch_apply ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch + patch_apply ntoskrnl-Stubs/0005-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch + patch_apply ntoskrnl-Stubs/0006-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch + patch_apply ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch + patch_apply ntoskrnl-Stubs/0008-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch + patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch + patch_apply ntoskrnl-Stubs/0010-ntoskrnl.exe-Add-stub-for-ExAcquireResourceExclusive.patch + patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-stub-for-ExReleaseResourceForThread.patch + patch_apply ntoskrnl-Stubs/0012-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch + patch_apply ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch + patch_apply ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-KeInitializeMutex.patch + patch_apply ntoskrnl-Stubs/0015-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch + patch_apply ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch ( - echo '+ { "Sebastian Lackner", "include: Remove several duplicate definitions from ntdef.h.", 1 },'; echo '+ { "Austin English", "ntoskrnl.exe: add KeWaitForMultipleObjects stub.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for IoGetAttachedDeviceReference.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stubs for ExAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafe.", 1 },';