ntoskrnl-KeWaitForMultipleObjects: Directly use new header file ntdef.h.

This commit is contained in:
Sebastian Lackner 2015-01-27 04:38:18 +01:00
parent 42ef436373
commit aab0c9dd62

View File

@ -1,19 +1,27 @@
From 0fa1a31ae872769dc2ccf069184d36117b767435 Mon Sep 17 00:00:00 2001
From 58be1f49e04389722d967a139a337bf4524cccdd 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
---
dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++
dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
include/ddk/ntddk.h | 17 +++++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
include/ddk/ntddk.h | 10 ++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index af1626d..97e09a7 100644
index af1626d..807a172 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -1480,6 +1480,19 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object,
@@ -29,6 +29,7 @@
#include "ntstatus.h"
#define WIN32_NO_STATUS
+#include "ntdef.h"
#include "windef.h"
#include "winternl.h"
#include "excpt.h"
@@ -1480,6 +1481,19 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object,
}
/***********************************************************************
@ -47,10 +55,10 @@ index b824250..720ce3e 100644
@ stdcall KeWaitForSingleObject(ptr long long long ptr)
@ stub KiBugCheckData
diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h
index 56f2f35..ac6484f 100644
index 56f2f35..6fdb21a 100644
--- a/include/ddk/ntddk.h
+++ b/include/ddk/ntddk.h
@@ -140,6 +140,23 @@ typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION
@@ -140,6 +140,16 @@ typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION
LARGE_INTEGER ValidDataLength;
} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION;
@ -63,17 +71,10 @@ index 56f2f35..ac6484f 100644
+ USHORT WaitKey;
+ USHORT WaitType;
+} KWAIT_BLOCK, *PKWAIT_BLOCK;
+
+/* FIXME: belongs in ntdef.h */
+typedef enum _WAIT_TYPE
+{
+ WaitAll,
+ WaitAny
+} WAIT_TYPE;
+
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);
--
1.9.1
2.2.1