Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[cfinck] 46269: Proper fix for the valgrind-detected error. Always null-terminates the line now before regular string functions are used.
by cfinck＠svn.reactos.org 19 Mar '10

19 Mar '10

Author: cfinck Date: Fri Mar 19 01:00:42 2010 New Revision: 46269 URL: http://svn.reactos.org/svn/reactos?rev=46269&view=rev Log: Proper fix for the valgrind-detected error. Always null-terminates the line now before regular string functions are used. Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=46269&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Fri Mar 19 01:00:42 2010 @@ -25,8 +25,7 @@ /* Initialize CacheBuffer with an empty string */ *CacheBuffer = 0; - memset(Buffer, 0, BUFFER_SIZE); - + /* ttyfd is the file descriptor of the virtual COM port */ if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) { @@ -112,17 +111,15 @@ } else { - /* Also break on newlines */ - if(*bp == '\n') + /* Null-terminate the line */ + bp[1] = 0; + + /* Break on newlines or in case of KDBG messages (which aren't terminated by newlines) */ + if(*bp == '\n' || strstr(Buffer, "kdb:>") || strstr(Buffer, "--- Press q")) break; - /* KDBG doesn't send a newline */ - if ((strstr(Buffer, "kdb:>")) || - (strstr(Buffer, "--- Press q"))) - break; - } - - ++bp; + ++bp; + } } /* The rest of this logic is just about processing the serial output */ @@ -137,9 +134,6 @@ Ret = EXIT_CONTINUE; goto cleanup; } - - /* Null-terminate the line */ - *(++bp) = 0; /* Detect whether the same line appears over and over again. If that is the case, cancel this test after a specified number of repetitions. */

1 0

[akhaldi] 46268: [XDK] - DDKAPI -> NTAPI [WDM] - Update wdm.h to reflect XDK changes.
by akhaldi＠svn.reactos.org 18 Mar '10

18 Mar '10

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

1 0

[akhaldi] 46267: [XDK] - Apply a consistent formatting. [WDM] - Update wdm.h to reflect XDK changes.
by akhaldi＠svn.reactos.org 18 Mar '10

18 Mar '10

Author: akhaldi Date: Thu Mar 18 23:45:30 2010 New Revision: 46267 URL: http://svn.reactos.org/svn/reactos?rev=46267&view=rev Log: [XDK] - Apply a consistent formatting. [WDM] - Update wdm.h to reflect XDK changes. Modified: branches/header-work/include/ddk/wdm.h branches/header-work/include/xdk/amd64/ke.h branches/header-work/include/xdk/cmfuncs.h branches/header-work/include/xdk/cmtypes.h branches/header-work/include/xdk/exfuncs.h branches/header-work/include/xdk/extypes.h branches/header-work/include/xdk/halfuncs.h branches/header-work/include/xdk/ia64/ke.h branches/header-work/include/xdk/interlocked.h branches/header-work/include/xdk/iofuncs.h branches/header-work/include/xdk/iotypes.h branches/header-work/include/xdk/kdfuncs.h branches/header-work/include/xdk/kefuncs.h branches/header-work/include/xdk/ketypes.h branches/header-work/include/xdk/mips/ke.h branches/header-work/include/xdk/mmfuncs.h branches/header-work/include/xdk/mmtypes.h branches/header-work/include/xdk/obfuncs.h branches/header-work/include/xdk/obtypes.h branches/header-work/include/xdk/pofuncs.h branches/header-work/include/xdk/potypes.h branches/header-work/include/xdk/ppc/ke.h branches/header-work/include/xdk/psfuncs.h branches/header-work/include/xdk/rtlfuncs.h branches/header-work/include/xdk/rtltypes.h branches/header-work/include/xdk/sefuncs.h branches/header-work/include/xdk/setypes.h branches/header-work/include/xdk/wmifuncs.h branches/header-work/include/xdk/x86/ke.h branches/header-work/include/xdk/zwfuncs.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… Modified: branches/header-work/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/amd64/k… Modified: branches/header-work/include/xdk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cmfuncs… Modified: branches/header-work/include/xdk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cmtypes… Modified: branches/header-work/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/exfuncs… Modified: branches/header-work/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/extypes… Modified: branches/header-work/include/xdk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/halfunc… Modified: branches/header-work/include/xdk/ia64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ia64/ke… Modified: branches/header-work/include/xdk/interlocked.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/interlo… Modified: branches/header-work/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iofuncs… Modified: branches/header-work/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes… Modified: branches/header-work/include/xdk/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/kdfuncs… Modified: branches/header-work/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/kefuncs… Modified: branches/header-work/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ketypes… Modified: branches/header-work/include/xdk/mips/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mips/ke… Modified: branches/header-work/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mmfuncs… Modified: branches/header-work/include/xdk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mmtypes… Modified: branches/header-work/include/xdk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/obfuncs… Modified: branches/header-work/include/xdk/obtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/obtypes… Modified: branches/header-work/include/xdk/pofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/pofuncs… Modified: branches/header-work/include/xdk/potypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/potypes… Modified: branches/header-work/include/xdk/ppc/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ppc/ke.… Modified: branches/header-work/include/xdk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/psfuncs… Modified: branches/header-work/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtlfunc… Modified: branches/header-work/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtltype… Modified: branches/header-work/include/xdk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/sefuncs… Modified: branches/header-work/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/setypes… Modified: branches/header-work/include/xdk/wmifuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/wmifunc… Modified: branches/header-work/include/xdk/x86/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/x86/ke.… Modified: branches/header-work/include/xdk/zwfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/zwfuncs…

1 0

[khornicek] 46266: [WIN32K] Remove a pedantic assert to allow compressed bitmaps. See issue #5255 for more details.
by khornicek＠svn.reactos.org 18 Mar '10

18 Mar '10

Author: khornicek Date: Thu Mar 18 19:55:48 2010 New Revision: 46266 URL: http://svn.reactos.org/svn/reactos?rev=46266&view=rev Log: [WIN32K] Remove a pedantic assert to allow compressed bitmaps. See issue #5255 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Thu Mar 18 19:55:48 2010 @@ -624,7 +624,6 @@ else { /* Compressed surfaces don't have scanlines! */ - ASSERT(FALSE); // Should not get here on ENGDDI pso->lDelta = 0; pso->cjBits = BitmapInfo->Size;

1 0

[akhaldi] 46265: [XDK] - Add KeNumberProcessors, XSTATE_CONTEXT, MINIMAL_XSTATE_AREA_LENGTH, LOCK_QUEUE_WAIT_BIT, LOCK_QUEUE_OWNER_BIT and some missing XSAVE_*, CONTEXT_* and RTL_CONTEXT_* definitions - PKINTERRUPT_ROUTINE : DDKAPI -> NTAPI - Add some C_ASSERTs [WDM] - Update wdm.h to reflect XDK changes.
by akhaldi＠svn.reactos.org 18 Mar '10

18 Mar '10

