Rebase against 839995d5e9afcbcdcd084eac3a8e6e48a2173eda.

This commit is contained in:
Sebastian Lackner
2016-08-25 23:43:12 +02:00
parent f2fd04974f
commit deb73bfa7c
3 changed files with 20 additions and 20 deletions

View File

@@ -1,4 +1,4 @@
From b3df25d2fc4e83fbd018c56c95f627a29a777429 Mon Sep 17 00:00:00 2001
From 3b325b1efd31f5162d119b7f7cef2edc06f3d627 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
@@ -9,18 +9,18 @@ Subject: ntoskrnl.exe: add KeWaitForMultipleObjects stub
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
index 7c35d14..7ffae6e 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -29,6 +29,7 @@
@@ -30,6 +30,7 @@
#include "ntstatus.h"
#define WIN32_NO_STATUS
+#include "ntdef.h"
#include "windef.h"
#include "winsvc.h"
#include "winternl.h"
#include "excpt.h"
@@ -1480,6 +1481,19 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object,
@@ -1918,6 +1919,19 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object,
}
/***********************************************************************
@@ -41,7 +41,7 @@ index af1626d..807a172 100644
*/
VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index b824250..720ce3e 100644
index 119d406..059f49c 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -627,7 +627,7 @@
@@ -54,5 +54,5 @@ index b824250..720ce3e 100644
@ stdcall KeWaitForSingleObject(ptr long long long ptr)
@ stub KiBugCheckData
--
2.2.1
2.9.0