Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[gvg] 16059: Thanks to GreatLord for spotting that we shouldn't access pixels outside the

by gvg＠svn.reactos.com

Thanks to GreatLord for spotting that we shouldn't access pixels outside the source surface in EngBitBlt. Modified: trunk/reactos/subsys/win32k/eng/bitblt.c _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-18 20:25:08 UTC (rev 16058) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-18 20:29:31 UTC (rev 16059) @@ -290,38 +290,73 @@ return TRUE; } - if (UsesSource && NULL != SourcePoint) + OutputRect = *DestRect; + if (OutputRect.right < OutputRect.left) { - InputRect.left = SourcePoint->x; - InputRect.right = SourcePoint->x + (DestRect->right - DestRect->left); - InputRect.top = SourcePoint->y; - InputRect.bottom = SourcePoint->y + (DestRect->bottom - DestRect->top); + OutputRect.left = DestRect->right; + OutputRect.right = DestRect->left; } - else + if (OutputRect.bottom < OutputRect.top) { - InputRect.left = 0; - InputRect.right = DestRect->right - DestRect->left; - InputRect.top = 0; - InputRect.bottom = DestRect->bottom - DestRect->top; + OutputRect.left = DestRect->right; + OutputRect.right = DestRect->left; } - if (! IntEngEnter(&EnterLeaveSource, SourceObj, &InputRect, TRUE, &Translate, &InputObj)) + if (UsesSource) { - return FALSE; - } + if (NULL == SourcePoint) + { + return FALSE; + } - if (NULL != SourcePoint) - { - InputPoint.x = SourcePoint->x + Translate.x; - InputPoint.y = SourcePoint->y + Translate.y; + /* Make sure we don't try to copy anything outside the valid source + region */ + InputPoint = *SourcePoint; + if (InputPoint.x < 0) + { + OutputRect.left -= InputPoint.x; + InputPoint.x = 0; + } + if (InputPoint.y < 0) + { + OutputRect.top -= InputPoint.y; + InputPoint.y = 0; + } + if (SourceObj->sizlBitmap.cx < InputPoint.x + + OutputRect.right - OutputRect.left) + { + OutputRect.right = OutputRect.left + + SourceObj->sizlBitmap.cx - InputPoint.x; + } + if (SourceObj->sizlBitmap.cy < InputPoint.y + + OutputRect.bottom - OutputRect.top) + { + OutputRect.bottom = OutputRect.top + + SourceObj->sizlBitmap.cy - InputPoint.y; + } + + InputRect.left = InputPoint.x; + InputRect.right = InputPoint.x + (OutputRect.right - OutputRect.left); + InputRect.top = InputPoint.y; + InputRect.bottom = InputPoint.y + (OutputRect.bottom - OutputRect.top); + + if (! IntEngEnter(&EnterLeaveSource, SourceObj, &InputRect, TRUE, + &Translate, &InputObj)) + { + return FALSE; + } + + InputPoint.x += Translate.x; + InputPoint.y += Translate.y; } else { - InputPoint.x = 0; - InputPoint.y = 0; + InputRect.left = 0; + InputRect.right = DestRect->right - DestRect->left; + InputRect.top = 0; + InputRect.bottom = DestRect->bottom - DestRect->top; } - OutputRect = *DestRect; if (NULL != ClipRegion) { if (OutputRect.left < ClipRegion->rclBounds.left) @@ -348,17 +383,25 @@ } } - /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's - nothing to do */ - if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) + /* Check for degenerate case: if height or width of OutputRect is 0 pixels + there's nothing to do */ + if (OutputRect.right <= OutputRect.left || + OutputRect.bottom <= OutputRect.top) { - IntEngLeave(&EnterLeaveSource); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } return TRUE; } - if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, &OutputObj)) + if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, + &OutputObj)) { - IntEngLeave(&EnterLeaveSource); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } return FALSE; } @@ -368,20 +411,24 @@ OutputRect.bottom += Translate.y; if(BrushOrigin) - { + { AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; - } + } else + { AdjustedBrushOrigin = Translate; + } - // Determine clipping type + /* Determine clipping type */ if (ClipRegion == (CLIPOBJ *) NULL) - { + { clippingType = DC_TRIVIAL; - } else { + } + else + { clippingType = ClipRegion->iDComplexity; - } + } if (R4_MASK == Rop4) { @@ -404,10 +451,11 @@ { case DC_TRIVIAL: Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4); + &OutputRect, &InputPoint, MaskOrigin, Brush, + &AdjustedBrushOrigin, Rop4); break; case DC_RECT: - // Clip the blt to the clip rectangle + /* Clip the blt to the clip rectangle */ ClipRect.left = ClipRegion->rclBounds.left + Translate.x; ClipRect.right = ClipRegion->rclBounds.right + Translate.x; ClipRect.top = ClipRegion->rclBounds.top + Translate.y; @@ -417,7 +465,8 @@ Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4); + &CombinedRect, &Pt, MaskOrigin, Brush, + &AdjustedBrushOrigin, Rop4); } break; case DC_COMPLEX: @@ -426,11 +475,13 @@ { if (OutputRect.top < InputPoint.y) { - Direction = OutputRect.left < InputPoint.x ? CD_RIGHTDOWN : CD_LEFTDOWN; + Direction = OutputRect.left < InputPoint.x ? + CD_RIGHTDOWN : CD_LEFTDOWN; } else { - Direction = OutputRect.left < InputPoint.x ? CD_RIGHTUP : CD_LEFTUP; + Direction = OutputRect.left < InputPoint.x ? + CD_RIGHTUP : CD_LEFTUP; } } else @@ -440,7 +491,8 @@ CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, Direction, 0); do { - EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), + (PVOID) &RectEnum); for (i = 0; i < RectEnum.c; i++) { @@ -465,7 +517,10 @@ IntEngLeave(&EnterLeaveDest); - IntEngLeave(&EnterLeaveSource); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } return Ret; } @@ -516,7 +571,8 @@ } InputPoint = *SourcePoint; - /* Make sure we don't try to copy anything outside the valid source region */ + /* Make sure we don't try to copy anything outside the valid source + region */ if (InputPoint.x < 0) { InputClippedRect.left -= InputPoint.x; @@ -527,13 +583,19 @@ InputClippedRect.top -= InputPoint.y; InputPoint.y = 0; } - if (SourceSurf->sizlBitmap.cx < InputPoint.x + InputClippedRect.right - InputClippedRect.left) + if (SourceSurf->sizlBitmap.cx < InputPoint.x + + InputClippedRect.right - + InputClippedRect.left) { - InputClippedRect.right = InputClippedRect.left + SourceSurf->sizlBitmap.cx - InputPoint.x; + InputClippedRect.right = InputClippedRect.left + + SourceSurf->sizlBitmap.cx - InputPoint.x; } - if (SourceSurf->sizlBitmap.cy < InputPoint.y + InputClippedRect.bottom - InputClippedRect.top) + if (SourceSurf->sizlBitmap.cy < InputPoint.y + + InputClippedRect.bottom - + InputClippedRect.top) { - InputClippedRect.bottom = InputClippedRect.top + SourceSurf->sizlBitmap.cy - InputPoint.y; + InputClippedRect.bottom = InputClippedRect.top + + SourceSurf->sizlBitmap.cy - InputPoint.y; } if (InputClippedRect.right < InputClippedRect.left || @@ -548,7 +610,8 @@ * outside the surface */ if (NULL != ClipRegion) { - if (! EngIntersectRect(&OutputRect, &InputClippedRect, &ClipRegion->rclBounds)) + if (! EngIntersectRect(&OutputRect, &InputClippedRect, + &ClipRegion->rclBounds)) { return TRUE; }

19 years, 6 months

[navaraf] 16058: - Convert mouclass and sermouse to use official DDK prototypes.

by navaraf＠svn.reactos.com

- Convert mouclass and sermouse to use official DDK prototypes. - Get rid of the old ROS DDK headers. Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.h Modified: trunk/reactos/drivers/input/sermouse/sermouse.c Deleted: trunk/reactos/include/ddk/ccfuncs.h Deleted: trunk/reactos/include/ddk/cctypes.h Deleted: trunk/reactos/include/ddk/cmtypes.h Deleted: trunk/reactos/include/ddk/dbgfuncs.h Deleted: trunk/reactos/include/ddk/defines.h Deleted: trunk/reactos/include/ddk/exfuncs.h Deleted: trunk/reactos/include/ddk/extypes.h Deleted: trunk/reactos/include/ddk/fsfuncs.h Deleted: trunk/reactos/include/ddk/fstypes.h Deleted: trunk/reactos/include/ddk/halfuncs.h Deleted: trunk/reactos/include/ddk/ioctrl.h Deleted: trunk/reactos/include/ddk/iodef.h Deleted: trunk/reactos/include/ddk/iofuncs.h Deleted: trunk/reactos/include/ddk/iotypes.h Deleted: trunk/reactos/include/ddk/kedef.h Deleted: trunk/reactos/include/ddk/kefuncs.h Deleted: trunk/reactos/include/ddk/ketypes.h Deleted: trunk/reactos/include/ddk/mmfuncs.h Deleted: trunk/reactos/include/ddk/mmtypes.h Deleted: trunk/reactos/include/ddk/ntdd8042.h Deleted: trunk/reactos/include/ddk/ntddbeep.h Deleted: trunk/reactos/include/ddk/ntddk.h Deleted: trunk/reactos/include/ddk/ntddkbd.h Deleted: trunk/reactos/include/ddk/ntddmou.h Deleted: trunk/reactos/include/ddk/ntddscsi.h Deleted: trunk/reactos/include/ddk/ntddser.h Deleted: trunk/reactos/include/ddk/ntdef.h Modified: trunk/reactos/include/ddk/ntifs.h Deleted: trunk/reactos/include/ddk/obfuncs.h Deleted: trunk/reactos/include/ddk/pnpfuncs.h Deleted: trunk/reactos/include/ddk/pnptypes.h Deleted: trunk/reactos/include/ddk/pofuncs.h Deleted: trunk/reactos/include/ddk/potypes.h Deleted: trunk/reactos/include/ddk/psfuncs.h Deleted: trunk/reactos/include/ddk/pstypes.h Deleted: trunk/reactos/include/ddk/sefuncs.h Deleted: trunk/reactos/include/ddk/setypes.h Deleted: trunk/reactos/include/ddk/status.h Deleted: trunk/reactos/include/ddk/structs.h Deleted: trunk/reactos/include/ddk/types.h Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Added: trunk/reactos/w32api/include/ddk/kbdmou.h Modified: trunk/reactos/w32api/include/ddk/ntddscsi.h _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2005-06-18 20:25:08 UTC (rev 16058) @@ -13,7 +13,7 @@ #include <ddk/ntddk.h> #include <ddk/ntddmou.h> -#include <rosrtl/string.h> +#include <ddk/kbdmou.h> #include "mouclass.h" #define NDEBUG @@ -106,11 +106,11 @@ PDEVICE_OBJECT PortDeviceObject = NULL; PFILE_OBJECT FileObject = NULL; NTSTATUS status; - UNICODE_STRING PortName = ROS_STRING_INITIALIZER(L"\\Device\\PointerClass0"); + UNICODE_STRING PortName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0"); IO_STATUS_BLOCK ioStatus; KEVENT event; PIRP irp; - CLASS_INFORMATION ClassInformation; + CONNECT_DATA ClassInformation; PDEVICE_EXTENSION DeviceExtension = ClassDeviceObject->DeviceExtension; // Get the port driver's DeviceObject @@ -137,11 +137,11 @@ KeInitializeEvent(&event, NotificationEvent, FALSE); - ClassInformation.DeviceObject = ClassDeviceObject; - ClassInformation.CallBack = MouseClassCallBack; + ClassInformation.ClassDeviceObject = ClassDeviceObject; + ClassInformation.ClassService = MouseClassCallBack; irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_MOUSE_CONNECT, - PortDeviceObject, &ClassInformation, sizeof(CLASS_INFORMATION), NULL, 0, TRUE, &event, &ioStatus); + PortDeviceObject, &ClassInformation, sizeof(CONNECT_DATA), NULL, 0, TRUE, &event, &ioStatus); status = IoCallDriver(DeviceExtension->PortDeviceObject, irp); @@ -236,8 +236,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\Mouse"); - UNICODE_STRING SymlinkName = ROS_STRING_INITIALIZER(L"\\??\\Mouse"); + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Mouse"); + UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\Mouse"); NTSTATUS Status; DriverObject->MajorFunction[IRP_MJ_CREATE] = MouseClassDispatch; _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.h --- trunk/reactos/drivers/input/mouclass/mouclass.h 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/drivers/input/mouclass/mouclass.h 2005-06-18 20:25:08 UTC (rev 16058) @@ -1,3 +1,5 @@ +#define MOUSE_BUFFER_SIZE 100 + typedef struct _DEVICE_EXTENSION { PIO_WORKITEM WorkItem; KSPIN_LOCK SpinLock; _____ Modified: trunk/reactos/drivers/input/sermouse/sermouse.c --- trunk/reactos/drivers/input/sermouse/sermouse.c 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/drivers/input/sermouse/sermouse.c 2005-06-18 20:25:08 UTC (rev 16058) @@ -13,6 +13,7 @@ #include <stdio.h> #include <ddk/ntddk.h> #include <ddk/ntddmou.h> +#include <ddk/kbdmou.h> #define NDEBUG #include <debug.h> @@ -76,6 +77,8 @@ /* Microsoft byte mask for middle button */ #define MOUSE_BUTTON_MIDDLE 0x04 +#define MOUSE_BUFFER_SIZE 100 + /* * Structures */ @@ -86,7 +89,7 @@ ULONG ActiveQueue; ULONG InputDataCount[2]; MOUSE_INPUT_DATA MouseInputData[2][MOUSE_BUFFER_SIZE]; - CLASS_INFORMATION ClassInformation; + CONNECT_DATA ClassInformation; PKINTERRUPT MouseInterrupt; KDPC IsrDpc; ULONG MousePort; @@ -293,7 +296,7 @@ { case IOCTL_INTERNAL_MOUSE_CONNECT: DeviceExtension->ClassInformation = - *((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer ); + *((PCONNECT_DATA)Stack->Parameters.DeviceIoControl.Type3InputBuffer); /* Reinitialize the port input data queue synchronously */ KeSynchronizeExecution(DeviceExtension->MouseInterrupt, @@ -376,8 +379,8 @@ Queue = DeviceExtension->ActiveQueue % 2; InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue); - (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack) ( - DeviceExtension->ClassInformation.DeviceObject, + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.ClassServ ice)( + DeviceExtension->ClassInformation.ClassDeviceObject, DeviceExtension->MouseInputData[Queue], NULL, &DeviceExtension->InputDataCount[Queue]); _____ Deleted: trunk/reactos/include/ddk/ccfuncs.h --- trunk/reactos/include/ddk/ccfuncs.h 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/include/ddk/ccfuncs.h 2005-06-18 20:25:08 UTC (rev 16058) @@ -1,369 +0,0 @@ - -#ifndef _NTOS_CCFUNCS_H -#define _NTOS_CCFUNCS_H -/* $Id$ */ - -#ifdef __cplusplus -extern "C" { -#endif - - -/* exported variables */ -/* these should be in the KPCR */ - -#ifdef __NTOSKRNL__ -extern ULONG EXPORTED CcFastMdlReadWait; -extern ULONG EXPORTED CcFastReadNotPossible; -extern ULONG EXPORTED CcFastReadWait; -#else -extern ULONG IMPORTED CcFastMdlReadWait; -extern ULONG IMPORTED CcFastReadNotPossible; -extern ULONG IMPORTED CcFastReadWait; -#endif - -BOOLEAN -STDCALL -CcCanIWrite ( - IN PFILE_OBJECT FileObject, - IN ULONG BytesToWrite, - IN BOOLEAN Wait, - IN BOOLEAN Retrying - ); - -BOOLEAN -STDCALL -CcCopyRead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus - ); - -BOOLEAN -STDCALL -CcCopyWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN PVOID Buffer - ); - -VOID -STDCALL -CcDeferWrite ( - IN PFILE_OBJECT FileObject, - IN PCC_POST_DEFERRED_WRITE PostRoutine, - IN PVOID Context1, - IN PVOID Context2, - IN ULONG BytesToWrite, - IN BOOLEAN Retrying - ); - -VOID -STDCALL -CcFastCopyRead ( - IN PFILE_OBJECT FileObject, - IN ULONG FileOffset, - IN ULONG Length, - IN ULONG PageCount, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus - ); - -VOID -STDCALL -CcFastCopyWrite ( - IN PFILE_OBJECT FileObject, - IN ULONG FileOffset, - IN ULONG Length, - IN PVOID Buffer - ); - -VOID -STDCALL -CcFlushCache ( - IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN PLARGE_INTEGER FileOffset OPTIONAL, - IN ULONG Length, - OUT PIO_STATUS_BLOCK IoStatus OPTIONAL - ); - -LARGE_INTEGER -STDCALL -CcGetDirtyPages ( - IN PVOID LogHandle, - IN PDIRTY_PAGE_ROUTINE DirtyPageRoutine, - IN PVOID Context1, - IN PVOID Context2 - ); - -PFILE_OBJECT -STDCALL -CcGetFileObjectFromBcb ( - IN PVOID Bcb - ); - -PFILE_OBJECT -STDCALL -CcGetFileObjectFromSectionPtrs ( - IN PSECTION_OBJECT_POINTERS SectionObjectPointer - ); - -LARGE_INTEGER -STDCALL -CcGetFlushedValidData ( - IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN BOOLEAN BcbListHeld - ); - -LARGE_INTEGER -STDCALL -CcGetLsnForFileObject ( - IN PFILE_OBJECT FileObject, - OUT PLARGE_INTEGER OldestLsn OPTIONAL - ); - -VOID -STDCALL -CcInitializeCacheMap ( - IN PFILE_OBJECT FileObject, - IN PCC_FILE_SIZES FileSizes, - IN BOOLEAN PinAccess, - IN PCACHE_MANAGER_CALLBACKS CallBacks, - IN PVOID LazyWriterContext - ); - -BOOLEAN -STDCALL -CcIsThereDirtyData ( - IN PVPB Vpb - ); - -BOOLEAN -STDCALL -CcMapData ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - OUT PVOID * Bcb, - OUT PVOID * Buffer - ); - -VOID -STDCALL -CcMdlRead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - OUT PMDL * MdlChain, - OUT PIO_STATUS_BLOCK IoStatus - ); - -VOID -STDCALL -CcMdlReadComplete ( - IN PFILE_OBJECT FileObject, - IN PMDL MdlChain - ); - -VOID -STDCALL -CcMdlWriteAbort ( - IN PFILE_OBJECT FileObject, - IN PMDL MdlChain - ); - -VOID -STDCALL -CcMdlWriteComplete ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain - ); - -BOOLEAN -STDCALL -CcPinMappedData ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG Flags, - OUT PVOID * Bcb - ); - -BOOLEAN -STDCALL -CcPinRead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG Flags, - OUT PVOID * Bcb, - OUT PVOID * Buffer - ); - -VOID -STDCALL -CcPrepareMdlWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - OUT PMDL * MdlChain, - OUT PIO_STATUS_BLOCK IoStatus - ); - -BOOLEAN -STDCALL -CcPreparePinWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Zero, - IN ULONG Flags, - OUT PVOID * Bcb, - OUT PVOID * Buffer - ); - -BOOLEAN -STDCALL -CcPurgeCacheSection ( - IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN PLARGE_INTEGER FileOffset OPTIONAL, - IN ULONG Length, - IN BOOLEAN UninitializeCacheMaps - ); - -#define CcReadAhead(FO,FOFF,LEN) \ -{ \ - if ((LEN) >= 256) \ - { \ - CcScheduleReadAhead((FO),(FOFF),(LEN)); \ - } \ -} - -VOID -STDCALL -CcRepinBcb ( - IN PVOID Bcb - ); - -PVOID -STDCALL -CcRemapBcb ( - IN PVOID Bcb - ); - -VOID -STDCALL -CcScheduleReadAhead ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length - ); - -VOID -STDCALL -CcSetAdditionalCacheAttributes ( - IN PFILE_OBJECT FileObject, - IN BOOLEAN DisableReadAhead, - IN BOOLEAN DisableWriteBehind - ); - -VOID -STDCALL -CcSetBcbOwnerPointer ( - IN PVOID Bcb, - IN PVOID Owner - ); - -VOID -STDCALL -CcSetDirtyPageThreshold ( - IN PFILE_OBJECT FileObject, - IN ULONG DirtyPageThreshold - ); - -VOID -STDCALL -CcSetDirtyPinnedData ( - IN PVOID Bcb, - IN PLARGE_INTEGER Lsn OPTIONAL - ); - -VOID -STDCALL -CcSetFileSizes ( - IN PFILE_OBJECT FileObject, - IN PCC_FILE_SIZES FileSizes - ); - -VOID -STDCALL -CcSetLogHandleForFile ( - IN PFILE_OBJECT FileObject, - IN PVOID LogHandle, - IN PFLUSH_TO_LSN FlushToLsnRoutine - ); - -VOID -STDCALL -CcSetReadAheadGranularity ( - IN PFILE_OBJECT FileObject, - IN ULONG Granularity - ); - -BOOLEAN -STDCALL -CcUninitializeCacheMap ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER TruncateSize OPTIONAL, - IN PCACHE_UNINITIALIZE_EVENT UninitializeCompleteEvent OPTIONAL - ); - -VOID -STDCALL -CcUnpinData ( - IN PVOID Bcb - ); - -VOID -STDCALL -CcUnpinDataForThread ( - IN PVOID Bcb, - IN ERESOURCE_THREAD ResourceThreadId - ); - -VOID -STDCALL -CcUnpinRepinnedBcb ( - IN PVOID Bcb, - IN BOOLEAN WriteThrough, - IN PIO_STATUS_BLOCK IoStatus - ); - -NTSTATUS -STDCALL -CcWaitForCurrentLazyWriterActivity ( - VOID - ); - -BOOLEAN -STDCALL -CcZeroData ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER StartOffset, - IN PLARGE_INTEGER EndOffset, - IN BOOLEAN Wait - ); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____ Deleted: trunk/reactos/include/ddk/cctypes.h --- trunk/reactos/include/ddk/cctypes.h 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/include/ddk/cctypes.h 2005-06-18 20:25:08 UTC (rev 16058) @@ -1,90 +0,0 @@ -#ifndef __INCLUDE_DDK_CCTYPES_H -#define __INCLUDE_DDK_CCTYPES_H - -typedef struct _CACHE_UNINITIALIZE_EVENT -{ - struct _CACHE_UNINITIALIZE_EVENT * Next; - KEVENT Event; -} CACHE_UNINITIALIZE_EVENT, *PCACHE_UNINITIALIZE_EVENT; - -typedef struct _CC_FILE_SIZES -{ - LARGE_INTEGER AllocationSize; - LARGE_INTEGER FileSize; - LARGE_INTEGER ValidDataLength; -} CC_FILE_SIZES, *PCC_FILE_SIZES; - - -typedef VOID STDCALL_FUNC -(*PCC_POST_DEFERRED_WRITE)(IN PVOID Context1, - IN PVOID Context2); - -typedef struct _PUBLIC_BCB -{ - CSHORT NodeTypeCode; - CSHORT NodeByteSize; - ULONG MappedLength; - LARGE_INTEGER MappedFileOffset; -} PUBLIC_BCB, *PPUBLIC_BCB; - -typedef VOID (*PDIRTY_PAGE_ROUTINE) ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN PLARGE_INTEGER OldestLsn, - IN PLARGE_INTEGER NewestLsn, - IN PVOID Context1, - IN PVOID Context2 -); - -typedef BOOLEAN STDCALL_FUNC -(*PACQUIRE_FOR_LAZY_WRITE)(IN PVOID Context, - IN BOOLEAN Wait); - -typedef VOID STDCALL_FUNC -(*PRELEASE_FROM_LAZY_WRITE)(IN PVOID Context); - -typedef BOOLEAN STDCALL_FUNC -(*PACQUIRE_FOR_READ_AHEAD)(IN PVOID Context, - IN BOOLEAN Wait); - -typedef VOID STDCALL_FUNC -(*PRELEASE_FROM_READ_AHEAD)(IN PVOID Context); - -typedef struct _CACHE_MANAGER_CALLBACKS -{ - PACQUIRE_FOR_LAZY_WRITE AcquireForLazyWrite; - PRELEASE_FROM_LAZY_WRITE ReleaseFromLazyWrite; - PACQUIRE_FOR_READ_AHEAD AcquireForReadAhead; - PRELEASE_FROM_READ_AHEAD ReleaseFromReadAhead; -} CACHE_MANAGER_CALLBACKS, *PCACHE_MANAGER_CALLBACKS; - -/* this is already defined in iotypes.h */ -/* -typedef struct _SECTION_OBJECT_POINTERS -{ - PVOID DataSectionObject; - PVOID SharedCacheMap; - PVOID ImageSectionObject; -} SECTION_OBJECT_POINTERS, *PSECTION_OBJECT_POINTERS; -*/ - -typedef VOID STDCALL_FUNC -(*PFLUSH_TO_LSN)(IN PVOID LogHandle, - IN LARGE_INTEGER Lsn); - -typedef struct _FSRTL_COMMON_FCB_HEADER { - CSHORT NodeTypeCode; - CSHORT NodeByteSize; - UCHAR Flags; - UCHAR IsFastIoPossible; - UCHAR Flags2; - UCHAR Reserved; - PERESOURCE Resource; - PERESOURCE PagingIoResource; - LARGE_INTEGER AllocationSize; - LARGE_INTEGER FileSize; - LARGE_INTEGER ValidDataLength; -} FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER; - -#endif /* __INCLUDE_DDK_CCTYPES_H */ _____ Deleted: trunk/reactos/include/ddk/cmtypes.h --- trunk/reactos/include/ddk/cmtypes.h 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/include/ddk/cmtypes.h 2005-06-18 20:25:08 UTC (rev 16058) @@ -1,117 +0,0 @@ -#ifndef __INCLUDE_DDK_CMTYPES_H -#define __INCLUDE_DDK_CMTYPES_H -/* - * Configuration Manager structures and typedefs - */ - -/* key query information class */ - -typedef enum _KEY_INFORMATION_CLASS -{ - KeyBasicInformation, - KeyNodeInformation, - KeyFullInformation, - KeyNameInformation, - KeyCachedInformation, - KeyFlagsInformation -} KEY_INFORMATION_CLASS; - -typedef struct _KEY_BASIC_INFORMATION -{ - LARGE_INTEGER LastWriteTime; - ULONG TitleIndex; - ULONG NameLength; - WCHAR Name[1]; -} KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION; - -typedef struct _KEY_FULL_INFORMATION -{ - LARGE_INTEGER LastWriteTime; - ULONG TitleIndex; - ULONG ClassOffset; - ULONG ClassLength; - ULONG SubKeys; - ULONG MaxNameLen; - ULONG MaxClassLen; - ULONG Values; - ULONG MaxValueNameLen; - ULONG MaxValueDataLen; - WCHAR Class[1]; -} KEY_FULL_INFORMATION, *PKEY_FULL_INFORMATION; - -typedef struct _KEY_NODE_INFORMATION -{ - LARGE_INTEGER LastWriteTime; - ULONG TitleIndex; - ULONG ClassOffset; - ULONG ClassLength; - ULONG NameLength; - WCHAR Name[1]; -} KEY_NODE_INFORMATION, *PKEY_NODE_INFORMATION; - - -/* key set information class */ - -typedef enum _KEY_SET_INFORMATION_CLASS { - KeyWriteTimeInformation, - KeyUserFlagsInformation, - MaxKeySetInfoClass -} KEY_SET_INFORMATION_CLASS; - -typedef struct _KEY_WRITE_TIME_INFORMATION { - LARGE_INTEGER LastWriteTime; -} KEY_WRITE_TIME_INFORMATION, *PKEY_WRITE_TIME_INFORMATION; - -typedef struct _KEY_USER_FLAGS_INFORMATION { - ULONG UserFlags; -} KEY_USER_FLAGS_INFORMATION, *PKEY_USER_FLAGS_INFORMATION; - - -/* key value information class */ - -typedef enum _KEY_VALUE_INFORMATION_CLASS -{ - KeyValueBasicInformation, - KeyValueFullInformation, - KeyValuePartialInformation -} KEY_VALUE_INFORMATION_CLASS; - -typedef struct _KEY_VALUE_BASIC_INFORMATION -{ - ULONG TitleIndex; - ULONG Type; - ULONG NameLength; - WCHAR Name[1]; -} KEY_VALUE_BASIC_INFORMATION, *PKEY_VALUE_BASIC_INFORMATION; - -typedef struct _KEY_VALUE_FULL_INFORMATION -{ - ULONG TitleIndex; - ULONG Type; - ULONG DataOffset; - ULONG DataLength; - ULONG NameLength; - WCHAR Name[1]; -} KEY_VALUE_FULL_INFORMATION, *PKEY_VALUE_FULL_INFORMATION; - -typedef struct _KEY_VALUE_PARTIAL_INFORMATION -{ - ULONG TitleIndex; - ULONG Type; - ULONG DataLength; - UCHAR Data[1]; -} KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION; - - -/* used by [Nt/Zw]QueryMultipleValueKey */ - -typedef struct _KEY_VALUE_ENTRY -{ - PUNICODE_STRING ValueName; - ULONG DataLength; - ULONG DataOffset; - ULONG Type; -} KEY_VALUE_ENTRY, *PKEY_VALUE_ENTRY; - - -#endif /* __INCLUDE_DDK_CMTYPES_H */ _____ Deleted: trunk/reactos/include/ddk/dbgfuncs.h --- trunk/reactos/include/ddk/dbgfuncs.h 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/include/ddk/dbgfuncs.h 2005-06-18 20:25:08 UTC (rev 16058) @@ -1,49 +0,0 @@ -#ifndef __INCLUDE_DDK_DBGFUNCS_H -#define __INCLUDE_DDK_DBGFUNCS_H -/* $Id$ */ - -VOID STDCALL DbgBreakPointWithStatus (ULONG Status); -VOID STDCALL DbgBreakPoint(VOID); -ULONG DbgPrint(PCH Format,...); -VOID STDCALL DbgPrompt (PCH OutputString, PCH InputString, USHORT InputSize); - -ULONG -__cdecl -DbgPrintEx( - IN ULONG ComponentId, - IN ULONG Level, - IN PCH Format, - ... - ); - -ULONG -__cdecl -DbgPrintReturnControlC( - PCH Format, - ... - ); - -NTSTATUS -STDCALL -DbgQueryDebugFilterState( - IN ULONG ComponentId, - IN ULONG Level - ); - -NTSTATUS -STDCALL -DbgSetDebugFilterState( - IN ULONG ComponentId, - IN ULONG Level, - IN BOOLEAN State - ); - -NTSTATUS -STDCALL -DbgLoadImageSymbols( - IN PUNICODE_STRING Name, - IN ULONG Base, - IN ULONG Unknown3 - ); - -#endif /* __INCLUDE_DDK_DBGFUNCS_H */ _____ Deleted: trunk/reactos/include/ddk/defines.h --- trunk/reactos/include/ddk/defines.h 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/include/ddk/defines.h 2005-06-18 20:25:08 UTC (rev 16058) @@ -1,110 +0,0 @@ -#ifndef _DDK_DEFINES_H -#define _DDK_DEFINES_H - -/* GENERAL DEFINITIONS ****************************************************/ - -#ifndef __ASM__ - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 -#endif - -#include <ddk/kedef.h> -#include <ddk/iodef.h> - -/* - * PURPOSE: Number of a thread priority levels - */ -#define NR_PRIORITY_LEVELS (32) - -/* - * PURPOSE: Object attributes - */ -enum -{ - OBJ_INHERIT = 0x2, - OBJ_PERMANENT = 0x10, - OBJ_EXCLUSIVE = 0x20, - OBJ_CASE_INSENSITIVE = 0x40, - OBJ_OPENIF = 0x80, - OBJ_OPENLINK = 0x100, - OBJ_KERNEL_HANDLE = 0x200, - OBJ_VALID_ATTRIBUTES = 0x3F2, -}; - -/* - * PURPOSE: Timer types - */ -enum -{ - NotificationTimer, - SynchronizationTimer, -}; - -/* - * PURPOSE: Some drivers use these - */ -#ifndef IN -#define IN -#define OUT -#define OPTIONAL -#endif - -/* - * PURPOSE: Arguments to MmProbeAndLockPages - */ -enum -{ - IoReadAccess, - IoWriteAccess, - IoModifyAccess, -}; - -#define MAXIMUM_VOLUME_LABEL_LENGTH (32) - -#include <ddk/i386/irql.h> - -#define PASSIVE_LEVEL 0 // Passive release level -#define LOW_LEVEL 0 // Lowest interrupt level -#define APC_LEVEL 1 // APC interrupt level -#define DISPATCH_LEVEL 2 // Dispatcher level -/* timer used for profiling */ -#define PROFILE_LEVEL 27 -/* Interval clock 1 level - Not used on x86 */ -#define CLOCK1_LEVEL 28 -#define CLOCK2_LEVEL 28 // Interval clock 2 level -#define IPI_LEVEL 29 // Interprocessor interrupt level -#define POWER_LEVEL 30 // Power failure level -#define HIGH_LEVEL 31 // Highest interrupt level -#define SYNCH_LEVEL (IPI_LEVEL-1) // synchronization level - -#define WINSTA_ACCESSCLIPBOARD (0x4L) -#define WINSTA_ACCESSGLOBALATOMS (0x20L) -#define WINSTA_CREATEDESKTOP (0x8L) -#define WINSTA_ENUMDESKTOPS (0x1L) -#define WINSTA_ENUMERATE (0x100L) -#define WINSTA_EXITWINDOWS (0x40L) -#define WINSTA_READATTRIBUTES (0x2L) -#define WINSTA_READSCREEN (0x200L) -#define WINSTA_WRITEATTRIBUTES (0x10L) - -#define DF_ALLOWOTHERACCOUNTHOOK (0x1L) -#define DESKTOP_CREATEMENU (0x4L) -#define DESKTOP_CREATEWINDOW (0x2L) -#define DESKTOP_ENUMERATE (0x40L) -#define DESKTOP_HOOKCONTROL (0x8L) -#define DESKTOP_JOURNALPLAYBACK (0x20L) -#define DESKTOP_JOURNALRECORD (0x10L) -#define DESKTOP_READOBJECTS (0x1L) -#define DESKTOP_SWITCHDESKTOP (0x100L) -#define DESKTOP_WRITEOBJECTS (0x80L) - -#else - -/* Values returned by KeGetPreviousMode() */ -#define KernelMode (0) -#define UserMode (1) - -#endif /* __ASM__ */ - -#endif /* ndef _DDK_DEFINES_H */ _____ Deleted: trunk/reactos/include/ddk/exfuncs.h --- trunk/reactos/include/ddk/exfuncs.h 2005-06-18 19:53:49 UTC (rev 16057) +++ trunk/reactos/include/ddk/exfuncs.h 2005-06-18 20:25:08 UTC (rev 16058) @@ -1,1043 +0,0 @@ -#ifndef _NTOS_EXFUNCS_H -#define _NTOS_EXFUNCS_H - -/* EXECUTIVE ROUTINES ******************************************************/ - -#ifdef __NTOSKRNL__ -extern POBJECT_TYPE EXPORTED ExDesktopObjectType; -extern POBJECT_TYPE EXPORTED ExEventObjectType; -extern POBJECT_TYPE EXPORTED ExWindowStationObjectType; -extern POBJECT_TYPE EXPORTED ExIoCompletionType; -#else -extern POBJECT_TYPE IMPORTED ExDesktopObjectType; -extern POBJECT_TYPE IMPORTED ExEventObjectType; -extern POBJECT_TYPE IMPORTED ExWindowStationObjectType; -extern POBJECT_TYPE IMPORTED ExIoCompletionType; -#endif - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - -VOID -FASTCALL -ExAcquireFastMutex ( - PFAST_MUTEX FastMutex - ); -VOID -FASTCALL -ExAcquireFastMutexUnsafe ( - PFAST_MUTEX FastMutex - ); -BOOLEAN -STDCALL -ExAcquireResourceExclusive ( - PERESOURCE Resource, - BOOLEAN Wait - ); -BOOLEAN -STDCALL -ExAcquireResourceExclusiveLite ( - PERESOURCE Resource, - BOOLEAN Wait - ); -BOOLEAN -STDCALL -ExAcquireResourceSharedLite ( - PERESOURCE Resource, - BOOLEAN Wait - ); -BOOLEAN -FASTCALL -ExAcquireRundownProtection ( - IN PEX_RUNDOWN_REF RunRef - ); -BOOLEAN -FASTCALL -ExAcquireRundownProtectionEx ( - IN PEX_RUNDOWN_REF RunRef, - IN ULONG Count - ); -PVOID -FASTCALL -ExfAcquirePushLockExclusive ( - PVOID Lock - ); -PVOID -FASTCALL -ExfAcquirePushLockShared ( - PVOID Lock - ); -PVOID -FASTCALL -ExfReleasePushLock ( - PVOID Lock - ); -BOOLEAN -STDCALL -ExAcquireSharedStarveExclusive ( - PERESOURCE Resource, - BOOLEAN Wait - ); -BOOLEAN -STDCALL -ExAcquireSharedWaitForExclusive ( - PERESOURCE Resource, - BOOLEAN Wait - ); - -PVOID -STDCALL -ExAllocateFromZone ( - PZONE_HEADER Zone - ); - -/* - * PVOID - * ExAllocateFromZone ( - * PZONE_HEADER Zone - * ); - * - * FUNCTION: - * Allocate a block from a zone - * - * ARGUMENTS: - * Zone = Zone to allocate from - * - * RETURNS: - * The base address of the block allocated - */ -#define ExAllocateFromZone(Zone) \ - (PVOID)((Zone)->FreeList.Next); \ - if ((Zone)->FreeList.Next) \ - (Zone)->FreeList.Next = (Zone)->FreeList.Next->Next - -/* - * FUNCTION: Allocates memory from the nonpaged pool - * ARGUMENTS: - * NumberOfBytes = minimum size of the block to be allocated - * PoolType = the type of memory to use for the block (ignored) - * RETURNS: - * the address of the block if it succeeds - */ -PVOID -STDCALL [truncated at 1000 lines; 12140 more skipped]

