[ros-diffs] [navaraf] 13384: Correct prototype for NtGetPlugPlayEvent and use the ntpnp.h header.

Correct prototype for NtGetPlugPlayEvent and use the ntpnp.h header.
Modified: trunk/reactos/include/ntos/zw.h
Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h
Modified: trunk/reactos/ntoskrnl/io/plugplay.c
  _____  

Modified: trunk/reactos/include/ntos/zw.h
--- trunk/reactos/include/ntos/zw.h	2005-02-01 17:53:55 UTC (rev
13383)
+++ trunk/reactos/include/ntos/zw.h	2005-02-01 17:54:25 UTC (rev
13384)
@@ -4929,21 +4929,6 @@

 	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
  _____  

Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h
--- trunk/reactos/ntoskrnl/include/ntoskrnl.h	2005-02-01 17:53:55 UTC
(rev 13383)
+++ trunk/reactos/ntoskrnl/include/ntoskrnl.h	2005-02-01 17:54:25 UTC
(rev 13384)
@@ -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>
  _____  

Modified: trunk/reactos/ntoskrnl/io/plugplay.c
--- trunk/reactos/ntoskrnl/io/plugplay.c	2005-02-01 17:53:55 UTC
(rev 13383)
+++ trunk/reactos/ntoskrnl/io/plugplay.c	2005-02-01 17:54:25 UTC
(rev 13384)
@@ -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 @@
 NTSTATUS STDCALL
 NtGetPlugPlayEvent(IN ULONG Reserved1,
                    IN ULONG Reserved2,
-                   OUT PVOID Buffer,
+                   OUT PPLUGPLAY_EVENT_BLOCK Buffer,
                    IN ULONG BufferLength)
 {
   NTSTATUS Status;