Author: akhaldi Date: Thu Mar 18 18:16:54 2010 New Revision: 46265 URL: http://svn.reactos.org/svn/reactos?rev=46265&view=rev Log: [XDK] - Add KeNumberProcessors, XSTATE_CONTEXT, MINIMAL_XSTATE_AREA_LENGTH, LOCK_QUEUE_WAIT_BIT, LOCK_QUEUE_OWNER_BIT and some missing XSAVE_*, CONTEXT_* and RTL_CONTEXT_* definitions - PKINTERRUPT_ROUTINE : DDKAPI -> NTAPI - Add some C_ASSERTs [WDM] - Update wdm.h to reflect XDK changes. Modified: branches/header-work/include/ddk/wdm.h branches/header-work/include/xdk/ketypes.h branches/header-work/include/xdk/rtlfuncs.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 18:16:54 2010 @@ -460,26 +460,25 @@ } MODE; /* Processor features */ -#define PF_FLOATING_POINT_PRECISION_ERRATA 0 -#define PF_FLOATING_POINT_EMULATED 1 -#define PF_COMPARE_EXCHANGE_DOUBLE 2 -#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 -#define PF_PPC_MOVEMEM_64BIT_OK 4 -#define PF_ALPHA_BYTE_INSTRUCTIONS 5 -#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 -#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 -#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 -#define PF_PAE_ENABLED 9 -#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#define PF_SSE_DAZ_MODE_AVAILABLE 11 -#define PF_NX_ENABLED 12 -#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 -#define PF_COMPARE_EXCHANGE128 14 -#define PF_COMPARE64_EXCHANGE128 15 -#define PF_CHANNELS_ENABLED 16 -#define PF_XSAVE_ENABLED 17 - -#define MAXIMUM_SUPPORTED_EXTENSION 512 +#define PF_FLOATING_POINT_PRECISION_ERRATA 0 +#define PF_FLOATING_POINT_EMULATED 1 +#define PF_COMPARE_EXCHANGE_DOUBLE 2 +#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 +#define PF_PPC_MOVEMEM_64BIT_OK 4 +#define PF_ALPHA_BYTE_INSTRUCTIONS 5 +#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 +#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 +#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 +#define PF_PAE_ENABLED 9 +#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_SSE_DAZ_MODE_AVAILABLE 11 +#define PF_NX_ENABLED 12 +#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 +#define PF_COMPARE_EXCHANGE128 14 +#define PF_COMPARE64_EXCHANGE128 15 +#define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 + #define MAXIMUM_WAIT_OBJECTS 64 #define ASSERT_APC(Object) \ @@ -518,6 +517,9 @@ #define GM_LOCK_BIT_V 0x0 #define GM_LOCK_WAITER_WOKEN 0x2 #define GM_LOCK_WAITER_INC 0x4 + +#define LOCK_QUEUE_WAIT_BIT 0 +#define LOCK_QUEUE_OWNER_BIT 1 #define LOCK_QUEUE_WAIT 1 #define LOCK_QUEUE_OWNER 2 @@ -744,7 +746,7 @@ #define THREAD_WAIT_OBJECTS 3 typedef VOID -(DDKAPI *PKINTERRUPT_ROUTINE)( +(NTAPI *PKINTERRUPT_ROUTINE)( VOID); typedef enum _KD_OPTION { @@ -836,13 +838,13 @@ typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; typedef struct _KSPIN_LOCK_QUEUE { - struct _KSPIN_LOCK_QUEUE *volatile Next; - PKSPIN_LOCK volatile Lock; + struct _KSPIN_LOCK_QUEUE *volatile Next; + PKSPIN_LOCK volatile Lock; } KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE; typedef struct _KLOCK_QUEUE_HANDLE { - KSPIN_LOCK_QUEUE LockQueue; - KIRQL OldIrql; + KSPIN_LOCK_QUEUE LockQueue; + KIRQL OldIrql; } KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; #if defined(_AMD64_) @@ -1104,11 +1106,10 @@ EndAlternatives } ALTERNATIVE_ARCHITECTURE_TYPE; -typedef struct _KSYSTEM_TIME -{ - ULONG LowPart; - LONG High1Time; - LONG High2Time; +typedef struct _KSYSTEM_TIME { + ULONG LowPart; + LONG High1Time; + LONG High2Time; } KSYSTEM_TIME, *PKSYSTEM_TIME; typedef struct _PNP_BUS_INFORMATION { @@ -1118,8 +1119,8 @@ } PNP_BUS_INFORMATION, *PPNP_BUS_INFORMATION; typedef struct DECLSPEC_ALIGN(16) _M128A { - ULONGLONG Low; - LONGLONG High; + ULONGLONG Low; + LONGLONG High; } M128A, *PM128A; typedef struct DECLSPEC_ALIGN(16) _XSAVE_FORMAT { @@ -1148,6 +1149,69 @@ #endif } XSAVE_FORMAT, *PXSAVE_FORMAT; +typedef struct DECLSPEC_ALIGN(8) _XSAVE_AREA_HEADER { + ULONG64 Mask; + ULONG64 Reserved[7]; +} XSAVE_AREA_HEADER, *PXSAVE_AREA_HEADER; + +typedef struct DECLSPEC_ALIGN(16) _XSAVE_AREA { + XSAVE_FORMAT LegacyState; + XSAVE_AREA_HEADER Header; +} XSAVE_AREA, *PXSAVE_AREA; + +typedef struct _XSTATE_CONTEXT { + ULONG64 Mask; + ULONG Length; + ULONG Reserved1; + PXSAVE_AREA Area; +#if defined(_X86_) + ULONG Reserved2; +#endif + PVOID Buffer; +#if defined(_X86_) + ULONG Reserved3; +#endif +} XSTATE_CONTEXT, *PXSTATE_CONTEXT; + +#ifdef _X86_ + +#define MAXIMUM_SUPPORTED_EXTENSION 512 + +#if !defined(__midl) && !defined(MIDL_PASS) +C_ASSERT(sizeof(XSAVE_FORMAT) == MAXIMUM_SUPPORTED_EXTENSION); +#endif + +#endif /* _X86_ */ + +#define XSAVE_ALIGN 64 +#define MINIMAL_XSTATE_AREA_LENGTH sizeof(XSAVE_AREA) + +#if !defined(__midl) && !defined(MIDL_PASS) +C_ASSERT((sizeof(XSAVE_FORMAT) & (XSAVE_ALIGN - 1)) == 0); +C_ASSERT((FIELD_OFFSET(XSAVE_AREA, Header) & (XSAVE_ALIGN - 1)) == 0); +C_ASSERT(MINIMAL_XSTATE_AREA_LENGTH == 512 + 64); +#endif + +typedef struct _CONTEXT_CHUNK { + LONG Offset; + ULONG Length; +} CONTEXT_CHUNK, *PCONTEXT_CHUNK; + +typedef struct _CONTEXT_EX { + CONTEXT_CHUNK All; + CONTEXT_CHUNK Legacy; + CONTEXT_CHUNK XState; +} CONTEXT_EX, *PCONTEXT_EX; + +#define CONTEXT_EX_LENGTH ALIGN_UP_BY(sizeof(CONTEXT_EX), STACK_ALIGN) + +#if (NTDDI_VERSION >= NTDDI_VISTA) +extern NTSYSAPI volatile CCHAR KeNumberProcessors; +#elif (NTDDI_VERSION >= NTDDI_WINXP) +extern NTSYSAPI CCHAR KeNumberProcessors; +#else +extern PCCHAR KeNumberProcessors; +#endif /****************************************************************************** * Memory manager Types * @@ -6957,6 +7021,19 @@ #endif /* !defined(_WINBASE_) */ +#define RTL_CONTEXT_EX_OFFSET(ContextEx, Chunk) ((ContextEx)->Chunk.Offset) +#define RTL_CONTEXT_EX_LENGTH(ContextEx, Chunk) ((ContextEx)->Chunk.Length) +#define RTL_CONTEXT_EX_CHUNK(Base, Layout, Chunk) \ + ((PVOID)((PCHAR)(Base) + RTL_CONTEXT_EX_OFFSET(Layout, Chunk))) +#define RTL_CONTEXT_OFFSET(Context, Chunk) \ + RTL_CONTEXT_EX_OFFSET((PCONTEXT_EX)(Context + 1), Chunk) +#define RTL_CONTEXT_LENGTH(Context, Chunk) \ + RTL_CONTEXT_EX_LENGTH((PCONTEXT_EX)(Context + 1), Chunk) +#define RTL_CONTEXT_CHUNK(Context, Chunk) \ + RTL_CONTEXT_EX_CHUNK((PCONTEXT_EX)(Context + 1), \ + (PCONTEXT_EX)(Context + 1), \ + Chunk) + /****************************************************************************** * Kernel Functions * ******************************************************************************/ 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 18:16:54 2010 @@ -15,26 +15,25 @@ } MODE; /* Processor features */ -#define PF_FLOATING_POINT_PRECISION_ERRATA 0 -#define PF_FLOATING_POINT_EMULATED 1 -#define PF_COMPARE_EXCHANGE_DOUBLE 2 -#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 -#define PF_PPC_MOVEMEM_64BIT_OK 4 -#define PF_ALPHA_BYTE_INSTRUCTIONS 5 -#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 -#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 -#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 -#define PF_PAE_ENABLED 9 -#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#define PF_SSE_DAZ_MODE_AVAILABLE 11 -#define PF_NX_ENABLED 12 -#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 -#define PF_COMPARE_EXCHANGE128 14 -#define PF_COMPARE64_EXCHANGE128 15 -#define PF_CHANNELS_ENABLED 16 -#define PF_XSAVE_ENABLED 17 - -#define MAXIMUM_SUPPORTED_EXTENSION 512 +#define PF_FLOATING_POINT_PRECISION_ERRATA 0 +#define PF_FLOATING_POINT_EMULATED 1 +#define PF_COMPARE_EXCHANGE_DOUBLE 2 +#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 +#define PF_PPC_MOVEMEM_64BIT_OK 4 +#define PF_ALPHA_BYTE_INSTRUCTIONS 5 +#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 +#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 +#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 +#define PF_PAE_ENABLED 9 +#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_SSE_DAZ_MODE_AVAILABLE 11 +#define PF_NX_ENABLED 12 +#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 +#define PF_COMPARE_EXCHANGE128 14 +#define PF_COMPARE64_EXCHANGE128 15 +#define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 + #define MAXIMUM_WAIT_OBJECTS 64 #define ASSERT_APC(Object) \ @@ -73,6 +72,9 @@ #define GM_LOCK_BIT_V 0x0 #define GM_LOCK_WAITER_WOKEN 0x2 #define GM_LOCK_WAITER_INC 0x4 + +#define LOCK_QUEUE_WAIT_BIT 0 +#define LOCK_QUEUE_OWNER_BIT 1 #define LOCK_QUEUE_WAIT 1 #define LOCK_QUEUE_OWNER 2 @@ -299,7 +301,7 @@ #define THREAD_WAIT_OBJECTS 3 typedef VOID -(DDKAPI *PKINTERRUPT_ROUTINE)( +(NTAPI *PKINTERRUPT_ROUTINE)( VOID); typedef enum _KD_OPTION { @@ -391,13 +393,13 @@ typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; typedef struct _KSPIN_LOCK_QUEUE { - struct _KSPIN_LOCK_QUEUE *volatile Next; - PKSPIN_LOCK volatile Lock; + struct _KSPIN_LOCK_QUEUE *volatile Next; + PKSPIN_LOCK volatile Lock; } KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE; typedef struct _KLOCK_QUEUE_HANDLE { - KSPIN_LOCK_QUEUE LockQueue; - KIRQL OldIrql; + KSPIN_LOCK_QUEUE LockQueue; + KIRQL OldIrql; } KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; #if defined(_AMD64_) @@ -659,11 +661,10 @@ EndAlternatives } ALTERNATIVE_ARCHITECTURE_TYPE; -typedef struct _KSYSTEM_TIME -{ - ULONG LowPart; - LONG High1Time; - LONG High2Time; +typedef struct _KSYSTEM_TIME { + ULONG LowPart; + LONG High1Time; + LONG High2Time; } KSYSTEM_TIME, *PKSYSTEM_TIME; typedef struct _PNP_BUS_INFORMATION { @@ -673,8 +674,8 @@ } PNP_BUS_INFORMATION, *PPNP_BUS_INFORMATION; typedef struct DECLSPEC_ALIGN(16) _M128A { - ULONGLONG Low; - LONGLONG High; + ULONGLONG Low; + LONGLONG High; } M128A, *PM128A; typedef struct DECLSPEC_ALIGN(16) _XSAVE_FORMAT { @@ -703,4 +704,67 @@ #endif } XSAVE_FORMAT, *PXSAVE_FORMAT; - +typedef struct DECLSPEC_ALIGN(8) _XSAVE_AREA_HEADER { + ULONG64 Mask; + ULONG64 Reserved[7]; +} XSAVE_AREA_HEADER, *PXSAVE_AREA_HEADER; + +typedef struct DECLSPEC_ALIGN(16) _XSAVE_AREA { + XSAVE_FORMAT LegacyState; + XSAVE_AREA_HEADER Header; +} XSAVE_AREA, *PXSAVE_AREA; + +typedef struct _XSTATE_CONTEXT { + ULONG64 Mask; + ULONG Length; + ULONG Reserved1; + PXSAVE_AREA Area; +#if defined(_X86_) + ULONG Reserved2; +#endif + PVOID Buffer; +#if defined(_X86_) + ULONG Reserved3; +#endif +} XSTATE_CONTEXT, *PXSTATE_CONTEXT; + +#ifdef _X86_ + +#define MAXIMUM_SUPPORTED_EXTENSION 512 + +#if !defined(__midl) && !defined(MIDL_PASS) +C_ASSERT(sizeof(XSAVE_FORMAT) == MAXIMUM_SUPPORTED_EXTENSION); +#endif + +#endif /* _X86_ */ + +#define XSAVE_ALIGN 64 +#define MINIMAL_XSTATE_AREA_LENGTH sizeof(XSAVE_AREA) + +#if !defined(__midl) && !defined(MIDL_PASS) +C_ASSERT((sizeof(XSAVE_FORMAT) & (XSAVE_ALIGN - 1)) == 0); +C_ASSERT((FIELD_OFFSET(XSAVE_AREA, Header) & (XSAVE_ALIGN - 1)) == 0); +C_ASSERT(MINIMAL_XSTATE_AREA_LENGTH == 512 + 64); +#endif + +typedef struct _CONTEXT_CHUNK { + LONG Offset; + ULONG Length; +} CONTEXT_CHUNK, *PCONTEXT_CHUNK; + +typedef struct _CONTEXT_EX { + CONTEXT_CHUNK All; + CONTEXT_CHUNK Legacy; + CONTEXT_CHUNK XState; +} CONTEXT_EX, *PCONTEXT_EX; + +#define CONTEXT_EX_LENGTH ALIGN_UP_BY(sizeof(CONTEXT_EX), STACK_ALIGN) + +#if (NTDDI_VERSION >= NTDDI_VISTA) +extern NTSYSAPI volatile CCHAR KeNumberProcessors; +#elif (NTDDI_VERSION >= NTDDI_WINXP) +extern NTSYSAPI CCHAR KeNumberProcessors; +#else +extern PCCHAR KeNumberProcessors; +#endif + Modified: branches/header-work/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtlfunc… ============================================================================== --- branches/header-work/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/rtlfuncs.h [iso-8859-1] Thu Mar 18 18:16:54 2010 @@ -1284,3 +1284,16 @@ #endif /* !defined(_WINBASE_) */ +#define RTL_CONTEXT_EX_OFFSET(ContextEx, Chunk) ((ContextEx)->Chunk.Offset) +#define RTL_CONTEXT_EX_LENGTH(ContextEx, Chunk) ((ContextEx)->Chunk.Length) +#define RTL_CONTEXT_EX_CHUNK(Base, Layout, Chunk) \ + ((PVOID)((PCHAR)(Base) + RTL_CONTEXT_EX_OFFSET(Layout, Chunk))) +#define RTL_CONTEXT_OFFSET(Context, Chunk) \ + RTL_CONTEXT_EX_OFFSET((PCONTEXT_EX)(Context + 1), Chunk) +#define RTL_CONTEXT_LENGTH(Context, Chunk) \ + RTL_CONTEXT_EX_LENGTH((PCONTEXT_EX)(Context + 1), Chunk) +#define RTL_CONTEXT_CHUNK(Context, Chunk) \ + RTL_CONTEXT_EX_CHUNK((PCONTEXT_EX)(Context + 1), \ + (PCONTEXT_EX)(Context + 1), \ + Chunk) +

