From cfdd73e2c4a46aff624b9be8851889c59a28309f Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 28 Jan 2015 02:03:28 +0100 Subject: [PATCH] ntoskrnl-KeWaitForMultipleObjects: Remove definition of KWAIT_BLOCK (accepted upstream). --- ...xe-add-KeWaitForMultipleObjects-stub.patch | 26 ++----------------- patches/patchinstall.sh | 2 +- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/patches/ntoskrnl-KeWaitForMultipleObjects/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch b/patches/ntoskrnl-KeWaitForMultipleObjects/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch index bce754a1..c79515c6 100644 --- a/patches/ntoskrnl-KeWaitForMultipleObjects/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch +++ b/patches/ntoskrnl-KeWaitForMultipleObjects/0002-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch @@ -1,4 +1,4 @@ -From 763c686161d8d3c05edf7a508d0fd4f211de4587 Mon Sep 17 00:00:00 2001 +From b3df25d2fc4e83fbd018c56c95f627a29a777429 Mon Sep 17 00:00:00 2001 From: Austin English Date: Wed, 24 Dec 2014 15:35:23 -0600 Subject: ntoskrnl.exe: add KeWaitForMultipleObjects stub @@ -6,8 +6,7 @@ Subject: ntoskrnl.exe: add KeWaitForMultipleObjects stub --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- - include/ddk/ntddk.h | 10 ++++++++++ - 3 files changed, 25 insertions(+), 1 deletion(-) + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index af1626d..807a172 100644 @@ -54,27 +53,6 @@ index b824250..720ce3e 100644 @ stdcall KeWaitForMutexObject(ptr long long long ptr) @ stdcall KeWaitForSingleObject(ptr long long long ptr) @ stub KiBugCheckData -diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h -index 56f2f35..6fdb21a 100644 ---- a/include/ddk/ntddk.h -+++ b/include/ddk/ntddk.h -@@ -140,6 +140,16 @@ typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION - LARGE_INTEGER ValidDataLength; - } FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; - -+typedef struct _KWAIT_BLOCK -+{ -+ LIST_ENTRY WaitListEntry; -+ PKTHREAD Thread; -+ PVOID Object; -+ struct _KWAIT_BLOCK *NextWaitBlock; -+ USHORT WaitKey; -+ USHORT WaitType; -+} KWAIT_BLOCK, *PKWAIT_BLOCK; -+ - typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); - typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); - typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); -- 2.2.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 3894608f..afde2576 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2264,7 +2264,7 @@ fi # Patchset ntoskrnl-KeWaitForMultipleObjects # | # | Modified files: -# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/ntddk.h, include/ntdef.h +# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ntdef.h # | if test "$enable_ntoskrnl_KeWaitForMultipleObjects" -eq 1; then patch_apply ntoskrnl-KeWaitForMultipleObjects/0001-include-Remove-several-duplicate-definitions-from-nt.patch