[akhaldi] 46268: [XDK] - DDKAPI -> NTAPI [WDM] - Update wdm.h to reflect XDK changes.

Author: akhaldi
Date: Thu Mar 18 23:48:53 2010
New Revision: 46268

URL: http://svn.reactos.org/svn/reactos?rev=46268&view=rev
Log:
[XDK]
- DDKAPI -> NTAPI
[WDM]
- Update wdm.h to reflect XDK changes.

Modified:
    branches/header-work/include/ddk/wdm.h
    branches/header-work/include/xdk/extypes.h
    branches/header-work/include/xdk/iotypes.h
    branches/header-work/include/xdk/ketypes.h
    branches/header-work/include/xdk/mips/ke.h
    branches/header-work/include/xdk/potypes.h
    branches/header-work/include/xdk/ppc/ke.h
    branches/header-work/include/xdk/rtltypes.h
    branches/header-work/include/xdk/x86/ke.h

Modified: branches/header-work/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r…
==============================================================================
--- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -362,7 +362,7 @@
 } RTL_BITMAP_RUN, *PRTL_BITMAP_RUN;
 
 typedef NTSTATUS
-(DDKAPI *PRTL_QUERY_REGISTRY_ROUTINE)(
+(NTAPI *PRTL_QUERY_REGISTRY_ROUTINE)(
   IN PWSTR ValueName,
   IN ULONG ValueType,
   IN PVOID ValueData,
@@ -593,7 +593,7 @@
 struct _KBUGCHECK_REASON_CALLBACK_RECORD;
 
 typedef VOID
-(DDKAPI *PKBUGCHECK_REASON_CALLBACK_ROUTINE)(
+(NTAPI *PKBUGCHECK_REASON_CALLBACK_ROUTINE)(
   IN KBUGCHECK_CALLBACK_REASON Reason,
   IN struct _KBUGCHECK_REASON_CALLBACK_RECORD *Record,
   IN OUT PVOID ReasonSpecificData,
@@ -617,7 +617,7 @@
 } KBUGCHECK_BUFFER_DUMP_STATE;
 
 typedef VOID
-(DDKAPI *PKBUGCHECK_CALLBACK_ROUTINE)(
+(NTAPI *PKBUGCHECK_CALLBACK_ROUTINE)(
   IN PVOID Buffer,
   IN ULONG Length);
 
@@ -632,7 +632,7 @@
 } KBUGCHECK_CALLBACK_RECORD, *PKBUGCHECK_CALLBACK_RECORD;
 
 typedef BOOLEAN
-(DDKAPI *PNMI_CALLBACK)(
+(NTAPI *PNMI_CALLBACK)(
   IN PVOID Context,
   IN BOOLEAN Handled);
 
@@ -777,17 +777,17 @@
 } INTERFACE_TYPE, *PINTERFACE_TYPE;
 
 typedef VOID
-(DDKAPI *PKNORMAL_ROUTINE)(
+(NTAPI *PKNORMAL_ROUTINE)(
   IN PVOID NormalContext,
   IN PVOID SystemArgument1,
   IN PVOID SystemArgument2);
 
 typedef VOID
-(DDKAPI *PKRUNDOWN_ROUTINE)(
+(NTAPI *PKRUNDOWN_ROUTINE)(
   IN struct _KAPC *Apc);
 
 typedef VOID
-(DDKAPI *PKKERNEL_ROUTINE)(
+(NTAPI *PKKERNEL_ROUTINE)(
   IN struct _KAPC *Apc,
   IN OUT PKNORMAL_ROUTINE *NormalRoutine,
   IN OUT PVOID *NormalContext,
@@ -896,7 +896,7 @@
 #endif /* defined(_AMD64_) */
 
 typedef VOID
-(DDKAPI *PKDEFERRED_ROUTINE)(
+(NTAPI *PKDEFERRED_ROUTINE)(
   IN struct _KDPC *Dpc,
   IN PVOID DeferredContext,
   IN PVOID SystemArgument1,
@@ -1071,7 +1071,7 @@
 } KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER;
 
 typedef BOOLEAN
-(DDKAPI *PKSYNCHRONIZE_ROUTINE)(
+(NTAPI *PKSYNCHRONIZE_ROUTINE)(
   IN PVOID SynchronizeContext);
 
 typedef enum _POOL_TYPE {
@@ -1413,29 +1413,29 @@
 typedef struct _LOOKASIDE_LIST_EX *PLOOKASIDE_LIST_EX;
 
 typedef PVOID
-(DDKAPI *PALLOCATE_FUNCTION)(
+(NTAPI *PALLOCATE_FUNCTION)(
   IN POOL_TYPE PoolType,
   IN SIZE_T NumberOfBytes,
   IN ULONG Tag);
 
 typedef PVOID
-(DDKAPI *PALLOCATE_FUNCTION_EX)(
+(NTAPI *PALLOCATE_FUNCTION_EX)(
   IN POOL_TYPE PoolType,
   IN SIZE_T NumberOfBytes,
   IN ULONG Tag,
   IN OUT PLOOKASIDE_LIST_EX Lookaside);
 
 typedef VOID
-(DDKAPI *PFREE_FUNCTION)(
+(NTAPI *PFREE_FUNCTION)(
   IN PVOID Buffer);
 
 typedef VOID
-(DDKAPI *PFREE_FUNCTION_EX)(
+(NTAPI *PFREE_FUNCTION_EX)(
   IN PVOID Buffer,
   IN OUT PLOOKASIDE_LIST_EX Lookaside);
 
 typedef VOID
-(DDKAPI *PCALLBACK_FUNCTION)(
+(NTAPI *PCALLBACK_FUNCTION)(
   IN PVOID CallbackContext,
   IN PVOID Argument1,
   IN PVOID Argument2);
@@ -1516,7 +1516,7 @@
 typedef struct _EX_RUNDOWN_REF_CACHE_AWARE *PEX_RUNDOWN_REF_CACHE_AWARE;
 
 typedef VOID
-(DDKAPI *PWORKER_THREAD_ROUTINE)(
+(NTAPI *PWORKER_THREAD_ROUTINE)(
   IN PVOID Parameter);
 
 typedef struct _WORK_QUEUE_ITEM {
@@ -1945,7 +1945,7 @@
 #endif /* !_PO_DDK_ */
 
 typedef VOID
-(DDKAPI *PREQUEST_POWER_COMPLETE)(
+(NTAPI *PREQUEST_POWER_COMPLETE)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN UCHAR MinorFunction,
   IN POWER_STATE PowerState,
@@ -1954,7 +1954,7 @@
 
 typedef
 NTSTATUS
-(DDKAPI *PPOWER_SETTING_CALLBACK)(
+(NTAPI *PPOWER_SETTING_CALLBACK)(
   IN LPCGUID SettingGuid,
   IN PVOID Value,
   IN ULONG ValueLength,
@@ -2951,7 +2951,7 @@
 } CLIENT_ID, *PCLIENT_ID;
 
 typedef VOID
-(DDKAPI *PKSTART_ROUTINE)(
+(NTAPI *PKSTART_ROUTINE)(
   IN PVOID StartContext);
 
 typedef struct _VPB {
@@ -2973,7 +2973,7 @@
 } IO_ALLOCATION_ACTION, *PIO_ALLOCATION_ACTION;
 
 typedef IO_ALLOCATION_ACTION
-(DDKAPI *PDRIVER_CONTROL)(
+(NTAPI *PDRIVER_CONTROL)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN PVOID MapRegisterBase,
@@ -3052,7 +3052,7 @@
 typedef struct _IO_WORKITEM *PIO_WORKITEM;
 
 typedef VOID
-(DDKAPI IO_WORKITEM_ROUTINE)(
+(NTAPI IO_WORKITEM_ROUTINE)(
   IN PDEVICE_OBJECT DeviceObject,
   IN PVOID Context);
 typedef IO_WORKITEM_ROUTINE *PIO_WORKITEM_ROUTINE;
@@ -3194,13 +3194,13 @@
 } PCI_SLOT_NUMBER, *PPCI_SLOT_NUMBER;
 
 typedef VOID
-(DDKAPI *PIO_APC_ROUTINE)(
+(NTAPI *PIO_APC_ROUTINE)(
   IN PVOID ApcContext,
   IN PIO_STATUS_BLOCK IoStatusBlock,
   IN ULONG Reserved);
 
 typedef VOID
-(DDKAPI *WMI_NOTIFICATION_CALLBACK)(
+(NTAPI *WMI_NOTIFICATION_CALLBACK)(
   PVOID Wnode,
   PVOID Context);
 
@@ -3359,15 +3359,15 @@
 */
 
 typedef VOID
-(DDKAPI *PINTERFACE_REFERENCE)(
+(NTAPI *PINTERFACE_REFERENCE)(
   PVOID Context);
 
 typedef VOID
-(DDKAPI *PINTERFACE_DEREFERENCE)(
+(NTAPI *PINTERFACE_DEREFERENCE)(
   PVOID Context);
 
 typedef BOOLEAN
-(DDKAPI *PTRANSLATE_BUS_ADDRESS)(
+(NTAPI *PTRANSLATE_BUS_ADDRESS)(
   IN PVOID Context,
   IN PHYSICAL_ADDRESS BusAddress,
   IN ULONG Length,
@@ -3375,13 +3375,13 @@
   OUT PPHYSICAL_ADDRESS  TranslatedAddress);
 
 typedef struct _DMA_ADAPTER*
-(DDKAPI *PGET_DMA_ADAPTER)(
+(NTAPI *PGET_DMA_ADAPTER)(
   IN PVOID Context,
   IN struct _DEVICE_DESCRIPTION *DeviceDescriptor,
   OUT PULONG NumberOfMapRegisters);
 
 typedef ULONG
-(DDKAPI *PGET_SET_DEVICE_DATA)(
+(NTAPI *PGET_SET_DEVICE_DATA)(
   IN PVOID Context,
   IN ULONG DataType,
   IN PVOID Buffer,
@@ -3411,7 +3411,7 @@
 } PCI_DEVICE_PRESENCE_PARAMETERS, *PPCI_DEVICE_PRESENCE_PARAMETERS;
 
 typedef BOOLEAN
-(DDKAPI *PPCI_IS_DEVICE_PRESENT)(
+(NTAPI *PPCI_IS_DEVICE_PRESENT)(
   IN USHORT VendorID,
   IN USHORT DeviceID,
   IN UCHAR RevisionID,
@@ -3420,7 +3420,7 @@
   IN ULONG Flags);
 
 typedef BOOLEAN
-(DDKAPI *PPCI_IS_DEVICE_PRESENT_EX)(
+(NTAPI *PPCI_IS_DEVICE_PRESENT_EX)(
   IN PVOID Context,
   IN PPCI_DEVICE_PRESENCE_PARAMETERS Parameters);
 
@@ -3593,12 +3593,12 @@
 #define PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES    0x00000001
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
+(NTAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
   IN PVOID NotificationStructure,
   IN PVOID Context);
 
 typedef VOID
-(DDKAPI *PDEVICE_CHANGE_COMPLETE_CALLBACK)(
+(NTAPI *PDEVICE_CHANGE_COMPLETE_CALLBACK)(
   IN PVOID Context);
 
 typedef enum _FILE_INFORMATION_CLASS {
@@ -3761,7 +3761,7 @@
 #define RESOURCE_HASH_TABLE_SIZE          64
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_CHECK_IF_POSSIBLE)(
+(NTAPI *PFAST_IO_CHECK_IF_POSSIBLE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -3772,7 +3772,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_READ)(
+(NTAPI *PFAST_IO_READ)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -3783,7 +3783,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_WRITE)(
+(NTAPI *PFAST_IO_WRITE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -3794,7 +3794,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_QUERY_BASIC_INFO)(
+(NTAPI *PFAST_IO_QUERY_BASIC_INFO)(
   IN struct _FILE_OBJECT *FileObject,
   IN BOOLEAN Wait,
   OUT PFILE_BASIC_INFORMATION Buffer,
@@ -3802,7 +3802,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_QUERY_STANDARD_INFO)(
+(NTAPI *PFAST_IO_QUERY_STANDARD_INFO)(
   IN struct _FILE_OBJECT *FileObject,
   IN BOOLEAN Wait,
   OUT PFILE_STANDARD_INFORMATION Buffer,
@@ -3810,7 +3810,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_LOCK)(
+(NTAPI *PFAST_IO_LOCK)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN PLARGE_INTEGER Length,
@@ -3822,7 +3822,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_UNLOCK_SINGLE)(
+(NTAPI *PFAST_IO_UNLOCK_SINGLE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN PLARGE_INTEGER Length,
@@ -3832,14 +3832,14 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_UNLOCK_ALL)(
+(NTAPI *PFAST_IO_UNLOCK_ALL)(
   IN struct _FILE_OBJECT *FileObject,
   PEPROCESS ProcessId,
   OUT PIO_STATUS_BLOCK IoStatus,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_UNLOCK_ALL_BY_KEY)(
+(NTAPI *PFAST_IO_UNLOCK_ALL_BY_KEY)(
   IN struct _FILE_OBJECT *FileObject,
   PVOID ProcessId,
   ULONG Key,
@@ -3847,7 +3847,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_DEVICE_CONTROL)(
+(NTAPI *PFAST_IO_DEVICE_CONTROL)(
   IN struct _FILE_OBJECT *FileObject,
   IN BOOLEAN Wait,
   IN PVOID InputBuffer OPTIONAL,
@@ -3859,20 +3859,20 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef VOID
-(DDKAPI *PFAST_IO_ACQUIRE_FILE)(
+(NTAPI *PFAST_IO_ACQUIRE_FILE)(
   IN struct _FILE_OBJECT *FileObject);
 
 typedef VOID
-(DDKAPI *PFAST_IO_RELEASE_FILE)(
+(NTAPI *PFAST_IO_RELEASE_FILE)(
   IN struct _FILE_OBJECT *FileObject);
 
 typedef VOID
-(DDKAPI *PFAST_IO_DETACH_DEVICE)(
+(NTAPI *PFAST_IO_DETACH_DEVICE)(
   IN struct _DEVICE_OBJECT *SourceDevice,
   IN struct _DEVICE_OBJECT *TargetDevice);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_QUERY_NETWORK_OPEN_INFO)(
+(NTAPI *PFAST_IO_QUERY_NETWORK_OPEN_INFO)(
   IN struct _FILE_OBJECT *FileObject,
   IN BOOLEAN Wait,
   OUT struct _FILE_NETWORK_OPEN_INFORMATION *Buffer,
@@ -3880,14 +3880,14 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef NTSTATUS
-(DDKAPI *PFAST_IO_ACQUIRE_FOR_MOD_WRITE)(
+(NTAPI *PFAST_IO_ACQUIRE_FOR_MOD_WRITE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER EndingOffset,
   OUT struct _ERESOURCE **ResourceToRelease,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_READ)(
+(NTAPI *PFAST_IO_MDL_READ)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -3897,13 +3897,13 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_READ_COMPLETE)(
+(NTAPI *PFAST_IO_MDL_READ_COMPLETE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PMDL MdlChain,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_PREPARE_MDL_WRITE)(
+(NTAPI *PFAST_IO_PREPARE_MDL_WRITE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -3913,14 +3913,14 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_WRITE_COMPLETE)(
+(NTAPI *PFAST_IO_MDL_WRITE_COMPLETE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN PMDL MdlChain,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_READ_COMPRESSED)(
+(NTAPI *PFAST_IO_READ_COMPRESSED)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -3933,7 +3933,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_WRITE_COMPRESSED)(
+(NTAPI *PFAST_IO_WRITE_COMPRESSED)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -3946,37 +3946,37 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)(
+(NTAPI *PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)(
   IN struct _FILE_OBJECT *FileObject,
   IN PMDL MdlChain,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)(
+(NTAPI *PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN PMDL MdlChain,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_QUERY_OPEN)(
+(NTAPI *PFAST_IO_QUERY_OPEN)(
   IN struct _IRP *Irp,
   OUT PFILE_NETWORK_OPEN_INFORMATION NetworkInformation,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef NTSTATUS
-(DDKAPI *PFAST_IO_RELEASE_FOR_MOD_WRITE)(
+(NTAPI *PFAST_IO_RELEASE_FOR_MOD_WRITE)(
   IN struct _FILE_OBJECT *FileObject,
   IN struct _ERESOURCE *ResourceToRelease,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef NTSTATUS
-(DDKAPI *PFAST_IO_ACQUIRE_FOR_CCFLUSH)(
+(NTAPI *PFAST_IO_ACQUIRE_FOR_CCFLUSH)(
   IN struct _FILE_OBJECT *FileObject,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef NTSTATUS
-(DDKAPI *PFAST_IO_RELEASE_FOR_CCFLUSH) (
+(NTAPI *PFAST_IO_RELEASE_FOR_CCFLUSH) (
   IN struct _FILE_OBJECT *FileObject,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
@@ -4360,7 +4360,7 @@
 #endif
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_ADD_DEVICE)(
+(NTAPI *PDRIVER_ADD_DEVICE)(
   IN struct _DRIVER_OBJECT *DriverObject,
   IN struct _DEVICE_OBJECT *PhysicalDeviceObject);
 
@@ -4376,21 +4376,21 @@
 #define DRVO_BUILTIN_DRIVER               0x00000004
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_INITIALIZE)(
+(NTAPI *PDRIVER_INITIALIZE)(
   IN struct _DRIVER_OBJECT *DriverObject,
   IN PUNICODE_STRING RegistryPath);
 
 typedef VOID
-(DDKAPI *PDRIVER_STARTIO)(
+(NTAPI *PDRIVER_STARTIO)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp);
 
 typedef VOID
-(DDKAPI *PDRIVER_UNLOAD)(
+(NTAPI *PDRIVER_UNLOAD)(
   IN struct _DRIVER_OBJECT *DriverObject);
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_DISPATCH)(
+(NTAPI *PDRIVER_DISPATCH)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp);
 
@@ -4419,18 +4419,18 @@
 } DMA_ADAPTER, *PDMA_ADAPTER;
 
 typedef VOID
-(DDKAPI *PPUT_DMA_ADAPTER)(
+(NTAPI *PPUT_DMA_ADAPTER)(
   IN PDMA_ADAPTER DmaAdapter);
 
 typedef PVOID
-(DDKAPI *PALLOCATE_COMMON_BUFFER)(
+(NTAPI *PALLOCATE_COMMON_BUFFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN ULONG Length,
   OUT PPHYSICAL_ADDRESS LogicalAddress,
   IN BOOLEAN CacheEnabled);
 
 typedef VOID
-(DDKAPI *PFREE_COMMON_BUFFER)(
+(NTAPI *PFREE_COMMON_BUFFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN ULONG Length,
   IN PHYSICAL_ADDRESS LogicalAddress,
@@ -4438,7 +4438,7 @@
   IN BOOLEAN CacheEnabled);
 
 typedef NTSTATUS
-(DDKAPI *PALLOCATE_ADAPTER_CHANNEL)(
+(NTAPI *PALLOCATE_ADAPTER_CHANNEL)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
   IN ULONG NumberOfMapRegisters,
@@ -4446,7 +4446,7 @@
   IN PVOID Context);
 
 typedef BOOLEAN
-(DDKAPI *PFLUSH_ADAPTER_BUFFERS)(
+(NTAPI *PFLUSH_ADAPTER_BUFFERS)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl,
   IN PVOID MapRegisterBase,
@@ -4455,17 +4455,17 @@
   IN BOOLEAN WriteToDevice);
 
 typedef VOID
-(DDKAPI *PFREE_ADAPTER_CHANNEL)(
+(NTAPI *PFREE_ADAPTER_CHANNEL)(
   IN PDMA_ADAPTER DmaAdapter);
 
 typedef VOID
-(DDKAPI *PFREE_MAP_REGISTERS)(
+(NTAPI *PFREE_MAP_REGISTERS)(
   IN PDMA_ADAPTER DmaAdapter,
   PVOID MapRegisterBase,
   ULONG NumberOfMapRegisters);
 
 typedef PHYSICAL_ADDRESS
-(DDKAPI *PMAP_TRANSFER)(
+(NTAPI *PMAP_TRANSFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl,
   IN PVOID MapRegisterBase,
@@ -4474,22 +4474,22 @@
   IN BOOLEAN WriteToDevice);
 
 typedef ULONG
-(DDKAPI *PGET_DMA_ALIGNMENT)(
+(NTAPI *PGET_DMA_ALIGNMENT)(
   IN PDMA_ADAPTER DmaAdapter);
 
 typedef ULONG
-(DDKAPI *PREAD_DMA_COUNTER)(
+(NTAPI *PREAD_DMA_COUNTER)(
   IN PDMA_ADAPTER DmaAdapter);
 
 typedef VOID
-(DDKAPI *PDRIVER_LIST_CONTROL)(
+(NTAPI *PDRIVER_LIST_CONTROL)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN struct _SCATTER_GATHER_LIST *ScatterGather,
   IN PVOID Context);
 
 typedef NTSTATUS
-(DDKAPI *PGET_SCATTER_GATHER_LIST)(
+(NTAPI *PGET_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
   IN PMDL Mdl,
@@ -4500,13 +4500,13 @@
   IN BOOLEAN WriteToDevice);
 
 typedef VOID
-(DDKAPI *PPUT_SCATTER_GATHER_LIST)(
+(NTAPI *PPUT_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PSCATTER_GATHER_LIST ScatterGather,
   IN BOOLEAN WriteToDevice);
 
 typedef NTSTATUS
-(DDKAPI *PCALCULATE_SCATTER_GATHER_LIST_SIZE)(
+(NTAPI *PCALCULATE_SCATTER_GATHER_LIST_SIZE)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl OPTIONAL,
   IN PVOID CurrentVa,
@@ -4515,7 +4515,7 @@
   OUT PULONG pNumberOfMapRegisters OPTIONAL);
 
 typedef NTSTATUS
-(DDKAPI *PBUILD_SCATTER_GATHER_LIST)(
+(NTAPI *PBUILD_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
   IN PMDL Mdl,
@@ -4528,7 +4528,7 @@
   IN ULONG ScatterGatherLength);
 
 typedef NTSTATUS
-(DDKAPI *PBUILD_MDL_FROM_SCATTER_GATHER_LIST)(
+(NTAPI *PBUILD_MDL_FROM_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PSCATTER_GATHER_LIST ScatterGather,
   IN PMDL OriginalMdl,
@@ -4622,7 +4622,7 @@
 } IO_RESOURCE_REQUIREMENTS_LIST, *PIO_RESOURCE_REQUIREMENTS_LIST;
 
 typedef VOID
-(DDKAPI *PDRIVER_CANCEL)(
+(NTAPI *PDRIVER_CANCEL)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp);
 
@@ -4693,33 +4693,33 @@
 } IO_PAGING_PRIORITY;
 
 typedef NTSTATUS
-(DDKAPI *PIO_COMPLETION_ROUTINE)(
+(NTAPI *PIO_COMPLETION_ROUTINE)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN PVOID Context);
 
 typedef VOID
-(DDKAPI *PIO_DPC_ROUTINE)(
+(NTAPI *PIO_DPC_ROUTINE)(
   IN struct _KDPC *Dpc,
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN PVOID Context);
 
 typedef NTSTATUS
-(DDKAPI *PMM_DLL_INITIALIZE)(
+(NTAPI *PMM_DLL_INITIALIZE)(
   IN PUNICODE_STRING RegistryPath);
 
 typedef NTSTATUS
-(DDKAPI *PMM_DLL_UNLOAD)(
+(NTAPI *PMM_DLL_UNLOAD)(
   VOID);
 
 typedef BOOLEAN
-(DDKAPI *PKSERVICE_ROUTINE)(
+(NTAPI *PKSERVICE_ROUTINE)(
   IN struct _KINTERRUPT *Interrupt,
   IN PVOID ServiceContext);
 
 typedef VOID
-(DDKAPI *PIO_TIMER_ROUTINE)(
+(NTAPI *PIO_TIMER_ROUTINE)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN PVOID Context);
 
@@ -4739,33 +4739,33 @@
 } IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT;
 
 typedef VOID
-(DDKAPI *PIO_CSQ_INSERT_IRP)(
+(NTAPI *PIO_CSQ_INSERT_IRP)(
   IN struct _IO_CSQ *Csq,
   IN PIRP Irp);
 
 typedef VOID
-(DDKAPI *PIO_CSQ_REMOVE_IRP)(
+(NTAPI *PIO_CSQ_REMOVE_IRP)(
   IN struct _IO_CSQ *Csq,
   IN PIRP Irp);
 
 typedef PIRP
-(DDKAPI *PIO_CSQ_PEEK_NEXT_IRP)(
+(NTAPI *PIO_CSQ_PEEK_NEXT_IRP)(
   IN struct _IO_CSQ *Csq,
   IN PIRP Irp,
   IN PVOID PeekContext);
 
 typedef VOID
-(DDKAPI *PIO_CSQ_ACQUIRE_LOCK)(
+(NTAPI *PIO_CSQ_ACQUIRE_LOCK)(
   IN struct _IO_CSQ *Csq,
   OUT PKIRQL Irql);
 
 typedef VOID
-(DDKAPI *PIO_CSQ_RELEASE_LOCK)(
+(NTAPI *PIO_CSQ_RELEASE_LOCK)(
   IN struct _IO_CSQ *Csq,
   IN KIRQL Irql);
 
 typedef VOID
-(DDKAPI *PIO_CSQ_COMPLETE_CANCELED_IRP)(
+(NTAPI *PIO_CSQ_COMPLETE_CANCELED_IRP)(
   IN struct _IO_CSQ *Csq,
   IN PIRP Irp);
 
@@ -5331,12 +5331,12 @@
 
 NTHALAPI
 KIRQL
-DDKAPI
+NTAPI
 KeRaiseIrqlToDpcLevel(VOID);
 
 NTHALAPI
 KIRQL
-DDKAPI
+NTAPI
 KeRaiseIrqlToSynchLevel(VOID);
 
 NTHALAPI
@@ -5637,12 +5637,12 @@
 
 NTHALAPI
 KIRQL
-DDKAPI
+NTAPI
 KeRaiseIrqlToDpcLevel(VOID);
 
 NTHALAPI
 KIRQL
-DDKAPI
+NTAPI
 KeRaiseIrqlToSynchLevel(VOID);
 
 
@@ -5678,7 +5678,7 @@
 
 static __inline
 ULONG
-DDKAPI
+NTAPI
 KeGetCurrentProcessorNumber(VOID)
 {
   return 0;

Modified: branches/header-work/include/xdk/extypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/extypes…
==============================================================================
--- branches/header-work/include/xdk/extypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/extypes.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -62,29 +62,29 @@
 typedef struct _LOOKASIDE_LIST_EX *PLOOKASIDE_LIST_EX;
 
 typedef PVOID
-(DDKAPI *PALLOCATE_FUNCTION)(
+(NTAPI *PALLOCATE_FUNCTION)(
   IN POOL_TYPE PoolType,
   IN SIZE_T NumberOfBytes,
   IN ULONG Tag);
 
 typedef PVOID
-(DDKAPI *PALLOCATE_FUNCTION_EX)(
+(NTAPI *PALLOCATE_FUNCTION_EX)(
   IN POOL_TYPE PoolType,
   IN SIZE_T NumberOfBytes,
   IN ULONG Tag,
   IN OUT PLOOKASIDE_LIST_EX Lookaside);
 
 typedef VOID
-(DDKAPI *PFREE_FUNCTION)(
+(NTAPI *PFREE_FUNCTION)(
   IN PVOID Buffer);
 
 typedef VOID
-(DDKAPI *PFREE_FUNCTION_EX)(
+(NTAPI *PFREE_FUNCTION_EX)(
   IN PVOID Buffer,
   IN OUT PLOOKASIDE_LIST_EX Lookaside);
 
 typedef VOID
-(DDKAPI *PCALLBACK_FUNCTION)(
+(NTAPI *PCALLBACK_FUNCTION)(
   IN PVOID CallbackContext,
   IN PVOID Argument1,
   IN PVOID Argument2);
@@ -165,7 +165,7 @@
 typedef struct _EX_RUNDOWN_REF_CACHE_AWARE *PEX_RUNDOWN_REF_CACHE_AWARE;
 
 typedef VOID
-(DDKAPI *PWORKER_THREAD_ROUTINE)(
+(NTAPI *PWORKER_THREAD_ROUTINE)(
   IN PVOID Parameter);
 
 typedef struct _WORK_QUEUE_ITEM {

Modified: branches/header-work/include/xdk/iotypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes…
==============================================================================
--- branches/header-work/include/xdk/iotypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/iotypes.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -288,7 +288,7 @@
 } CLIENT_ID, *PCLIENT_ID;
 
 typedef VOID
-(DDKAPI *PKSTART_ROUTINE)(
+(NTAPI *PKSTART_ROUTINE)(
   IN PVOID StartContext);
 
 typedef struct _VPB {
@@ -310,7 +310,7 @@
 } IO_ALLOCATION_ACTION, *PIO_ALLOCATION_ACTION;
 
 typedef IO_ALLOCATION_ACTION
-(DDKAPI *PDRIVER_CONTROL)(
+(NTAPI *PDRIVER_CONTROL)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN PVOID MapRegisterBase,
@@ -389,7 +389,7 @@
 typedef struct _IO_WORKITEM *PIO_WORKITEM;
 
 typedef VOID
-(DDKAPI IO_WORKITEM_ROUTINE)(
+(NTAPI IO_WORKITEM_ROUTINE)(
   IN PDEVICE_OBJECT DeviceObject,
   IN PVOID Context);
 typedef IO_WORKITEM_ROUTINE *PIO_WORKITEM_ROUTINE;
@@ -531,13 +531,13 @@
 } PCI_SLOT_NUMBER, *PPCI_SLOT_NUMBER;
 
 typedef VOID
-(DDKAPI *PIO_APC_ROUTINE)(
+(NTAPI *PIO_APC_ROUTINE)(
   IN PVOID ApcContext,
   IN PIO_STATUS_BLOCK IoStatusBlock,
   IN ULONG Reserved);
 
 typedef VOID
-(DDKAPI *WMI_NOTIFICATION_CALLBACK)(
+(NTAPI *WMI_NOTIFICATION_CALLBACK)(
   PVOID Wnode,
   PVOID Context);
 
@@ -696,15 +696,15 @@
 */
 
 typedef VOID
-(DDKAPI *PINTERFACE_REFERENCE)(
+(NTAPI *PINTERFACE_REFERENCE)(
   PVOID Context);
 
 typedef VOID
-(DDKAPI *PINTERFACE_DEREFERENCE)(
+(NTAPI *PINTERFACE_DEREFERENCE)(
   PVOID Context);
 
 typedef BOOLEAN
-(DDKAPI *PTRANSLATE_BUS_ADDRESS)(
+(NTAPI *PTRANSLATE_BUS_ADDRESS)(
   IN PVOID Context,
   IN PHYSICAL_ADDRESS BusAddress,
   IN ULONG Length,
@@ -712,13 +712,13 @@
   OUT PPHYSICAL_ADDRESS  TranslatedAddress);
 
 typedef struct _DMA_ADAPTER*
-(DDKAPI *PGET_DMA_ADAPTER)(
+(NTAPI *PGET_DMA_ADAPTER)(
   IN PVOID Context,
   IN struct _DEVICE_DESCRIPTION *DeviceDescriptor,
   OUT PULONG NumberOfMapRegisters);
 
 typedef ULONG
-(DDKAPI *PGET_SET_DEVICE_DATA)(
+(NTAPI *PGET_SET_DEVICE_DATA)(
   IN PVOID Context,
   IN ULONG DataType,
   IN PVOID Buffer,
@@ -748,7 +748,7 @@
 } PCI_DEVICE_PRESENCE_PARAMETERS, *PPCI_DEVICE_PRESENCE_PARAMETERS;
 
 typedef BOOLEAN
-(DDKAPI *PPCI_IS_DEVICE_PRESENT)(
+(NTAPI *PPCI_IS_DEVICE_PRESENT)(
   IN USHORT VendorID,
   IN USHORT DeviceID,
   IN UCHAR RevisionID,
@@ -757,7 +757,7 @@
   IN ULONG Flags);
 
 typedef BOOLEAN
-(DDKAPI *PPCI_IS_DEVICE_PRESENT_EX)(
+(NTAPI *PPCI_IS_DEVICE_PRESENT_EX)(
   IN PVOID Context,
   IN PPCI_DEVICE_PRESENCE_PARAMETERS Parameters);
 
@@ -930,12 +930,12 @@
 #define PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES    0x00000001
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
+(NTAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
   IN PVOID NotificationStructure,
   IN PVOID Context);
 
 typedef VOID
-(DDKAPI *PDEVICE_CHANGE_COMPLETE_CALLBACK)(
+(NTAPI *PDEVICE_CHANGE_COMPLETE_CALLBACK)(
   IN PVOID Context);
 
 typedef enum _FILE_INFORMATION_CLASS {
@@ -1098,7 +1098,7 @@
 #define RESOURCE_HASH_TABLE_SIZE          64
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_CHECK_IF_POSSIBLE)(
+(NTAPI *PFAST_IO_CHECK_IF_POSSIBLE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -1109,7 +1109,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_READ)(
+(NTAPI *PFAST_IO_READ)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -1120,7 +1120,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_WRITE)(
+(NTAPI *PFAST_IO_WRITE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -1131,7 +1131,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_QUERY_BASIC_INFO)(
+(NTAPI *PFAST_IO_QUERY_BASIC_INFO)(
   IN struct _FILE_OBJECT *FileObject,
   IN BOOLEAN Wait,
   OUT PFILE_BASIC_INFORMATION Buffer,
@@ -1139,7 +1139,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_QUERY_STANDARD_INFO)(
+(NTAPI *PFAST_IO_QUERY_STANDARD_INFO)(
   IN struct _FILE_OBJECT *FileObject,
   IN BOOLEAN Wait,
   OUT PFILE_STANDARD_INFORMATION Buffer,
@@ -1147,7 +1147,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_LOCK)(
+(NTAPI *PFAST_IO_LOCK)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN PLARGE_INTEGER Length,
@@ -1159,7 +1159,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_UNLOCK_SINGLE)(
+(NTAPI *PFAST_IO_UNLOCK_SINGLE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN PLARGE_INTEGER Length,
@@ -1169,14 +1169,14 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_UNLOCK_ALL)(
+(NTAPI *PFAST_IO_UNLOCK_ALL)(
   IN struct _FILE_OBJECT *FileObject,
   PEPROCESS ProcessId,
   OUT PIO_STATUS_BLOCK IoStatus,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_UNLOCK_ALL_BY_KEY)(
+(NTAPI *PFAST_IO_UNLOCK_ALL_BY_KEY)(
   IN struct _FILE_OBJECT *FileObject,
   PVOID ProcessId,
   ULONG Key,
@@ -1184,7 +1184,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_DEVICE_CONTROL)(
+(NTAPI *PFAST_IO_DEVICE_CONTROL)(
   IN struct _FILE_OBJECT *FileObject,
   IN BOOLEAN Wait,
   IN PVOID InputBuffer OPTIONAL,
@@ -1196,20 +1196,20 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef VOID
-(DDKAPI *PFAST_IO_ACQUIRE_FILE)(
+(NTAPI *PFAST_IO_ACQUIRE_FILE)(
   IN struct _FILE_OBJECT *FileObject);
 
 typedef VOID
-(DDKAPI *PFAST_IO_RELEASE_FILE)(
+(NTAPI *PFAST_IO_RELEASE_FILE)(
   IN struct _FILE_OBJECT *FileObject);
 
 typedef VOID
-(DDKAPI *PFAST_IO_DETACH_DEVICE)(
+(NTAPI *PFAST_IO_DETACH_DEVICE)(
   IN struct _DEVICE_OBJECT *SourceDevice,
   IN struct _DEVICE_OBJECT *TargetDevice);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_QUERY_NETWORK_OPEN_INFO)(
+(NTAPI *PFAST_IO_QUERY_NETWORK_OPEN_INFO)(
   IN struct _FILE_OBJECT *FileObject,
   IN BOOLEAN Wait,
   OUT struct _FILE_NETWORK_OPEN_INFORMATION *Buffer,
@@ -1217,14 +1217,14 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef NTSTATUS
-(DDKAPI *PFAST_IO_ACQUIRE_FOR_MOD_WRITE)(
+(NTAPI *PFAST_IO_ACQUIRE_FOR_MOD_WRITE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER EndingOffset,
   OUT struct _ERESOURCE **ResourceToRelease,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_READ)(
+(NTAPI *PFAST_IO_MDL_READ)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -1234,13 +1234,13 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_READ_COMPLETE)(
+(NTAPI *PFAST_IO_MDL_READ_COMPLETE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PMDL MdlChain,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_PREPARE_MDL_WRITE)(
+(NTAPI *PFAST_IO_PREPARE_MDL_WRITE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -1250,14 +1250,14 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_WRITE_COMPLETE)(
+(NTAPI *PFAST_IO_MDL_WRITE_COMPLETE)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN PMDL MdlChain,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_READ_COMPRESSED)(
+(NTAPI *PFAST_IO_READ_COMPRESSED)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -1270,7 +1270,7 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_WRITE_COMPRESSED)(
+(NTAPI *PFAST_IO_WRITE_COMPRESSED)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN ULONG Length,
@@ -1283,37 +1283,37 @@
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)(
+(NTAPI *PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)(
   IN struct _FILE_OBJECT *FileObject,
   IN PMDL MdlChain,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)(
+(NTAPI *PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)(
   IN struct _FILE_OBJECT *FileObject,
   IN PLARGE_INTEGER FileOffset,
   IN PMDL MdlChain,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef BOOLEAN
-(DDKAPI *PFAST_IO_QUERY_OPEN)(
+(NTAPI *PFAST_IO_QUERY_OPEN)(
   IN struct _IRP *Irp,
   OUT PFILE_NETWORK_OPEN_INFORMATION NetworkInformation,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef NTSTATUS
-(DDKAPI *PFAST_IO_RELEASE_FOR_MOD_WRITE)(
+(NTAPI *PFAST_IO_RELEASE_FOR_MOD_WRITE)(
   IN struct _FILE_OBJECT *FileObject,
   IN struct _ERESOURCE *ResourceToRelease,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef NTSTATUS
-(DDKAPI *PFAST_IO_ACQUIRE_FOR_CCFLUSH)(
+(NTAPI *PFAST_IO_ACQUIRE_FOR_CCFLUSH)(
   IN struct _FILE_OBJECT *FileObject,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
 typedef NTSTATUS
-(DDKAPI *PFAST_IO_RELEASE_FOR_CCFLUSH) (
+(NTAPI *PFAST_IO_RELEASE_FOR_CCFLUSH) (
   IN struct _FILE_OBJECT *FileObject,
   IN struct _DEVICE_OBJECT *DeviceObject);
 
@@ -1697,7 +1697,7 @@
 #endif
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_ADD_DEVICE)(
+(NTAPI *PDRIVER_ADD_DEVICE)(
   IN struct _DRIVER_OBJECT *DriverObject,
   IN struct _DEVICE_OBJECT *PhysicalDeviceObject);
 
@@ -1713,21 +1713,21 @@
 #define DRVO_BUILTIN_DRIVER               0x00000004
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_INITIALIZE)(
+(NTAPI *PDRIVER_INITIALIZE)(
   IN struct _DRIVER_OBJECT *DriverObject,
   IN PUNICODE_STRING RegistryPath);
 
 typedef VOID
-(DDKAPI *PDRIVER_STARTIO)(
+(NTAPI *PDRIVER_STARTIO)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp);
 
 typedef VOID
-(DDKAPI *PDRIVER_UNLOAD)(
+(NTAPI *PDRIVER_UNLOAD)(
   IN struct _DRIVER_OBJECT *DriverObject);
 
 typedef NTSTATUS
-(DDKAPI *PDRIVER_DISPATCH)(
+(NTAPI *PDRIVER_DISPATCH)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp);
 
@@ -1756,18 +1756,18 @@
 } DMA_ADAPTER, *PDMA_ADAPTER;
 
 typedef VOID
-(DDKAPI *PPUT_DMA_ADAPTER)(
+(NTAPI *PPUT_DMA_ADAPTER)(
   IN PDMA_ADAPTER DmaAdapter);
 
 typedef PVOID
-(DDKAPI *PALLOCATE_COMMON_BUFFER)(
+(NTAPI *PALLOCATE_COMMON_BUFFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN ULONG Length,
   OUT PPHYSICAL_ADDRESS LogicalAddress,
   IN BOOLEAN CacheEnabled);
 
 typedef VOID
-(DDKAPI *PFREE_COMMON_BUFFER)(
+(NTAPI *PFREE_COMMON_BUFFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN ULONG Length,
   IN PHYSICAL_ADDRESS LogicalAddress,
@@ -1775,7 +1775,7 @@
   IN BOOLEAN CacheEnabled);
 
 typedef NTSTATUS
-(DDKAPI *PALLOCATE_ADAPTER_CHANNEL)(
+(NTAPI *PALLOCATE_ADAPTER_CHANNEL)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
   IN ULONG NumberOfMapRegisters,
@@ -1783,7 +1783,7 @@
   IN PVOID Context);
 
 typedef BOOLEAN
-(DDKAPI *PFLUSH_ADAPTER_BUFFERS)(
+(NTAPI *PFLUSH_ADAPTER_BUFFERS)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl,
   IN PVOID MapRegisterBase,
@@ -1792,17 +1792,17 @@
   IN BOOLEAN WriteToDevice);
 
 typedef VOID
-(DDKAPI *PFREE_ADAPTER_CHANNEL)(
+(NTAPI *PFREE_ADAPTER_CHANNEL)(
   IN PDMA_ADAPTER DmaAdapter);
 
 typedef VOID
-(DDKAPI *PFREE_MAP_REGISTERS)(
+(NTAPI *PFREE_MAP_REGISTERS)(
   IN PDMA_ADAPTER DmaAdapter,
   PVOID MapRegisterBase,
   ULONG NumberOfMapRegisters);
 
 typedef PHYSICAL_ADDRESS
-(DDKAPI *PMAP_TRANSFER)(
+(NTAPI *PMAP_TRANSFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl,
   IN PVOID MapRegisterBase,
@@ -1811,22 +1811,22 @@
   IN BOOLEAN WriteToDevice);
 
 typedef ULONG
-(DDKAPI *PGET_DMA_ALIGNMENT)(
+(NTAPI *PGET_DMA_ALIGNMENT)(
   IN PDMA_ADAPTER DmaAdapter);
 
 typedef ULONG
-(DDKAPI *PREAD_DMA_COUNTER)(
+(NTAPI *PREAD_DMA_COUNTER)(
   IN PDMA_ADAPTER DmaAdapter);
 
 typedef VOID
-(DDKAPI *PDRIVER_LIST_CONTROL)(
+(NTAPI *PDRIVER_LIST_CONTROL)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN struct _SCATTER_GATHER_LIST *ScatterGather,
   IN PVOID Context);
 
 typedef NTSTATUS
-(DDKAPI *PGET_SCATTER_GATHER_LIST)(
+(NTAPI *PGET_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
   IN PMDL Mdl,
@@ -1837,13 +1837,13 @@
   IN BOOLEAN WriteToDevice);
 
 typedef VOID
-(DDKAPI *PPUT_SCATTER_GATHER_LIST)(
+(NTAPI *PPUT_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PSCATTER_GATHER_LIST ScatterGather,
   IN BOOLEAN WriteToDevice);
 
 typedef NTSTATUS
-(DDKAPI *PCALCULATE_SCATTER_GATHER_LIST_SIZE)(
+(NTAPI *PCALCULATE_SCATTER_GATHER_LIST_SIZE)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl OPTIONAL,
   IN PVOID CurrentVa,
@@ -1852,7 +1852,7 @@
   OUT PULONG pNumberOfMapRegisters OPTIONAL);
 
 typedef NTSTATUS
-(DDKAPI *PBUILD_SCATTER_GATHER_LIST)(
+(NTAPI *PBUILD_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
   IN PMDL Mdl,
@@ -1865,7 +1865,7 @@
   IN ULONG ScatterGatherLength);
 
 typedef NTSTATUS
-(DDKAPI *PBUILD_MDL_FROM_SCATTER_GATHER_LIST)(
+(NTAPI *PBUILD_MDL_FROM_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PSCATTER_GATHER_LIST ScatterGather,
   IN PMDL OriginalMdl,
@@ -1959,7 +1959,7 @@
 } IO_RESOURCE_REQUIREMENTS_LIST, *PIO_RESOURCE_REQUIREMENTS_LIST;
 
 typedef VOID
-(DDKAPI *PDRIVER_CANCEL)(
+(NTAPI *PDRIVER_CANCEL)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp);
 
@@ -2030,33 +2030,33 @@
 } IO_PAGING_PRIORITY;
 
 typedef NTSTATUS
-(DDKAPI *PIO_COMPLETION_ROUTINE)(
+(NTAPI *PIO_COMPLETION_ROUTINE)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN PVOID Context);
 
 typedef VOID
-(DDKAPI *PIO_DPC_ROUTINE)(
+(NTAPI *PIO_DPC_ROUTINE)(
   IN struct _KDPC *Dpc,
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN PVOID Context);
 
 typedef NTSTATUS
-(DDKAPI *PMM_DLL_INITIALIZE)(
+(NTAPI *PMM_DLL_INITIALIZE)(
   IN PUNICODE_STRING RegistryPath);
 
 typedef NTSTATUS
-(DDKAPI *PMM_DLL_UNLOAD)(
+(NTAPI *PMM_DLL_UNLOAD)(
   VOID);
 
 typedef BOOLEAN
-(DDKAPI *PKSERVICE_ROUTINE)(
+(NTAPI *PKSERVICE_ROUTINE)(
   IN struct _KINTERRUPT *Interrupt,
   IN PVOID ServiceContext);
 
 typedef VOID
-(DDKAPI *PIO_TIMER_ROUTINE)(
+(NTAPI *PIO_TIMER_ROUTINE)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN PVOID Context);
 
@@ -2076,33 +2076,33 @@
 } IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT;
 
 typedef VOID
-(DDKAPI *PIO_CSQ_INSERT_IRP)(
+(NTAPI *PIO_CSQ_INSERT_IRP)(
   IN struct _IO_CSQ *Csq,
   IN PIRP Irp);
 
 typedef VOID
-(DDKAPI *PIO_CSQ_REMOVE_IRP)(
+(NTAPI *PIO_CSQ_REMOVE_IRP)(
   IN struct _IO_CSQ *Csq,
   IN PIRP Irp);
 
 typedef PIRP
-(DDKAPI *PIO_CSQ_PEEK_NEXT_IRP)(
+(NTAPI *PIO_CSQ_PEEK_NEXT_IRP)(
   IN struct _IO_CSQ *Csq,
   IN PIRP Irp,
   IN PVOID PeekContext);
 
 typedef VOID
-(DDKAPI *PIO_CSQ_ACQUIRE_LOCK)(
+(NTAPI *PIO_CSQ_ACQUIRE_LOCK)(
   IN struct _IO_CSQ *Csq,
   OUT PKIRQL Irql);
 
 typedef VOID
-(DDKAPI *PIO_CSQ_RELEASE_LOCK)(
+(NTAPI *PIO_CSQ_RELEASE_LOCK)(
   IN struct _IO_CSQ *Csq,
   IN KIRQL Irql);
 
 typedef VOID
-(DDKAPI *PIO_CSQ_COMPLETE_CANCELED_IRP)(
+(NTAPI *PIO_CSQ_COMPLETE_CANCELED_IRP)(
   IN struct _IO_CSQ *Csq,
   IN PIRP Irp);
 

Modified: branches/header-work/include/xdk/ketypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ketypes…
==============================================================================
--- branches/header-work/include/xdk/ketypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/ketypes.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -146,7 +146,7 @@
 struct _KBUGCHECK_REASON_CALLBACK_RECORD;
 
 typedef VOID
-(DDKAPI *PKBUGCHECK_REASON_CALLBACK_ROUTINE)(
+(NTAPI *PKBUGCHECK_REASON_CALLBACK_ROUTINE)(
   IN KBUGCHECK_CALLBACK_REASON Reason,
   IN struct _KBUGCHECK_REASON_CALLBACK_RECORD *Record,
   IN OUT PVOID ReasonSpecificData,
@@ -170,7 +170,7 @@
 } KBUGCHECK_BUFFER_DUMP_STATE;
 
 typedef VOID
-(DDKAPI *PKBUGCHECK_CALLBACK_ROUTINE)(
+(NTAPI *PKBUGCHECK_CALLBACK_ROUTINE)(
   IN PVOID Buffer,
   IN ULONG Length);
 
@@ -185,7 +185,7 @@
 } KBUGCHECK_CALLBACK_RECORD, *PKBUGCHECK_CALLBACK_RECORD;
 
 typedef BOOLEAN
-(DDKAPI *PNMI_CALLBACK)(
+(NTAPI *PNMI_CALLBACK)(
   IN PVOID Context,
   IN BOOLEAN Handled);
 
@@ -330,17 +330,17 @@
 } INTERFACE_TYPE, *PINTERFACE_TYPE;
 
 typedef VOID
-(DDKAPI *PKNORMAL_ROUTINE)(
+(NTAPI *PKNORMAL_ROUTINE)(
   IN PVOID NormalContext,
   IN PVOID SystemArgument1,
   IN PVOID SystemArgument2);
 
 typedef VOID
-(DDKAPI *PKRUNDOWN_ROUTINE)(
+(NTAPI *PKRUNDOWN_ROUTINE)(
   IN struct _KAPC *Apc);
 
 typedef VOID
-(DDKAPI *PKKERNEL_ROUTINE)(
+(NTAPI *PKKERNEL_ROUTINE)(
   IN struct _KAPC *Apc,
   IN OUT PKNORMAL_ROUTINE *NormalRoutine,
   IN OUT PVOID *NormalContext,
@@ -449,7 +449,7 @@
 #endif /* defined(_AMD64_) */
 
 typedef VOID
-(DDKAPI *PKDEFERRED_ROUTINE)(
+(NTAPI *PKDEFERRED_ROUTINE)(
   IN struct _KDPC *Dpc,
   IN PVOID DeferredContext,
   IN PVOID SystemArgument1,
@@ -624,7 +624,7 @@
 } KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER;
 
 typedef BOOLEAN
-(DDKAPI *PKSYNCHRONIZE_ROUTINE)(
+(NTAPI *PKSYNCHRONIZE_ROUTINE)(
   IN PVOID SynchronizeContext);
 
 typedef enum _POOL_TYPE {

Modified: branches/header-work/include/xdk/mips/ke.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mips/ke…
==============================================================================
--- branches/header-work/include/xdk/mips/ke.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/mips/ke.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -29,7 +29,7 @@
 
 static __inline
 ULONG
-DDKAPI
+NTAPI
 KeGetCurrentProcessorNumber(VOID)
 {
   return 0;

Modified: branches/header-work/include/xdk/potypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/potypes…
==============================================================================
--- branches/header-work/include/xdk/potypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/potypes.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -115,7 +115,7 @@
 #endif /* !_PO_DDK_ */
 
 typedef VOID
-(DDKAPI *PREQUEST_POWER_COMPLETE)(
+(NTAPI *PREQUEST_POWER_COMPLETE)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN UCHAR MinorFunction,
   IN POWER_STATE PowerState,
@@ -124,7 +124,7 @@
 
 typedef
 NTSTATUS
-(DDKAPI *PPOWER_SETTING_CALLBACK)(
+(NTAPI *PPOWER_SETTING_CALLBACK)(
   IN LPCGUID SettingGuid,
   IN PVOID Value,
   IN ULONG ValueLength,

Modified: branches/header-work/include/xdk/ppc/ke.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ppc/ke.…
==============================================================================
--- branches/header-work/include/xdk/ppc/ke.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/ppc/ke.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -94,12 +94,12 @@
 
 NTHALAPI
 KIRQL
-DDKAPI
+NTAPI
 KeRaiseIrqlToDpcLevel(VOID);
 
 NTHALAPI
 KIRQL
-DDKAPI
+NTAPI
 KeRaiseIrqlToSynchLevel(VOID);
 
 $endif

Modified: branches/header-work/include/xdk/rtltypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtltype…
==============================================================================
--- branches/header-work/include/xdk/rtltypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/rtltypes.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -36,7 +36,7 @@
 } RTL_BITMAP_RUN, *PRTL_BITMAP_RUN;
 
 typedef NTSTATUS
-(DDKAPI *PRTL_QUERY_REGISTRY_ROUTINE)(
+(NTAPI *PRTL_QUERY_REGISTRY_ROUTINE)(
   IN PWSTR ValueName,
   IN ULONG ValueType,
   IN PVOID ValueData,

Modified: branches/header-work/include/xdk/x86/ke.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/x86/ke.…
==============================================================================
--- branches/header-work/include/xdk/x86/ke.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/x86/ke.h [iso-8859-1] Thu Mar 18 23:48:53 2010
@@ -75,12 +75,12 @@
 
 NTHALAPI
 KIRQL
-DDKAPI
+NTAPI
 KeRaiseIrqlToDpcLevel(VOID);
 
 NTHALAPI
 KIRQL
-DDKAPI
+NTAPI
 KeRaiseIrqlToSynchLevel(VOID);
 
 NTHALAPI