1 0

[tkreuzer] 46264: [NTOS] Fix compilation with MSVC. Dedicated to Stefan.
by tkreuzer＠svn.reactos.org 18 Mar '10

18 Mar '10

Author: tkreuzer Date: Thu Mar 18 17:30:54 2010 New Revision: 46264 URL: http://svn.reactos.org/svn/reactos?rev=46264&view=rev Log: [NTOS] Fix compilation with MSVC. Dedicated to Stefan. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Thu Mar 18 17:30:54 2010 @@ -397,9 +397,9 @@ IN PKTRAP_FRAME TrapFrame ); +DECLSPEC_NORETURN VOID FASTCALL -DECLSPEC_NORETURN KiEoiHelper( IN PKTRAP_FRAME TrapFrame ); @@ -416,9 +416,9 @@ IN PKTRAP_FRAME TrapFrame ); -VOID -NTAPI DECLSPEC_NORETURN +VOID +NTAPI KiDispatchExceptionFromTrapFrame( IN NTSTATUS Code, IN ULONG_PTR Address, @@ -620,6 +620,7 @@ * later to function like this as well. * */ +#ifdef __GNUC__ __asm__ __volatile__ ( "subl %1, %%esp\n" @@ -635,7 +636,23 @@ "r"(Handler) : "%esp", "%esi", "%edi" ); - +#elif defined(_MSC_VER) + __asm + { + mov ecx, StackBytes + mov edx, Arguments + sub esp, ecx + mov edi, esp + mov esi, edx + shr ecx, 2 + rep movsd + call Handler + mov Result, eax + } +#else +#error Unknown Compiler +#endif + return Result; } @@ -702,6 +719,7 @@ * on its merry way. * */ +#ifdef __GNUC__ __asm__ __volatile__ ( "movl %%ebp, %1\n" @@ -714,7 +732,20 @@ : : "%esp", "%ecx", "%edx", "memory" ); - +#elif defined(_MSC_VER) + NTSTATUS NTAPI PsConvertToGuiThread(VOID); + __asm + { + mov StackFrame, ebp + sub StackFrame, esp + call PsConvertToGuiThread + add StackFrame, esp + mov ebp, StackFrame + mov Result, eax + } +#else +#error Unknown Compiler +#endif return Result; } @@ -726,7 +757,8 @@ KiSwitchToBootStack(IN ULONG_PTR InitialStack) { /* We have to switch to a new stack before continuing kernel initialization */ - __asm__ __volatile__ +#ifdef __GNUC__ + __asm__ ( "movl %0, %%esp\n" "subl %1, %%esp\n" @@ -738,6 +770,19 @@ "i"(CR0_EM | CR0_TS | CR0_MP) : "%esp" ); +#elif defined(_MSC_VER) + VOID NTAPI KiSystemStartupBootStack(VOID); + __asm + { + mov ecx, InitialStack + mov esp, ecx + sub esp, (NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH) + push (CR0_EM | CR0_TS | CR0_MP) + jmp KiSystemStartupBootStack + } +#else +#error Unknown Compiler +#endif } // Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Thu Mar 18 17:30:54 2010 @@ -1092,9 +1092,9 @@ VOID ); -VOID -FASTCALL DECLSPEC_NORETURN +VOID +FASTCALL KiSystemFatalException( IN ULONG ExceptionCode, IN PKTRAP_FRAME TrapFrame Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Thu Mar 18 17:30:54 2010 @@ -192,17 +192,17 @@ // // Generic Exit Routine // -VOID FASTCALL DECLSPEC_NORETURN KiSystemCallReturn(IN PKTRAP_FRAME TrapFrame); -VOID FASTCALL DECLSPEC_NORETURN KiSystemCallSysExitReturn(IN PKTRAP_FRAME TrapFrame); -VOID FASTCALL DECLSPEC_NORETURN KiSystemCallTrapReturn(IN PKTRAP_FRAME TrapFrame); -VOID FASTCALL DECLSPEC_NORETURN KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame); -VOID FASTCALL DECLSPEC_NORETURN KiTrapReturn(IN PKTRAP_FRAME TrapFrame); -VOID FASTCALL DECLSPEC_NORETURN KiTrapReturnNoSegments(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL KiSystemCallReturn(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL KiSystemCallSysExitReturn(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL KiSystemCallTrapReturn(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL KiTrapReturn(IN PKTRAP_FRAME TrapFrame); +DECLSPEC_NORETURN VOID FASTCALL KiTrapReturnNoSegments(IN PKTRAP_FRAME TrapFrame); typedef VOID (FASTCALL -*PFAST_SYSTEM_CALL_EXIT)(IN PKTRAP_FRAME TrapFrame) DECLSPEC_NORETURN; +*PFAST_SYSTEM_CALL_EXIT)(IN PKTRAP_FRAME TrapFrame); extern PFAST_SYSTEM_CALL_EXIT KiFastCallExitHandler;

