- 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]
-
navaraf＠svn.reactos.com