- Fix typo in NDK

- Fix compilation of NPFS and MSFS and increase their compile speed by using PCH.

svn path=/trunk/; revision=17647

diff --git a/reactos/drivers/fs/ms/create.c b/reactos/drivers/fs/ms/create.c
index b2a2da7..bedaaac 100644 (file)
--- a/reactos/drivers/fs/ms/create.c
+++ b/reactos/drivers/fs/ms/create.c
@@ -9,8 +9,6 @@
 
 /* INCLUDES ******************************************************************/
 
 
 /* INCLUDES ******************************************************************/
 

-#include <ntifs.h>
-#include <ndk/iotypes.h>

 #include "msfs.h"
 
 #define NDEBUG
 #include "msfs.h"
 
 #define NDEBUG


@@ -107,7 +105,7 @@ NTSTATUS STDCALL
 MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject,
                   PIRP Irp)
 {
 MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject,
                   PIRP Irp)
 {

-   PIO_STACK_LOCATION IoStack;
+   PEXTENDED_IO_STACK_LOCATION IoStack;

    PFILE_OBJECT FileObject;
    PMSFS_DEVICE_EXTENSION DeviceExtension;
    PMSFS_MAILSLOT Mailslot;
    PFILE_OBJECT FileObject;
    PMSFS_DEVICE_EXTENSION DeviceExtension;
    PMSFS_MAILSLOT Mailslot;


@@ -119,7 +117,7 @@ MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject,
 
    DPRINT("MsfsCreateMailslot(DeviceObject %p Irp %p)\n", DeviceObject, Irp);
 
 
    DPRINT("MsfsCreateMailslot(DeviceObject %p Irp %p)\n", DeviceObject, Irp);
 

-   IoStack = IoGetCurrentIrpStackLocation(Irp);
+   IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp);

    DeviceExtension = DeviceObject->DeviceExtension;
    FileObject = IoStack->FileObject;
    Buffer = IoStack->Parameters.CreateMailslot.Parameters;
    DeviceExtension = DeviceObject->DeviceExtension;
    FileObject = IoStack->FileObject;
    Buffer = IoStack->Parameters.CreateMailslot.Parameters;

diff --git a/reactos/drivers/fs/ms/finfo.c b/reactos/drivers/fs/ms/finfo.c
index 33a5beb..d6356f8 100644 (file)
--- a/reactos/drivers/fs/ms/finfo.c
+++ b/reactos/drivers/fs/ms/finfo.c
@@ -9,7 +9,6 @@
 
 /* INCLUDES ******************************************************************/
 
 
 /* INCLUDES ******************************************************************/
 

-#include <ntifs.h>

 #include "msfs.h"
 
 #define NDEBUG
 #include "msfs.h"
 
 #define NDEBUG

diff --git a/reactos/drivers/fs/ms/fsctrl.c b/reactos/drivers/fs/ms/fsctrl.c
index 8a855ed..a64ca8c 100644 (file)
--- a/reactos/drivers/fs/ms/fsctrl.c
+++ b/reactos/drivers/fs/ms/fsctrl.c
@@ -9,10 +9,9 @@
 
 /* INCLUDES ******************************************************************/
 
 
 /* INCLUDES ******************************************************************/
 

-#include <ntifs.h>

 #include "msfs.h"
 
 #include "msfs.h"
 

-//#define NDEBUG
+#define NDEBUG

 #include <debug.h>
 
 
 #include <debug.h>
 
 

diff --git a/reactos/drivers/fs/ms/msfs.c b/reactos/drivers/fs/ms/msfs.c
index b79a69b..c1c140b 100644 (file)
--- a/reactos/drivers/fs/ms/msfs.c
+++ b/reactos/drivers/fs/ms/msfs.c
@@ -9,7 +9,6 @@
 
 /* INCLUDES ******************************************************************/
 
 
 /* INCLUDES ******************************************************************/
 

-#include <ntifs.h>

 #include "msfs.h"
 
 #define NDEBUG
 #include "msfs.h"
 
 #define NDEBUG

diff --git a/reactos/drivers/fs/ms/msfs.h b/reactos/drivers/fs/ms/msfs.h
index 4f7da54..52d2619 100644 (file)
--- a/reactos/drivers/fs/ms/msfs.h
+++ b/reactos/drivers/fs/ms/msfs.h
@@ -1,6 +1,9 @@
 #ifndef __SERVICES_FS_MS_MSFS_H
 #define __SERVICES_FS_MS_MSFS_H
 
 #ifndef __SERVICES_FS_MS_MSFS_H
 #define __SERVICES_FS_MS_MSFS_H
 