1 0

[akhaldi] 46263: Sync with trunk head (part 2 of 2)
by akhaldi＠svn.reactos.org 18 Mar '10

18 Mar '10

Author: akhaldi Date: Thu Mar 18 16:38:48 2010 New Revision: 46263 URL: http://svn.reactos.org/svn/reactos?rev=46263&view=rev Log: Sync with trunk head (part 2 of 2) Modified: branches/header-work/ (props changed) Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 18 16:38:48 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos:45691-46152 +/trunk/reactos:45691-46261

1 0

[akhaldi] 46262: Sync with trunk head (part 1 of 2)
by akhaldi＠svn.reactos.org 18 Mar '10

18 Mar '10

Author: akhaldi Date: Thu Mar 18 16:37:13 2010 New Revision: 46262 URL: http://svn.reactos.org/svn/reactos?rev=46262&view=rev Log: Sync with trunk head (part 1 of 2) Added: branches/header-work/dll/directx/ksproxy/node.cpp - copied unchanged from r46261, trunk/reactos/dll/directx/ksproxy/node.cpp branches/header-work/dll/win32/dbghelp/cpu_i386.c - copied unchanged from r46261, trunk/reactos/dll/win32/dbghelp/cpu_i386.c branches/header-work/dll/win32/dbghelp/cpu_ppc.c - copied unchanged from r46261, trunk/reactos/dll/win32/dbghelp/cpu_ppc.c branches/header-work/dll/win32/dbghelp/cpu_x86_64.c - copied unchanged from r46261, trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c branches/header-work/dll/win32/dbghelp/crc32.c - copied unchanged from r46261, trunk/reactos/dll/win32/dbghelp/crc32.c branches/header-work/dll/win32/dbghelp/macho_module.c - copied unchanged from r46261, trunk/reactos/dll/win32/dbghelp/macho_module.c branches/header-work/dll/win32/dbghelp/version.rc - copied unchanged from r46261, trunk/reactos/dll/win32/dbghelp/version.rc branches/header-work/dll/win32/faultrep/ (props changed) - copied from r46261, trunk/reactos/dll/win32/faultrep/ branches/header-work/dll/win32/wininet/wininet_Lt.rc - copied unchanged from r46261, trunk/reactos/dll/win32/wininet/wininet_Lt.rc branches/header-work/drivers/bus/acpi/cmbatt/ - copied from r46261, trunk/reactos/drivers/bus/acpi/cmbatt/ branches/header-work/tools/log2lines/match.c - copied unchanged from r46261, trunk/reactos/tools/log2lines/match.c branches/header-work/tools/log2lines/match.h - copied unchanged from r46261, trunk/reactos/tools/log2lines/match.h Removed: branches/header-work/drivers/bus/acpi/acpica/osl/ Modified: branches/header-work/base/applications/dxdiag/dxdiag.c branches/header-work/base/applications/dxdiag/system.c branches/header-work/base/applications/rapps/rapps/firefox3.txt branches/header-work/base/applications/rapps/rapps/openoffice2.4.txt branches/header-work/base/applications/rapps/rapps/openoffice3.0.txt branches/header-work/base/applications/rapps/rapps/scite.txt branches/header-work/base/services/eventlog/eventlog.c branches/header-work/base/services/eventlog/eventlog.h branches/header-work/base/services/eventlog/rpc.c branches/header-work/baseaddress.rbuild branches/header-work/boot/bootdata/packages/reactos.dff branches/header-work/boot/freeldr/freeldr/windows/winldr.c branches/header-work/dll/directx/bdaplgin/classfactory.cpp (props changed) branches/header-work/dll/directx/d3d8/d3d8.spec (props changed) branches/header-work/dll/directx/dsound_new/classfactory.c (props changed) branches/header-work/dll/directx/dsound_new/dsound.spec (props changed) branches/header-work/dll/directx/dsound_new/dsound_convert.c (props changed) branches/header-work/dll/directx/dsound_new/regsvr.c (props changed) branches/header-work/dll/directx/ksproxy/datatype.cpp branches/header-work/dll/directx/ksproxy/input_pin.cpp branches/header-work/dll/directx/ksproxy/interface.cpp branches/header-work/dll/directx/ksproxy/ksproxy.cpp branches/header-work/dll/directx/ksproxy/ksproxy.rbuild branches/header-work/dll/directx/ksproxy/output_pin.cpp branches/header-work/dll/directx/ksproxy/precomp.h branches/header-work/dll/directx/ksproxy/proxy.cpp branches/header-work/dll/directx/ksuser/ksuser.c branches/header-work/dll/shellext/devcpux/devcpux.spec (props changed) branches/header-work/dll/shellext/slayer/slayer.spec (props changed) branches/header-work/dll/win32/advapi32/reg/reg.c branches/header-work/dll/win32/advapi32/sec/sid.c branches/header-work/dll/win32/advapi32/service/eventlog.c branches/header-work/dll/win32/advapi32/service/scm.c branches/header-work/dll/win32/advapi32/service/sctrl.c branches/header-work/dll/win32/dbghelp/coff.c branches/header-work/dll/win32/dbghelp/dbghelp.c branches/header-work/dll/win32/dbghelp/dbghelp.rbuild branches/header-work/dll/win32/dbghelp/dbghelp_private.h branches/header-work/dll/win32/dbghelp/dwarf.c branches/header-work/dll/win32/dbghelp/dwarf.h branches/header-work/dll/win32/dbghelp/elf_module.c branches/header-work/dll/win32/dbghelp/minidump.c branches/header-work/dll/win32/dbghelp/module.c branches/header-work/dll/win32/dbghelp/msc.c branches/header-work/dll/win32/dbghelp/path.c branches/header-work/dll/win32/dbghelp/pe_module.c branches/header-work/dll/win32/dbghelp/rosstubs.c branches/header-work/dll/win32/dbghelp/source.c branches/header-work/dll/win32/dbghelp/stabs.c branches/header-work/dll/win32/dbghelp/stack.c branches/header-work/dll/win32/dbghelp/storage.c branches/header-work/dll/win32/dbghelp/symbol.c branches/header-work/dll/win32/dbghelp/type.c branches/header-work/dll/win32/kernel32/file/dir.c branches/header-work/dll/win32/kernel32/misc/profile.c branches/header-work/dll/win32/kernel32/misc/stubs.c branches/header-work/dll/win32/shell32/shell32_main.c branches/header-work/dll/win32/shell32/shellord.c branches/header-work/dll/win32/shell32/shlfileop.c branches/header-work/dll/win32/user32/windows/menu.c branches/header-work/dll/win32/win32.rbuild branches/header-work/dll/win32/wininet/cookie.c branches/header-work/dll/win32/wininet/dialogs.c branches/header-work/dll/win32/wininet/ftp.c branches/header-work/dll/win32/wininet/http.c branches/header-work/dll/win32/wininet/internet.c branches/header-work/dll/win32/wininet/internet.h branches/header-work/dll/win32/wininet/netconnection.c branches/header-work/dll/win32/wininet/resource.h branches/header-work/dll/win32/wininet/rsrc.rc branches/header-work/dll/win32/wininet/urlcache.c branches/header-work/dll/win32/wininet/utility.c branches/header-work/dll/win32/wininet/wininet.rbuild branches/header-work/dll/win32/wininet/wininet.spec branches/header-work/dll/win32/wininet/wininet_Bg.rc branches/header-work/dll/win32/wininet/wininet_Cs.rc branches/header-work/dll/win32/wininet/wininet_Da.rc branches/header-work/dll/win32/wininet/wininet_De.rc branches/header-work/dll/win32/wininet/wininet_En.rc branches/header-work/dll/win32/wininet/wininet_Eo.rc branches/header-work/dll/win32/wininet/wininet_Es.rc branches/header-work/dll/win32/wininet/wininet_Fi.rc branches/header-work/dll/win32/wininet/wininet_Fr.rc branches/header-work/dll/win32/wininet/wininet_Hu.rc branches/header-work/dll/win32/wininet/wininet_It.rc branches/header-work/dll/win32/wininet/wininet_Ja.rc branches/header-work/dll/win32/wininet/wininet_Ko.rc branches/header-work/dll/win32/wininet/wininet_Nl.rc branches/header-work/dll/win32/wininet/wininet_No.rc branches/header-work/dll/win32/wininet/wininet_Pl.rc branches/header-work/dll/win32/wininet/wininet_Pt.rc branches/header-work/dll/win32/wininet/wininet_Ro.rc branches/header-work/dll/win32/wininet/wininet_Ru.rc branches/header-work/dll/win32/wininet/wininet_Si.rc branches/header-work/dll/win32/wininet/wininet_Sv.rc branches/header-work/dll/win32/wininet/wininet_Tr.rc branches/header-work/dll/win32/wininet/wininet_Uk.rc branches/header-work/dll/win32/wininet/wininet_Zh.rc branches/header-work/drivers/bus/acpi/acpi.rbuild branches/header-work/drivers/bus/acpi/acpica/acpica.rbuild branches/header-work/drivers/bus/acpi/acpica/events/evgpe.c branches/header-work/drivers/bus/acpi/acpienum.c branches/header-work/drivers/bus/acpi/busmgr/bus.c branches/header-work/drivers/bus/acpi/busmgr/power.c branches/header-work/drivers/bus/acpi/busmgr/system.c branches/header-work/drivers/bus/acpi/busmgr/utils.c branches/header-work/drivers/bus/acpi/buspdo.c branches/header-work/drivers/bus/acpi/main.c branches/header-work/drivers/bus/acpi/osl.c branches/header-work/drivers/bus/acpi/pnp.c branches/header-work/drivers/bus/acpi/power.c branches/header-work/drivers/storage/port/buslogic/BusLogic958.c branches/header-work/drivers/storage/port/buslogic/buslogic.rbuild branches/header-work/drivers/video/font/ftfd/freetype.def branches/header-work/include/ddk/wdm.h branches/header-work/include/dxsdk/axextend.idl branches/header-work/include/ndk/amd64/ (props changed) branches/header-work/include/ndk/amd64/asmmacro.S (props changed) branches/header-work/include/psdk/ks.h branches/header-work/include/psdk/winternl.h branches/header-work/include/reactos/wine/mscvpdb.h branches/header-work/include/xdk/iotypes.h branches/header-work/lib/3rdparty/freetype/src/base/ftbitmap.c branches/header-work/lib/sdk/crt/time/ (props changed) branches/header-work/ntoskrnl/include/internal/i386/asmmacro.S branches/header-work/ntoskrnl/include/internal/trap_x.h branches/header-work/ntoskrnl/io/iomgr/driver.c branches/header-work/ntoskrnl/io/iomgr/drvrlist.c branches/header-work/ntoskrnl/io/pnpmgr/pnpmgr.c branches/header-work/ntoskrnl/kdbg/ (props changed) branches/header-work/ntoskrnl/ke/i386/cpu.c branches/header-work/ntoskrnl/ke/i386/trap.s branches/header-work/ntoskrnl/ke/i386/traphdlr.c branches/header-work/subsystems/win32/csrss/csrsrv/init.c branches/header-work/subsystems/win32/win32k/eng/surface.c branches/header-work/subsystems/win32/win32k/include/engobjects.h (props changed) branches/header-work/subsystems/win32/win32k/objects/freetype.c branches/header-work/tools/log2lines/cache.c branches/header-work/tools/log2lines/cache.h branches/header-work/tools/log2lines/cmd.c branches/header-work/tools/log2lines/config.h branches/header-work/tools/log2lines/help.c branches/header-work/tools/log2lines/image.c branches/header-work/tools/log2lines/list.c branches/header-work/tools/log2lines/list.h branches/header-work/tools/log2lines/log2lines.c branches/header-work/tools/log2lines/log2lines.mak branches/header-work/tools/log2lines/options.c branches/header-work/tools/log2lines/options.h branches/header-work/tools/log2lines/revision.c branches/header-work/tools/log2lines/stat.c branches/header-work/tools/log2lines/util.c branches/header-work/tools/log2lines/util.h branches/header-work/tools/log2lines/version.h branches/header-work/tools/rsym/rsym.c (props changed) branches/header-work/tools/rsym/rsym.h (props changed) branches/header-work/tools/rsym/rsym.mak (props changed) branches/header-work/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/d… Modified: branches/header-work/base/applications/dxdiag/system.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/d… Modified: branches/header-work/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/applications/r… Modified: branches/header-work/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/services/event… Modified: branches/header-work/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/services/event… Modified: branches/header-work/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/services/event… Modified: branches/header-work/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/baseaddress.rbuild?… Modified: branches/header-work/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/bootdata/packa… Modified: branches/header-work/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… Modified: branches/header-work/dll/directx/ksproxy/datatype.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/input_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/ksproxy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksproxy/proxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksproxy… Modified: branches/header-work/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/directx/ksuser/… Modified: branches/header-work/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/advapi32/… Modified: branches/header-work/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/advapi32/… Modified: branches/header-work/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/advapi32/… Modified: branches/header-work/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/advapi32/… Modified: branches/header-work/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/advapi32/… Modified: branches/header-work/dll/win32/dbghelp/coff.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/c… Modified: branches/header-work/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/d… Modified: branches/header-work/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/d… Modified: branches/header-work/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/d… Modified: branches/header-work/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/d… Modified: branches/header-work/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/d… Modified: branches/header-work/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/e… Modified: branches/header-work/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/m… Modified: branches/header-work/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/m… Modified: branches/header-work/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/m… Modified: branches/header-work/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/p… Modified: branches/header-work/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/p… Modified: branches/header-work/dll/win32/dbghelp/rosstubs.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/r… Modified: branches/header-work/dll/win32/dbghelp/source.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/s… Modified: branches/header-work/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/s… Modified: branches/header-work/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/s… Modified: branches/header-work/dll/win32/dbghelp/storage.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/s… Modified: branches/header-work/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/s… Modified: branches/header-work/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/dbghelp/t… Modified: branches/header-work/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shell32/s… Modified: branches/header-work/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shell32/s… Modified: branches/header-work/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/shell32/s… Modified: branches/header-work/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/user32/wi… Modified: branches/header-work/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/win32.rbu… Modified: branches/header-work/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/c… Modified: branches/header-work/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/d… Modified: branches/header-work/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/f… Modified: branches/header-work/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/h… Modified: branches/header-work/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/i… Modified: branches/header-work/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/i… Modified: branches/header-work/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/n… Modified: branches/header-work/dll/win32/wininet/resource.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/r… Modified: branches/header-work/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/r… Modified: branches/header-work/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/u… Modified: branches/header-work/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/u… Modified: branches/header-work/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Eo.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/wininet/w… Modified: branches/header-work/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/ac… Modified: branches/header-work/drivers/bus/acpi/acpica/acpica.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/ac… Modified: branches/header-work/drivers/bus/acpi/acpica/events/evgpe.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/ac… Modified: branches/header-work/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/ac… Modified: branches/header-work/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/ma… Modified: branches/header-work/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/os… Modified: branches/header-work/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/pn… Modified: branches/header-work/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/po… Modified: branches/header-work/drivers/storage/port/buslogic/BusLogic958.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/por… Modified: branches/header-work/drivers/storage/port/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/por… Modified: branches/header-work/drivers/video/font/ftfd/freetype.def URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/video/font/… Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… Modified: branches/header-work/include/dxsdk/axextend.idl URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/dxsdk/axext… Modified: branches/header-work/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ks.h?r… Modified: branches/header-work/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winter… Modified: branches/header-work/include/reactos/wine/mscvpdb.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/win… Modified: branches/header-work/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes… Modified: branches/header-work/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/freety… Modified: branches/header-work/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… Modified: branches/header-work/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… Modified: branches/header-work/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/io/iomgr/d… Modified: branches/header-work/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/io/iomgr/d… Modified: branches/header-work/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/io/pnpmgr/… Modified: branches/header-work/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/ke/i386/cp… Modified: branches/header-work/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/ke/i386/tr… Modified: branches/header-work/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/ke/i386/tr… Modified: branches/header-work/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… Modified: branches/header-work/tools/log2lines/cache.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/cac… Modified: branches/header-work/tools/log2lines/cache.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/cac… Modified: branches/header-work/tools/log2lines/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/cmd… Modified: branches/header-work/tools/log2lines/config.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/con… Modified: branches/header-work/tools/log2lines/help.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/hel… Modified: branches/header-work/tools/log2lines/image.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/ima… Modified: branches/header-work/tools/log2lines/list.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/lis… Modified: branches/header-work/tools/log2lines/list.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/lis… Modified: branches/header-work/tools/log2lines/log2lines.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/log… Modified: branches/header-work/tools/log2lines/log2lines.mak URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/log… Modified: branches/header-work/tools/log2lines/options.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/opt… Modified: branches/header-work/tools/log2lines/options.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/opt… Modified: branches/header-work/tools/log2lines/revision.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/rev… Modified: branches/header-work/tools/log2lines/stat.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/sta… Modified: branches/header-work/tools/log2lines/util.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/uti… Modified: branches/header-work/tools/log2lines/util.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/uti… Modified: branches/header-work/tools/log2lines/version.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/log2lines/ver…

