Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 16238: use DDK for rossym
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

use DDK for rossym Modified: trunk/reactos/lib/rossym/initkm.c _____ Modified: trunk/reactos/lib/rossym/initkm.c --- trunk/reactos/lib/rossym/initkm.c 2005-06-23 04:52:27 UTC (rev 16237) +++ trunk/reactos/lib/rossym/initkm.c 2005-06-23 04:53:57 UTC (rev 16238) @@ -8,7 +8,7 @@ */ #define NTOSAPI -#include <roskrnl.h> +#include <ddk/ntddk.h> #include <reactos/rossym.h> #include "rossympriv.h"

1 0

[ion] 16237: fix build...sigh...sorry, my ntoskrnl builds with NDK
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

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

1 0

[ion] 16236: Fix more ddk/ndk missing defintions
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

Fix more ddk/ndk missing defintions Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/sefuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/w32api/include/ddk/win2k.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-06-23 03:24:42 UTC (rev 16235) +++ trunk/reactos/include/ndk/kefuncs.h 2005-06-23 04:42:49 UTC (rev 16236) @@ -112,6 +112,10 @@ BOOLEAN STDCALL +KeIsAttachedProcess(VOID); + +BOOLEAN +STDCALL KeIsExecutingDpc( VOID ); _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-06-23 03:24:42 UTC (rev 16235) +++ trunk/reactos/include/ndk/pstypes.h 2005-06-23 04:42:49 UTC (rev 16236) @@ -95,6 +95,8 @@ /* TYPES *********************************************************************/ struct _ETHREAD; +typedef struct _W32PROCESS *PW32PROCESS; +typedef struct _W32THREAD *PW32THREAD; typedef struct _CURDIR { _____ Modified: trunk/reactos/include/ndk/sefuncs.h --- trunk/reactos/include/ndk/sefuncs.h 2005-06-23 03:24:42 UTC (rev 16235) +++ trunk/reactos/include/ndk/sefuncs.h 2005-06-23 04:42:49 UTC (rev 16236) @@ -15,6 +15,24 @@ /* PROTOTYPES ****************************************************************/ +NTSTATUS +STDCALL +SeCaptureSecurityDescriptor( + IN PSECURITY_DESCRIPTOR OriginalSecurityDescriptor, + IN KPROCESSOR_MODE CurrentMode, + IN POOL_TYPE PoolType, + IN BOOLEAN CaptureIfKernel, + OUT PSECURITY_DESCRIPTOR *CapturedSecurityDescriptor +); + +NTSTATUS +STDCALL +SeReleaseSecurityDescriptor( + IN PSECURITY_DESCRIPTOR CapturedSecurityDescriptor, + IN KPROCESSOR_MODE CurrentMode, + IN BOOLEAN CaptureIfKernelMode +); + SECURITY_IMPERSONATION_LEVEL STDCALL SeTokenImpersonationLevel( _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-23 03:24:42 UTC (rev 16235) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-23 04:42:49 UTC (rev 16236) @@ -104,12 +104,6 @@ #define FSCTL_PIPE_INTERNAL_READ_OVFLOW \ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA) -/* Macros for getting the current Process or Thread */ -#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) -#define ZwCurrentProcess() NtCurrentProcess() -#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) -#define ZwCurrentThread() NtCurrentThread() - /* Kernel Shared Data Constants */ #define PROCESSOR_FEATURE_MAX 64 #define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA) _____ Modified: trunk/reactos/w32api/include/ddk/win2k.h --- trunk/reactos/w32api/include/ddk/win2k.h 2005-06-23 03:24:42 UTC (rev 16235) +++ trunk/reactos/w32api/include/ddk/win2k.h 2005-06-23 04:42:49 UTC (rev 16236) @@ -64,7 +64,7 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN BOOLEAN ReturnRecognizedPartitions, - OUT struct _DRIVE_LAYOUT_INFORMATION **PartitionBuffer); + OUT PVOID PartitionBuffer); NTOSAPI NTSTATUS @@ -83,7 +83,7 @@ IN ULONG SectorSize, IN ULONG SectorsPerTrack, IN ULONG NumberOfHeads, - IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer); + IN PVOID PartitionBuffer); /* * PVOID MmGetSystemAddressForMdl( _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-23 03:24:42 UTC (rev 16235) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-23 04:42:49 UTC (rev 16236) @@ -190,6 +190,11 @@ typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; /* Constants */ +#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) +#define ZwCurrentProcess() NtCurrentProcess() +#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) +#define ZwCurrentThread() NtCurrentThread() + #define MAXIMUM_PROCESSORS 32 #define MAXIMUM_WAIT_OBJECTS 64 @@ -1537,6 +1542,50 @@ ULONG BaudClock; } CM_SERIAL_DEVICE_DATA, *PCM_SERIAL_DEVICE_DATA; +typedef struct _VM_COUNTERS +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; +} VM_COUNTERS, *PVM_COUNTERS; + +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX, *PVM_COUNTERS_EX; + +typedef struct _POOLED_USAGE_AND_LIMITS +{ + SIZE_T PeakPagedPoolUsage; + SIZE_T PagedPoolUsage; + SIZE_T PagedPoolLimit; + SIZE_T PeakNonPagedPoolUsage; + SIZE_T NonPagedPoolUsage; + SIZE_T NonPagedPoolLimit; + SIZE_T PeakPagefileUsage; + SIZE_T PagefileUsage; + SIZE_T PagefileLimit; +} POOLED_USAGE_AND_LIMITS, *PPOOLED_USAGE_AND_LIMITS; + /* IO_RESOURCE_DESCRIPTOR.Option */ #define IO_RESOURCE_PREFERRED 0x01 @@ -4278,6 +4327,12 @@ MaxThreadInfoClass } THREADINFOCLASS; +typedef struct _PROCESS_WS_WATCH_INFORMATION +{ + PVOID FaultingPc; + PVOID FaultingVa; +} PROCESS_WS_WATCH_INFORMATION, *PPROCESS_WS_WATCH_INFORMATION; + #define ES_SYSTEM_REQUIRED 0x00000001 #define ES_DISPLAY_REQUIRED 0x00000002 #define ES_USER_PRESENT 0x00000004

1 0

[ion] 16235: Fix build (my fault now :P)
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

Fix build (my fault now :P) Modified: trunk/reactos/include/ntos/fstypes.h Modified: trunk/reactos/include/ntos/rtl.h _____ Modified: trunk/reactos/include/ntos/fstypes.h --- trunk/reactos/include/ntos/fstypes.h 2005-06-23 03:18:20 UTC (rev 16234) +++ trunk/reactos/include/ntos/fstypes.h 2005-06-23 03:24:42 UTC (rev 16235) @@ -10,7 +10,7 @@ typedef ULONG VBN; typedef VBN *PVBN; - +#ifndef __USE_W32API typedef struct _LARGE_MCB { PFAST_MUTEX FastMutex; @@ -23,8 +23,8 @@ typedef struct _MCB { LARGE_MCB LargeMcb; } MCB, *PMCB; +#endif - typedef struct _MAILSLOT_CREATE_PARAMETERS { ULONG MailslotQuota; _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2005-06-23 03:18:20 UTC (rev 16234) +++ trunk/reactos/include/ntos/rtl.h 2005-06-23 03:24:42 UTC (rev 16235) @@ -481,8 +481,6 @@ #define SHORT_SIZE (sizeof(USHORT)) #define SHORT_MASK (SHORT_SIZE-1) -#define LONG_SIZE (sizeof(ULONG)) -#define LONG_MASK (LONG_SIZE-1) #define LOWBYTE_MASK 0x00FF #define FIRSTBYTE(Value) ((Value) & LOWBYTE_MASK) @@ -502,7 +500,6 @@ #define NLS_ANSI_CODE_PAGE NlsAnsiCodePage #define NLS_LEAD_BYTE_INFO NlsLeadByteInfo -#define NLS_MB_CODE_PAGE_TAG NlsMbCodePageTag #define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo

1 0

[ion] 16234: Fix some NDK things and missing w32api defines.
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

Fix some NDK things and missing w32api defines. Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/include/ntos/ntpnp.h Modified: trunk/reactos/include/reactos/helper.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/haltypes.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -10,7 +10,6 @@ #define _HALTYPES_H /* DEPENDENCIES **************************************************************/ -//#include <ddk/ntdddisk.h> /* EXPORTED DATA *************************************************************/ extern ULONG NTOSAPI KdComPortInUse; @@ -30,6 +29,7 @@ #define MB_FLAGS_BOOT_LOADER_NAME (0x200) #define MB_FLAGS_APM_TABLE (0x400) #define MB_FLAGS_GRAPHICS_TABLE (0x800) +#define MB_FLAGS_ACPI_TABLE (0x1000) /* ENUMERATIONS **************************************************************/ typedef enum _FIRMWARE_ENTRY @@ -44,6 +44,19 @@ /* TYPES *********************************************************************/ +typedef struct _HAL_PRIVATE_DISPATCH +{ + ULONG Version; +} HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; + +#ifdef __NTOSKRNL__ +extern NTOSAPI HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +#else +extern NTOSAPI PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +#endif + +#define HAL_PRIVATE_DISPATCH_VERSION 1 + typedef struct _LOADER_MODULE { ULONG ModStart; _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/iotypes.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -20,6 +20,11 @@ extern POBJECT_TYPE NTOSAPI IoFileObjectType; /* CONSTANTS *****************************************************************/ +#define DOE_UNLOAD_PENDING 0x1 +#define DOE_DELETE_PENDING 0x2 +#define DOE_REMOVE_PENDING 0x4 +#define DOE_REMOVE_PROCESSED 0x8 +#define DOE_START_PENDING 0x10 /* ENUMERATIONS **************************************************************/ _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/kefuncs.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -277,5 +277,9 @@ KeRaiseUserException( IN NTSTATUS ExceptionCode ); + +VOID +STDCALL +KeFlushWriteBuffer(VOID); #endif _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/lpctypes.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -16,6 +16,8 @@ /* CONSTANTS *****************************************************************/ #define LPC_MESSAGE_BASE_SIZE 24 #define MAX_MESSAGE_DATA (0x130) +#define PORT_MAX_DATA_LENGTH 0x104 +#define PORT_MAX_MESSAGE_LENGTH 0x148 /* ENUMERATIONS **************************************************************/ _____ Modified: trunk/reactos/include/ndk/mmtypes.h --- trunk/reactos/include/ndk/mmtypes.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/mmtypes.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -16,6 +16,17 @@ /* CONSTANTS *****************************************************************/ /* ENUMERATIONS **************************************************************/ +typedef enum _PP_NPAGED_LOOKASIDE_NUMBER +{ + LookasideSmallIrpList = 0, + LookasideLargeIrpList = 1, + LookasideMdlList = 2, + LookasideCreateInfoList = 3, + LookasideNameBufferList = 4, + LookasideTwilightList = 5, + LookasideCompletionList = 6, + LookasideMaximumList = 7 +} PP_NPAGED_LOOKASIDE_NUMBER; /* TYPES *********************************************************************/ _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/obtypes.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -13,7 +13,7 @@ /* EXPORTED DATA *************************************************************/ extern NTOSAPI POBJECT_TYPE ObDirectoryType; -extern NTOSAPI struct DEVICE_MAP* ObSystemDeviceMap; +extern NTOSAPI PDEVICE_MAP ObSystemDeviceMap; /* CONSTANTS *****************************************************************/ _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/rtltypes.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -387,6 +387,11 @@ AclRevisionInformation = 1, AclSizeInformation } ACL_INFORMATION_CLASS; + + #define TIME_ZONE_ID_UNKNOWN 0 + #define TIME_ZONE_ID_STANDARD 1 + #define TIME_ZONE_ID_DAYLIGHT 2 + #define TIME_ZONE_ID_INVALID 0xFFFFFFFF #endif #endif _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -292,79 +292,7 @@ #define IsLastEntry(ListHead, Entry) \ ((ListHead)->Blink == Entry) - -#define InsertAscendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ -{\ - PLIST_ENTRY current;\ -\ - current = (ListHead)->Flink;\ - while (current != (ListHead))\ - {\ - if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >\ - (NewEntry)->SortField)\ - {\ - break;\ - }\ - current = current->Flink;\ - }\ -\ - InsertTailList(current, &((NewEntry)->ListEntryField));\ -} -#define InsertDescendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ -{\ - PLIST_ENTRY current;\ -\ - current = (ListHead)->Flink;\ - while (current != (ListHead))\ - {\ - if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField <\ - (NewEntry)->SortField)\ - {\ - break;\ - }\ - current = current->Flink;\ - }\ -\ - InsertTailList(current, &((NewEntry)->ListEntryField));\ -} - -#define InsertAscendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ -{\ - PLIST_ENTRY current;\ -\ - current = (ListHead)->Flink;\ - while (current != (ListHead))\ - {\ - if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >=\ - (NewEntry)->SortField)\ - {\ - break;\ - }\ - current = current->Flink;\ - }\ -\ - InsertTailList(current, &((NewEntry)->ListEntryField));\ -} - -#define InsertDescendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ -{\ - PLIST_ENTRY current;\ -\ - current = (ListHead)->Flink;\ - while (current != (ListHead))\ - {\ - if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField <=\ - (NewEntry)->SortField)\ - {\ - break;\ - }\ - current = current->Flink;\ - }\ -\ - InsertTailList(current, &((NewEntry)->ListEntryField));\ -} - /* * Constant String Macro */ _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -954,6 +954,15 @@ NTSTATUS STDCALL +NtGetPlugPlayEvent( + ULONG Reserved1, + ULONG Reserved2, + struct _PLUGPLAY_EVENT_BLOCK *Buffer, + ULONG BufferSize +); + +NTSTATUS +STDCALL NtImpersonateClientOfPort( HANDLE PortHandle, PLPC_MESSAGE ClientMessage @@ -1498,6 +1507,14 @@ ); NTSTATUS +STDCALL +NtPlugPlayControl( + ULONG ControlCode, + PVOID Buffer, + ULONG BufferSize +); + +NTSTATUS STDCALL NtPowerInformation( POWER_INFORMATION_LEVEL PowerInformationLevel, @@ -2049,7 +2066,7 @@ STDCALL NtQuerySystemEnvironmentValue( IN PUNICODE_STRING Name, - OUT PVOID Value, + OUT PWSTR Value, ULONG Length, PULONG ReturnLength ); @@ -3307,23 +3324,6 @@ VOID ); -NTSTATUS -STDCALL -NtPlugPlayControl( - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3 -); - -NTSTATUS -STDCALL -NtGetPlugPlayEvent( - ULONG Reserved1, - ULONG Reserved2, - PVOID Buffer, - ULONG BufferLength -); - NTSTATUS STDCALL NtSetSystemPowerState( @@ -3608,7 +3608,7 @@ STDCALL NtQuerySection( IN HANDLE SectionHandle, - IN CINT SectionInformationClass, + IN SECTION_INFORMATION_CLASS SectionInformationClass, OUT PVOID SectionInformation, IN ULONG Length, OUT PULONG ResultLength _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ndk/zwtypes.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -25,6 +25,9 @@ #define EVENT_PAIR_ALL_ACCESS (0x1F0000L) +#define OBJECT_TYPE_CREATE 0x0001 +#define OBJECT_TYPE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) + /* For ProcessDeviceMap */ #define DOSDEVICE_DRIVE_UNKNOWN 0 #define DOSDEVICE_DRIVE_CALCULATE 1 @@ -36,7 +39,6 @@ /* ENUMERATIONS **************************************************************/ - typedef enum _HARDERROR_RESPONSE_OPTION { OptionAbortRetryIgnore, @@ -250,6 +252,7 @@ typedef unsigned short LANGID; typedef LANGID *PLANGID; +struct _PLUGPLAY_EVENT_BLOCK; /* FIXME: Ask Filip if it's OK to define it */ /**** Information Structures ****/ /* _____ Modified: trunk/reactos/include/ntos/ntpnp.h --- trunk/reactos/include/ntos/ntpnp.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/ntos/ntpnp.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -71,24 +71,6 @@ MaxPlugEventCategory } PLUGPLAY_EVENT_CATEGORY; -#ifndef __USE_W32API -typedef enum _PNP_VETO_TYPE { - PNP_VetoTypeUnknown, - PNP_VetoLegacyDevice, - PNP_VetoPendingClose, - PNP_VetoWindowsApp, - PNP_VetoWindowsService, - PNP_VetoOutstandingOpen, - PNP_VetoDevice, - PNP_VetoDriver, - PNP_VetoIllegalDeviceRequest, - PNP_VetoInsufficientPower, - PNP_VetoNonDisableable, - PNP_VetoLegacyDriver, - PNP_VetoInsufficientRights, -} PNP_VETO_TYPE; -#endif - /* * Plug and Play event structure used by NtGetPlugPlayEvent. * @@ -184,14 +166,13 @@ * * Remarks * This function isn't multi-thread safe! - */ - NTSTATUS STDCALL NtGetPlugPlayEvent( ULONG Reserved1, ULONG Reserved2, PPLUGPLAY_EVENT_BLOCK Buffer, ULONG BufferSize); + */ /* * NtPlugPlayControl @@ -294,13 +275,6 @@ ULONG Flags; /* DN_ see cfg.h */ } PLUGPLAY_DEVICE_STATUS_DATA, *PPLUGPLAY_DEVICE_STATUS_DATA; - -NTSTATUS STDCALL -NtPlugPlayControl( - ULONG ControlCode, - PVOID Buffer, - ULONG BufferSize); - #endif /* __GUIDS_ONLY__ */ #endif /* __NTPNP_H */ _____ Modified: trunk/reactos/include/reactos/helper.h --- trunk/reactos/include/reactos/helper.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/include/reactos/helper.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -41,4 +41,77 @@ #define SECONDS_TO_100NS(seconds) (((LONGLONG)(seconds)) * MILLIS_TO_100NS(1000)) #define MINUTES_TO_100NS(minutes) (((LONGLONG)(minutes)) * SECONDS_TO_100NS(60)) #define HOURS_TO_100NS(hours) (((LONGLONG)(hours)) * MINUTES_TO_100NS(60)) +#define TYPE_ALIGNMENT(t) FIELD_OFFSET(struct { char x; t test; }, test) +#define InsertAscendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + +#define InsertDescendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField <\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + +#define InsertAscendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >=\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + +#define InsertDescendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField <=\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + #endif _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -29,7 +29,7 @@ #endif #include "ntddk.h" -#include "ntapi.h" +//#include "ntapi.h" #ifdef __cplusplus extern "C" { @@ -329,9 +329,6 @@ #define PIN_NO_READ (4) #define PIN_IF_BCB (8) -#define PORT_CONNECT 0x0001 -#define PORT_ALL_ACCESS (STANDARD_RIGHTS_ALL |\ - PORT_CONNECT) /* also in winnt.h */ #define SEC_BASED 0x00200000 #define SEC_NO_CHANGE 0x00400000 @@ -539,6 +536,12 @@ typedef struct _VACB *PVACB; typedef struct _VAD_HEADER *PVAD_HEADER; +typedef ULONG LBN; +typedef LBN *PLBN; + +typedef ULONG VBN; +typedef VBN *PVBN; + typedef struct _NOTIFY_SYNC { ULONG Unknown0; @@ -1239,6 +1242,28 @@ #endif /* (VER_PRODUCTBUILD >= 2600) */ +typedef struct _BASE_MCB +{ + ULONG MaximumPairCount; + ULONG PairCount; + POOL_TYPE PoolType; + PVOID Mapping; +} BASE_MCB; +typedef BASE_MCB *PBASE_MCB; + +typedef struct _LARGE_MCB +{ + PFAST_MUTEX FastMutex; + BASE_MCB BaseMcb; +} LARGE_MCB; +typedef LARGE_MCB *PLARGE_MCB; + +typedef struct _MCB +{ + LARGE_MCB DummyFieldThatSizesThisStructureCorrectly; +} MCB; +typedef MCB *PMCB; + typedef struct _GENERATE_NAME_CONTEXT { USHORT Checksum; BOOLEAN CheckSumInserted; @@ -2556,6 +2581,15 @@ IN NTSTATUS Ntstatus ); +#define NLS_MB_CODE_PAGE_TAG NlsMbCodePageTag +#define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag +#define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag +#define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo + +extern BOOLEAN NlsMbCodePageTag; +extern BOOLEAN NlsMbOemCodePageTag; +extern PUSHORT NlsOemLeadByteInfo; + #define FsRtlIsLeadDbcsCharacter(DBCS_CHAR) ( \ (BOOLEAN)((UCHAR)(DBCS_CHAR) < 0x80 ? FALSE : \ (NLS_MB_CODE_PAGE_TAG && \ _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-23 01:36:58 UTC (rev 16233) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-23 03:18:20 UTC (rev 16234) @@ -5368,13 +5368,30 @@ IN PVOID Context, IN PVOID Environment OPTIONAL); -NTOSAPI -VOID -DDKAPI -RtlRetrieveUlong( - IN OUT PULONG DestinationAddress, - IN PULONG SourceAddress); + +#define LONG_SIZE (sizeof(LONG)) +#define LONG_MASK (LONG_SIZE - 1) +/* + * VOID + * RtlRetrieveUlong ( + * PULONG DestinationAddress, + * PULONG SourceAddress + * ); + */ +#define RtlRetrieveUlong(DestAddress,SrcAddress) \ + if ((ULONG_PTR)(SrcAddress) & LONG_MASK) \ + { \ + ((PUCHAR)(DestAddress))[0]=((PUCHAR)(SrcAddress))[0]; \ + ((PUCHAR)(DestAddress))[1]=((PUCHAR)(SrcAddress))[1]; \ + ((PUCHAR)(DestAddress))[2]=((PUCHAR)(SrcAddress))[2]; \ + ((PUCHAR)(DestAddress))[3]=((PUCHAR)(SrcAddress))[3]; \ + } \ + else \ + { \ + *((PULONG)(DestAddress))=*((PULONG)(SrcAddress)); \ + } + NTOSAPI VOID DDKAPI

1 0

[ion] 16233: Fix build (no, not because of me, casper)
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

Fix build (no, not because of me, casper) Modified: trunk/reactos/include/ddentry.h _____ Modified: trunk/reactos/include/ddentry.h --- trunk/reactos/include/ddentry.h 2005-06-22 23:47:53 UTC (rev 16232) +++ trunk/reactos/include/ddentry.h 2005-06-23 01:36:58 UTC (rev 16233) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ddrawi.h> +#include <ddk/ddrawi.h> #include <ddk/d3dhal.h> #include <ddk/winddi.h> BOOL STDCALL DdCreateDirectDrawObject(

1 0

[sedwards] 16232: mark IopCsqCancelRoutine as static. Vizzini really does write good code.
by sedwards＠svn.reactos.com 22 Jun '05

22 Jun '05

mark IopCsqCancelRoutine as static. Vizzini really does write good code. Modified: trunk/reactos/drivers/lib/csq/csq.c _____ Modified: trunk/reactos/drivers/lib/csq/csq.c --- trunk/reactos/drivers/lib/csq/csq.c 2005-06-22 23:12:49 UTC (rev 16231) +++ trunk/reactos/drivers/lib/csq/csq.c 2005-06-22 23:47:53 UTC (rev 16232) @@ -30,7 +30,7 @@ #include <ddk/csq.h> -VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject, +static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp) /* * FUNCTION: Cancel routine that is installed on any IRP that this library manages

1 0

[ion] 16231: Fix typo
by ion＠svn.reactos.com 22 Jun '05

22 Jun '05

Fix typo Modified: trunk/reactos/w32api/include/ddk/ntnls.h _____ Modified: trunk/reactos/w32api/include/ddk/ntnls.h --- trunk/reactos/w32api/include/ddk/ntnls.h 2005-06-22 23:12:24 UTC (rev 16230) +++ trunk/reactos/w32api/include/ddk/ntnls.h 2005-06-22 23:12:49 UTC (rev 16231) @@ -1,5 +1,5 @@ /* - * ntddmou.h + * ntnls.h * * Structures and definitions for NLS data types. *

1 0

[ion] 16230: Build diskdump with NDK
by ion＠svn.reactos.com 22 Jun '05

22 Jun '05

Build diskdump with NDK Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c --- trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-06-22 23:10:15 UTC (rev 16229) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-06-22 23:12:24 UTC (rev 16230) @@ -32,7 +32,8 @@ #include <ddk/ntdddisk.h> #include <ddk/ntddscsi.h> #include <ddk/class2.h> -#include <ntos.h> + +#include <ndk/ntndk.h> #include <napi/core.h> #include "../scsiport/scsiport_int.h" @@ -222,7 +223,7 @@ { KIRQL CurrentIrql = KeGetCurrentIrql(); IsDumping = TRUE; - if (CurrentIrql >= CoreDumpPortDeviceExtension->Interrupt->SynchLevel) + if (CurrentIrql >= CoreDumpPortDeviceExtension->Interrupt->SynchronizeIrql) { DbgPrint("DISKDUMP: Error: Crash inside high priority interrupt routine.\n"); return(STATUS_UNSUCCESSFUL); @@ -244,9 +245,9 @@ KIRQL OldIrql, OldIrql2; KIRQL CurrentIrql = KeGetCurrentIrql(); - if (CurrentIrql < (CoreDumpPortDeviceExtension->Interrupt->SynchLevel - 1)) + if (CurrentIrql < (CoreDumpPortDeviceExtension->Interrupt->SynchronizeIrql - 1)) { - KeRaiseIrql(CoreDumpPortDeviceExtension->Interrupt->SynchLevel - 1, &OldIrql); + KeRaiseIrql(CoreDumpPortDeviceExtension->Interrupt->SynchronizeIrql - 1, &OldIrql); } /* Adjust the address for the start of the partition. */ @@ -260,7 +261,7 @@ /* Start i/o on the HBA. */ IrqComplete = IrqNextRequest = FALSE; - KeRaiseIrql(CoreDumpPortDeviceExtension->Interrupt->SynchLevel, &OldIrql2); + KeRaiseIrql(CoreDumpPortDeviceExtension->Interrupt->SynchronizeIrql, &OldIrql2); if (!CoreDumpPortDeviceExtension->HwStartIo(&CoreDumpPortDeviceExtension->M iniPortDeviceExtension, &CoreDumpSrb)) { @@ -276,7 +277,7 @@ { __asm__ ("hlt\n\t"); } - if (CurrentIrql < (CoreDumpPortDeviceExtension->Interrupt->SynchLevel - 1)) + if (CurrentIrql < (CoreDumpPortDeviceExtension->Interrupt->SynchronizeIrql - 1)) { KeLowerIrql(OldIrql); }

1 0

[ion] 16229: Fix definition of KINTERRUPT in ROS headers so that moving to NDK will be easier. Also fix KeDisconnectInterrupt to return the old state instead of VOID, and re-write the I/O Interrupt code to work with an array and first object for better speed
by ion＠svn.reactos.com 22 Jun '05

22 Jun '05

Fix definition of KINTERRUPT in ROS headers so that moving to NDK will be easier. Also fix KeDisconnectInterrupt to return the old state instead of VOID, and re-write the I/O Interrupt code to work with an array and first object for better speed Modified: trunk/reactos/include/ntos/kefuncs.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/ntoskrnl/io/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/spinlock.c _____ Modified: trunk/reactos/include/ntos/kefuncs.h --- trunk/reactos/include/ntos/kefuncs.h 2005-06-22 21:55:43 UTC (rev 16228) +++ trunk/reactos/include/ntos/kefuncs.h 2005-06-22 23:10:15 UTC (rev 16229) @@ -62,7 +62,7 @@ KeConnectInterrupt( PKINTERRUPT InterruptObject); -VOID STDCALL +BOOLEAN STDCALL KeDisconnectInterrupt( PKINTERRUPT InterruptObject); _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-06-22 21:55:43 UTC (rev 16228) +++ trunk/reactos/include/ntos/zwtypes.h 2005-06-22 23:10:15 UTC (rev 16229) @@ -1781,23 +1781,49 @@ } LPC_PORT_BASIC_INFORMATION, * PLPC_PORT_BASIC_INFORMATION; +#if 0 typedef struct _KINTERRUPT { - ULONG Vector; - KAFFINITY ProcessorEnableMask; - KSPIN_LOCK SpinLock; - PKSPIN_LOCK ActualLock; - BOOLEAN Shareable; - BOOLEAN FloatingSave; - CHAR ProcessorNumber; - PKSERVICE_ROUTINE ServiceRoutine; - PVOID ServiceContext; - LIST_ENTRY Entry; - KIRQL Irql; - KIRQL SynchLevel; - KINTERRUPT_MODE InterruptMode; + ULONG Vector; // Idem + KAFFINITY ProcessorEnableMask; // not needed + KSPIN_LOCK SpinLock; // Idem + PKSPIN_LOCK ActualLock; // Idem + BOOLEAN Shareable; // ShareVector + BOOLEAN FloatingSave; // Idem + CHAR ProcessorNumber; // Number + PKSERVICE_ROUTINE ServiceRoutine; // Idem + PVOID ServiceContext; // Idem + LIST_ENTRY Entry; // InteruptListEntry + KIRQL Irql; // Irql + KIRQL SynchLevel; // SynchronizeIrql + KINTERRUPT_MODE InterruptMode; // Mode } KINTERRUPT; +#endif +typedef struct _KINTERRUPT +{ + CSHORT Type; + CSHORT Size; + LIST_ENTRY InterruptListEntry; + PKSERVICE_ROUTINE ServiceRoutine; + PVOID ServiceContext; + KSPIN_LOCK SpinLock; + ULONG TickCount; + PKSPIN_LOCK ActualLock; + PVOID DispatchAddress; + ULONG Vector; + KIRQL Irql; + KIRQL SynchronizeIrql; + BOOLEAN FloatingSave; + BOOLEAN Connected; + CHAR Number; + UCHAR ShareVector; + KINTERRUPT_MODE Mode; + ULONG ServiceCount; + ULONG DispatchCount; + ULONG DispatchCode[106]; +} KINTERRUPT, *PKINTERRUPT; + #ifndef __USE_W32API typedef struct _KINTERRUPT *PKINTERRUPT; _____ Modified: trunk/reactos/ntoskrnl/io/irq.c --- trunk/reactos/ntoskrnl/io/irq.c 2005-06-22 21:55:43 UTC (rev 16228) +++ trunk/reactos/ntoskrnl/io/irq.c 2005-06-22 23:10:15 UTC (rev 16229) @@ -14,24 +14,17 @@ #define NDEBUG #include <internal/debug.h> +/* TYPES ********************************************************************/ +typedef struct _IO_INTERRUPT +{ + KINTERRUPT FirstInterrupt; + PKINTERRUPT Interrupt[MAXIMUM_PROCESSORS]; + KSPIN_LOCK SpinLock; +} IO_INTERRUPT, *PIO_INTERRUPT; + /* FUNCTIONS *****************************************************************/ /* - * @implemented - */ -NTSTATUS STDCALL -IoConnectInterrupt(PKINTERRUPT* InterruptObject, - PKSERVICE_ROUTINE ServiceRoutine, - PVOID ServiceContext, - PKSPIN_LOCK SpinLock, - ULONG Vector, - KIRQL Irql, - KIRQL SynchronizeIrql, - KINTERRUPT_MODE InterruptMode, - BOOLEAN ShareVector, - KAFFINITY ProcessorEnableMask, - BOOLEAN FloatingSave) -/* * FUNCTION: Registers a driver's isr to be called when its device interrupts * ARGUMENTS: * InterruptObject (OUT) = Points to the interrupt object created on @@ -57,106 +50,163 @@ * the isr runs. Must be false for x86 drivers * RETURNS: Status * IRQL: PASSIVE_LEVEL + * + * @implemented */ +NTSTATUS +STDCALL +IoConnectInterrupt(PKINTERRUPT* InterruptObject, + PKSERVICE_ROUTINE ServiceRoutine, + PVOID ServiceContext, + PKSPIN_LOCK SpinLock, + ULONG Vector, + KIRQL Irql, + KIRQL SynchronizeIrql, + KINTERRUPT_MODE InterruptMode, + BOOLEAN ShareVector, + KAFFINITY ProcessorEnableMask, + BOOLEAN FloatingSave) { - PKINTERRUPT Interrupt; - ULONG i, count; + PKINTERRUPT Interrupt; + PKINTERRUPT InterruptUsed; + PIO_INTERRUPT IoInterrupt; + PKSPIN_LOCK SpinLockUsed; + BOOLEAN FirstRun = TRUE; + ULONG i, count; + + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); + DPRINT1("IoConnectInterrupt(Vector %x)\n",Vector); - DPRINT("IoConnectInterrupt(Vector %x)\n",Vector); + /* Convert the Mask */ + ProcessorEnableMask &= ((1 << KeNumberProcessors) - 1); - ProcessorEnableMask &= ((1 << KeNumberProcessors) - 1); + /* Make sure at least one CPU is on it */ + if (!ProcessorEnableMask) return STATUS_INVALID_PARAMETER; - if (ProcessorEnableMask == 0) - { - return STATUS_INVALID_PARAMETER; - } + /* Determine the allocation */ + for (i = 0, count = 0; i < KeNumberProcessors; i++) + { + if (ProcessorEnableMask & (1 << i)) count++; + } + + /* Allocate the array of I/O Interrupts */ + IoInterrupt = ExAllocatePoolWithTag(NonPagedPool, + (count - 1)* sizeof(KINTERRUPT) + + sizeof(IO_INTERRUPT), + TAG_KINTERRUPT); + if (!Interrupt) return(STATUS_INSUFFICIENT_RESOURCES); - for (i = 0, count = 0; i < KeNumberProcessors; i++) - { - if (ProcessorEnableMask & (1 << i)) - { - count++; - } - } - /* - * Initialize interrupt object - */ - Interrupt=ExAllocatePoolWithTag(NonPagedPool,count*sizeof(KINTERRUPT), - TAG_KINTERRUPT); - if (Interrupt==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } + /* Select which Spinlock to use */ + if (SpinLock) + { + SpinLockUsed = SpinLock; + } + else + { + SpinLockUsed = &IoInterrupt->SpinLock; + } + + /* We first start with a built-in Interrupt inside the I/O Structure */ + *InterruptObject = &IoInterrupt->FirstInterrupt; + Interrupt = (PKINTERRUPT)(IoInterrupt + 1); + FirstRun = TRUE; + + /* Start with a fresh structure */ + RtlZeroMemory(IoInterrupt, sizeof(IO_INTERRUPT)); + + /* Now create all the interrupts */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Check if it's enabled for this CPU */ + if (ProcessorEnableMask & (1 << i)) + { + /* Check which one we will use */ + InterruptUsed = FirstRun ? &IoInterrupt->FirstInterrupt : Interrupt; + + /* Initialize it */ + KeInitializeInterrupt(InterruptUsed, + ServiceRoutine, + ServiceContext, + SpinLockUsed, + Vector, + Irql, + SynchronizeIrql, + InterruptMode, + ShareVector, + i, + FloatingSave); + + /* Connect it */ + if (!KeConnectInterrupt(InterruptUsed)) + { + /* Check how far we got */ + if (FirstRun) + { + /* We failed early so just free this */ + ExFreePool(IoInterrupt); + } + else + { + /* Far enough, so disconnect everything */ + IoDisconnectInterrupt(&IoInterrupt->FirstInterrupt); + } + return STATUS_INVALID_PARAMETER; + } + + /* Now we've used up our First Run */ + if (FirstRun) + { + FirstRun = FALSE; + } + else + { + /* Move on to the next one */ + IoInterrupt->Interrupt[i] = Interrupt++; + } + } + } - if (SpinLock == NULL) - { - SpinLock = &Interrupt[0].SpinLock; - KeInitializeSpinLock(SpinLock); - } - - Interrupt[0].ProcessorEnableMask = ProcessorEnableMask; - - for (i = 0, count = 0; i < KeNumberProcessors; i++) - { - if (ProcessorEnableMask & (1 << i)) - { - KeInitializeInterrupt(&Interrupt[count], - ServiceRoutine, - ServiceContext, - SpinLock, - Vector, - Irql, - SynchronizeIrql, - InterruptMode, - ShareVector, - i, - FloatingSave); - if (!KeConnectInterrupt(&Interrupt[count])) - { - for (i = 0; i < count; i++) - { - if (ProcessorEnableMask & (1 << i)) - { - KeDisconnectInterrupt(&Interrupt[i]); - } - } - ExFreePool(Interrupt); - return STATUS_INVALID_PARAMETER; - } - count++; - } - } - - *InterruptObject = Interrupt; - - return(STATUS_SUCCESS); + /* Return Success */ + return STATUS_SUCCESS; } - /* - * @implemented - */ -VOID STDCALL -IoDisconnectInterrupt(PKINTERRUPT InterruptObject) -/* * FUNCTION: Releases a drivers isr * ARGUMENTS: * InterruptObject = isr to release + * + * @implemented */ +VOID +STDCALL +IoDisconnectInterrupt(PKINTERRUPT InterruptObject) + { - ULONG i, count; + ULONG i; + PIO_INTERRUPT IoInterrupt; + + PAGED_CODE(); + + /* Get the I/O Interrupt */ + IoInterrupt = CONTAINING_RECORD(InterruptObject, + IO_INTERRUPT, + FirstInterrupt); + + /* Disconnect the first one */ + KeDisconnectInterrupt(&IoInterrupt->FirstInterrupt); - for (i = 0, count = 0; i < KeNumberProcessors; i++) + /* Now disconnect the others */ + for (i = 0; i < KeNumberProcessors; i++) { - if (InterruptObject[0].ProcessorEnableMask & (1 << i)) + if (IoInterrupt->Interrupt[i]) { - KeDisconnectInterrupt(&InterruptObject[count]); - count++; - } + KeDisconnectInterrupt(&InterruptObject[i]); + } } - ExFreePool(InterruptObject); + + /* Free the I/O Interrupt */ + ExFreePool(IoInterrupt); } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-06-22 21:55:43 UTC (rev 16228) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-06-22 23:10:15 UTC (rev 16229) @@ -278,7 +278,7 @@ while (current != &CurrentIsr->ListHead) { - isr = CONTAINING_RECORD(current,KINTERRUPT,Entry); + isr = CONTAINING_RECORD(current,KINTERRUPT,InterruptListEntry); oldlvl = KeAcquireInterruptSpinLock(isr); if (isr->ServiceRoutine(isr, isr->ServiceContext)) { @@ -401,7 +401,7 @@ KiAcquireSpinLock(&IsrTable[i][j].Lock); current_entry = IsrTable[i][j].ListHead.Flink; - current = CONTAINING_RECORD(current_entry,KINTERRUPT,Entry); + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); while (current_entry!=&(IsrTable[i][j].ListHead)) { if (printed == FALSE) @@ -411,7 +411,7 @@ } DPRINT(" Isr %x\n",current); current_entry = current_entry->Flink; - current = CONTAINING_RECORD(current_entry,KINTERRUPT,Entry); + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); } KiReleaseSpinLock(&IsrTable[i][j].Lock); } @@ -422,7 +422,8 @@ /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN +STDCALL KeConnectInterrupt(PKINTERRUPT InterruptObject) { KIRQL oldlvl,synch_oldlvl; @@ -440,11 +441,11 @@ Vector -= IRQ_BASE; - ASSERT (InterruptObject->ProcessorNumber < KeNumberProcessors); + ASSERT (InterruptObject->Number < KeNumberProcessors); - KeSetSystemAffinityThread(1 << InterruptObject->ProcessorNumber); + KeSetSystemAffinityThread(1 << InterruptObject->Number); - CurrentIsr = &IsrTable[Vector][(ULONG)InterruptObject->ProcessorNumber]; + CurrentIsr = &IsrTable[Vector][(ULONG)InterruptObject->Number]; KeRaiseIrql(VECTOR2IRQL(Vector + IRQ_BASE),&oldlvl); KiAcquireSpinLock(&CurrentIsr->Lock); @@ -454,8 +455,8 @@ */ if (!IsListEmpty(&CurrentIsr->ListHead)) { - ListHead = CONTAINING_RECORD(CurrentIsr->ListHead.Flink,KINTERRUPT,Entry); - if (InterruptObject->Shareable == FALSE || ListHead->Shareable==FALSE) + ListHead = CONTAINING_RECORD(CurrentIsr->ListHead.Flink,KINTERRUPT,InterruptListEnt ry); + if (InterruptObject->ShareVector == FALSE || ListHead->ShareVector==FALSE) { KiReleaseSpinLock(&CurrentIsr->Lock); KeLowerIrql(oldlvl); @@ -468,13 +469,14 @@ DPRINT("%x %x\n",CurrentIsr->ListHead.Flink, CurrentIsr->ListHead.Blink); - Result = HalEnableSystemInterrupt(Vector + IRQ_BASE, InterruptObject->Irql, InterruptObject->InterruptMode); + Result = HalEnableSystemInterrupt(Vector + IRQ_BASE, InterruptObject->Irql, InterruptObject->Mode); if (Result) { - InsertTailList(&CurrentIsr->ListHead,&InterruptObject->Entry); - DPRINT("%x %x\n",InterruptObject->Entry.Flink, InterruptObject->Entry.Blink); + InsertTailList(&CurrentIsr->ListHead,&InterruptObject->InterruptListEntr y); + DPRINT("%x %x\n",InterruptObject->InterruptListEntry.Flink, InterruptObject->Entry.Blink); } + InterruptObject->Connected = TRUE; KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); /* @@ -490,78 +492,112 @@ return Result; } - /* * @implemented - */ -VOID STDCALL -KeDisconnectInterrupt(PKINTERRUPT InterruptObject) -/* + * * FUNCTION: Releases a drivers isr * ARGUMENTS: * InterruptObject = isr to release */ +BOOLEAN +STDCALL +KeDisconnectInterrupt(PKINTERRUPT InterruptObject) { - KIRQL oldlvl,synch_oldlvl; - PISR_TABLE CurrentIsr; + KIRQL oldlvl,synch_oldlvl; + PISR_TABLE CurrentIsr; + BOOLEAN State; - DPRINT("KeDisconnectInterrupt\n"); + DPRINT1("KeDisconnectInterrupt\n"); + ASSERT (InterruptObject->Number < KeNumberProcessors); - ASSERT (InterruptObject->ProcessorNumber < KeNumberProcessors); + /* Set the affinity */ + KeSetSystemAffinityThread(1 << InterruptObject->Number); - KeSetSystemAffinityThread(1 << InterruptObject->ProcessorNumber); + /* Get the ISR Tabe */ + CurrentIsr = &IsrTable[InterruptObject->Vector - IRQ_BASE] + [(ULONG)InterruptObject->Number]; - CurrentIsr = &IsrTable[InterruptObject->Vector - IRQ_BASE][(ULONG)InterruptObject->ProcessorNumber]; + /* Raise IRQL to required level and lock table */ + KeRaiseIrql(VECTOR2IRQL(InterruptObject->Vector),&oldlvl); + KiAcquireSpinLock(&CurrentIsr->Lock); - KeRaiseIrql(VECTOR2IRQL(InterruptObject->Vector),&oldlvl); - KiAcquireSpinLock(&CurrentIsr->Lock); + /* Check if it's actually connected */ + if ((State = InterruptObject->Connected)) + { + /* Lock the Interrupt */ + synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); - synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); + /* Remove this one, and check if all are gone */ + RemoveEntryList(&InterruptObject->InterruptListEntry); + if (IsListEmpty(&CurrentIsr->ListHead)) + { + /* Completely Disable the Interrupt */ + HalDisableSystemInterrupt(InterruptObject->Vector, InterruptObject->Irql); + } + + /* Disconnect it */ + InterruptObject->Connected = FALSE; + + /* Release the interrupt lock */ + KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); + } + /* Release the table spinlock */ + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); - RemoveEntryList(&InterruptObject->Entry); - if (IsListEmpty(&CurrentIsr->ListHead)) - { - HalDisableSystemInterrupt(InterruptObject->Vector, 0); - } - KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); - - /* - * Release the table spinlock - */ - KiReleaseSpinLock(&CurrentIsr->Lock); - KeLowerIrql(oldlvl); - - KeRevertToUserAffinityThread(); + /* Go back to default affinity */ + KeRevertToUserAffinityThread(); + + /* Return Old Interrupt State */ + return State; } - /* * @implemented */ VOID STDCALL -KeInitializeInterrupt(PKINTERRUPT InterruptObject, - PKSERVICE_ROUTINE ServiceRoutine, - PVOID ServiceContext, - PKSPIN_LOCK SpinLock, - ULONG Vector, - KIRQL Irql, - KIRQL SynchronizeIrql, - KINTERRUPT_MODE InterruptMode, - BOOLEAN ShareVector, - CHAR ProcessorNumber, - BOOLEAN FloatingSave) +KeInitializeInterrupt(PKINTERRUPT Interrupt, + PKSERVICE_ROUTINE ServiceRoutine, + PVOID ServiceContext, + PKSPIN_LOCK SpinLock, + ULONG Vector, + KIRQL Irql, + KIRQL SynchronizeIrql, + KINTERRUPT_MODE InterruptMode, + BOOLEAN ShareVector, + CHAR ProcessorNumber, + BOOLEAN FloatingSave) { - InterruptObject->ServiceRoutine = ServiceRoutine; - InterruptObject->ServiceContext = ServiceContext; - InterruptObject->ActualLock = SpinLock; - InterruptObject->Vector = Vector; - InterruptObject->Irql = Irql; - InterruptObject->SynchLevel = SynchronizeIrql; - InterruptObject->InterruptMode = InterruptMode; - InterruptObject->Shareable = ShareVector; - InterruptObject->ProcessorNumber = ProcessorNumber; - InterruptObject->FloatingSave = FloatingSave; + /* Set the Interrupt Header */ + Interrupt->Type = InterruptObject; + Interrupt->Size = sizeof(KINTERRUPT); + + /* Check if we got a spinlock */ + if (SpinLock) + { + Interrupt->ActualLock = SpinLock; + } + else + { + /* This means we'll be usin the built-in one */ + KeInitializeSpinLock(&Interrupt->SpinLock); + Interrupt->ActualLock = &Interrupt->SpinLock; + } + + /* Set the other settings */ + Interrupt->ServiceRoutine = ServiceRoutine; + Interrupt->ServiceContext = ServiceContext; + Interrupt->Vector = Vector; + Interrupt->Irql = Irql; + Interrupt->SynchronizeIrql = SynchronizeIrql; + Interrupt->Mode = InterruptMode; + Interrupt->ShareVector = ShareVector; + Interrupt->Number = ProcessorNumber; + Interrupt->FloatingSave = FloatingSave; + + /* Disconnect it at first */ + Interrupt->Connected = FALSE; } VOID KePrintInterruptStatistic(VOID) _____ Modified: trunk/reactos/ntoskrnl/ke/spinlock.c --- trunk/reactos/ntoskrnl/ke/spinlock.c 2005-06-22 21:55:43 UTC (rev 16228) +++ trunk/reactos/ntoskrnl/ke/spinlock.c 2005-06-22 23:10:15 UTC (rev 16229) @@ -62,8 +62,7 @@ { KIRQL oldIrql; - //KeRaiseIrql(Interrupt->SynchronizeIrql, &oldIrql); - KeRaiseIrql(Interrupt->SynchLevel, &oldIrql); + KeRaiseIrql(Interrupt->SynchronizeIrql, &oldIrql); KiAcquireSpinLock(Interrupt->ActualLock); return oldIrql; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs