From f8707b368d6abdeac1b69b45236e61f73e5ff4ae Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Thu, 23 Jun 2005 04:52:27 +0000 Subject: [PATCH] fix build...sigh...sorry, my ntoskrnl builds with NDK svn path=/trunk/; revision=16237 --- reactos/include/ntos/ntpnp.h | 2 +- reactos/include/ntos/port.h | 6 ------ reactos/include/ntos/zw.h | 18 ++++++++++++++++++ reactos/ntoskrnl/fs/mcb.c | 22 +++++++++++----------- reactos/w32api/include/ddk/ntapi.h | 30 ------------------------------ 5 files changed, 30 insertions(+), 48 deletions(-) diff --git a/reactos/include/ntos/ntpnp.h b/reactos/include/ntos/ntpnp.h index 977a36622c2..af55dda37a1 100644 --- a/reactos/include/ntos/ntpnp.h +++ b/reactos/include/ntos/ntpnp.h @@ -173,7 +173,7 @@ NtGetPlugPlayEvent( PPLUGPLAY_EVENT_BLOCK Buffer, ULONG BufferSize); */ - + /* * NtPlugPlayControl * diff --git a/reactos/include/ntos/port.h b/reactos/include/ntos/port.h index 805dd6cb092..8ff3b2ff28b 100644 --- a/reactos/include/ntos/port.h +++ b/reactos/include/ntos/port.h @@ -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 -#endif /* __USE_W32API */ - #endif /* __INCLUDE_PORT_H */ /* EOF */ diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h index c85089e0bd7..ebfda3f7970 100755 --- a/reactos/include/ntos/zw.h +++ b/reactos/include/ntos/zw.h @@ -6464,6 +6464,24 @@ typedef struct _SECTION_IMAGE_INFORMATION #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: diff --git a/reactos/ntoskrnl/fs/mcb.c b/reactos/ntoskrnl/fs/mcb.c index dd972908505..abc255d4917 100644 --- a/reactos/ntoskrnl/fs/mcb.c +++ b/reactos/ntoskrnl/fs/mcb.c @@ -45,7 +45,7 @@ FsRtlAddMcbEntry (IN PMCB Mcb, IN LBN Lbn, IN ULONG SectorCount) { - return FsRtlAddLargeMcbEntry(& Mcb->LargeMcb, + return FsRtlAddLargeMcbEntry(& Mcb->DummyFieldThatSizesThisStructureCorrectly, (LONGLONG) Vbn, (LONGLONG) Lbn, (LONGLONG) SectorCount); @@ -82,7 +82,7 @@ FsRtlGetNextMcbEntry (IN PMCB Mcb, LONGLONG llSectorCount; /* Call the Large version */ - Return = FsRtlGetNextLargeMcbEntry(&Mcb->LargeMcb, + Return = FsRtlGetNextLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly, RunIndex, &llVbn, &llLbn, @@ -106,7 +106,7 @@ FsRtlInitializeLargeMcb(IN PLARGE_MCB Mcb, IN POOL_TYPE PoolType) { UNIMPLEMENTED; - Mcb->PoolType = PoolType; + Mcb->BaseMcb.PoolType = PoolType; } /* @@ -117,7 +117,7 @@ VOID STDCALL FsRtlInitializeMcb (IN PMCB Mcb, IN POOL_TYPE PoolType) { - FsRtlInitializeLargeMcb(& Mcb->LargeMcb, PoolType); + FsRtlInitializeLargeMcb(& Mcb->DummyFieldThatSizesThisStructureCorrectly, PoolType); } @@ -209,7 +209,7 @@ FsRtlLookupLastMcbEntry(IN PMCB Mcb, LONGLONG llLbn; /* Call the Large version */ - Return = FsRtlLookupLastLargeMcbEntry(&Mcb->LargeMcb, + Return = FsRtlLookupLastLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly, &llVbn, &llLbn); @@ -237,7 +237,7 @@ FsRtlLookupMcbEntry(IN PMCB Mcb, LONGLONG llSectorCount; /* Call the Large version */ - Return = FsRtlLookupLargeMcbEntry(&Mcb->LargeMcb, + Return = FsRtlLookupLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly, (LONGLONG)Vbn, &llLbn, &llSectorCount, @@ -262,7 +262,7 @@ FsRtlNumberOfRunsInLargeMcb(IN PLARGE_MCB Mcb) { ULONG NumberOfRuns; ExAcquireFastMutex (Mcb->FastMutex); - NumberOfRuns=Mcb->PairCount; + NumberOfRuns=Mcb->BaseMcb.MaximumPairCount; ExReleaseFastMutex (Mcb->FastMutex); return(NumberOfRuns); } @@ -276,7 +276,7 @@ FsRtlNumberOfRunsInLargeMcb(IN PLARGE_MCB Mcb) ULONG STDCALL FsRtlNumberOfRunsInMcb (IN PMCB Mcb) { - return FsRtlNumberOfRunsInLargeMcb(& Mcb->LargeMcb); + return FsRtlNumberOfRunsInLargeMcb(& Mcb->DummyFieldThatSizesThisStructureCorrectly); } @@ -301,7 +301,7 @@ FsRtlRemoveMcbEntry (IN PMCB Mcb, IN ULONG SectorCount) { /* Call the large function */ - return FsRtlRemoveLargeMcbEntry(&Mcb->LargeMcb, + return FsRtlRemoveLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly, (LONGLONG)Vbn, (LONGLONG)SectorCount); } @@ -353,7 +353,7 @@ VOID STDCALL FsRtlTruncateMcb (IN PMCB Mcb, IN VBN Vbn) { - FsRtlTruncateLargeMcb (& Mcb->LargeMcb, (LONGLONG) Vbn); + FsRtlTruncateLargeMcb (& Mcb->DummyFieldThatSizesThisStructureCorrectly, (LONGLONG) Vbn); } @@ -374,7 +374,7 @@ FsRtlUninitializeLargeMcb(IN PLARGE_MCB Mcb) VOID STDCALL FsRtlUninitializeMcb (IN PMCB Mcb) { - FsRtlUninitializeLargeMcb(& Mcb->LargeMcb); + FsRtlUninitializeLargeMcb(& Mcb->DummyFieldThatSizesThisStructureCorrectly); } diff --git a/reactos/w32api/include/ddk/ntapi.h b/reactos/w32api/include/ddk/ntapi.h index ea4e126e3fa..667cce8d550 100644 --- a/reactos/w32api/include/ddk/ntapi.h +++ b/reactos/w32api/include/ddk/ntapi.h @@ -248,20 +248,6 @@ typedef struct _SYSTEM_TIME_OF_DAY_INFORMATION { 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,22 +1472,6 @@ typedef struct _PROCESS_ACCESS_TOKEN { #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