1 0

[akhaldi] 46261: [PSDK] - Add several missing ntiologc.h definitions. [XDK] - Include ntiologc.h in wdm.h [WDM] - Update wdm.h to reflect XDK changes.
by akhaldi＠svn.reactos.org 18 Mar '10

18 Mar '10

Author: akhaldi Date: Thu Mar 18 15:14:27 2010 New Revision: 46261 URL: http://svn.reactos.org/svn/reactos?rev=46261&view=rev Log: [PSDK] - Add several missing ntiologc.h definitions. [XDK] - Include ntiologc.h in wdm.h [WDM] - Update wdm.h to reflect XDK changes. Added: branches/header-work/include/psdk/ntiologc.h (with props) Modified: branches/header-work/include/ddk/wdm.h branches/header-work/include/xdk/wdm.template.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 15:14:27 2010 @@ -38,6 +38,7 @@ #include <excpt.h> #include <ntdef.h> #include <ntstatus.h> +#include <ntiologc.h> #ifndef GUID_DEFINED #include <guiddef.h> Added: branches/header-work/include/psdk/ntiologc.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntiolo… ============================================================================== --- branches/header-work/include/psdk/ntiologc.h (added) +++ branches/header-work/include/psdk/ntiologc.h [iso-8859-1] Thu Mar 18 15:14:27 2010 @@ -1,0 +1,152 @@ +#pragma once + +#define FACILITY_RPC_RUNTIME 0x2 +#define FACILITY_RPC_STUBS 0x3 +#define FACILITY_IO_ERROR_CODE 0x4 +#define FACILITY_MCA_ERROR_CODE 0x5 + +#define IO_ERR_RETRY_SUCCEEDED ((NTSTATUS)0x00040001L) +#define IO_ERR_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC0040002L) +#define IO_ERR_CONFIGURATION_ERROR ((NTSTATUS)0xC0040003L) +#define IO_ERR_DRIVER_ERROR ((NTSTATUS)0xC0040004L) +#define IO_ERR_PARITY ((NTSTATUS)0xC0040005L) +#define IO_ERR_SEEK_ERROR ((NTSTATUS)0xC0040006L) +#define IO_ERR_BAD_BLOCK ((NTSTATUS)0xC0040007L) +#define IO_ERR_OVERRUN_ERROR ((NTSTATUS)0xC0040008L) +#define IO_ERR_TIMEOUT ((NTSTATUS)0xC0040009L) +#define IO_ERR_SEQUENCE ((NTSTATUS)0xC004000AL) +#define IO_ERR_CONTROLLER_ERROR ((NTSTATUS)0xC004000BL) +#define IO_ERR_INTERNAL_ERROR ((NTSTATUS)0xC004000CL) +#define IO_ERR_INCORRECT_IRQL ((NTSTATUS)0xC004000DL) +#define IO_ERR_INVALID_IOBASE ((NTSTATUS)0xC004000EL) +#define IO_ERR_NOT_READY ((NTSTATUS)0xC004000FL) +#define IO_ERR_INVALID_REQUEST ((NTSTATUS)0xC0040010L) +#define IO_ERR_VERSION ((NTSTATUS)0xC0040011L) +#define IO_ERR_LAYERED_FAILURE ((NTSTATUS)0xC0040012L) +#define IO_ERR_RESET ((NTSTATUS)0xC0040013L) +#define IO_ERR_PROTOCOL ((NTSTATUS)0xC0040014L) +#define IO_ERR_MEMORY_CONFLICT_DETECTED ((NTSTATUS)0xC0040015L) +#define IO_ERR_PORT_CONFLICT_DETECTED ((NTSTATUS)0xC0040016L) +#define IO_ERR_DMA_CONFLICT_DETECTED ((NTSTATUS)0xC0040017L) +#define IO_ERR_IRQ_CONFLICT_DETECTED ((NTSTATUS)0xC0040018L) +#define IO_ERR_BAD_FIRMWARE ((NTSTATUS)0xC0040019L) +#define IO_WRN_BAD_FIRMWARE ((NTSTATUS)0x8004001AL) +#define IO_ERR_DMA_RESOURCE_CONFLICT ((NTSTATUS)0xC004001BL) +#define IO_ERR_INTERRUPT_RESOURCE_CONFLICT ((NTSTATUS)0xC004001CL) +#define IO_ERR_MEMORY_RESOURCE_CONFLICT ((NTSTATUS)0xC004001DL) +#define IO_ERR_PORT_RESOURCE_CONFLICT ((NTSTATUS)0xC004001EL) +#define IO_BAD_BLOCK_WITH_NAME ((NTSTATUS)0xC004001FL) +#define IO_WRITE_CACHE_ENABLED ((NTSTATUS)0x80040020L) +#define IO_RECOVERED_VIA_ECC ((NTSTATUS)0x80040021L) +#define IO_WRITE_CACHE_DISABLED ((NTSTATUS)0x80040022L) +#define IO_FILE_QUOTA_THRESHOLD ((NTSTATUS)0x40040024L) +#define IO_FILE_QUOTA_LIMIT ((NTSTATUS)0x40040025L) +#define IO_FILE_QUOTA_STARTED ((NTSTATUS)0x40040026L) +#define IO_FILE_QUOTA_SUCCEEDED ((NTSTATUS)0x40040027L) +#define IO_FILE_QUOTA_FAILED ((NTSTATUS)0x80040028L) +#define IO_FILE_SYSTEM_CORRUPT ((NTSTATUS)0xC0040029L) +#define IO_FILE_QUOTA_CORRUPT ((NTSTATUS)0xC004002AL) +#define IO_SYSTEM_SLEEP_FAILED ((NTSTATUS)0xC004002BL) +#define IO_DUMP_POINTER_FAILURE ((NTSTATUS)0xC004002CL) +#define IO_DUMP_DRIVER_LOAD_FAILURE ((NTSTATUS)0xC004002DL) +#define IO_DUMP_INITIALIZATION_FAILURE ((NTSTATUS)0xC004002EL) +#define IO_DUMP_DUMPFILE_CONFLICT ((NTSTATUS)0xC004002FL) +#define IO_DUMP_DIRECT_CONFIG_FAILED ((NTSTATUS)0xC0040030L) +#define IO_DUMP_PAGE_CONFIG_FAILED ((NTSTATUS)0xC0040031L) +#define IO_LOST_DELAYED_WRITE ((NTSTATUS)0x80040032L) +#define IO_WARNING_PAGING_FAILURE ((NTSTATUS)0x80040033L) +#define IO_WRN_FAILURE_PREDICTED ((NTSTATUS)0x80040034L) +#define IO_WARNING_INTERRUPT_STILL_PENDING ((NTSTATUS)0x80040035L) +#define IO_DRIVER_CANCEL_TIMEOUT ((NTSTATUS)0x80040036L) +#define IO_FILE_SYSTEM_CORRUPT_WITH_NAME ((NTSTATUS)0xC0040037L) +#define IO_WARNING_ALLOCATION_FAILED ((NTSTATUS)0x80040038L) +#define IO_WARNING_LOG_FLUSH_FAILED ((NTSTATUS)0x80040039L) +#define IO_WARNING_DUPLICATE_SIGNATURE ((NTSTATUS)0x8004003AL) +#define IO_WARNING_DUPLICATE_PATH ((NTSTATUS)0x8004003BL) +#define IO_ERR_THREAD_STUCK_IN_DEVICE_DRIVER ((NTSTATUS)0xC004006CL) +#define IO_ERR_PORT_TIMEOUT ((NTSTATUS)0xC0040075L) +#define IO_WARNING_BUS_RESET ((NTSTATUS)0x80040076L) +#define IO_INFO_THROTTLE_COMPLETE ((NTSTATUS)0x40040077L) +#define IO_WARNING_RESET ((NTSTATUS)0x80040081L) +#define IO_FILE_SYSTEM_REPAIR_SUCCESS ((NTSTATUS)0x80040082L) +#define IO_FILE_SYSTEM_REPAIR_FAILED ((NTSTATUS)0xC0040083L) +#define IO_WARNING_WRITE_FUA_PROBLEM ((NTSTATUS)0x80040084L) +#define IO_CDROM_EXCLUSIVE_LOCK ((NTSTATUS)0x40040085L) +#define IO_FILE_SYSTEM_TXF_RECOVERY_FAILURE ((NTSTATUS)0x80040086L) +#define IO_FILE_SYSTEM_TXF_LOG_FULL_HANDLING_FAILED ((NTSTATUS)0xC0040087L) +#define IO_FILE_SYSTEM_TXF_RESOURCE_MANAGER_RESET ((NTSTATUS)0x80040088L) +#define IO_FILE_SYSTEM_TXF_RESOURCE_MANAGER_START_FAILED ((NTSTATUS)0xC0040089L) +#define IO_FILE_SYSTEM_TXF_RESOURCE_MANAGER_SHUT_DOWN ((NTSTATUS)0xC004008AL) +#define IO_LOST_DELAYED_WRITE_NETWORK_DISCONNECTED ((NTSTATUS)0x8004008BL) +#define IO_LOST_DELAYED_WRITE_NETWORK_SERVER_ERROR ((NTSTATUS)0x8004008CL) +#define IO_LOST_DELAYED_WRITE_NETWORK_LOCAL_DISK_ERROR ((NTSTATUS)0x8004008DL) + +#define MCA_WARNING_CACHE ((NTSTATUS)0x8005003CL) +#define MCA_ERROR_CACHE ((NTSTATUS)0xC005003DL) +#define MCA_WARNING_TLB ((NTSTATUS)0x8005003EL) +#define MCA_ERROR_TLB ((NTSTATUS)0xC005003FL) +#define MCA_WARNING_CPU_BUS ((NTSTATUS)0x80050040L) +#define MCA_ERROR_CPU_BUS ((NTSTATUS)0xC0050041L) +#define MCA_WARNING_REGISTER_FILE ((NTSTATUS)0x80050042L) +#define MCA_ERROR_REGISTER_FILE ((NTSTATUS)0xC0050043L) +#define MCA_WARNING_MAS ((NTSTATUS)0x80050044L) +#define MCA_ERROR_MAS ((NTSTATUS)0xC0050045L) +#define MCA_WARNING_MEM_UNKNOWN ((NTSTATUS)0x80050046L) +#define MCA_ERROR_MEM_UNKNOWN ((NTSTATUS)0xC0050047L) +#define MCA_WARNING_MEM_1_2 ((NTSTATUS)0x80050048L) +#define MCA_ERROR_MEM_1_2 ((NTSTATUS)0xC0050049L) +#define MCA_WARNING_MEM_1_2_5 ((NTSTATUS)0x8005004AL) +#define MCA_ERROR_MEM_1_2_5 ((NTSTATUS)0xC005004BL) +#define MCA_WARNING_MEM_1_2_5_4 ((NTSTATUS)0x8005004CL) +#define MCA_ERROR_MEM_1_2_5_4 ((NTSTATUS)0xC005004DL) +#define MCA_WARNING_SYSTEM_EVENT ((NTSTATUS)0x8005004EL) +#define MCA_ERROR_SYSTEM_EVENT ((NTSTATUS)0xC005004FL) +#define MCA_WARNING_PCI_BUS_PARITY ((NTSTATUS)0x80050050L) +#define MCA_ERROR_PCI_BUS_PARITY ((NTSTATUS)0xC0050051L) +#define MCA_WARNING_PCI_BUS_PARITY_NO_INFO ((NTSTATUS)0x80050052L) +#define MCA_ERROR_PCI_BUS_PARITY_NO_INFO ((NTSTATUS)0xC0050053L) +#define MCA_WARNING_PCI_BUS_SERR ((NTSTATUS)0x80050054L) +#define MCA_ERROR_PCI_BUS_SERR ((NTSTATUS)0xC0050055L) +#define MCA_WARNING_PCI_BUS_SERR_NO_INFO ((NTSTATUS)0x80050056L) +#define MCA_ERROR_PCI_BUS_SERR_NO_INFO ((NTSTATUS)0xC0050057L) +#define MCA_WARNING_PCI_BUS_MASTER_ABORT ((NTSTATUS)0x80050058L) +#define MCA_ERROR_PCI_BUS_MASTER_ABORT ((NTSTATUS)0xC0050059L) +#define MCA_WARNING_PCI_BUS_MASTER_ABORT_NO_INFO ((NTSTATUS)0x8005005AL) +#define MCA_ERROR_PCI_BUS_MASTER_ABORT_NO_INFO ((NTSTATUS)0xC005005BL) +#define MCA_WARNING_PCI_BUS_TIMEOUT ((NTSTATUS)0x8005005CL) +#define MCA_ERROR_PCI_BUS_TIMEOUT ((NTSTATUS)0xC005005DL) +#define MCA_WARNING_PCI_BUS_TIMEOUT_NO_INFO ((NTSTATUS)0x8005005EL) +#define MCA_ERROR_PCI_BUS_TIMEOUT_NO_INFO ((NTSTATUS)0xC005005FL) +#define MCA_WARNING_PCI_BUS_UNKNOWN ((NTSTATUS)0x80050060L) +#define MCA_ERROR_PCI_BUS_UNKNOWN ((NTSTATUS)0xC0050061L) +#define MCA_WARNING_PCI_DEVICE ((NTSTATUS)0x80050062L) +#define MCA_ERROR_PCI_DEVICE ((NTSTATUS)0xC0050063L) +#define MCA_WARNING_SMBIOS ((NTSTATUS)0x80050064L) +#define MCA_ERROR_SMBIOS ((NTSTATUS)0xC0050065L) +#define MCA_WARNING_PLATFORM_SPECIFIC ((NTSTATUS)0x80050066L) +#define MCA_ERROR_PLATFORM_SPECIFIC ((NTSTATUS)0xC0050067L) +#define MCA_WARNING_UNKNOWN ((NTSTATUS)0x80050068L) +#define MCA_ERROR_UNKNOWN ((NTSTATUS)0xC0050069L) +#define MCA_WARNING_UNKNOWN_NO_CPU ((NTSTATUS)0x8005006AL) +#define MCA_ERROR_UNKNOWN_NO_CPU ((NTSTATUS)0xC005006BL) +#define MCA_WARNING_CMC_THRESHOLD_EXCEEDED ((NTSTATUS)0x8005006DL) +#define MCA_WARNING_CPE_THRESHOLD_EXCEEDED ((NTSTATUS)0x8005006EL) +#define MCA_WARNING_CPU_THERMAL_THROTTLED ((NTSTATUS)0x8005006FL) +#define MCA_INFO_CPU_THERMAL_THROTTLING_REMOVED ((NTSTATUS)0x40050070L) +#define MCA_WARNING_CPU ((NTSTATUS)0x80050071L) +#define MCA_ERROR_CPU ((NTSTATUS)0xC0050072L) +#define MCA_INFO_NO_MORE_CORRECTED_ERROR_LOGS ((NTSTATUS)0x40050073L) +#define MCA_INFO_MEMORY_PAGE_MARKED_BAD ((NTSTATUS)0x40050074L) +#define MCA_MEMORYHIERARCHY_ERROR ((NTSTATUS)0xC0050078L) +#define MCA_TLB_ERROR ((NTSTATUS)0xC0050079L) +#define MCA_BUS_ERROR ((NTSTATUS)0xC005007AL) +#define MCA_BUS_TIMEOUT_ERROR ((NTSTATUS)0xC005007BL) +#define MCA_INTERNALTIMER_ERROR ((NTSTATUS)0xC005007CL) +#define MCA_MICROCODE_ROM_PARITY_ERROR ((NTSTATUS)0xC005007EL) +#define MCA_EXTERNAL_ERROR ((NTSTATUS)0xC005007FL) +#define MCA_FRC_ERROR ((NTSTATUS)0xC0050080L) + +#define STATUS_SEVERITY_SUCCESS 0x0 +#define STATUS_SEVERITY_INFORMATIONAL 0x1 +#define STATUS_SEVERITY_WARNING 0x2 +#define STATUS_SEVERITY_ERROR 0x3 Propchange: branches/header-work/include/psdk/ntiologc.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/header-work/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/wdm.tem… ============================================================================== --- branches/header-work/include/xdk/wdm.template.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/wdm.template.h [iso-8859-1] Thu Mar 18 15:14:27 2010 @@ -38,6 +38,7 @@ #include <excpt.h> #include <ntdef.h> #include <ntstatus.h> +#include <ntiologc.h> #ifndef GUID_DEFINED #include <guiddef.h>

