[ros-diffs] [ion] 16237: fix build...sigh...sorry, my ntoskrnl builds with NDK

fix build...sigh...sorry, my ntoskrnl builds with NDK
Modified: trunk/reactos/include/ntos/ntpnp.h
Modified: trunk/reactos/include/ntos/port.h
Modified: trunk/reactos/include/ntos/zw.h
Modified: trunk/reactos/ntoskrnl/fs/mcb.c
Modified: trunk/reactos/w32api/include/ddk/ntapi.h
  _____  

Modified: trunk/reactos/include/ntos/ntpnp.h
--- trunk/reactos/include/ntos/ntpnp.h	2005-06-23 04:42:49 UTC (rev
16236)
+++ trunk/reactos/include/ntos/ntpnp.h	2005-06-23 04:52:27 UTC (rev
16237)
@@ -173,7 +173,7 @@

    PPLUGPLAY_EVENT_BLOCK Buffer,
    ULONG BufferSize);
  */
-
+ 
 /*
  * NtPlugPlayControl
  *
  _____  

Modified: trunk/reactos/include/ntos/port.h
--- trunk/reactos/include/ntos/port.h	2005-06-23 04:42:49 UTC (rev
16236)
+++ trunk/reactos/include/ntos/port.h	2005-06-23 04:52:27 UTC (rev
16237)
@@ -13,18 +13,12 @@

 #ifndef __INCLUDE_PORT_H
 #define __INCLUDE_PORT_H
 
-#ifndef __USE_W32API
-
 /* Port Object Access */
 
 #define PORT_ALL_ACCESS               (0x1)
 
-#else /* __USE_W32API */
-
 #include <ddk/ntifs.h>
 
-#endif /* __USE_W32API */
-
 #endif /* __INCLUDE_PORT_H */
 
 /* EOF */
  _____  

Modified: trunk/reactos/include/ntos/zw.h
--- trunk/reactos/include/ntos/zw.h	2005-06-23 04:42:49 UTC (rev
16236)
+++ trunk/reactos/include/ntos/zw.h	2005-06-23 04:52:27 UTC (rev
16237)
@@ -6464,6 +6464,24 @@

 
 #endif /* !__USE_W32API */
 
+struct _PLUGPLAY_EVENT_BLOCK;
+NTSTATUS 
+STDCALL
+NtGetPlugPlayEvent(
+    ULONG Reserved1,
+    ULONG Reserved2,
+    struct _PLUGPLAY_EVENT_BLOCK *Buffer,
+    ULONG BufferSize
+);
+
+NTSTATUS 
+STDCALL
+NtPlugPlayControl(
+    ULONG ControlCode,
+    PVOID Buffer,
+    ULONG BufferSize
+);
+
 /*
  * FUNCTION: Loads a registry key.
  * ARGUMENTS:
  _____  

Modified: trunk/reactos/ntoskrnl/fs/mcb.c
--- trunk/reactos/ntoskrnl/fs/mcb.c	2005-06-23 04:42:49 UTC (rev
16236)
+++ trunk/reactos/ntoskrnl/fs/mcb.c	2005-06-23 04:52:27 UTC (rev
16237)
@@ -45,7 +45,7 @@

 		  IN LBN      Lbn,
 		  IN ULONG    SectorCount)
 {
-  return FsRtlAddLargeMcbEntry(& Mcb->LargeMcb,
+  return FsRtlAddLargeMcbEntry(&
Mcb->DummyFieldThatSizesThisStructureCorrectly,
 			       (LONGLONG) Vbn,
 			       (LONGLONG) Lbn,
 			       (LONGLONG) SectorCount);
@@ -82,7 +82,7 @@
   LONGLONG llSectorCount;
 
   /* Call the Large version */
-  Return = FsRtlGetNextLargeMcbEntry(&Mcb->LargeMcb,
+  Return =
FsRtlGetNextLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectl
y,
                                      RunIndex,
                                      &llVbn,
                                      &llLbn,
@@ -106,7 +106,7 @@
 			IN POOL_TYPE PoolType)
 {
   UNIMPLEMENTED;
-  Mcb->PoolType = PoolType;
+  Mcb->BaseMcb.PoolType = PoolType;
 }
 
 /*
@@ -117,7 +117,7 @@
 FsRtlInitializeMcb (IN PMCB         Mcb,
 		    IN POOL_TYPE    PoolType)
 {
-  FsRtlInitializeLargeMcb(& Mcb->LargeMcb, PoolType);
+  FsRtlInitializeLargeMcb(&
Mcb->DummyFieldThatSizesThisStructureCorrectly, PoolType);
 }
 
 
@@ -209,7 +209,7 @@
   LONGLONG llLbn;
 
   /* Call the Large version */
-  Return = FsRtlLookupLastLargeMcbEntry(&Mcb->LargeMcb,
+  Return =
FsRtlLookupLastLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorre
ctly,
                                         &llVbn,
                                         &llLbn);
 