19 years, 6 months

[gvg] 16057: Use correct dest rect when preventing copy outside source surf

by gvg＠svn.reactos.com

Use correct dest rect when preventing copy outside source surf Modified: trunk/reactos/subsys/win32k/eng/bitblt.c _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-18 19:30:47 UTC (rev 16056) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-18 19:53:49 UTC (rev 16057) @@ -552,8 +552,8 @@ { return TRUE; } - InputPoint.x += OutputRect.left - DestRect->left; - InputPoint.y += OutputRect.top - DestRect->top; + InputPoint.x += OutputRect.left - InputClippedRect.left; + InputPoint.y += OutputRect.top - InputClippedRect.top; } else {

19 years, 6 months

[navaraf] 16056: Don't include internal headers.

by navaraf＠svn.reactos.com

Don't include internal headers. Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c _____ Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c --- trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-18 19:30:15 UTC (rev 16055) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-18 19:30:47 UTC (rev 16056) @@ -14,8 +14,6 @@ #include <ddk/ntddk.h> #include <hal.h> #include "halxbox.h" -#include <internal/ob.h> -#include <internal/ps.h> #define NDEBUG #include <internal/debug.h>

19 years, 6 months

[navaraf] 16055: Add __ASM__ guard.

by navaraf＠svn.reactos.com

Add __ASM__ guard. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h --- trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-06-18 19:13:29 UTC (rev 16054) +++ trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-06-18 19:30:15 UTC (rev 16055) @@ -20,8 +20,10 @@ #define __NTOSKRNL_INCLUDE_INTERNAL_I386_PS_H #ifdef __USE_W32API +#ifndef __ASM__ #include <ddk/ntpoapi.h> #endif +#endif /* * Defines for accessing KPCR and KTHREAD structure members

19 years, 6 months

[navaraf] 16054: Fix build. :/

by navaraf＠svn.reactos.com

Fix build. :/ Modified: trunk/reactos/hal/hal/hal.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-06-18 18:32:29 UTC (rev 16053) +++ trunk/reactos/hal/hal/hal.c 2005-06-18 19:13:29 UTC (rev 16054) @@ -17,9 +17,12 @@ #define NDEBUG #include <internal/debug.h> +typedef struct _LOADER_PARAMETER_BLOCK *PLOADER_PARAMETER_BLOCK; +typedef struct _KD_PORT_INFORMATION *PKD_PORT_INFORMATION; + /* DATA **********************************************************************/ -ULONG EXPORTED KdComPortInUse = 0; +ULONG KdComPortInUse = 0; /* FUNCTIONS *****************************************************************/

19 years, 6 months

[navaraf] 16053: Use W32API for NTOSKRNL.

by navaraf＠svn.reactos.com

Use W32API for NTOSKRNL. Modified: trunk/reactos/drivers/fs/vfat/vfat.h Modified: trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/include/ddk/halfuncs.h Modified: trunk/reactos/include/ddk/ketypes.h Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ntos/halfuncs.h Modified: trunk/reactos/include/ntos/krnltypes.h Modified: trunk/reactos/ntoskrnl/cm/cm.h Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/fs/fastio.c Modified: trunk/reactos/ntoskrnl/fs/filelock.c Modified: trunk/reactos/ntoskrnl/fs/notify.c Modified: trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/ifs.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h Modified: trunk/reactos/ntoskrnl/include/internal/kdbochs.h Modified: trunk/reactos/ntoskrnl/include/internal/kdgdb.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/module.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/include/internal/po.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/trap.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/disk.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/resource.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h Modified: trunk/reactos/ntoskrnl/mm/elf32.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/rtl/i386/exception.c Modified: trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/ntoskrnl/se/access.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -17,11 +17,13 @@ #endif #ifdef USE_ROS_CC_AND_FS +#ifndef __INCLUDE_DDK_NTIFS_H NTSTATUS STDCALL CcRosInitializeFileCache(PFILE_OBJECT, ULONG); NTSTATUS STDCALL CcRosReleaseFileCache(PFILE_OBJECT); #define FSCTL_ROS_QUERY_LCN_MAPPING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) typedef struct _ROS_QUERY_LCN_MAPPING { LARGE_INTEGER LcnDiskOffset; } ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; #endif +#endif #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/hal/halx86/include/hal.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -13,9 +13,7 @@ #include <stdio.h> /* FIXME: NDK Headers */ -#include <ntos/types.h> -#include <ntos/haltypes.h> -#include <ntos/halfuncs.h> +#include <roskrnl.h> /* Internal Kernel Headers */ //#include <internal/mm.h> _____ Modified: trunk/reactos/include/ddk/halfuncs.h --- trunk/reactos/include/ddk/halfuncs.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/include/ddk/halfuncs.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -136,10 +136,6 @@ HalSetTimeIncrement */ -BOOLEAN STDCALL -HalStartNextProcessor(ULONG Unknown1, - ULONG Unknown2); - /* HalStartProfileInterrupt */ _____ Modified: trunk/reactos/include/ddk/ketypes.h --- trunk/reactos/include/ddk/ketypes.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/include/ddk/ketypes.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -128,14 +128,6 @@ DISPATCHER_HEADER Header; } KEVENT, *PKEVENT, *RESTRICTED_POINTER PRKEVENT; -typedef struct _KEVENT_PAIR -{ - CSHORT Type; - CSHORT Size; - KEVENT LowEvent; - KEVENT HighEvent; -} KEVENT_PAIR, *PKEVENT_PAIR; - typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; typedef struct _KDEVICE_QUEUE _____ Modified: trunk/reactos/include/ddk/ntifs.h --- trunk/reactos/include/ddk/ntifs.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/include/ddk/ntifs.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -1,3 +1,6 @@ +#ifndef __INCLUDE_DDK_NTIFS_H +#define __INCLUDE_DDK_NTIFS_H + #ifdef __USE_W32API #include_next <ddk/ntifs.h> @@ -2,13 +5,12 @@ -NTSTATUS STDCALL -CcRosInitializeFileCache (PFILE_OBJECT FileObject, - ULONG CacheSegmentSize); -NTSTATUS STDCALL -CcRosReleaseFileCache (PFILE_OBJECT FileObject); - #else /* __USE_W32API */ -#ifndef __INCLUDE_DDK_NTIFS_H -#define __INCLUDE_DDK_NTIFS_H +#include <ddk/cctypes.h> +#include <ddk/ccfuncs.h> +#include <ddk/fstypes.h> +#include <ddk/fsfuncs.h> + +#endif + NTSTATUS STDCALL @@ -27,13 +29,4 @@ LARGE_INTEGER LcnDiskOffset; } ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; -#include <ddk/cctypes.h> - -#include <ddk/ccfuncs.h> - -#include <ddk/fstypes.h> -#include <ddk/fsfuncs.h> - #endif /* __INCLUDE_DDK_NTIFS_H */ - -#endif /* __USE_W32API */ _____ Modified: trunk/reactos/include/ntos/halfuncs.h --- trunk/reactos/include/ntos/halfuncs.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/include/ntos/halfuncs.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -90,6 +90,10 @@ ULONG Unknown2, ULONG Unknown3); +BOOLEAN STDCALL +HalStartNextProcessor(ULONG Unknown1, + ULONG Unknown2); + VOID STDCALL IoAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, _____ Modified: trunk/reactos/include/ntos/krnltypes.h --- trunk/reactos/include/ntos/krnltypes.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/include/ntos/krnltypes.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -119,5 +119,18 @@ ULONG64 Return; } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; +typedef struct _KEVENT_PAIR +{ + CSHORT Type; + CSHORT Size; + KEVENT LowEvent; + KEVENT HighEvent; +} KEVENT_PAIR, *PKEVENT_PAIR; + +typedef struct _RUNDOWN_DESCRIPTOR { + ULONG_PTR References; + KEVENT RundownEvent; +} RUNDOWN_DESCRIPTOR, *PRUNDOWN_DESCRIPTOR; + #endif /* __INCLUDE_NTOS_KRNLTYPES_H */ _____ Modified: trunk/reactos/ntoskrnl/cm/cm.h --- trunk/reactos/ntoskrnl/cm/cm.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/cm/cm.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -424,9 +424,9 @@ } REG_NOTIFY_CLASS, *PREG_NOTIFY_CLASS; /* Registry Callback Function */ -typedef NTSTATUS (*PEX_CALLBACK_FUNCTION ) ( +typedef NTSTATUS (STDCALL *PEX_CALLBACK_FUNCTION ) ( IN PVOID CallbackContext, - IN REG_NOTIFY_CLASS Argument1, + IN PVOID Argument1, IN PVOID Argument2 ); _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -286,7 +286,7 @@ ExReleaseFastMutex(&CmiCallbackLock); Status = CurrentCallback->Function(CurrentCallback->Context, - Argument1, + (PVOID)Argument1, Argument2); if(!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -398,8 +398,6 @@ ExFreePool(Buffer); - ASSERTMSG(NT_SUCCESS(Status), ("Status: 0x%X\n", Status)); - if (!NT_SUCCESS(Status)) { return(Status); @@ -688,9 +686,8 @@ return STATUS_REGISTRY_CORRUPT; } - ASSERTMSG((Bin->BinSize % REG_BLOCK_SIZE) == 0, - ("Bin size (0x%.08x) must be multiple of 4K\n", - Bin->BinSize)); + ASSERTMSG("Bin size must be multiple of 4K\n", + (Bin->BinSize % REG_BLOCK_SIZE) == 0); /* Allocate the hive block */ Hive->BlockList[BlockIndex].Bin = ExAllocatePool (PagedPool, _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -248,8 +248,8 @@ ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); - ASSERT(FIELD_OFFSET(KPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); - ASSERT(FIELD_OFFSET(KPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); + ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); + ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); ASSERT(FIELD_OFFSET(KTSS, Eflags) == KTSS_EFLAGS); ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -15,6 +15,10 @@ #define NDEBUG #include <internal/debug.h> +#ifndef MUTANT_INCREMENT +#define MUTANT_INCREMENT 1 +#endif + POBJECT_TYPE ExMutantObjectType = NULL; static GENERIC_MAPPING ExpMutantMapping = { _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -415,9 +415,9 @@ Spi->IdleTime.QuadPart = TheIdleProcess->Pcb.KernelTime * 100000LL; - Spi->ReadTransferCount.QuadPart = IoReadTransferCount; - Spi->WriteTransferCount.QuadPart = IoWriteTransferCount; - Spi->OtherTransferCount.QuadPart = IoOtherTransferCount; + Spi->ReadTransferCount = IoReadTransferCount; + Spi->WriteTransferCount = IoWriteTransferCount; + Spi->OtherTransferCount = IoOtherTransferCount; Spi->ReadOperationCount = IoReadOperationCount; Spi->WriteOperationCount = IoWriteOperationCount; Spi->OtherOperationCount = IoOtherOperationCount; @@ -984,6 +984,9 @@ * ReqSize = sizeof (SYSTEM_CACHE_INFORMATION); return (STATUS_INFO_LENGTH_MISMATCH); } + + RtlZeroMemory(Sci, sizeof(SYSTEM_CACHE_INFORMATION)); + /* Return the Byte size not the page size. */ Sci->CurrentSize = MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; @@ -993,8 +996,6 @@ Sci->PageFaultCount = 0; /* FIXME */ Sci->MinimumWorkingSet = 0; /* FIXME */ Sci->MaximumWorkingSet = 0; /* FIXME */ - Sci->TransitionSharedPages = 0; /* FIXME */ - Sci->TransitionSharedPagesPeak = 0; /* FIXME */ return (STATUS_SUCCESS); } _____ Modified: trunk/reactos/ntoskrnl/fs/fastio.c --- trunk/reactos/ntoskrnl/fs/fastio.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/fs/fastio.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -15,7 +15,9 @@ /* GLOBALS *******************************************************************/ +extern ULONG CcFastReadNotPossible; extern ULONG CcFastReadResourceMiss; +extern ULONG CcFastReadWait; extern ULONG CcFastReadNoWait; /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/fs/filelock.c --- trunk/reactos/ntoskrnl/fs/filelock.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/fs/filelock.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -1372,7 +1372,7 @@ if ((FcbHeader = (PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)) { /* Use a Resource Release */ - ExReleaseResource(FcbHeader->Resource); + ExReleaseResourceLite(FcbHeader->Resource); return; } _____ Modified: trunk/reactos/ntoskrnl/fs/notify.c --- trunk/reactos/ntoskrnl/fs/notify.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/fs/notify.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -609,11 +609,11 @@ if (Unicode) { - memcpy(CurrentEntry->Name, RelativeName->Buffer, RelativeName->Length); + memcpy(CurrentEntry->FileName, RelativeName->Buffer, RelativeName->Length); if (StreamName) { - CurrentEntry->Name[RelativeName->Length/sizeof(WCHAR)] = ':'; - memcpy(&CurrentEntry ->Name[(RelativeName->Length/sizeof(WCHAR))+1], + CurrentEntry->FileName[RelativeName->Length/sizeof(WCHAR)] = ':'; + memcpy(&CurrentEntry->FileName[(RelativeName->Length/sizeof(WCHAR))+1], StreamName->Buffer, StreamName->Length); } @@ -741,7 +741,7 @@ (StreamName ? ((StreamName->Length * sizeof(WCHAR)) + sizeof(WCHAR)) : 0); } - RecordLen = FIELD_OFFSET(FILE_NOTIFY_INFORMATION, Name) + NameLenU; + RecordLen = FIELD_OFFSET(FILE_NOTIFY_INFORMATION, FileName) + NameLenU; if ((Irp = FsRtlpGetNextIrp(NotifyEntry))) { @@ -770,7 +770,7 @@ if (CurrentEntry) { CurrentEntry->Action = Action; - CurrentEntry->NameLength = NameLenU; + CurrentEntry->FileNameLength = NameLenU; CurrentEntry->NextEntryOffset = 0; FsRtlpCopyName( @@ -816,7 +816,7 @@ CurrentEntry = (PFILE_NOTIFY_INFORMATION)NotifyEntry->Buffer; CurrentEntry->Action = Action; - CurrentEntry->NameLength = NameLenU; + CurrentEntry->FileNameLength = NameLenU; CurrentEntry->NextEntryOffset = 0; FsRtlpCopyName(CurrentEntry, @@ -937,10 +937,10 @@ VOID STDCALL FsRtlNotifyUninitializeSync ( - IN PNOTIFY_SYNC NotifySync + IN PNOTIFY_SYNC *NotifySync ) { - ExFreePool (NotifySync); + ExFreePool (*NotifySync); } /********************************************************************** _____ Modified: trunk/reactos/ntoskrnl/include/internal/cc.h --- trunk/reactos/ntoskrnl/include/internal/cc.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/cc.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -1,10 +1,6 @@ #ifndef __INCLUDE_INTERNAL_CC_H #define __INCLUDE_INTERNAL_CC_H -/* $Id$ */ -#include <ddk/ntifs.h> -#include <reactos/bugcodes.h> - typedef struct _BCB { LIST_ENTRY BcbSegmentListHead; _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -18,8 +18,6 @@ #ifndef __INTERNAL_DEBUG #define __INTERNAL_DEBUG -#include <internal/ntoskrnl.h> - #if defined(_MSC_VER) && (_MSC_VER < 1300) /* TODO: Verify which version the MS compiler learned the __FUNCTION__ macro */ #define __FUNCTION__ "<unknown>" _____ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h --- trunk/reactos/ntoskrnl/include/internal/ex.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/ex.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -5,9 +5,6 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H #define __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H -#define NTOS_MODE_KERNEL -#include <ntos.h> - typedef enum { wmCenter = 0, _____ Modified: trunk/reactos/ntoskrnl/include/internal/ifs.h --- trunk/reactos/ntoskrnl/include/internal/ifs.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/ifs.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -1,10 +1,6 @@ #ifndef __INCLUDE_INTERNAL_IFS_H #define __INCLUDE_INTERNAL_IFS_H -/* $Id$ */ -#include <ddk/ntifs.h> -#include <ntos.h> - /* Look for "FSrt" in mem view */ #define IFS_POOL_TAG 0x74725346 _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -29,11 +29,6 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_IO_H #define __NTOSKRNL_INCLUDE_INTERNAL_IO_H -#include <ddk/ntddk.h> -#include <internal/ob.h> -#include <internal/module.h> - - #ifndef __USE_W32API #define DEVICE_TYPE_FROM_CTL_CODE(ctlCode) (((ULONG)(ctlCode&0xffff0000))>>16) #endif @@ -333,8 +328,6 @@ extern PDEVICE_NODE IopRootDeviceNode; -extern ULONG IoOtherOperationCount; -extern ULONGLONG IoOtherTransferCount; VOID PnpInit(VOID); _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -6,10 +6,6 @@ #ifndef __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H #define __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H -#include <internal/ke.h> -#include <internal/ldr.h> -#include <ntdll/ldr.h> - struct _KD_DISPATCH_TABLE; #define KdPrintEx(_x_) DbgPrintEx _x_ _____ Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h --- trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/kdb.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -1,13 +1,6 @@ #ifndef NTOSKRNL_KDB_H #define NTOSKRNL_KDB_H -/* INCLUDES ******************************************************************/ - -#define NTOS_MODE_KERNEL -#include <ntos.h> - -#include <internal/ke.h> - /* DEFINES *******************************************************************/ #define TAG_KDBG (('K' << 24) | ('D' << 16) | ('B' << 8) | 'G') _____ Modified: trunk/reactos/ntoskrnl/include/internal/kdbochs.h --- trunk/reactos/ntoskrnl/include/internal/kdbochs.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/kdbochs.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -6,16 +6,12 @@ #ifndef __INCLUDE_INTERNAL_KD_BOCHS_H #define __INCLUDE_INTERNAL_KD_BOCHS_H -#include <internal/ke.h> -#include <internal/ldr.h> -#include <ntdll/ldr.h> - VOID STDCALL KdpBochsInit(struct _KD_DISPATCH_TABLE *DispatchTable, ULONG BootPhase); -VOID -STDCALL -KdpBochsDebugPrint(IN PCH Message); - +VOID +STDCALL +KdpBochsDebugPrint(IN PCH Message); + #endif /* __INCLUDE_INTERNAL_KD_BOCHS_H */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/kdgdb.h --- trunk/reactos/ntoskrnl/include/internal/kdgdb.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/kdgdb.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -6,10 +6,6 @@ #ifndef __INCLUDE_INTERNAL_KD_GDB_H #define __INCLUDE_INTERNAL_KD_GDB_H -#include <internal/ke.h> -#include <internal/ldr.h> -#include <ntdll/ldr.h> - VOID STDCALL KdpGdbStubInit(struct _KD_DISPATCH_TABLE *DispatchTable, _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -22,11 +22,6 @@ /* INCLUDES *****************************************************************/ -#ifndef __ASM__ -#include <ddk/ntifs.h> -#include <stdarg.h> -#endif /* not __ASM__ */ - #include "arch/ke.h" /* INTERNAL KERNEL TYPES ****************************************************/ @@ -38,10 +33,6 @@ typedef struct _KPROCESS *PKPROCESS; typedef struct _DISPATCHER_HEADER *PDISPATCHER_HEADER; -#else - -typedef struct _KEVENT_PAIR *PKEVENT_PAIR; - #endif /* __USE_W32API */ typedef struct _HARDWARE_PTE_X86 { @@ -222,7 +213,7 @@ /* INTERNAL KERNEL FUNCTIONS ************************************************/ #ifdef __USE_W32API -struct _KPROCESS* KeGetCurrentProcess(VOID); +struct _KPROCESS* STDCALL KeGetCurrentProcess(VOID); VOID KeSetGdtSelector(ULONG Entry, ULONG Value1, ULONG Value2); #endif _____ Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h --- trunk/reactos/ntoskrnl/include/internal/ldr.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/ldr.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -8,10 +8,6 @@ #ifndef __INCLUDE_INTERNAL_LDR_H #define __INCLUDE_INTERNAL_LDR_H -#include <pe.h> -#include <internal/io.h> -#include <internal/module.h> - #define KERNEL_MODULE_NAME L"ntoskrnl.exe" #define HAL_MODULE_NAME L"hal.dll" #define DRIVER_ROOT_NAME L"\\Driver\\" _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -40,7 +40,6 @@ #ifndef __INCLUDE_INTERNAL_MM_H #define __INCLUDE_INTERNAL_MM_H -#include <internal/ntoskrnl.h> #include <internal/arch/mm.h> /* TYPES *********************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/include/internal/module.h --- trunk/reactos/ntoskrnl/include/internal/module.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/module.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -1,12 +1,6 @@ - #ifndef __MODULE_H #define __MODULE_H -#include <ddk/ntddk.h> -#include <roscfg.h> -#include <pe.h> -#include <reactos/rossym.h> - typedef struct _MODULE_TEXT_SECTION { ULONG Base; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -7,12 +7,6 @@ #ifndef __ASM__ -#include <stdarg.h> -#define NTOS_MODE_KERNEL -#include <ntos.h> - -#include "internal/ke.h" - /* * Use these to place a function in a specific section of the executable */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -9,9 +9,6 @@ #ifndef __INCLUDE_INTERNAL_OBJMGR_H #define __INCLUDE_INTERNAL_OBJMGR_H -#define NTOS_MODE_KERNEL -#include <ntos.h> - #define TAG_OBJECT_TYPE TAG('O', 'b', 'j', 'T') struct _EPROCESS; _____ Modified: trunk/reactos/ntoskrnl/include/internal/po.h --- trunk/reactos/ntoskrnl/include/internal/po.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/po.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -12,9 +12,6 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_PO_H #define __NTOSKRNL_INCLUDE_INTERNAL_PO_H -#include <ddk/ntddk.h> -#include <internal/io.h> - extern PDEVICE_NODE PopSystemPowerDeviceNode; VOID _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -41,10 +41,6 @@ #ifndef __ASM__ -#include <internal/mm.h> -#include <internal/ke.h> -#include <napi/teb.h> - extern LCID PsDefaultThreadLocaleId; extern LCID PsDefaultSystemLocaleId; @@ -187,7 +183,7 @@ * KERNEL VERSION: 5.2 * DOCUMENTATION: http://reactos.com/wiki/index.php/EPROCESS */ -struct _EPROCESS +typedef struct _EPROCESS { KPROCESS Pcb; /* 000 */ EX_PUSH_LOCK ProcessLock; /* 078 */ @@ -317,7 +313,7 @@ /* FIXME MOVE TO AVL TREES */ MADDRESS_SPACE AddressSpace; /* 28C */ -}; +} EPROCESS; #include <poppack.h> #define PROCESS_STATE_TERMINATED (1) _____ Modified: trunk/reactos/ntoskrnl/include/internal/trap.h --- trunk/reactos/ntoskrnl/include/internal/trap.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/internal/trap.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -33,8 +33,6 @@ #ifndef __ASM__ -#include <internal/ke.h> - typedef struct _KV86M_TRAP_FRAME { KTRAP_FRAME Tf; _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-18 18:32:29 UTC (rev 16053) @@ -1,34 +1,39 @@ #ifndef __INCLUDE_NTOSKRNL_H #define __INCLUDE_NTOSKRNL_H -#define __NO_CTYPE_INLINES +#define NTKERNELAPI /* include the ntoskrnl config.h file */ #include "config.h" +#include <roskrnl.h> +#include <ddk/ntddk.h> +#include <ddk/ntifs.h> +#include <ddk/wdmguid.h> + +#undef IO_TYPE_FILE +#define IO_TYPE_FILE 0x0F5L /* Temp Hack */ + #include <roscfg.h> #include <reactos/version.h> #include <reactos/resource.h> #include <reactos/bugcodes.h> +#include <reactos/rossym.h> #include <limits.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> #include <malloc.h> #include <wchar.h> -#include <roskrnl.h> #include <ntos/minmax.h> #include <ntos/synch.h> #include <ntos/keyboard.h> #include <ntos/ntdef.h> +#include <ntos/ldrtypes.h> #include <ntos/ntpnp.h> +#include <ddk/ldrfuncs.h> #include <rosrtl/minmax.h> #include <rosrtl/string.h> -#include <ddk/halfuncs.h> -#include <ddk/kefuncs.h> -#include <ddk/pnptypes.h> -#include <ddk/pnpfuncs.h> -#include <ddk/wdmguid.h> #include <ntdll/ldr.h> #include <pseh.h> #include <internal/ctype.h> @@ -41,12 +46,11 @@ #include <internal/handle.h> #include <internal/pool.h> #include <internal/ob.h> +#include <internal/mm.h> #include <internal/ps.h> -#include <internal/mm.h> #include <internal/cc.h> #include <internal/io.h> #include <internal/po.h> -#include <internal/ob.h> #include <internal/se.h> #include <internal/ldr.h> #include <internal/kd.h> _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -84,7 +84,6 @@ (pHalMirrorVerify) NULL //HalMirrorVerify; }; - HAL_PRIVATE_DISPATCH EXPORTED HalPrivateDispatchTable = { HAL_PRIVATE_DISPATCH_VERSION _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/io/file.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -14,6 +14,9 @@ #define NDEBUG #include <internal/debug.h> +/* FIXME: Header mess */ +#undef CreateMailslot + /* GLOBALS *******************************************************************/ extern GENERIC_MAPPING IopFileMapping; @@ -1351,7 +1354,7 @@ BOOLEAN OurIrpsInList = FALSE; LARGE_INTEGER Interval; - if ((ULONG_PTR)IoStatusBlock >= MmUserProbeAddress && + if ((ULONG_PTR)IoStatusBlock >= (ULONG_PTR)MmUserProbeAddress && KeGetPreviousMode() == UserMode) return STATUS_ACCESS_VIOLATION; @@ -2877,7 +2880,7 @@ else { /* Reference the Port */ - Status = ObReferenceObjectByHandle(CompletionInfo->IoCompletionHandle, + Status = ObReferenceObjectByHandle(CompletionInfo->Port, IO_COMPLETION_MODIFY_STATE, IoCompletionType, PreviousMode, @@ -2891,7 +2894,7 @@ TAG('I', 'o', 'C', 'p')); /* Set the Data */ - Context->Key = CompletionInfo->CompletionKey; + Context->Key = CompletionInfo->Key; Context->Port = Queue; FileObject->CompletionContext = Context; _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -18,13 +18,13 @@ POBJECT_TYPE EXPORTED IoDeviceObjectType = NULL; POBJECT_TYPE EXPORTED IoFileObjectType = NULL; extern POBJECT_TYPE IoControllerObjectType; -ULONG EXPORTED IoReadOperationCount = 0; -ULONGLONG EXPORTED IoReadTransferCount = 0; -ULONG EXPORTED IoWriteOperationCount = 0; -ULONGLONG EXPORTED IoWriteTransferCount = 0; -ULONG IoOtherOperationCount = 0; -ULONGLONG IoOtherTransferCount = 0; -KSPIN_LOCK EXPORTED IoStatisticsLock = 0; +ULONG EXPORTED IoReadOperationCount = 0; +LARGE_INTEGER EXPORTED IoReadTransferCount = {{0, 0}}; +ULONG EXPORTED IoWriteOperationCount = 0; +LARGE_INTEGER EXPORTED IoWriteTransferCount = {{0, 0}}; +ULONG IoOtherOperationCount = 0; +LARGE_INTEGER IoOtherTransferCount = {{0, 0}}; +KSPIN_LOCK EXPORTED IoStatisticsLock = 0; GENERIC_MAPPING IopFileMapping = { FILE_GENERIC_READ, @@ -36,6 +36,7 @@ extern LIST_ENTRY ShutdownListHead; extern KSPIN_LOCK ShutdownListLock; extern NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; +extern POBJECT_TYPE IoAdapterObjectType; NPAGED_LOOKASIDE_LIST IoLargeIrpLookaside; NPAGED_LOOKASIDE_LIST IoSmallIrpLookaside; _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -1033,6 +1033,7 @@ /* * @implemented */ +#undef IoCompleteRequest VOID STDCALL IoCompleteRequest(PIRP Irp, _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -15,6 +15,9 @@ #define NDEBUG #include <internal/debug.h> +/* FIXME: Header mess */ +#undef DeviceCapabilities + /* GLOBALS *******************************************************************/ PDEVICE_NODE IopRootDeviceNode; _____ Modified: trunk/reactos/ntoskrnl/io/resource.c --- trunk/reactos/ntoskrnl/io/resource.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/io/resource.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -17,7 +17,7 @@ /* GLOBALS *******************************************************************/ static CONFIGURATION_INFORMATION -SystemConfigurationInformation = {0, 0, 0, 0, 0, 0, 0, FALSE, FALSE}; +_SystemConfigurationInformation = {0, 0, 0, 0, 0, 0, 0, FALSE, FALSE}; /* API Parameters to Pass in IopQueryBusDescription */ typedef struct IO_QUERY { @@ -659,7 +659,7 @@ PCONFIGURATION_INFORMATION STDCALL IoGetConfigurationInformation(VOID) { - return(&SystemConfigurationInformation); + return(&_SystemConfigurationInformation); } /* _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -1422,7 +1422,7 @@ STATIC BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]) { - PKPCR Pcr = KeGetCurrentKPCR(); + PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR(); KdbpPrint("Current PCR is at 0x%08x.\n", (INT)Pcr); KdbpPrint(" Tib.ExceptionList: 0x%08x\n" @@ -1446,7 +1446,6 @@ " MinorVersion: 0x%04x\n" " SetMember: 0x%08x\n" " StallScaleFactor: 0x%08x\n" - " DebugActive: 0x%02x\n" " Number: 0x%02x\n" " L2CacheAssociativity: 0x%02x\n" " VdmAlert: 0x%08x\n" @@ -1457,7 +1456,7 @@ Pcr->Tib.Self, Pcr->Self, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive, Pcr->IDR, Pcr->KdVersionBlock, Pcr->IDT, Pcr->GDT, Pcr->TSS, Pcr->MajorVersion, Pcr->MinorVersion, Pcr->SetMember, Pcr->StallScaleFactor, - Pcr->DebugActive, Pcr->Number, Pcr->L2CacheAssociativity, + Pcr->Number, Pcr->L2CacheAssociativity, Pcr->VdmAlert, Pcr->L2CacheSize, Pcr->InterruptMode); return TRUE; _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -9,10 +9,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <roscfg.h> #include <ntoskrnl.h> -#include <reactos/rossym.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-06-18 17:22:21 UTC (rev 16052) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-06-18 18:32:29 UTC (rev 16053) @@ -37,7 +37,7 @@ ULONG OrigFlags, Flags, FinalFlags; ULONG MaxCpuidLevel; ULONG Dummy, Eax, Ecx, Edx; - PKPCR Pcr = KeGetCurrentKPCR(); + PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR(); Ke386CpuidFlags2 = Ke386CpuidExFlags = 0; Ke386CacheAlignment = 32; @@ -166,11 +166,11 @@ { DPRINT("KePrepareForApplicationProcessorInit(Id %d)\n", Id); PFN_TYPE PrcPfn; - PKPCR Pcr; - PKPCR BootPcr; + PKIPCR Pcr; + PKIPCR BootPcr; - BootPcr = (PKPCR)KPCR_BASE; - Pcr = (PKPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE); + BootPcr = (PKIPCR)KPCR_BASE; + Pcr = (PKIPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE); MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &PrcPfn); MmCreateVirtualMappingForKernel((PVOID)Pcr, @@ -183,7 +183,7 @@ memset(Pcr, 0, PAGE_SIZE); Pcr->Number = Id; Pcr->Tib.Self = &Pcr->Tib; - Pcr->Self = Pcr; + Pcr->Self = (PKPCR)Pcr; Pcr->Prcb = &Pcr->PrcbData; Pcr->Irql = SYNCH_LEVEL; @@ -200,7 +200,7 @@ KeApplicationProcessorInit(VOID) { ULONG Offset; - PKPCR Pcr; + PKIPCR Pcr; DPRINT("KeApplicationProcessorInit()\n"); @@ -212,12 +212,12 @@ Offset = InterlockedIncrementUL(&PcrsAllocated) - 1; - Pcr = (PKPCR)((ULONG_PTR)KPCR_BASE + Offset * PAGE_SIZE); + Pcr = (PKIPCR)((ULONG_PTR)KPCR_BASE + Offset * PAGE_SIZE); /* * Initialize the GDT */ - KiInitializeGdt(Pcr); + KiInitializeGdt((PKPCR)Pcr); /* Get processor information. */ Ki386GetCpuId(); @@ -261,7 +261,7 @@ VOID INIT_FUNCTION KeInit1(PCHAR CommandLine, PULONG LastKernelAddress) { - PKPCR KPCR; + PKIPCR KPCR; BOOLEAN Pae = FALSE; BOOLEAN NoExecute = FALSE; PCHAR p1, p2; @@ -274,12 +274,12 @@ * called, so we use a predefined page in low memory [truncated at 1000 lines; 378 more skipped]

19 years, 6 months

[navaraf] 16052: Fix build.

by navaraf＠svn.reactos.com

Fix build. Modified: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/ntdll/rtl/critical.c _____ Modified: trunk/reactos/lib/ntdll/inc/ntdll.h --- trunk/reactos/lib/ntdll/inc/ntdll.h 2005-06-18 17:17:52 UTC (rev 16051) +++ trunk/reactos/lib/ntdll/inc/ntdll.h 2005-06-18 17:22:21 UTC (rev 16052) @@ -9,9 +9,9 @@ /* INCLUDES ******************************************************************/ /* SDK/DDK/NDK Headers. */ +#include <windows.h> #include <ddk/ntddk.h> /* FIXME: NDK */ #include <ddk/ntifs.h> /* FIXME: NDK */ -#include <windows.h> #include <ntos/ldrtypes.h> /* FIXME: NDK */ /* NTDLL Public Headers. FIXME: USE NDK */ _____ Modified: trunk/reactos/lib/ntdll/rtl/critical.c --- trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-18 17:17:52 UTC (rev 16051) +++ trunk/reactos/lib/ntdll/rtl/critical.c 2005-06-18 17:22:21 UTC (rev 16052) @@ -12,7 +12,6 @@ /* INCLUDES ******************************************************************/ -#include <ntdll/rtl.h> #define NDEBUG #include <ntdll.h>

19 years, 6 months

[navaraf] 16051: - Move few non-DDK types from ROS DDK to NTOS headers.

by navaraf＠svn.reactos.com

- Move few non-DDK types from ROS DDK to NTOS headers. - Fix some __USE_W32API guards. Modified: trunk/reactos/include/ddk/extypes.h Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/include/ddk/ketypes.h Modified: trunk/reactos/include/ntdll/rtl.h Modified: trunk/reactos/include/ntos/haltypes.h Added: trunk/reactos/include/ntos/krnltypes.h Modified: trunk/reactos/include/ntos/synch.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/include/ntos.h _____ Modified: trunk/reactos/include/ddk/extypes.h --- trunk/reactos/include/ddk/extypes.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ddk/extypes.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -30,22 +30,6 @@ MaximumWorkQueue } WORK_QUEUE_TYPE; -typedef struct _EX_QUEUE_WORKER_INFO { - UCHAR QueueDisabled:1; - UCHAR MakeThreadsAsNecessary:1; - UCHAR WaitMode:1; - ULONG WorkerCount:29; -} EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; - -typedef struct _EX_WORK_QUEUE { - KQUEUE WorkerQueue; - ULONG DynamicThreadCount; - ULONG WorkItemsProcessed; - ULONG WorkItemsProcessedLastPass; - ULONG QueueDepthLastPass; - EX_QUEUE_WORKER_INFO Info; -} EX_WORK_QUEUE, *PEX_WORK_QUEUE; - typedef ULONG_PTR ERESOURCE_THREAD, *PERESOURCE_THREAD; typedef struct _OWNER_ENTRY @@ -220,18 +204,6 @@ PGENERAL_LOOKASIDE L; } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; -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; - typedef enum _EX_POOL_PRIORITY { LowPoolPriority, LowPoolPrioritySpecialPoolOverrun = 8, _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ddk/iotypes.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -1181,12 +1181,6 @@ #define DRVO_BOOTREINIT_REGISTERED 0x20L #define DRVO_LEGACY_RESOURCES 0x40L -#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 - typedef struct _DRIVER_OBJECT { CSHORT Type; @@ -1234,18 +1228,6 @@ (*PIO_TIMER_ROUTINE)(PDEVICE_OBJECT DeviceObject, PVOID Context); -/* - * PURPOSE: Special timer associated with each device - */ -typedef struct _IO_TIMER { - USHORT Type; /* Every IO Object has a Type */ - USHORT TimerEnabled; /* Tells us if the Timer is enabled or not */ - LIST_ENTRY IoTimerList; /* List of other Timers on the system */ - PIO_TIMER_ROUTINE TimerRoutine; /* The associated timer routine */ - PVOID Context; /* Context */ - PDEVICE_OBJECT DeviceObject; /* Driver that owns this IO Timer */ -} IO_TIMER, *PIO_TIMER; - typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef VOID (*PIO_WORKITEM_ROUTINE)(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); _____ Modified: trunk/reactos/include/ddk/ketypes.h --- trunk/reactos/include/ddk/ketypes.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ddk/ketypes.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -46,35 +46,6 @@ MaximumMode } MODE; -typedef enum _KOBJECTS { - EventNotificationObject = 0, - EventSynchronizationObject = 1, - MutantObject = 2, - ProcessObject = 3, - QueueObject = 4, - SemaphoreObject = 5, - ThreadObject = 6, - GateObject = 7, - TimerNotificationObject = 8, - TimerSynchronizationObject = 9, - Spare2Object = 10, - Spare3Object = 11, - Spare4Object = 12, - Spare5Object = 13, - Spare6Object = 14, - Spare7Object = 15, - Spare8Object = 16, - Spare9Object = 17, - ApcObject = 18, - DpcObject = 19, - DeviceQueueObject = 20, - EventPairObject = 21, - InterruptObject = 22, - ProfileObject = 23, - ThreadedDpcObject = 24, - MaximumKernelObject = 25 -} KOBJECTS; - #include <pshpack1.h> typedef struct _DISPATCHER_HEADER @@ -336,45 +307,6 @@ typedef LONG FIX; /* fixed-point number */ -typedef struct _M128 { - ULONGLONG Low; - LONGLONG High; -} M128, *PM128; - -typedef struct _KEXCEPTION_FRAME { - ULONG64 P1Home; - ULONG64 P2Home; - ULONG64 P3Home; - ULONG64 P4Home; - ULONG64 P5; - ULONG64 InitialStack; - M128 Xmm6; - M128 Xmm7; - M128 Xmm8; - M128 Xmm9; - M128 Xmm10; - M128 Xmm11; - M128 Xmm12; - M128 Xmm13; - M128 Xmm14; - M128 Xmm15; - ULONG64 TrapFrame; - ULONG64 CallbackStack; - ULONG64 OutputBuffer; - ULONG64 OutputLength; - UCHAR ExceptionRecord[64]; - ULONG64 Fill1; - ULONG64 Rbp; - ULONG64 Rbx; - ULONG64 Rdi; - ULONG64 Rsi; - ULONG64 R12; - ULONG64 R13; - ULONG64 R14; - ULONG64 R15; - ULONG64 Return; -} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; - /* copied from W32API */ typedef struct _KFLOATING_SAVE { _____ Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ntdll/rtl.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -5,10 +5,9 @@ #ifndef __INCLUDE_NTDLL_RTL_H #define __INCLUDE_NTDLL_RTL_H +#include <ddk/ntifs.h> #include <ntos/types.h> #include <napi/teb.h> -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> #ifdef __cplusplus extern "C" { _____ Modified: trunk/reactos/include/ntos/haltypes.h --- trunk/reactos/include/ntos/haltypes.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ntos/haltypes.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -636,6 +636,8 @@ #define HalDereferenceBusHandler HALDISPATCH->HalDereferenceBusHandler +#endif /* !__USE_W32API */ + /* Hal private dispatch table */ typedef struct _HAL_PRIVATE_DISPATCH @@ -649,8 +651,6 @@ extern PHAL_PRIVATE_DISPATCH IMPORTED HalPrivateDispatchTable; #endif -#endif /* !__USE_W32API */ - #define HAL_PRIVATE_DISPATCH_VERSION 1 _____ Added: trunk/reactos/include/ntos/krnltypes.h --- trunk/reactos/include/ntos/krnltypes.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ntos/krnltypes.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -0,0 +1,123 @@ +/* + * FIXME: *** NDK *** + */ + +#ifndef __INCLUDE_NTOS_KRNLTYPES_H +#define __INCLUDE_NTOS_KRNLTYPES_H + +#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 + +/* + * PURPOSE: Special timer associated with each device + */ +typedef struct _IO_TIMER { + USHORT Type; /* Every IO Object has a Type */ + USHORT TimerEnabled; /* Tells us if the Timer is enabled or not */ + LIST_ENTRY IoTimerList; /* List of other Timers on the system */ + PIO_TIMER_ROUTINE TimerRoutine; /* The associated timer routine */ + PVOID Context; /* Context */ + PDEVICE_OBJECT DeviceObject; /* Driver that owns this IO Timer */ +} IO_TIMER, *PIO_TIMER; + +typedef struct _EX_QUEUE_WORKER_INFO { + UCHAR QueueDisabled:1; + UCHAR MakeThreadsAsNecessary:1; + UCHAR WaitMode:1; + ULONG WorkerCount:29; +} EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; + +typedef struct _EX_WORK_QUEUE { + KQUEUE WorkerQueue; + ULONG DynamicThreadCount; + ULONG WorkItemsProcessed; + ULONG WorkItemsProcessedLastPass; + ULONG QueueDepthLastPass; + EX_QUEUE_WORKER_INFO Info; +} EX_WORK_QUEUE, *PEX_WORK_QUEUE; + +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; + +typedef enum _KOBJECTS { + EventNotificationObject = 0, + EventSynchronizationObject = 1, + MutantObject = 2, + ProcessObject = 3, + QueueObject = 4, + SemaphoreObject = 5, + ThreadObject = 6, + GateObject = 7, + TimerNotificationObject = 8, + TimerSynchronizationObject = 9, + Spare2Object = 10, + Spare3Object = 11, + Spare4Object = 12, + Spare5Object = 13, + Spare6Object = 14, + Spare7Object = 15, + Spare8Object = 16, + Spare9Object = 17, + ApcObject = 18, + DpcObject = 19, + DeviceQueueObject = 20, + EventPairObject = 21, + InterruptObject = 22, + ProfileObject = 23, + ThreadedDpcObject = 24, + MaximumKernelObject = 25 +} KOBJECTS; + +typedef struct _M128 { + ULONGLONG Low; + LONGLONG High; +} M128, *PM128; + +typedef struct _KEXCEPTION_FRAME { + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5; + ULONG64 InitialStack; + M128 Xmm6; + M128 Xmm7; + M128 Xmm8; + M128 Xmm9; + M128 Xmm10; + M128 Xmm11; + M128 Xmm12; + M128 Xmm13; + M128 Xmm14; + M128 Xmm15; + ULONG64 TrapFrame; + ULONG64 CallbackStack; + ULONG64 OutputBuffer; + ULONG64 OutputLength; + UCHAR ExceptionRecord[64]; + ULONG64 Fill1; + ULONG64 Rbp; + ULONG64 Rbx; + ULONG64 Rdi; + ULONG64 Rsi; + ULONG64 R12; + ULONG64 R13; + ULONG64 R14; + ULONG64 R15; + ULONG64 Return; +} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; + +#endif /* __INCLUDE_NTOS_KRNLTYPES_H */ + _____ Modified: trunk/reactos/include/ntos/synch.h --- trunk/reactos/include/ntos/synch.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ntos/synch.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -17,7 +17,6 @@ #define EVENT_ALL_ACCESS (0x1f0003L) #define EVENT_MODIFY_STATE (2) #define EVENT_QUERY_STATE (1) -#define EVENT_PAIR_ALL_ACCESS (0x1f0000L) #define MUTEX_ALL_ACCESS (0x1f0001L) #define MUTANT_ALL_ACCESS (0x1f0001L) #define MUTANT_QUERY_STATE (1) @@ -33,6 +32,7 @@ #endif /* !__USE_W32API */ +#define EVENT_PAIR_ALL_ACCESS (0x1f0000L) #define MUTEX_QUERY_STATE (1) #endif /* __INCLUDE_SYNCH_H */ _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ntos/zwtypes.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -1720,11 +1720,11 @@ #define PORT_MESSAGE_TYPE(m) (LPC_TYPE)((m).Header.MessageType) +#endif /* __USE_W32API */ + #define PORT_MAX_DATA_LENGTH 0x104 #define PORT_MAX_MESSAGE_LENGTH 0x148 -#endif /* __USE_W32API */ - #define MAX_MESSAGE_DATA (0x130) #ifdef __USE_W32API _____ Modified: trunk/reactos/include/ntos.h --- trunk/reactos/include/ntos.h 2005-06-18 16:56:41 UTC (rev 16050) +++ trunk/reactos/include/ntos.h 2005-06-18 17:17:52 UTC (rev 16051) @@ -90,6 +90,7 @@ #include "ntos/obtypes.h" #include "ntos/setypes.h" #include "ntos/sefuncs.h" +#include "ntos/krnltypes.h" #include "ntos/tss.h" #include "rosrtl/thread.h" #endif

19 years, 6 months

[navaraf] 16050: Define DRVO_UNLOAD_INVOKED, DRVO_LEGACY_DRIVER, DRVO_BUILTIN_DRIVER, DRVO_REINIT_REGISTERED, DRVO_INITIALIZED, DRVO_BOOTREINIT_REGISTERED and DRVO_LEGACY_RESOURCES. Thanks Alex.

by navaraf＠svn.reactos.com

Define DRVO_UNLOAD_INVOKED, DRVO_LEGACY_DRIVER, DRVO_BUILTIN_DRIVER, DRVO_REINIT_REGISTERED, DRVO_INITIALIZED, DRVO_BOOTREINIT_REGISTERED and DRVO_LEGACY_RESOURCES. Thanks Alex. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-18 16:53:34 UTC (rev 16049) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-18 16:56:41 UTC (rev 16050) @@ -2791,6 +2791,14 @@ PFAST_IO_RELEASE_FOR_CCFLUSH ReleaseForCcFlush; } FAST_IO_DISPATCH, *PFAST_IO_DISPATCH; +#define DRVO_UNLOAD_INVOKED 0x00000001 +#define DRVO_LEGACY_DRIVER 0x00000002 +#define DRVO_BUILTIN_DRIVER 0x00000004 +#define DRVO_REINIT_REGISTERED 0x00000008 +#define DRVO_INITIALIZED 0x00000010 +#define DRVO_BOOTREINIT_REGISTERED 0x00000020 +#define DRVO_LEGACY_RESOURCES 0x00000040 + typedef struct _DRIVER_OBJECT { CSHORT Type; CSHORT Size;

19 years, 6 months

← Newer
1
...
28
29
30
31
32
33
34
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005