1 0

[akhaldi] 46260: [NTDDK] - Group related definitions. [XDK] - Add PCI_CAPABILITIES_HEADER. [WDM] - Update wdm.h to reflect XDK changes.
by akhaldi＠svn.reactos.org 18 Mar '10

18 Mar '10

Author: akhaldi Date: Thu Mar 18 14:37:50 2010 New Revision: 46260 URL: http://svn.reactos.org/svn/reactos?rev=46260&view=rev Log: [NTDDK] - Group related definitions. [XDK] - Add PCI_CAPABILITIES_HEADER. [WDM] - Update wdm.h to reflect XDK changes. Modified: branches/header-work/include/ddk/ntddk.h branches/header-work/include/ddk/wdm.h branches/header-work/include/xdk/iotypes.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Thu Mar 18 14:37:50 2010 @@ -5533,6 +5533,12 @@ return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); } +typedef enum _INTERLOCKED_RESULT { + ResultNegative = RESULT_NEGATIVE, + ResultZero = RESULT_ZERO, + ResultPositive = RESULT_POSITIVE +} INTERLOCKED_RESULT; + NTKERNELAPI INTERLOCKED_RESULT FASTCALL @@ -5638,12 +5644,6 @@ #endif /* _AMD64_ */ -typedef enum _INTERLOCKED_RESULT { - ResultNegative = RESULT_NEGATIVE, - ResultZero = RESULT_ZERO, - ResultPositive = RESULT_POSITIVE -} INTERLOCKED_RESULT; - #ifdef __cplusplus } #endif 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 14:37:50 2010 @@ -3088,6 +3088,11 @@ USHORT BridgeControl; \ } type2; \ } u; + +typedef struct _PCI_CAPABILITIES_HEADER { + UCHAR CapabilityID; + UCHAR Next; +} PCI_CAPABILITIES_HEADER, *PPCI_CAPABILITIES_HEADER; typedef struct _PCI_COMMON_HEADER { PCI_COMMON_HEADER_LAYOUT 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 14:37:50 2010 @@ -478,6 +478,11 @@ } type2; \ } u; +typedef struct _PCI_CAPABILITIES_HEADER { + UCHAR CapabilityID; + UCHAR Next; +} PCI_CAPABILITIES_HEADER, *PPCI_CAPABILITIES_HEADER; + typedef struct _PCI_COMMON_HEADER { PCI_COMMON_HEADER_LAYOUT } PCI_COMMON_HEADER, *PPCI_COMMON_HEADER;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
90
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 March 2010