@@ -237,7 +237,7 @@
   LONGLONG llSectorCount;
 
   /* Call the Large version */
-  Return = FsRtlLookupLargeMcbEntry(&Mcb->LargeMcb,
+  Return =
FsRtlLookupLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly
,
                                     (LONGLONG)Vbn,
                                     &llLbn,
                                     &llSectorCount,
@@ -262,7 +262,7 @@
 {
   ULONG NumberOfRuns;
   ExAcquireFastMutex (Mcb->FastMutex);
-  NumberOfRuns=Mcb->PairCount;
+  NumberOfRuns=Mcb->BaseMcb.MaximumPairCount;
   ExReleaseFastMutex (Mcb->FastMutex);
   return(NumberOfRuns);
 }
@@ -276,7 +276,7 @@
 ULONG STDCALL
 FsRtlNumberOfRunsInMcb (IN PMCB Mcb)
 {
-  return FsRtlNumberOfRunsInLargeMcb(& Mcb->LargeMcb);
+  return FsRtlNumberOfRunsInLargeMcb(&
Mcb->DummyFieldThatSizesThisStructureCorrectly);
 }
 
 
@@ -301,7 +301,7 @@
 		     IN ULONG    SectorCount)
 {
     /* Call the large function */
-      return FsRtlRemoveLargeMcbEntry(&Mcb->LargeMcb,
+      return
FsRtlRemoveLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly
,
                                       (LONGLONG)Vbn,
                                       (LONGLONG)SectorCount);
 }
@@ -353,7 +353,7 @@
 FsRtlTruncateMcb (IN PMCB Mcb,
 		  IN VBN  Vbn)
 {
-  FsRtlTruncateLargeMcb (& Mcb->LargeMcb, (LONGLONG) Vbn);
+  FsRtlTruncateLargeMcb (&
Mcb->DummyFieldThatSizesThisStructureCorrectly, (LONGLONG) Vbn);
 }
 
 
@@ -374,7 +374,7 @@
 VOID STDCALL
 FsRtlUninitializeMcb (IN PMCB Mcb)
 {
-  FsRtlUninitializeLargeMcb(& Mcb->LargeMcb);
+  FsRtlUninitializeLargeMcb(&
Mcb->DummyFieldThatSizesThisStructureCorrectly);
 }
 
 
  _____  

Modified: trunk/reactos/w32api/include/ddk/ntapi.h
--- trunk/reactos/w32api/include/ddk/ntapi.h	2005-06-23 04:42:49 UTC
(rev 16236)
+++ trunk/reactos/w32api/include/ddk/ntapi.h	2005-06-23 04:52:27 UTC
(rev 16237)
@@ -248,20 +248,6 @@

 	ULONG  CurrentTimeZoneId;
 } SYSTEM_TIME_OF_DAY_INFORMATION, *PSYSTEM_TIME_OF_DAY_INFORMATION;
 
-typedef struct _VM_COUNTERS {
-	ULONG  PeakVirtualSize;
-	ULONG  VirtualSize;
-	ULONG  PageFaultCount;
-	ULONG  PeakWorkingSetSize;
-	ULONG  WorkingSetSize;
-	ULONG  QuotaPeakPagedPoolUsage;
-	ULONG  QuotaPagedPoolUsage;
-	ULONG  QuotaPeakNonPagedPoolUsage;
-	ULONG  QuotaNonPagedPoolUsage;
-	ULONG  PagefileUsage;
-	ULONG  PeakPagefileUsage;
-} VM_COUNTERS, *PVM_COUNTERS;
-
 typedef enum _THREAD_STATE {
 	Initialized,
 	Ready,
@@ -1486,23 +1472,7 @@
 #define SEM_NOALIGNMENTFAULTEXCEPT        0x0004
 #define SEM_NOOPENFILEERRORBOX            0x8000
 /* end winbase.h */
-typedef struct _POOLED_USAGE_AND_LIMITS {
-	ULONG  PeakPagedPoolUsage;
-	ULONG  PagedPoolUsage;
-	ULONG  PagedPoolLimit;
-	ULONG  PeakNonPagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  NonPagedPoolLimit;
-	ULONG  PeakPagefileUsage;
-	ULONG  PagefileUsage;
-	ULONG  PagefileLimit;
-} POOLED_USAGE_AND_LIMITS, *PPOOLED_USAGE_AND_LIMITS;
 
-typedef struct _PROCESS_WS_WATCH_INFORMATION {
-  PVOID  FaultingPc;
-  PVOID  FaultingVa;
-} PROCESS_WS_WATCH_INFORMATION, *PPROCESS_WS_WATCH_INFORMATION;
-
 /* PROCESS_PRIORITY_CLASS.PriorityClass constants */
 #define PC_IDLE                           1
 #define PC_NORMAL                         2