From 02f0f81fc0c82db3d3151be32d26295f3706a732 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Tue, 1 Feb 2005 17:54:25 +0000
Subject: [PATCH] Correct prototype for NtGetPlugPlayEvent and use the ntpnp.h
 header.

svn path=/trunk/; revision=13384
---
 reactos/include/ntos/zw.h           | 15 ---------------
 reactos/ntoskrnl/include/ntoskrnl.h |  1 +
 reactos/ntoskrnl/io/plugplay.c      |  4 +---
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h
index e76c6019e32..476e5822115 100755
--- a/reactos/include/ntos/zw.h
+++ b/reactos/include/ntos/zw.h
@@ -4929,21 +4929,6 @@ ZwYieldExecution(
 	VOID
 	);
 
-/* --- PLUG AND PLAY --- */
-
-NTSTATUS
-STDCALL
-NtPlugPlayControl(IN ULONG ControlCode,
-                  IN OUT PVOID Buffer,
-                  IN ULONG BufferLength);
-
-NTSTATUS
-STDCALL
-NtGetPlugPlayEvent(IN ULONG Reserved1,
-                   IN ULONG Reserved2,
-                   OUT PVOID Buffer,
-                   IN ULONG BufferLength);
-
 /* --- POWER MANAGEMENT --- */
 
 #ifndef __USE_W32API
diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index a2c9144a57a..9f86d423f2e 100755
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -20,6 +20,7 @@
 #include <ntos/synch.h>
 #include <ntos/keyboard.h>
 #include <ntos/ntdef.h>
+#include <ntos/ntpnp.h>
 #include <rosrtl/minmax.h>
 #include <rosrtl/string.h>
 #include <ddk/halfuncs.h>
diff --git a/reactos/ntoskrnl/io/plugplay.c b/reactos/ntoskrnl/io/plugplay.c
index f9760ce3b20..e309df1cd8f 100644
--- a/reactos/ntoskrnl/io/plugplay.c
+++ b/reactos/ntoskrnl/io/plugplay.c
@@ -15,13 +15,11 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-
 /* GLOBALS *******************************************************************/
 
 static LIST_ENTRY IopPnpEventListHead;
 static KEVENT IopPnpNotifyEvent;
 
-
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS INIT_FUNCTION
@@ -67,7 +65,7 @@ IopDequeuePlugPlayEvent(VOID)
 NTSTATUS STDCALL
 NtGetPlugPlayEvent(IN ULONG Reserved1,
                    IN ULONG Reserved2,
-                   OUT PVOID Buffer,
+                   OUT PPLUGPLAY_EVENT_BLOCK Buffer,
                    IN ULONG BufferLength)
 {
   NTSTATUS Status;