+#include <ntifs.h>
+#include <ndk/iotypes.h>
+

 typedef struct _MSFS_DEVICE_EXTENSION
 {
    LIST_ENTRY MailslotListHead;
 typedef struct _MSFS_DEVICE_EXTENSION
 {
    LIST_ENTRY MailslotListHead;

diff --git a/reactos/drivers/fs/ms/msfs.xml b/reactos/drivers/fs/ms/msfs.xml
index 3fd9fdd..24edd00 100644 (file)
--- a/reactos/drivers/fs/ms/msfs.xml
+++ b/reactos/drivers/fs/ms/msfs.xml
@@ -9,4 +9,5 @@
        <file>msfs.c</file>
        <file>rw.c</file>
        <file>msfs.rc</file>
        <file>msfs.c</file>
        <file>rw.c</file>
        <file>msfs.rc</file>

+       <pch>msfs.h</pch>

 </module>
 </module>

diff --git a/reactos/drivers/fs/ms/rw.c b/reactos/drivers/fs/ms/rw.c
index 7b4a7f2..fc264a4 100644 (file)
--- a/reactos/drivers/fs/ms/rw.c
+++ b/reactos/drivers/fs/ms/rw.c
@@ -9,7 +9,6 @@
 
 /* INCLUDES ******************************************************************/
 
 
 /* INCLUDES ******************************************************************/
 

-#include <ntifs.h>

 #include "msfs.h"
 
 #define NDEBUG
 #include "msfs.h"
 
 #define NDEBUG

diff --git a/reactos/drivers/fs/np/create.c b/reactos/drivers/fs/np/create.c
index e23a4fd..773abf7 100644 (file)
--- a/reactos/drivers/fs/np/create.c
+++ b/reactos/drivers/fs/np/create.c
@@ -107,7 +107,7 @@ NTSTATUS STDCALL
 NpfsCreate(PDEVICE_OBJECT DeviceObject,
           PIRP Irp)
 {
 NpfsCreate(PDEVICE_OBJECT DeviceObject,
           PIRP Irp)
 {

-  PIO_STACK_LOCATION IoStack;
+  PEXTENDED_IO_STACK_LOCATION IoStack;

   PFILE_OBJECT FileObject;
   PNPFS_PIPE Pipe;
   PNPFS_FCB ClientFcb;
   PFILE_OBJECT FileObject;
   PNPFS_PIPE Pipe;
   PNPFS_FCB ClientFcb;


@@ -118,7 +118,7 @@ NpfsCreate(PDEVICE_OBJECT DeviceObject,
   DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp);
 
   DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
   DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp);
 
   DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension;

-  IoStack = IoGetCurrentIrpStackLocation(Irp);
+  IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp);

   FileObject = IoStack->FileObject;
   DPRINT("FileObject %p\n", FileObject);
   DPRINT("FileName %wZ\n", &FileObject->FileName);
   FileObject = IoStack->FileObject;
   DPRINT("FileObject %p\n", FileObject);
   DPRINT("FileName %wZ\n", &FileObject->FileName);


@@ -307,7 +307,7 @@ NTSTATUS STDCALL
 NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject,
                    PIRP Irp)
 {
 NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject,
                    PIRP Irp)
 {

-   PIO_STACK_LOCATION IoStack;
+   PEXTENDED_IO_STACK_LOCATION IoStack;

    PFILE_OBJECT FileObject;
    PNPFS_DEVICE_EXTENSION DeviceExt;
    PNPFS_PIPE Pipe;
    PFILE_OBJECT FileObject;
    PNPFS_DEVICE_EXTENSION DeviceExt;
    PNPFS_PIPE Pipe;


@@ -318,7 +318,7 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject,
    DPRINT("NpfsCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp);
 
    DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
    DPRINT("NpfsCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp);
 
    DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension;

-   IoStack = IoGetCurrentIrpStackLocation(Irp);
+   IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp);

    FileObject = IoStack->FileObject;
    DPRINT("FileObject %p\n", FileObject);
    DPRINT("Pipe name %wZ\n", &FileObject->FileName);
    FileObject = IoStack->FileObject;
    DPRINT("FileObject %p\n", FileObject);
    DPRINT("Pipe name %wZ\n", &FileObject->FileName);

diff --git a/reactos/drivers/fs/np/npfs.xml b/reactos/drivers/fs/np/npfs.xml
index 64262c1..e2a898a 100644 (file)
--- a/reactos/drivers/fs/np/npfs.xml
+++ b/reactos/drivers/fs/np/npfs.xml
@@ -10,4 +10,5 @@
        <file>rw.c</file>
        <file>volume.c</file>
        <file>npfs.rc</file>
        <file>rw.c</file>
        <file>volume.c</file>
        <file>npfs.rc</file>

+       <pch>npfs.h</pch>

 </module>
 </module>

diff --git a/reactos/include/ndk/iotypes.h b/reactos/include/ndk/iotypes.h
index ce8f96b..26947a9 100644 (file)
--- a/reactos/include/ndk/iotypes.h
+++ b/reactos/include/ndk/iotypes.h
@@ -889,7 +889,7 @@ typedef struct _EXTENDED_IO_STACK_LOCATION
     PFILE_OBJECT FileObject;
     PIO_COMPLETION_ROUTINE CompletionRoutine;
     PVOID Context;
     PFILE_OBJECT FileObject;
     PIO_COMPLETION_ROUTINE CompletionRoutine;
     PVOID Context;

-} IO_STACK_LOCATION, *PIO_STACK_LOCATION;
+} EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION;

 #if !defined(_ALPHA_)
 #include <poppack.h>
 #endif
 #if !defined(_ALPHA_)
 #include <poppack.h>
 #endif