Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 59619: [DDK] * Annotate storport.h.
by akhaldi＠svn.reactos.org 02 Aug '13

02 Aug '13

Author: akhaldi Date: Fri Aug 2 16:02:54 2013 New Revision: 59619 URL: http://svn.reactos.org/svn/reactos?rev=59619&view=rev Log: [DDK] * Annotate storport.h. Modified: trunk/reactos/include/ddk/storport.h Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/storport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/storport.h [iso-8859-1] Fri Aug 2 16:02:54 2013 @@ -76,331 +76,344 @@ ULONG NTAPI StorPortInitialize( - IN PVOID Argument1, - IN PVOID Argument2, - IN PHW_INITIALIZATION_DATA HwInitializationData, - IN PVOID Unused); + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _In_ PHW_INITIALIZATION_DATA HwInitializationData, + _In_opt_ PVOID Unused); STORPORTAPI VOID NTAPI StorPortFreeDeviceBase( - IN PVOID HwDeviceExtension, - IN PVOID MappedAddress); + _In_ PVOID HwDeviceExtension, + _In_ PVOID MappedAddress); STORPORTAPI ULONG NTAPI StorPortGetBusData( - IN PVOID DeviceExtension, - IN ULONG BusDataType, - IN ULONG SystemIoBusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length); + _In_ PVOID DeviceExtension, + _In_ ULONG BusDataType, + _In_ ULONG SystemIoBusNumber, + _In_ ULONG SlotNumber, + _Out_ _When_(Length != 0, _Out_writes_bytes_(Length)) PVOID Buffer, + _In_ ULONG Length); STORPORTAPI ULONG NTAPI StorPortSetBusDataByOffset( - IN PVOID DeviceExtension, - IN ULONG BusDataType, - IN ULONG SystemIoBusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length); + _In_ PVOID DeviceExtension, + _In_ ULONG BusDataType, + _In_ ULONG SystemIoBusNumber, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); STORPORTAPI PVOID NTAPI StorPortGetDeviceBase( - IN PVOID HwDeviceExtension, - IN INTERFACE_TYPE BusType, - IN ULONG SystemIoBusNumber, - IN SCSI_PHYSICAL_ADDRESS IoAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN InIoSpace); + _In_ PVOID HwDeviceExtension, + _In_ INTERFACE_TYPE BusType, + _In_ ULONG SystemIoBusNumber, + _In_ SCSI_PHYSICAL_ADDRESS IoAddress, + _In_ ULONG NumberOfBytes, + _In_ BOOLEAN InIoSpace); STORPORTAPI PVOID NTAPI StorPortGetLogicalUnit( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun); + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun); STORPORTAPI PSCSI_REQUEST_BLOCK NTAPI StorPortGetSrb( - IN PVOID DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN LONG QueueTag); + _In_ PVOID DeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ LONG QueueTag); STORPORTAPI STOR_PHYSICAL_ADDRESS NTAPI StorPortGetPhysicalAddress( - IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb, - IN PVOID VirtualAddress, - OUT ULONG *Length); + _In_ PVOID HwDeviceExtension, + _In_opt_ PSCSI_REQUEST_BLOCK Srb, + _In_ PVOID VirtualAddress, + _Out_ ULONG *Length); STORPORTAPI PVOID NTAPI StorPortGetVirtualAddress( - IN PVOID HwDeviceExtension, - IN STOR_PHYSICAL_ADDRESS PhysicalAddress); + _In_ PVOID HwDeviceExtension, + _In_ STOR_PHYSICAL_ADDRESS PhysicalAddress); STORPORTAPI PVOID NTAPI StorPortGetUncachedExtension( - IN PVOID HwDeviceExtension, - IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, - IN ULONG NumberOfBytes); + _In_ PVOID HwDeviceExtension, + _In_ PPORT_CONFIGURATION_INFORMATION ConfigInfo, + _In_ ULONG NumberOfBytes); STORPORTAPI VOID __cdecl StorPortNotification( - IN SCSI_NOTIFICATION_TYPE NotificationType, - IN PVOID HwDeviceExtension, - IN ...); + _In_ SCSI_NOTIFICATION_TYPE NotificationType, + _In_ PVOID HwDeviceExtension, + ...); STORPORTAPI VOID NTAPI StorPortLogError( - IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN ULONG ErrorCode, - IN ULONG UniqueId); + _In_ PVOID HwDeviceExtension, + _In_opt_ PSCSI_REQUEST_BLOCK Srb, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ ULONG ErrorCode, + _In_ ULONG UniqueId); STORPORTAPI VOID NTAPI StorPortCompleteRequest( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN UCHAR SrbStatus); + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ UCHAR SrbStatus); STORPORTAPI VOID NTAPI StorPortMoveMemory( - IN PVOID WriteBuffer, - IN PVOID ReadBuffer, - IN ULONG Length); + _Out_writes_bytes_(Length) PVOID WriteBuffer, + _In_reads_bytes_(Length) PVOID ReadBuffer, + _In_ ULONG Length); STORPORTAPI VOID NTAPI StorPortStallExecution( - IN ULONG Delay); + _In_ ULONG Delay); STORPORTAPI STOR_PHYSICAL_ADDRESS NTAPI StorPortConvertUlong64ToPhysicalAddress( - IN ULONG64 UlongAddress); + _In_ ULONG64 UlongAddress); STORPORTAPI ULONG64 NTAPI StorPortConvertPhysicalAddressToUlong64( - IN STOR_PHYSICAL_ADDRESS Address); + _In_ STOR_PHYSICAL_ADDRESS Address); STORPORTAPI BOOLEAN NTAPI StorPortValidateRange( - IN PVOID HwDeviceExtension, - IN INTERFACE_TYPE BusType, - IN ULONG SystemIoBusNumber, - IN STOR_PHYSICAL_ADDRESS IoAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN InIoSpace); + _In_ PVOID HwDeviceExtension, + _In_ INTERFACE_TYPE BusType, + _In_ ULONG SystemIoBusNumber, + _In_ STOR_PHYSICAL_ADDRESS IoAddress, + _In_ ULONG NumberOfBytes, + _In_ BOOLEAN InIoSpace); STORPORTAPI VOID __cdecl StorPortDebugPrint( - IN ULONG DebugPrintLevel, - IN PCCHAR DebugMessage, - IN ...); + _In_ ULONG DebugPrintLevel, + _In_ PCCHAR DebugMessage, + ...); STORPORTAPI UCHAR NTAPI StorPortReadPortUchar( - IN PUCHAR Port); + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Port); STORPORTAPI ULONG NTAPI StorPortReadPortUlong( - IN PULONG Port); + _In_ PVOID HwDeviceExtension, + _In_ PULONG Port); STORPORTAPI USHORT NTAPI StorPortReadPortUshort( - IN PUSHORT Port); + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Port); STORPORTAPI UCHAR NTAPI StorPortReadRegisterUchar( - IN PUCHAR Register); + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Register); STORPORTAPI ULONG NTAPI StorPortReadRegisterUlong( - IN PULONG Register); + _In_ PVOID HwDeviceExtension, + _In_ PULONG Register); STORPORTAPI USHORT NTAPI StorPortReadRegisterUshort( - IN PUSHORT Register); + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Register); STORPORTAPI VOID NTAPI StorPortWritePortUchar( - IN PUCHAR Port, - IN UCHAR Value); + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Port, + _In_ UCHAR Value); STORPORTAPI VOID NTAPI StorPortWritePortUlong( - IN PULONG Port, - IN ULONG Value); + _In_ PVOID HwDeviceExtension, + _In_ PULONG Port, + _In_ ULONG Value); STORPORTAPI VOID NTAPI StorPortWritePortUshort( - IN PUSHORT Port, - IN USHORT Value); + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Port, + _In_ USHORT Value); STORPORTAPI VOID NTAPI StorPortWriteRegisterUchar( - IN PUCHAR Port, - IN UCHAR Value); + _In_ PVOID HwDeviceExtension, + _In_ PUCHAR Register, + _In_ UCHAR Value); STORPORTAPI VOID NTAPI StorPortWriteRegisterUlong( - IN PULONG Port, - IN ULONG Value); + _In_ PVOID HwDeviceExtension, + _In_ PULONG Register, + _In_ ULONG Value); STORPORTAPI VOID NTAPI StorPortWriteRegisterUshort( - IN PUSHORT Port, - IN USHORT Value); + _In_ PVOID HwDeviceExtension, + _In_ PUSHORT Register, + _In_ USHORT Value); STORPORTAPI BOOLEAN NTAPI StorPortPauseDevice( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN ULONG TimeOut); + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ ULONG TimeOut); STORPORTAPI BOOLEAN NTAPI StorPortResumeDevice( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun); + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun); STORPORTAPI BOOLEAN NTAPI StorPortPause( - IN PVOID HwDeviceExtension, - IN ULONG TimeOut); + _In_ PVOID HwDeviceExtension, + _In_ ULONG TimeOut); STORPORTAPI BOOLEAN NTAPI StorPortResume( - IN PVOID HwDeviceExtension); + _In_ PVOID HwDeviceExtension); STORPORTAPI BOOLEAN NTAPI StorPortDeviceBusy( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN ULONG RequestsToComplete); + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ ULONG RequestsToComplete); STORPORTAPI BOOLEAN NTAPI StorPortDeviceReady( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun); + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun); STORPORTAPI BOOLEAN NTAPI StorPortBusy( - IN PVOID HwDeviceExtension, - IN ULONG RequestsToComplete); + _In_ PVOID HwDeviceExtension, + _In_ ULONG RequestsToComplete); STORPORTAPI BOOLEAN NTAPI StorPortReady( - IN PVOID HwDeviceExtension); + _In_ PVOID HwDeviceExtension); STORPORTAPI PSTOR_SCATTER_GATHER_LIST NTAPI StorPortGetScatterGatherList( - IN PVOID DeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb); + _In_ PVOID DeviceExtension, + _In_ PSCSI_REQUEST_BLOCK Srb); typedef BOOLEAN -(NTAPI *PSTOR_SYNCHRONIZED_ACCESS)( - IN PVOID HwDeviceExtension, - IN PVOID Context); +(NTAPI STOR_SYNCHRONIZED_ACCESS)( + _In_ PVOID HwDeviceExtension, + _In_ PVOID Context); +typedef STOR_SYNCHRONIZED_ACCESS *PSTOR_SYNCHRONIZED_ACCESS; STORPORTAPI VOID NTAPI StorPortSynchronizeAccess( - IN PVOID HwDeviceExtension, - IN PSTOR_SYNCHRONIZED_ACCESS SynchronizedAccessRoutine, - IN PVOID Context); + _In_ PVOID HwDeviceExtension, + _In_ PSTOR_SYNCHRONIZED_ACCESS SynchronizedAccessRoutine, + _In_opt_ PVOID Context); #if DBG #define DebugPrint(x) StorPortDebugPrint x

1 0

[akhaldi] 59618: [DDK] * Annotate tdikrnl.h.
by akhaldi＠svn.reactos.org 02 Aug '13

02 Aug '13

Author: akhaldi Date: Fri Aug 2 14:47:21 2013 New Revision: 59618 URL: http://svn.reactos.org/svn/reactos?rev=59618&view=rev Log: [DDK] * Annotate tdikrnl.h. Modified: trunk/reactos/include/ddk/tdikrnl.h Modified: trunk/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdikrnl.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] Fri Aug 2 14:47:21 2013 @@ -120,7 +120,7 @@ /* TdiSendDatagram */ typedef struct _TDI_REQUEST_KERNEL_SENDDG { ULONG SendLength; - PTDI_CONNECTION_INFORMATION SendDatagramInformation; + _Field_size_bytes_(SendLength) PTDI_CONNECTION_INFORMATION SendDatagramInformation; } TDI_REQUEST_KERNEL_SENDDG, *PTDI_REQUEST_KERNEL_SENDDG; /* TdiSetEventHandler */ @@ -157,232 +157,232 @@ typedef NTSTATUS (NTAPI *PTDI_IND_CONNECT)( - IN PVOID TdiEventContext, - IN LONG RemoteAddressLength, - IN PVOID RemoteAddress, - IN LONG UserDataLength, - IN PVOID UserData, - IN LONG OptionsLength, - IN PVOID Options, - OUT CONNECTION_CONTEXT *ConnectionContext, - OUT PIRP *AcceptIrp); + _In_opt_ PVOID TdiEventContext, + _In_ LONG RemoteAddressLength, + _In_reads_bytes_(RemoteAddressLength) PVOID RemoteAddress, + _In_ LONG UserDataLength, + _In_reads_bytes_opt_(UserDataLength) PVOID UserData, + _In_ LONG OptionsLength, + _In_reads_bytes_opt_(OptionsLength) PVOID Options, + _Out_ CONNECTION_CONTEXT *ConnectionContext, + _Out_ PIRP *AcceptIrp); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultConnectHandler( - IN PVOID TdiEventContext, - IN LONG RemoteAddressLength, - IN PVOID RemoteAddress, - IN LONG UserDataLength, - IN PVOID UserData, - IN LONG OptionsLength, - IN PVOID Options, - OUT CONNECTION_CONTEXT *ConnectionContext, - OUT PIRP *AcceptIrp); + _In_opt_ PVOID TdiEventContext, + _In_ LONG RemoteAddressLength, + _In_reads_bytes_(RemoteAddressLength) PVOID RemoteAddress, + _In_ LONG UserDataLength, + _In_reads_bytes_opt_(UserDataLength) PVOID UserData, + _In_ LONG OptionsLength, + _In_reads_bytes_opt_(OptionsLength) PVOID Options, + _Out_ CONNECTION_CONTEXT *ConnectionContext, + _Out_ PIRP *AcceptIrp); typedef NTSTATUS (NTAPI *PTDI_IND_DISCONNECT)( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN LONG DisconnectDataLength, - IN PVOID DisconnectData, - IN LONG DisconnectInformationLength, - IN PVOID DisconnectInformation, - IN ULONG DisconnectFlags); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ LONG DisconnectDataLength, + _In_reads_bytes_opt_(DisconnectDataLength) PVOID DisconnectData, + _In_ LONG DisconnectInformationLength, + _In_reads_bytes_opt_(DisconnectInformationLength) PVOID DisconnectInformation, + _In_ ULONG DisconnectFlags); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultDisconnectHandler( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN LONG DisconnectDataLength, - IN PVOID DisconnectData, - IN LONG DisconnectInformationLength, - IN PVOID DisconnectInformation, - IN ULONG DisconnectFlags); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ LONG DisconnectDataLength, + _In_reads_bytes_opt_(DisconnectDataLength) PVOID DisconnectData, + _In_ LONG DisconnectInformationLength, + _In_reads_bytes_opt_(DisconnectInformationLength) PVOID DisconnectInformation, + _In_ ULONG DisconnectFlags); typedef NTSTATUS (NTAPI *PTDI_IND_ERROR)( - IN PVOID TdiEventContext, - IN NTSTATUS Status); + _In_opt_ PVOID TdiEventContext, + _In_ NTSTATUS Status); typedef NTSTATUS (NTAPI *PTDI_IND_ERROR_EX)( - IN PVOID TdiEventContext, - IN NTSTATUS Status, - IN PVOID Buffer); + _In_opt_ PVOID TdiEventContext, + _In_ NTSTATUS Status, + _In_ PVOID Buffer); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultErrorHandler( - IN PVOID TdiEventContext, - IN NTSTATUS Status); + _In_opt_ PVOID TdiEventContext, + _In_ NTSTATUS Status); typedef NTSTATUS (NTAPI *PTDI_IND_RECEIVE)( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN ULONG ReceiveFlags, - IN ULONG BytesIndicated, - IN ULONG BytesAvailable, - OUT ULONG *BytesTaken, - IN PVOID Tsdu, - OUT PIRP *IoRequestPacket); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ ULONG ReceiveFlags, + _In_ ULONG BytesIndicated, + _In_ ULONG BytesAvailable, + _Out_ ULONG *BytesTaken, + _In_ PVOID Tsdu, + _Out_opt_ PIRP *IoRequestPacket); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultReceiveHandler( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN ULONG ReceiveFlags, - IN ULONG BytesIndicated, - IN ULONG BytesAvailable, - OUT ULONG *BytesTaken, - IN PVOID Tsdu, - OUT PIRP *IoRequestPacket); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ ULONG ReceiveFlags, + _In_ ULONG BytesIndicated, + _In_ ULONG BytesAvailable, + _Out_ ULONG *BytesTaken, + _In_ PVOID Tsdu, + _Out_opt_ PIRP *IoRequestPacket); typedef NTSTATUS (NTAPI *PTDI_IND_RECEIVE_DATAGRAM)( - IN PVOID TdiEventContext, - IN LONG SourceAddressLength, - IN PVOID SourceAddress, - IN LONG OptionsLength, - IN PVOID Options, - IN ULONG ReceiveDatagramFlags, - IN ULONG BytesIndicated, - IN ULONG BytesAvailable, - OUT ULONG *BytesTaken, - IN PVOID Tsdu, - OUT PIRP *IoRequestPacket); + _In_opt_ PVOID TdiEventContext, + _In_ LONG SourceAddressLength, + _In_reads_bytes_(SourceAddressLength) PVOID SourceAddress, + _In_ LONG OptionsLength, + _In_reads_bytes_opt_(OptionsLength) PVOID Options, + _In_ ULONG ReceiveDatagramFlags, + _In_ ULONG BytesIndicated, + _In_ ULONG BytesAvailable, + _Out_ ULONG *BytesTaken, + _In_ PVOID Tsdu, + _Out_opt_ PIRP *IoRequestPacket); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultRcvDatagramHandler( - IN PVOID TdiEventContext, - IN LONG SourceAddressLength, - IN PVOID SourceAddress, - IN LONG OptionsLength, - IN PVOID Options, - IN ULONG ReceiveDatagramFlags, - IN ULONG BytesIndicated, - IN ULONG BytesAvailable, - OUT ULONG *BytesTaken, - IN PVOID Tsdu, - OUT PIRP *IoRequestPacket); + _In_opt_ PVOID TdiEventContext, + _In_ LONG SourceAddressLength, + _In_reads_bytes_(SourceAddressLength) PVOID SourceAddress, + _In_ LONG OptionsLength, + _In_reads_bytes_opt_(OptionsLength) PVOID Options, + _In_ ULONG ReceiveDatagramFlags, + _In_ ULONG BytesIndicated, + _In_ ULONG BytesAvailable, + _Out_ ULONG *BytesTaken, + _In_ PVOID Tsdu, + _Out_opt_ PIRP *IoRequestPacket); typedef NTSTATUS (NTAPI *PTDI_IND_RECEIVE_EXPEDITED)( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN ULONG ReceiveFlags, - IN ULONG BytesIndicated, - IN ULONG BytesAvailable, - OUT ULONG *BytesTaken, - IN PVOID Tsdu, - OUT PIRP *IoRequestPacket); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ ULONG ReceiveFlags, + _In_ ULONG BytesIndicated, + _In_ ULONG BytesAvailable, + _Out_ ULONG *BytesTaken, + _In_ PVOID Tsdu, + _Out_opt_ PIRP *IoRequestPacket); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultRcvExpeditedHandler( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN ULONG ReceiveFlags, - IN ULONG BytesIndicated, - IN ULONG BytesAvailable, - OUT ULONG *BytesTaken, - IN PVOID Tsdu, - OUT PIRP *IoRequestPacket); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ ULONG ReceiveFlags, + _In_ ULONG BytesIndicated, + _In_ ULONG BytesAvailable, + _Out_ ULONG *BytesTaken, + _In_ PVOID Tsdu, + _Out_opt_ PIRP *IoRequestPacket); typedef NTSTATUS (NTAPI *PTDI_IND_CHAINED_RECEIVE)( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN ULONG ReceiveFlags, - IN ULONG ReceiveLength, - IN ULONG StartingOffset, - IN PMDL Tsdu, - IN PVOID TsduDescriptor); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ ULONG ReceiveFlags, + _In_ ULONG ReceiveLength, + _In_ ULONG StartingOffset, + _In_ PMDL Tsdu, + _In_ PVOID TsduDescriptor); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultChainedReceiveHandler( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN ULONG ReceiveFlags, - IN ULONG ReceiveLength, - IN ULONG StartingOffset, - IN PMDL Tsdu, - IN PVOID TsduDescriptor); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ ULONG ReceiveFlags, + _In_ ULONG ReceiveLength, + _In_ ULONG StartingOffset, + _In_ PMDL Tsdu, + _In_ PVOID TsduDescriptor); typedef NTSTATUS (NTAPI *PTDI_IND_CHAINED_RECEIVE_DATAGRAM)( - IN PVOID TdiEventContext, - IN LONG SourceAddressLength, - IN PVOID SourceAddress, - IN LONG OptionsLength, - IN PVOID Options, - IN ULONG ReceiveDatagramFlags, - IN ULONG ReceiveDatagramLength, - IN ULONG StartingOffset, - IN PMDL Tsdu, - IN PVOID TsduDescriptor); + _In_opt_ PVOID TdiEventContext, + _In_ LONG SourceAddressLength, + _In_reads_bytes_(SourceAddressLength) PVOID SourceAddress, + _In_ LONG OptionsLength, + _In_reads_bytes_opt_(OptionsLength) PVOID Options, + _In_ ULONG ReceiveDatagramFlags, + _In_ ULONG ReceiveDatagramLength, + _In_ ULONG StartingOffset, + _In_ PMDL Tsdu, + _In_ PVOID TsduDescriptor); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultChainedRcvDatagramHandler( - IN PVOID TdiEventContext, - IN LONG SourceAddressLength, - IN PVOID SourceAddress, - IN LONG OptionsLength, - IN PVOID Options, - IN ULONG ReceiveDatagramFlags, - IN ULONG ReceiveDatagramLength, - IN ULONG StartingOffset, - IN PMDL Tsdu, - IN PVOID TsduDescriptor); + _In_opt_ PVOID TdiEventContext, + _In_ LONG SourceAddressLength, + _In_reads_bytes_(SourceAddressLength) PVOID SourceAddress, + _In_ LONG OptionsLength, + _In_reads_bytes_opt_(OptionsLength) PVOID Options, + _In_ ULONG ReceiveDatagramFlags, + _In_ ULONG ReceiveDatagramLength, + _In_ ULONG StartingOffset, + _In_ PMDL Tsdu, + _In_ PVOID TsduDescriptor); typedef NTSTATUS (NTAPI *PTDI_IND_CHAINED_RECEIVE_EXPEDITED)( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN ULONG ReceiveFlags, - IN ULONG ReceiveLength, - IN ULONG StartingOffset, - IN PMDL Tsdu, - IN PVOID TsduDescriptor); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ ULONG ReceiveFlags, + _In_ ULONG ReceiveLength, + _In_ ULONG StartingOffset, + _In_ PMDL Tsdu, + _In_ PVOID TsduDescriptor); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultChainedRcvExpeditedHandler( - IN PVOID TdiEventContext, - IN CONNECTION_CONTEXT ConnectionContext, - IN ULONG ReceiveFlags, - IN ULONG ReceiveLength, - IN ULONG StartingOffset, - IN PMDL Tsdu, - IN PVOID TsduDescriptor); + _In_opt_ PVOID TdiEventContext, + _In_opt_ CONNECTION_CONTEXT ConnectionContext, + _In_ ULONG ReceiveFlags, + _In_ ULONG ReceiveLength, + _In_ ULONG StartingOffset, + _In_ PMDL Tsdu, + _In_ PVOID TsduDescriptor); typedef NTSTATUS (NTAPI *PTDI_IND_SEND_POSSIBLE)( - IN PVOID TdiEventContext, - IN PVOID ConnectionContext, - IN ULONG BytesAvailable); + _In_opt_ PVOID TdiEventContext, + _In_opt_ PVOID ConnectionContext, + _In_ ULONG BytesAvailable); TDIKRNLAPI NTSTATUS NTAPI TdiDefaultSendPossibleHandler( - IN PVOID TdiEventContext, - IN PVOID ConnectionContext, - IN ULONG BytesAvailable); + _In_opt_ PVOID TdiEventContext, + _In_opt_ PVOID ConnectionContext, + _In_ ULONG BytesAvailable); @@ -612,17 +612,17 @@ VOID NTAPI TdiBuildNetbiosAddress( - IN PUCHAR NetbiosName, - IN BOOLEAN IsGroupName, - IN OUT PTA_NETBIOS_ADDRESS NetworkName); + _In_ PUCHAR NetbiosName, + _In_ BOOLEAN IsGroupName, + _Inout_ PTA_NETBIOS_ADDRESS NetworkName); TDIKRNLAPI NTSTATUS NTAPI TdiBuildNetbiosAddressEa( - IN PUCHAR Buffer, - IN BOOLEAN IsGroupName, - IN PUCHAR NetbiosName); + _Out_ PUCHAR Buffer, + _In_ BOOLEAN IsGroupName, + _In_ PUCHAR NetbiosName); /* * VOID @@ -869,49 +869,49 @@ typedef VOID (NTAPI *TDI_ADD_ADDRESS_HANDLER)( - IN PTA_ADDRESS Address); + _In_ PTA_ADDRESS Address); typedef VOID (NTAPI *TDI_ADD_ADDRESS_HANDLER_V2)( - IN PTA_ADDRESS Address, - IN PUNICODE_STRING DeviceName, - IN PTDI_PNP_CONTEXT Context); + _In_ PTA_ADDRESS Address, + _In_ PUNICODE_STRING DeviceName, + _In_ PTDI_PNP_CONTEXT Context); typedef VOID (NTAPI *TDI_BINDING_HANDLER)( - IN TDI_PNP_OPCODE PnPOpcode, - IN PUNICODE_STRING DeviceName, - IN PWSTR MultiSZBindList); + _In_ TDI_PNP_OPCODE PnPOpcode, + _In_ PUNICODE_STRING DeviceName, + _In_ PWSTR MultiSZBindList); typedef VOID (NTAPI *TDI_BIND_HANDLER)( - IN PUNICODE_STRING DeviceName); + _In_ PUNICODE_STRING DeviceName); typedef VOID (NTAPI *TDI_DEL_ADDRESS_HANDLER)( - IN PTA_ADDRESS Address); + _In_ PTA_ADDRESS Address); typedef VOID (NTAPI *TDI_DEL_ADDRESS_HANDLER_V2)( - IN PTA_ADDRESS Address, - IN PUNICODE_STRING DeviceName, - IN PTDI_PNP_CONTEXT Context); + _In_ PTA_ADDRESS Address, + _In_ PUNICODE_STRING DeviceName, + _In_ PTDI_PNP_CONTEXT Context); typedef NTSTATUS (NTAPI *TDI_PNP_POWER_HANDLER)( - IN PUNICODE_STRING DeviceName, - IN PNET_PNP_EVENT PowerEvent, - IN PTDI_PNP_CONTEXT Context1, - IN PTDI_PNP_CONTEXT Context2); + _In_ PUNICODE_STRING DeviceName, + _In_ PNET_PNP_EVENT PowerEvent, + _In_ PTDI_PNP_CONTEXT Context1, + _In_ PTDI_PNP_CONTEXT Context2); typedef VOID (NTAPI *TDI_UNBIND_HANDLER)( - IN PUNICODE_STRING DeviceName); + _In_ PUNICODE_STRING DeviceName); typedef VOID (NTAPI *ProviderPnPPowerComplete)( - IN PNET_PNP_EVENT NetEvent, - IN NTSTATUS ProviderStatus); + _In_ PNET_PNP_EVENT NetEvent, + _In_ NTSTATUS ProviderStatus); typedef struct _TDI20_CLIENT_INTERFACE_INFO { _ANONYMOUS_UNION union { @@ -961,16 +961,17 @@ IoCompleteRequest((Irp), IO_NETWORK_INCREMENT); \ } +_IRQL_requires_max_(DISPATCH_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiCopyBufferToMdl( - IN PVOID SourceBuffer, - IN ULONG SourceOffset, - IN ULONG SourceBytesToCopy, - IN PMDL DestinationMdlChain, - IN ULONG DestinationOffset, - IN PULONG BytesCopied); + _In_ PVOID SourceBuffer, + _In_ ULONG SourceOffset, + _In_ ULONG SourceBytesToCopy, + _In_ PMDL DestinationMdlChain, + _In_ ULONG DestinationOffset, + _Out_ PULONG BytesCopied); /* * VOID @@ -983,173 +984,189 @@ #define TdiCopyLookaheadData(Destination, Source, Length, ReceiveFlags) \ RtlCopyMemory(Destination, Source, Length) -TDIKRNLAPI -NTSTATUS -NTAPI -TdiCopyMdlChainToMdlChain ( - IN PMDL SourceMdlChain, - IN ULONG SourceOffset, - IN PMDL DestinationMdlChain, - IN ULONG DestinationOffset, - OUT PULONG BytesCopied); - +_IRQL_requires_max_(DISPATCH_LEVEL) +TDIKRNLAPI +NTSTATUS +NTAPI +TdiCopyMdlChainToMdlChain( + _In_ PMDL SourceMdlChain, + _In_ ULONG SourceOffset, + _In_ PMDL DestinationMdlChain, + _In_ ULONG DestinationOffset, + _Out_ PULONG BytesCopied); + +_IRQL_requires_max_(DISPATCH_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiCopyMdlToBuffer( - IN PMDL SourceMdlChain, - IN ULONG SourceOffset, - IN PVOID DestinationBuffer, - IN ULONG DestinationOffset, - IN ULONG DestinationBufferSize, - OUT PULONG BytesCopied); + _In_ PMDL SourceMdlChain, + _In_ ULONG SourceOffset, + _Out_writes_bytes_(DestinationBufferSize) PVOID DestinationBuffer, + _In_ ULONG DestinationOffset, + _In_ ULONG DestinationBufferSize, + _Out_ PULONG BytesCopied); TDIKRNLAPI NTSTATUS NTAPI TdiDeregisterAddressChangeHandler( - IN HANDLE BindingHandle); - + _In_ HANDLE BindingHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiDeregisterDeviceObject( - IN HANDLE DevRegistrationHandle); - + _In_ HANDLE DevRegistrationHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiDeregisterNetAddress( - IN HANDLE AddrRegistrationHandle); - + _In_ HANDLE AddrRegistrationHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiDeregisterPnPHandlers( - IN HANDLE BindingHandle); - + _In_ HANDLE BindingHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiDeregisterProvider( - IN HANDLE ProviderHandle); - + _In_ HANDLE ProviderHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiEnumerateAddresses( - IN HANDLE BindingHandle); - + _In_ HANDLE BindingHandle); + +_IRQL_requires_max_(PASSIVE_LEVEL) TDIKRNLAPI VOID NTAPI -TdiInitialize( - VOID); +TdiInitialize(VOID); TDIKRNLAPI VOID NTAPI TdiMapBuffer( - IN PMDL MdlChain); - + _In_ PMDL MdlChain); + +_IRQL_requires_max_(PASSIVE_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiMapUserRequest( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp); + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IrpSp); TDIKRNLAPI BOOLEAN NTAPI TdiMatchPdoWithChainedReceiveContext( - IN PVOID TsduDescriptor, - IN PVOID PDO); - + _In_ PVOID TsduDescriptor, + _In_ PVOID PDO); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI VOID NTAPI TdiPnPPowerComplete( - IN HANDLE BindingHandle, - IN PNET_PNP_EVENT PowerEvent, - IN NTSTATUS Status); - + _In_ HANDLE BindingHandle, + _In_ PNET_PNP_EVENT PowerEvent, + _In_ NTSTATUS Status); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiPnPPowerRequest( - IN PUNICODE_STRING DeviceName, - IN PNET_PNP_EVENT PowerEvent, - IN PTDI_PNP_CONTEXT Context1, - IN PTDI_PNP_CONTEXT Context2, - IN ProviderPnPPowerComplete ProtocolCompletionHandler); - + _In_ PUNICODE_STRING DeviceName, + _In_ PNET_PNP_EVENT PowerEvent, + _In_ PTDI_PNP_CONTEXT Context1, + _In_ PTDI_PNP_CONTEXT Context2, + _In_ ProviderPnPPowerComplete ProtocolCompletionHandler); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiProviderReady( - IN HANDLE ProviderHandle); + _In_ HANDLE ProviderHandle); TDIKRNLAPI NTSTATUS NTAPI TdiRegisterAddressChangeHandler( - IN TDI_ADD_ADDRESS_HANDLER AddHandler, - IN TDI_DEL_ADDRESS_HANDLER DeleteHandler, - OUT HANDLE *BindingHandle); - + _In_ TDI_ADD_ADDRESS_HANDLER AddHandler, + _In_ TDI_DEL_ADDRESS_HANDLER DeleteHandler, + _Out_ HANDLE *BindingHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiRegisterDeviceObject( - IN PUNICODE_STRING DeviceName, - OUT HANDLE *DevRegistrationHandle); - + _In_ PUNICODE_STRING DeviceName, + _Out_ HANDLE *DevRegistrationHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiRegisterNetAddress( - IN PTA_ADDRESS Address, - IN PUNICODE_STRING DeviceName, - IN PTDI_PNP_CONTEXT Context, - OUT HANDLE *AddrRegistrationHandle); + _In_ PTA_ADDRESS Address, + _In_ PUNICODE_STRING DeviceName, + _In_ PTDI_PNP_CONTEXT Context, + _Out_ HANDLE *AddrRegistrationHandle); TDIKRNLAPI NTSTATUS NTAPI TdiRegisterNotificationHandler( - IN TDI_BIND_HANDLER BindHandler, - IN TDI_UNBIND_HANDLER UnbindHandler, - OUT HANDLE *BindingHandle); - + _In_ TDI_BIND_HANDLER BindHandler, + _In_ TDI_UNBIND_HANDLER UnbindHandler, + _Out_ HANDLE *BindingHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiRegisterPnPHandlers( - IN PTDI_CLIENT_INTERFACE_INFO ClientInterfaceInfo, - IN ULONG InterfaceInfoSize, - OUT HANDLE *BindingHandle); - + _In_reads_bytes_(InterfaceInfoSize) PTDI_CLIENT_INTERFACE_INFO ClientInterfaceInfo, + _In_ ULONG InterfaceInfoSize, + _Out_ HANDLE *BindingHandle); + +_IRQL_requires_max_(APC_LEVEL) TDIKRNLAPI NTSTATUS NTAPI TdiRegisterProvider( - IN PUNICODE_STRING ProviderName, - OUT HANDLE *ProviderHandle); - + _In_ PUNICODE_STRING ProviderName, + _Out_ HANDLE *ProviderHandle); + +_IRQL_requires_max_(DISPATCH_LEVEL) TDIKRNLAPI VOID NTAPI TdiReturnChainedReceives( - IN PVOID *TsduDescriptors, - IN ULONG NumberOfTsdus); + _In_ PVOID *TsduDescriptors, + _In_ ULONG NumberOfTsdus); TDIKRNLAPI VOID NTAPI TdiUnmapBuffer( - IN PMDL MdlChain); + _In_ PMDL MdlChain); #ifdef __cplusplus }

1 0

[akhaldi] 59617: [DDK] * Annotate srb.h.
by akhaldi＠svn.reactos.org 02 Aug '13

02 Aug '13

Author: akhaldi Date: Fri Aug 2 13:59:35 2013 New Revision: 59617 URL: http://svn.reactos.org/svn/reactos?rev=59617&view=rev Log: [DDK] * Annotate srb.h. Modified: trunk/reactos/include/ddk/srb.h Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=5961… ============================================================================== --- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Fri Aug 2 13:59:35 2013 @@ -288,7 +288,7 @@ ULONG SrbFlags; ULONG DataTransferLength; ULONG TimeOutValue; - PVOID DataBuffer; + _Field_size_bytes_(DataTransferLength) PVOID DataBuffer; PVOID SenseInfoBuffer; struct _SCSI_REQUEST_BLOCK *NextSrb; PVOID OriginalRequest; @@ -424,52 +424,66 @@ UCHAR Reserved4[16]; } SCSI_PNP_REQUEST_BLOCK, *PSCSI_PNP_REQUEST_BLOCK; -typedef BOOLEAN +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PHW_INITIALIZE)( - IN PVOID DeviceExtension); - -typedef BOOLEAN + _In_ PVOID DeviceExtension); + +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PHW_STARTIO)( - IN PVOID DeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb); - -typedef BOOLEAN + _In_ PVOID DeviceExtension, + _In_ PSCSI_REQUEST_BLOCK Srb); + +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PHW_INTERRUPT)( - IN PVOID DeviceExtension); + _In_ PVOID DeviceExtension); typedef VOID (NTAPI *PHW_TIMER)( - IN PVOID DeviceExtension); + _In_ PVOID DeviceExtension); typedef VOID (NTAPI *PHW_DMA_STARTED)( - IN PVOID DeviceExtension); - -typedef ULONG + _In_ PVOID DeviceExtension); + +typedef +_Must_inspect_result_ +ULONG (NTAPI *PHW_FIND_ADAPTER)( - IN PVOID DeviceExtension, - IN PVOID HwContext, - IN PVOID BusInformation, - IN PCHAR ArgumentString, - IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, - OUT PBOOLEAN Again); - -typedef BOOLEAN + _In_ PVOID DeviceExtension, + _In_ PVOID HwContext, + _In_ PVOID BusInformation, + _In_ PCHAR ArgumentString, + _Inout_ PPORT_CONFIGURATION_INFORMATION ConfigInfo, + _Out_ PBOOLEAN Again); + +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PHW_RESET_BUS)( - IN PVOID DeviceExtension, - IN ULONG PathId); - -typedef BOOLEAN + _In_ PVOID DeviceExtension, + _In_ ULONG PathId); + +typedef +_Must_inspect_result_ +BOOLEAN (NTAPI *PHW_ADAPTER_STATE)( - IN PVOID DeviceExtension, - IN PVOID Context, - IN BOOLEAN SaveState); - -typedef SCSI_ADAPTER_CONTROL_STATUS + _In_ PVOID DeviceExtension, + _In_ PVOID Context, + _In_ BOOLEAN SaveState); + +typedef +_Must_inspect_result_ +SCSI_ADAPTER_CONTROL_STATUS (NTAPI *PHW_ADAPTER_CONTROL)( - IN PVOID DeviceExtension, - IN SCSI_ADAPTER_CONTROL_TYPE ControlType, - IN PVOID Parameters); + _In_ PVOID DeviceExtension, + _In_ SCSI_ADAPTER_CONTROL_TYPE ControlType, + _In_ PVOID Parameters); typedef enum _SCSI_NOTIFICATION_TYPE { RequestComplete, @@ -531,185 +545,198 @@ VOID NTAPI ScsiPortCompleteRequest( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN UCHAR SrbStatus); - + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ UCHAR SrbStatus); + +_Must_inspect_result_ SCSIPORTAPI ULONG NTAPI ScsiPortConvertPhysicalAddressToUlong( - IN SCSI_PHYSICAL_ADDRESS Address); + _In_ SCSI_PHYSICAL_ADDRESS Address); #define ScsiPortConvertPhysicalAddressToUlong(Address) ((Address).LowPart) #define ScsiPortConvertPhysicalAddressToULongPtr(Address) ((ULONG_PTR)((Address).QuadPart)) +_Must_inspect_result_ SCSIPORTAPI SCSI_PHYSICAL_ADDRESS NTAPI ScsiPortConvertUlongToPhysicalAddress( - IN ULONG_PTR UlongAddress); + _In_ ULONG_PTR UlongAddress); SCSIPORTAPI VOID NTAPI ScsiPortFlushDma( - IN PVOID DeviceExtension); + _In_ PVOID DeviceExtension); SCSIPORTAPI VOID NTAPI ScsiPortFreeDeviceBase( - IN PVOID HwDeviceExtension, - IN PVOID MappedAddress); - + _In_ PVOID HwDeviceExtension, + _In_ PVOID MappedAddress); + +_Must_inspect_result_ SCSIPORTAPI ULONG NTAPI ScsiPortGetBusData( - IN PVOID DeviceExtension, - IN ULONG BusDataType, - IN ULONG SystemIoBusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length); - + _In_ PVOID DeviceExtension, + _In_ ULONG BusDataType, + _In_ ULONG SystemIoBusNumber, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length); + +_Must_inspect_result_ SCSIPORTAPI PVOID NTAPI ScsiPortGetDeviceBase( - IN PVOID HwDeviceExtension, - IN INTERFACE_TYPE BusType, - IN ULONG SystemIoBusNumber, - IN SCSI_PHYSICAL_ADDRESS IoAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN InIoSpace); - + _In_ PVOID HwDeviceExtension, + _In_ INTERFACE_TYPE BusType, + _In_ ULONG SystemIoBusNumber, + _In_ SCSI_PHYSICAL_ADDRESS IoAddress, + _In_ ULONG NumberOfBytes, + _In_ BOOLEAN InIoSpace); + +_Must_inspect_result_ SCSIPORTAPI PVOID NTAPI ScsiPortGetLogicalUnit( - IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun); - + _In_ PVOID HwDeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun); + +_Must_inspect_result_ SCSIPORTAPI SCSI_PHYSICAL_ADDRESS NTAPI ScsiPortGetPhysicalAddress( - IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, - IN PVOID VirtualAddress, - OUT ULONG *Length); - + _In_ PVOID HwDeviceExtension, + _In_ PSCSI_REQUEST_BLOCK Srb, + _In_ PVOID VirtualAddress, + _Out_ ULONG *Length); + +_Must_inspect_result_ SCSIPORTAPI PSCSI_REQUEST_BLOCK NTAPI ScsiPortGetSrb( - IN PVOID DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN LONG QueueTag); - + _In_ PVOID DeviceExtension, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ LONG QueueTag); + +_Must_inspect_result_ SCSIPORTAPI PVOID NTAPI ScsiPortGetUncachedExtension( - IN PVOID HwDeviceExtension, - IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, - IN ULONG NumberOfBytes); - + _In_ PVOID HwDeviceExtension, + _In_ PPORT_CONFIGURATION_INFORMATION ConfigInfo, + _In_ ULONG NumberOfBytes); + +_Must_inspect_result_ SCSIPORTAPI PVOID NTAPI ScsiPortGetVirtualAddress( - IN PVOID HwDeviceExtension, - IN SCSI_PHYSICAL_ADDRESS PhysicalAddress); - + _In_ PVOID HwDeviceExtension, + _In_ SCSI_PHYSICAL_ADDRESS PhysicalAddress); + +_Must_inspect_result_ +_IRQL_requires_max_(PASSIVE_LEVEL) SCSIPORTAPI ULONG NTAPI ScsiPortInitialize( - IN PVOID Argument1, - IN PVOID Argument2, - IN struct _HW_INITIALIZATION_DATA *HwInitializationData, - IN PVOID HwContext OPTIONAL); + _In_ PVOID Argument1, + _In_ PVOID Argument2, + _In_ struct _HW_INITIALIZATION_DATA *HwInitializationData, + _In_ PVOID HwContext); SCSIPORTAPI VOID NTAPI ScsiPortIoMapTransfer( - IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb, - IN PVOID LogicalAddress, - IN ULONG Length); + _In_ PVOID HwDeviceExtension, + _In_ PSCSI_REQUEST_BLOCK Srb, + _In_ PVOID LogicalAddress, + _In_ ULONG Length); SCSIPORTAPI VOID NTAPI ScsiPortLogError( - IN PVOID HwDeviceExtension, - IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN ULONG ErrorCode, - IN ULONG UniqueId); + _In_ PVOID HwDeviceExtension, + _In_opt_ PSCSI_REQUEST_BLOCK Srb, + _In_ UCHAR PathId, + _In_ UCHAR TargetId, + _In_ UCHAR Lun, + _In_ ULONG ErrorCode, + _In_ ULONG UniqueId); SCSIPORTAPI VOID __cdecl ScsiPortNotification( - IN SCSI_NOTIFICATION_TYPE NotificationType, - IN PVOID HwDeviceExtension, - IN ...); + _In_ SCSI_NOTIFICATION_TYPE NotificationType, + _In_ PVOID HwDeviceExtension, + ...); SCSIPORTAPI VOID NTAPI ScsiPortQuerySystemTime( - OUT PLARGE_INTEGER CurrentTime); - + _Out_ PLARGE_INTEGER CurrentTime); + +_Must_inspect_result_ SCSIPORTAPI ULONG NTAPI ScsiPortSetBusDataByOffset( - IN PVOID DeviceExtension, - IN ULONG BusDataType, - IN ULONG SystemIoBusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length); + _In_ PVOID DeviceExtension, + _In_ ULONG BusDataType, + _In_ ULONG SystemIoBusNumber, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); SCSIPORTAPI VOID NTAPI ScsiPortStallExecution( - IN ULONG Delay); - + _In_ ULONG Delay); + +_Must_inspect_result_ SCSIPORTAPI BOOLEAN NTAPI ScsiPortValidateRange( - IN PVOID HwDeviceExtension, - IN INTERFACE_TYPE BusType, - IN ULONG SystemIoBusNumber, - IN SCSI_PHYSICAL_ADDRESS IoAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN InIoSpace); + _In_ PVOID HwDeviceExtension, + _In_ INTERFACE_TYPE BusType, + _In_ ULONG SystemIoBusNumber, + _In_ SCSI_PHYSICAL_ADDRESS IoAddress, + _In_ ULONG NumberOfBytes, + _In_ BOOLEAN InIoSpace); SCSIPORTAPI VOID __cdecl ScsiDebugPrint( - IN ULONG DebugPrintLevel, - IN PCCHAR DebugMessage, - IN ...); + ULONG DebugPrintLevel, + PCCHAR DebugMessage, + ...); #if defined(_M_AMD64) @@ -749,187 +776,193 @@ #else +_Must_inspect_result_ SCSIPORTAPI UCHAR NTAPI ScsiPortReadPortUchar( - IN PUCHAR Port); - + _In_ PUCHAR Port); + +_Must_inspect_result_ SCSIPORTAPI ULONG NTAPI ScsiPortReadPortUlong( - IN PULONG Port); - + _In_ PULONG Port); + +_Must_inspect_result_ SCSIPORTAPI USHORT NTAPI ScsiPortReadPortUshort( - IN PUSHORT Port); + _In_ PUSHORT Port); SCSIPORTAPI VOID NTAPI ScsiPortReadPortBufferUchar( - IN PUCHAR Port, - IN PUCHAR Buffer, - IN ULONG Count); + _In_ PUCHAR Port, + _In_ PUCHAR Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortReadPortBufferUlong( - IN PULONG Port, - IN PULONG Buffer, - IN ULONG Count); + _In_ PULONG Port, + _In_ PULONG Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortReadPortBufferUshort( - IN PUSHORT Port, - IN PUSHORT Buffer, - IN ULONG Count); - + _In_ PUSHORT Port, + _In_ PUSHORT Buffer, + _In_ ULONG Count); + +_Must_inspect_result_ SCSIPORTAPI UCHAR NTAPI ScsiPortReadRegisterUchar( - IN PUCHAR Register); - + _In_ PUCHAR Register); + +_Must_inspect_result_ SCSIPORTAPI ULONG NTAPI ScsiPortReadRegisterUlong( - IN PULONG Register); - + _In_ PULONG Register); + +_Must_inspect_result_ SCSIPORTAPI USHORT NTAPI ScsiPortReadRegisterUshort( - IN PUSHORT Register); + _In_ PUSHORT Register); SCSIPORTAPI VOID NTAPI ScsiPortReadRegisterBufferUchar( - IN PUCHAR Register, - IN PUCHAR Buffer, - IN ULONG Count); + _In_ PUCHAR Register, + _In_ PUCHAR Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortReadRegisterBufferUlong( - IN PULONG Register, - IN PULONG Buffer, - IN ULONG Count); + _In_ PULONG Register, + _In_ PULONG Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortReadRegisterBufferUshort( - IN PUSHORT Register, - IN PUSHORT Buffer, - IN ULONG Count); + _In_ PUSHORT Register, + _In_ PUSHORT Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortWritePortUchar( - IN PUCHAR Port, - IN UCHAR Value); + _In_ PUCHAR Port, + _In_ UCHAR Value); SCSIPORTAPI VOID NTAPI ScsiPortWritePortUlong( - IN PULONG Port, - IN ULONG Value); + _In_ PULONG Port, + _In_ ULONG Value); SCSIPORTAPI VOID NTAPI ScsiPortWritePortUshort( - IN PUSHORT Port, - IN USHORT Value); + _In_ PUSHORT Port, + _In_ USHORT Value); SCSIPORTAPI VOID NTAPI ScsiPortWritePortBufferUchar( - IN PUCHAR Port, - IN PUCHAR Buffer, - IN ULONG Count); + _In_ PUCHAR Port, + _In_ PUCHAR Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortWritePortBufferUlong( - IN PULONG Port, - IN PULONG Buffer, - IN ULONG Count); + _In_ PULONG Port, + _In_ PULONG Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortWritePortBufferUshort( - IN PUSHORT Port, - IN PUSHORT Buffer, - IN ULONG Count); + _In_ PUSHORT Port, + _In_ PUSHORT Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortWriteRegisterUchar( - IN PUCHAR Register, - IN UCHAR Value); + _In_ PUCHAR Register, + _In_ UCHAR Value); SCSIPORTAPI VOID NTAPI ScsiPortWriteRegisterUlong( - IN PULONG Register, - IN ULONG Value); + _In_ PULONG Register, + _In_ ULONG Value); SCSIPORTAPI VOID NTAPI ScsiPortWriteRegisterUshort( - IN PUSHORT Register, - IN USHORT Value); + _In_ PUSHORT Register, + _In_ USHORT Value); SCSIPORTAPI VOID NTAPI ScsiPortWriteRegisterBufferUchar( - IN PUCHAR Register, - IN PUCHAR Buffer, - IN ULONG Count); + _In_ PUCHAR Register, + _In_ PUCHAR Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortWriteRegisterBufferUlong( - IN PULONG Register, - IN PULONG Buffer, - IN ULONG Count); + _In_ PULONG Register, + _In_ PULONG Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortWriteRegisterBufferUshort( - IN PUSHORT Register, - IN PUSHORT Buffer, - IN ULONG Count); + _In_ PUSHORT Register, + _In_ PUSHORT Buffer, + _In_ ULONG Count); SCSIPORTAPI VOID NTAPI ScsiPortMoveMemory( - IN PVOID WriteBuffer, - IN PVOID ReadBuffer, - IN ULONG Length); + _In_ PVOID WriteBuffer, + _In_ PVOID ReadBuffer, + _In_ ULONG Length); #endif /* defined(_M_AMD64) */

1 0

[akhaldi] 59616: [DDK] * Annotate minitape.h.
by akhaldi＠svn.reactos.org 01 Aug '13

01 Aug '13

Author: akhaldi Date: Thu Aug 1 21:43:07 2013 New Revision: 59616 URL: http://svn.reactos.org/svn/reactos?rev=59616&view=rev Log: [DDK] * Annotate minitape.h. Modified: trunk/reactos/include/ddk/minitape.h Modified: trunk/reactos/include/ddk/minitape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/minitape.h?rev… ============================================================================== --- trunk/reactos/include/ddk/minitape.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/minitape.h [iso-8859-1] Thu Aug 1 21:43:07 2013 @@ -19,8 +19,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * */ -#ifndef __MINITAPE_H -#define __MINITAPE_H +#ifndef _MINITAPE_ +#define _MINITAPE_ #ifdef __cplusplus extern "C" { @@ -153,32 +153,32 @@ UCHAR Reserved11[2]; } MODE_CAPABILITIES_PAGE, *PMODE_CAPABILITIES_PAGE; -typedef BOOLEAN NTAPI -(*TAPE_VERIFY_INQUIRY_ROUTINE)( - IN PINQUIRYDATA InquiryData, - IN PMODE_CAPABILITIES_PAGE ModeCapabilitiesPage); - -typedef VOID NTAPI -(*TAPE_EXTENSION_INIT_ROUTINE)( - IN PVOID MinitapeExtension, - IN PINQUIRYDATA InquiryData, - IN PMODE_CAPABILITIES_PAGE ModeCapabilitiesPage); - -typedef VOID NTAPI -(*TAPE_ERROR_ROUTINE)( - IN PVOID MinitapeExtension, - IN PSCSI_REQUEST_BLOCK Srb, - IN OUT PTAPE_STATUS TapeStatus); - -typedef TAPE_STATUS NTAPI -(*TAPE_PROCESS_COMMAND_ROUTINE)( - IN OUT PVOID MinitapeExtension, - IN OUT PVOID CommandExtension, - IN OUT PVOID CommandParameters, - IN OUT PSCSI_REQUEST_BLOCK Srb, - IN ULONG CallNumber, - IN TAPE_STATUS StatusOfLastCommand, - IN OUT PULONG RetryFlags); +typedef BOOLEAN +(NTAPI *TAPE_VERIFY_INQUIRY_ROUTINE)( + _In_ PINQUIRYDATA InquiryData, + _In_ PMODE_CAPABILITIES_PAGE ModeCapabilitiesPage); + +typedef VOID +(NTAPI *TAPE_EXTENSION_INIT_ROUTINE)( + _In_ PVOID MinitapeExtension, + _In_ PINQUIRYDATA InquiryData, + _In_ PMODE_CAPABILITIES_PAGE ModeCapabilitiesPage); + +typedef VOID +(NTAPI *TAPE_ERROR_ROUTINE)( + _In_ PVOID MinitapeExtension, + _In_ PSCSI_REQUEST_BLOCK Srb, + _Inout_ PTAPE_STATUS TapeStatus); + +typedef TAPE_STATUS +(NTAPI *TAPE_PROCESS_COMMAND_ROUTINE)( + _Inout_ PVOID MinitapeExtension, + _Inout_ PVOID CommandExtension, + _Inout_ PVOID CommandParameters, + _Inout_ PSCSI_REQUEST_BLOCK Srb, + _In_ ULONG CallNumber, + _In_ TAPE_STATUS StatusOfLastCommand, + _Inout_ PULONG RetryFlags); #define TAPE_RETRY_MASK 0x0000FFFF #define IGNORE_ERRORS 0x00010000 @@ -217,4 +217,4 @@ } #endif -#endif /* __MINITAPE_H */ +#endif /* _MINITAPE_ */

1 0

[akhaldi] 59615: [WIN32SS] * Sync user32 spy.c with Wine 1.5.26. Based on a patch by Samuel Serapion updated by me. CORE-7210 #resolve #comment Committed an updated version in r59615. Thanks.
by akhaldi＠svn.reactos.org 01 Aug '13

01 Aug '13

Author: akhaldi Date: Thu Aug 1 16:39:27 2013 New Revision: 59615 URL: http://svn.reactos.org/svn/reactos?rev=59615&view=rev Log: [WIN32SS] * Sync user32 spy.c with Wine 1.5.26. Based on a patch by Samuel Serapion updated by me. CORE-7210 #resolve #comment Committed an updated version in r59615. Thanks. Modified: trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/windows/spy.c Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Thu Aug 1 16:39:27 2013 @@ -52,7 +52,6 @@ extern const char *SPY_GetVKeyName(WPARAM wParam); extern void SPY_EnterMessage(INT iFlag, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); extern void SPY_ExitMessage(INT iFlag, HWND hwnd, UINT msg, LRESULT lReturn, WPARAM wParam, LPARAM lParam); -extern int SPY_Init(void); /* definitions for usrapihk.c */ BOOL FASTCALL BeginIfHookedUserApiHook(VOID); Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Aug 1 16:39:27 2013 @@ -295,10 +295,6 @@ Cleanup(); return FALSE; } - - /* Initialize message spying */ - if (!SPY_Init()) return FALSE; - break; case DLL_THREAD_ATTACH: Modified: trunk/reactos/win32ss/user/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] Thu Aug 1 16:39:27 2013 @@ -31,6 +31,7 @@ #define SPY_MAX_MSGNUM WM_USER #define SPY_INDENT_UNIT 4 /* 4 spaces */ +#define ARRAYSIZE(a) ((sizeof(a) / sizeof((a)[0]))) #define DEBUG_SPY 0 @@ -265,7 +266,7 @@ "WM_SYSKEYUP", /* 0x0105 */ "WM_SYSCHAR", /* 0x0106 */ "WM_SYSDEADCHAR", /* 0x0107 */ - "WM_KEYLAST", /* 0x0108 */ + NULL, "WM_UNICHAR", /* 0x0109 */ "WM_CONVERTREQUEST", /* 0x010a */ "WM_CONVERTRESULT", /* 0x010b */ @@ -678,27 +679,34 @@ "MM_JOY2BUTTONDOWN", "MM_JOY1BUTTONUP", "MM_JOY2BUTTONUP", - "MM_MCINOTIFY", + "MM_MCINOTIFY", /* 0x03B9 */ NULL, - "MM_WOM_OPEN", - "MM_WOM_CLOSE", - "MM_WOM_DONE", - "MM_WIM_OPEN", - "MM_WIM_CLOSE", + "MM_WOM_OPEN", /* 0x03BB */ + "MM_WOM_CLOSE", /* 0x03BC */ + "MM_WOM_DONE", /* 0x03BD */ + "MM_WIM_OPEN", /* 0x03BE */ + "MM_WIM_CLOSE", /* 0x03BF */ /* 0x03c0 */ - "MM_WIM_DATA", - "MM_MIM_OPEN", - "MM_MIM_CLOSE", - "MM_MIM_DATA", - "MM_MIM_LONGDATA", - "MM_MIM_ERROR", - "MM_MIM_LONGERROR", - "MM_MOM_OPEN", - "MM_MOM_CLOSE", - "MM_MOM_DONE", + "MM_WIM_DATA", /* 0x03C0 */ + "MM_MIM_OPEN", /* 0x03C1 */ + "MM_MIM_CLOSE", /* 0x03C2 */ + "MM_MIM_DATA", /* 0x03C3 */ + "MM_MIM_LONGDATA", /* 0x03C4 */ + "MM_MIM_ERROR", /* 0x03C5 */ + "MM_MIM_LONGERROR", /* 0x03C6 */ + "MM_MOM_OPEN", /* 0x03C7 */ + "MM_MOM_CLOSE", /* 0x03C8 */ + "MM_MOM_DONE", /* 0x03C9 */ + "MM_MOM_POSITIONCB", /* 0x03CA */ + "MM_MCISIGNAL", /* 0x03CB */ + "MM_MIM_MOREDATA", /* 0x03CC */ + NULL, NULL, NULL, + + /* 0x03d0 */ + "MM_MIXM_LINE_CHANGE", + "MM_MIXM_CONTROL_CHANGE", NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0x03e0 */ @@ -863,9 +871,8 @@ NULL, NULL, NULL, - NULL, "LVM_SETBKIMAGEW", - "LVM_GETBKIMAGEW" /* 0x108B */ + "LVM_GETBKIMAGEW", /* 0x108B */ "LVM_SETSELECTEDCOLUMN", "LVM_SETTILEWIDTH", "LVM_SETVIEW", @@ -1121,7 +1128,7 @@ "WM_WINE_SHOWWINDOW", "WM_WINE_SETPARENT", "WM_WINE_SETWINDOWLONG", - "WM_WINE_ENABLEWINDOW" + "WM_WINE_ENABLEWINDOW", "WM_WINE_SETACTIVEWINDOW", "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", @@ -1405,9 +1412,9 @@ typedef struct { -const WCHAR *classname; /* class name to match */ -const USER_MSG *classmsg; /* pointer to first USER_MSG for class */ -const USER_MSG *lastmsg; /* pointer to last USER_MSG for class */ + const WCHAR *classname; /* class name to match */ + const USER_MSG *classmsg; /* pointer to first USER_MSG for class */ + UINT count; /* number of entries */ } CONTROL_CLASS; #define USM(a,b) { #a ,a,b} @@ -1455,7 +1462,7 @@ USM(RB_SETPALETTE, 0), USM(RB_GETPALETTE, 0), USM(RB_MOVEBAND, 0), - {0,0,0} }; +}; static const USER_MSG toolbar_array[] = { USM(TB_ENABLEBUTTON ,0), @@ -1548,9 +1555,9 @@ USM(TB_SETHOTITEM2 ,0), USM(TB_SETLISTGAP ,0), USM(TB_GETIMAGELISTCOUNT ,0), - USM(TB_GETIDEALSIZE ,0), + USM(TB_GETIDEALSIZE ,8), USM(TB_UNKWN464 ,0), - {0,0,0} }; +}; static const USER_MSG tooltips_array[] = { USM(TTM_ACTIVATE ,0), @@ -1591,7 +1598,7 @@ USM(TTM_UPDATETIPTEXTW ,0), USM(TTM_ENUMTOOLSW ,0), USM(TTM_GETCURRENTTOOLW ,0), - {0,0,0} }; +}; static const USER_MSG comboex_array[] = { USM(CBEM_INSERTITEMA ,0), @@ -1608,7 +1615,7 @@ USM(CBEM_SETITEMW ,0), USM(CBEM_GETITEMW ,0), USM(CBEM_SETEXTENDEDSTYLE ,0), - {0,0,0} }; +}; static const USER_MSG propsht_array[] = { USM(PSM_SETCURSEL ,0), @@ -1631,8 +1638,8 @@ USM(PSM_GETCURRENTPAGEHWND ,0), USM(PSM_SETTITLEW ,0), USM(PSM_SETFINISHTEXTW ,0), - {0,0,0} }; -const WCHAR PropSheetInfoStr[] = +}; +static const WCHAR PropSheetInfoStr[] = {'P','r','o','p','e','r','t','y','S','h','e','e','t','I','n','f','o',0 }; static const USER_MSG updown_array[] = { @@ -1650,7 +1657,7 @@ USM(UDM_GETRANGE32 ,0), USM(UDM_SETPOS32 ,0), USM(UDM_GETPOS32 ,0), - {0,0,0} }; +}; /* generated from: * $ for i in `grep EM_ include/richedit.h | cut -d' ' -f2 | cut -f1`; do echo -e " USM($i\t\t,0),"; done @@ -1733,19 +1740,19 @@ USM(EM_SETFONTSIZE ,0), USM(EM_GETZOOM ,0), USM(EM_SETZOOM ,0), - {0,0,0} }; +}; #undef SZOF #undef USM -static CONTROL_CLASS cc_array[] = { - {WC_COMBOBOXEXW, comboex_array, 0}, - {WC_PROPSHEETW, propsht_array, 0}, - {REBARCLASSNAMEW, rebar_array, 0}, - {TOOLBARCLASSNAMEW, toolbar_array, 0}, - {TOOLTIPS_CLASSW, tooltips_array, 0}, - {UPDOWN_CLASSW, updown_array, 0}, - {RICHEDIT_CLASS20W, richedit_array, 0}, +static const CONTROL_CLASS cc_array[] = { + {WC_COMBOBOXEXW, comboex_array, ARRAYSIZE(comboex_array) }, + {WC_PROPSHEETW, propsht_array, ARRAYSIZE(propsht_array) }, + {REBARCLASSNAMEW, rebar_array, ARRAYSIZE(rebar_array) }, + {TOOLBARCLASSNAMEW, toolbar_array, ARRAYSIZE(toolbar_array) }, + {TOOLTIPS_CLASSW, tooltips_array, ARRAYSIZE(tooltips_array) }, + {UPDOWN_CLASSW, updown_array, ARRAYSIZE(updown_array) }, + {RICHEDIT_CLASS20W, richedit_array, ARRAYSIZE(richedit_array) }, {0, 0, 0} }; @@ -1973,22 +1980,27 @@ SPNFY(RBN_DELETINGBAND, NMREBAR), SPNFY(RBN_DELETEDBAND, NMREBAR), SPNFY(RBN_CHILDSIZE, NMREBARCHILDSIZE), - /* IP Adderss 0U-860U to 0U-879U */ + /* IP address 0U-860U to 0U-879U */ SPNFY(IPN_FIELDCHANGED, NMHDR), /* Status bar 0U-880U to 0U-899U */ SPNFY(SBN_SIMPLEMODECHANGE, NMHDR), /* Pager 0U-900U to 0U-950U */ SPNFY(PGN_SCROLL, NMPGSCROLL), SPNFY(PGN_CALCSIZE, NMPGCALCSIZE), - {0,0,0}}; -static const SPY_NOTIFY *end_spnfy_array; /* ptr to last good entry in array */ +}; #undef SPNFY -static BOOL SPY_Exclude[SPY_MAX_MSGNUM+1]; -static BOOL SPY_ExcludeDWP = 0; - -#define SPY_EXCLUDE(msg) \ - (SPY_Exclude[(msg) > SPY_MAX_MSGNUM ? SPY_MAX_MSGNUM : (msg)]) +static unsigned char *spy_exclude; + +static inline BOOL exclude_msg( UINT msg ) +{ + return spy_exclude[ min( msg, SPY_MAX_MSGNUM ) ]; +} + +static inline BOOL exclude_dwp(void) +{ + return spy_exclude[SPY_MAX_MSGNUM + 1]; +} typedef struct @@ -2003,12 +2015,12 @@ WCHAR wnd_name[16]; /* window name for message */ } SPY_INSTANCE; -static int indent_tls_index; +static int indent_tls_index = TLS_OUT_OF_INDEXES; /*********************************************************************** * get_indent_level */ -__inline static INT_PTR get_indent_level(void) +static inline INT_PTR get_indent_level(void) { return (INT_PTR)TlsGetValue( indent_tls_index ); } @@ -2017,7 +2029,7 @@ /*********************************************************************** * set_indent_level */ -__inline static void set_indent_level( INT_PTR level ) +static inline void set_indent_level( INT_PTR level ) { TlsSetValue( indent_tls_index, (void *)level ); } @@ -2058,33 +2070,18 @@ /*********************************************************************** * SPY_Bsearch_Msg */ -static const USER_MSG *SPY_Bsearch_Msg( const USER_MSG *first, const USER_MSG *last, UINT code) -{ - INT count; - const USER_MSG *test; - - while (last >= first) { - count = 1 + last - first; - if (count < 3) { -#if DEBUG_SPY - TRACE("code=%d, f-value=%d, f-name=%s, l-value=%d, l-name=%s, l-len=%d,\n", - code, first->value, first->name, last->value, last->name, last->len); -#endif - if (first->value == code) return first; - if (last->value == code) return last; - return NULL; - } - count = count / 2; - test = first + count; -#if DEBUG_SPY - TRACE("first=%p, last=%p, test=%p, t-value=%d, code=%d, count=%d\n", - first, last, test, test->value, code, count); -#endif - if (test->value == code) return test; - if (test->value > code) - last = test - 1; +static const USER_MSG *SPY_Bsearch_Msg( const USER_MSG *msgs, UINT count, UINT code) +{ + int low = 0, high = count - 1; + + while (low <= high) + { + int idx = (low + high) / 2; + if (msgs[idx].value == code) return msgs + idx; + if (msgs[idx].value > code) + high = idx - 1; else - first = test + 1; + low = idx + 1; } return NULL; } @@ -2113,10 +2110,6 @@ */ static void SPY_GetClassName( SPY_INSTANCE *sp_e ) { - DWORD save_error; - - /* save and restore error code over the next call */ - save_error = GetLastError(); /* special code to detect a property sheet dialog */ if ((GetClassLongPtrW(sp_e->msg_hwnd, GCW_ATOM) == (ULONG_PTR)WC_DIALOG) && (GetPropW(sp_e->msg_hwnd, PropSheetInfoStr))) { @@ -2125,7 +2118,6 @@ else { GetClassNameW(sp_e->msg_hwnd, sp_e->wnd_class, sizeof(sp_e->wnd_class)/sizeof(WCHAR)); } - SetLastError(save_error); } /*********************************************************************** @@ -2168,8 +2160,7 @@ debugstr_w(cc_array[i].classname), cc_array[i].classmsg, cc_array[i].lastmsg); #endif - p = SPY_Bsearch_Msg (cc_array[i].classmsg, cc_array[i].lastmsg, - sp_e->msgnum); + p = SPY_Bsearch_Msg (cc_array[i].classmsg, cc_array[i].count, sp_e->msgnum); if (p) { lstrcpynA (sp_e->msg_name, p->name, sizeof(sp_e->msg_name)); sp_e->data_len = p->len; @@ -2223,6 +2214,7 @@ const char *SPY_GetMsgName( UINT msg, HWND hWnd ) { SPY_INSTANCE ext_sp_e; + DWORD save_error = GetLastError(); ext_sp_e.msgnum = msg; ext_sp_e.msg_hwnd = hWnd; @@ -2230,6 +2222,7 @@ ext_sp_e.wParam = 0; ext_sp_e.wnd_class[0] = 0; SPY_GetMsgStuff(&ext_sp_e); + SetLastError( save_error ); return wine_dbg_sprintf("%s", ext_sp_e.msg_name); } @@ -2251,33 +2244,18 @@ /*********************************************************************** * SPY_Bsearch_Notify */ -static const SPY_NOTIFY *SPY_Bsearch_Notify( const SPY_NOTIFY *first, const SPY_NOTIFY *last, UINT code) -{ - INT count; - const SPY_NOTIFY *test; - - while (last >= first) { - count = 1 + last - first; - if (count < 3) { -#if DEBUG_SPY - TRACE("code=%d, f-value=%d, f-name=%s, l-value=%d, l-name=%s, l-len=%d,\n", - code, first->value, first->name, last->value, last->name, last->len); -#endif - if (first->value == code) return first; - if (last->value == code) return last; - return NULL; - } - count = count / 2; - test = first + count; -#if DEBUG_SPY - TRACE("first=%p, last=%p, test=%p, t-value=%d, code=%d, count=%d\n", - first, last, test, test->value, code, count); -#endif - if (test->value == code) return test; - if (test->value < code) - last = test - 1; +static const SPY_NOTIFY *SPY_Bsearch_Notify( UINT code) +{ + int low = 0, high = ARRAYSIZE(spnfy_array) - 1; + + while (low <= high) + { + int idx = (low + high) / 2; + if (spnfy_array[idx].value == code) return spnfy_array + idx; + if (spnfy_array[idx].value < code) + high = idx - 1; else - first = test + 1; + low = idx + 1; } return NULL; } @@ -2324,13 +2302,10 @@ switch (sp_e->msgnum) { case LVM_INSERTITEMW: - case LVM_INSERTITEMA: case LVM_SETITEMW: - case LVM_SETITEMA: if (!enter) break; /* fall through */ case LVM_GETITEMW: - case LVM_GETITEMA: { LPLVITEMA item = (LPLVITEMA) sp_e->lParam; if (item) { @@ -2358,10 +2333,8 @@ case LVM_GETSUBITEMRECT: { LPRECT rc = (LPRECT) sp_e->lParam; - if (rc) { - TRACE("lParam rect (%ld,%ld)-(%ld,%ld)\n", - rc->left, rc->top, rc->right, rc->bottom); - } + if (rc) + TRACE("lParam rect (%s)\n", wine_dbgstr_rect(rc)); break; } case LVM_SETITEMPOSITION32: @@ -2372,7 +2345,7 @@ { LPPOINT point = (LPPOINT) sp_e->lParam; if (point) { - TRACE("lParam point x=%ld, y=%ld\n", point->x, point->y); + TRACE("lParam point x=%d, y=%d\n", point->x, point->y); } break; } @@ -2398,14 +2371,14 @@ if (enter && sp_e->lParam) { CHARRANGE *cr = (CHARRANGE *) sp_e->lParam; - TRACE("CHARRANGE: cpMin=%ld cpMax=%ld\n", cr->cpMin, cr->cpMax); + TRACE("CHARRANGE: cpMin=%d cpMax=%d\n", cr->cpMin, cr->cpMax); } break; case EM_SETCHARFORMAT: if (enter && sp_e->lParam) { CHARFORMATW *cf = (CHARFORMATW *) sp_e->lParam; - TRACE("CHARFORMAT: dwMask=0x%08lx dwEffects=", cf->dwMask); + TRACE("CHARFORMAT: dwMask=0x%08x dwEffects=", cf->dwMask); if ((cf->dwMask & CFM_BOLD) && (cf->dwEffects & CFE_BOLD)) TRACE(" CFE_BOLD"); if ((cf->dwMask & CFM_COLOR) && (cf->dwEffects & CFE_AUTOCOLOR)) @@ -2420,11 +2393,11 @@ TRACE(" CFE_UNDERLINE"); TRACE("\n"); if (cf->dwMask & CFM_SIZE) - TRACE("yHeight=%ld\n", cf->yHeight); + TRACE("yHeight=%d\n", cf->yHeight); if (cf->dwMask & CFM_OFFSET) - TRACE("yOffset=%ld\n", cf->yOffset); + TRACE("yOffset=%d\n", cf->yOffset); if ((cf->dwMask & CFM_COLOR) && !(cf->dwEffects & CFE_AUTOCOLOR)) - TRACE("crTextColor=%lx\n", cf->crTextColor); + TRACE("crTextColor=%x\n", cf->crTextColor); TRACE("bCharSet=%x bPitchAndFamily=%x\n", cf->bCharSet, cf->bPitchAndFamily); /* FIXME: we should try to be a bit more intelligent about * whether this is in ANSI or Unicode (it could be either) */ @@ -2441,10 +2414,9 @@ lpdis->CtlType, lpdis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState); - TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n", - lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left, - lpdis->rcItem.top, lpdis->rcItem.right, - lpdis->rcItem.bottom, lpdis->itemData); + TRACE("hWnd=%p hDC=%p (%s) itemData=0x%08lx\n", + lpdis->hwndItem, lpdis->hDC, + wine_dbgstr_rect(&lpdis->rcItem), lpdis->itemData); } break; case WM_MEASUREITEM: @@ -2493,15 +2465,14 @@ case WM_STYLECHANGING: { LPSTYLESTRUCT ss = (LPSTYLESTRUCT) sp_e->lParam; - TRACE("STYLESTRUCT: StyleOld=0x%08lx, StyleNew=0x%08lx\n", + TRACE("STYLESTRUCT: StyleOld=0x%08x, StyleNew=0x%08x\n", ss->styleOld, ss->styleNew); } break; case WM_NCCALCSIZE: { RECT *rc = (RECT *)sp_e->lParam; - TRACE("Rect (%ld,%ld)-(%ld,%ld)\n", - rc->left, rc->top, rc->right, rc->bottom); + TRACE("Rect (%s)\n", wine_dbgstr_rect(rc)); } break; case WM_NOTIFY: @@ -2513,8 +2484,7 @@ WCHAR from_class[60]; DWORD save_error; - p = SPY_Bsearch_Notify (&spnfy_array[0], end_spnfy_array, - pnmh->code); + p = SPY_Bsearch_Notify( pnmh->code ); if (p) { TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=%s<0x%08x>, extra=0x%x\n", pnmh->hwndFrom, pnmh->idFrom, p->name, pnmh->code, p->len); @@ -2529,7 +2499,8 @@ SetLastError(save_error); if (strcmpW(TOOLBARCLASSNAMEW, from_class) == 0) dumplen = sizeof(NMTBCUSTOMDRAW)-sizeof(NMHDR); - } else if ((pnmh->code >= HDN_ITEMCHANGINGA) && (pnmh->code <= HDN_ENDDRAG)) { + } else if ( pnmh->code >= HDN_ENDDRAG + && pnmh->code <= HDN_ITEMCHANGINGA ) { dumplen = sizeof(NMHEADERA)-sizeof(NMHDR); } if (dumplen > 0) { @@ -2548,6 +2519,70 @@ } } + + +/*********************************************************************** + * spy_init + */ +static BOOL spy_init(void) +{ + int i; + char buffer[1024]; + HKEY hkey; + char *exclude; + + if (!TRACE_ON(message)) return FALSE; + + if (indent_tls_index == TLS_OUT_OF_INDEXES) + { + DWORD index = TlsAlloc(); + if (InterlockedCompareExchange((volatile LONG *) &indent_tls_index, index, TLS_OUT_OF_INDEXES ) != TLS_OUT_OF_INDEXES) + TlsFree( index ); + } + + if (spy_exclude) return TRUE; + exclude = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, SPY_MAX_MSGNUM + 2 ); + + /* @@ Wine registry key: HKCU\Software\Wine\Debug */ + if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Debug", &hkey)) + { + DWORD type, count = sizeof(buffer); + + buffer[0] = 0; + if (!RegQueryValueExA(hkey, "SpyInclude", 0, &type, (LPBYTE) buffer, &count) && + strcmp( buffer, "INCLUDEALL" )) + { + TRACE("Include=%s\n", buffer ); + for (i = 0; i <= SPY_MAX_MSGNUM; i++) + exclude[i] = (MessageTypeNames[i] && !strstr(buffer,MessageTypeNames[i])); + } + + count = sizeof(buffer); + buffer[0] = 0; + if (!RegQueryValueExA(hkey, "SpyExclude", 0, &type, (LPBYTE) buffer, &count)) + { + TRACE("Exclude=%s\n", buffer ); + if (!strcmp( buffer, "EXCLUDEALL" )) + for (i = 0; i <= SPY_MAX_MSGNUM; i++) exclude[i] = TRUE; + else + for (i = 0; i <= SPY_MAX_MSGNUM; i++) + exclude[i] = (MessageTypeNames[i] && strstr(buffer,MessageTypeNames[i])); + } + + count = sizeof(buffer); + if(!RegQueryValueExA(hkey, "SpyExcludeDWP", 0, &type, (LPBYTE) buffer, &count)) + exclude[SPY_MAX_MSGNUM + 1] = atoi(buffer); + + RegCloseKey(hkey); + } + + if (InterlockedCompareExchangePointer( (void **)&spy_exclude, exclude, NULL )) + HeapFree( GetProcessHeap(), 0, exclude ); + + return TRUE; +} + + /*********************************************************************** * SPY_EnterMessage */ @@ -2556,8 +2591,9 @@ { SPY_INSTANCE sp_e; int indent; - - if (!TRACE_ON(message) || SPY_EXCLUDE(msg)) return; + DWORD save_error = GetLastError(); + + if (!spy_init() || exclude_msg(msg)) return; sp_e.msgnum = msg; sp_e.msg_hwnd = hWnd; @@ -2571,7 +2607,7 @@ switch(iFlag) { case SPY_DISPATCHMESSAGE: - TRACE("%*s(%p) %-16s message [%04x] %s dispatched wp=%08lx lp=%08lx\n", + TRACE("%*s(%p) %-16s [%04x] %s dispatched wp=%08lx lp=%08lx\n", indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam); break; @@ -2582,23 +2618,23 @@ DWORD tid = GetWindowThreadProcessId( hWnd, NULL ); if (tid == GetCurrentThreadId()) strcpy( taskName, "self" ); - else sprintf( taskName, "tid %04lx", GetCurrentThreadId() ); - - TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08lx lp=%08lx\n", - indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, - sp_e.msg_name, taskName, wParam, lParam ); - SPY_DumpStructure(&sp_e, TRUE); + else sprintf( taskName, "tid %04ld", GetCurrentThreadId() ); + + TRACE("%*s(%p) %-16s [%04x] %s sent from %s wp=%08lx lp=%08lx\n", + indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, + sp_e.msg_name, taskName, wParam, lParam ); + SPY_DumpStructure(&sp_e, TRUE); } break; case SPY_DEFWNDPROC: - if( SPY_ExcludeDWP ) return; - TRACE("%*s(%p) DefWindowProc32: %s [%04x] wp=%08lx lp=%08lx\n", - indent, "", hWnd, sp_e.msg_name, - msg, wParam, lParam ); + if (exclude_dwp()) return; + TRACE("%*s(%p) DefWindowProc:[%04x] %s wp=%08lx lp=%08lx\n", + indent, "", hWnd, msg, sp_e.msg_name, wParam, lParam ); break; } set_indent_level( indent + SPY_INDENT_UNIT ); + SetLastError( save_error ); } @@ -2612,8 +2648,8 @@ int indent; DWORD save_error = GetLastError(); - if (!TRACE_ON(message) || SPY_EXCLUDE(msg) || - (SPY_ExcludeDWP && (/*iFlag == SPY_RESULT_DEFWND16 || */iFlag == SPY_RESULT_DEFWND)) ) + if (!TRACE_ON(message) || exclude_msg(msg) || + (exclude_dwp() && iFlag == SPY_RESULT_DEFWND)) return; sp_e.msgnum = msg; @@ -2632,110 +2668,16 @@ switch(iFlag) { case SPY_RESULT_DEFWND: - TRACE(" %*s(%p) DefWindowProc32: %s [%04x] returned %08lx\n", - indent, "", hWnd, sp_e.msg_name, msg, lReturn ); + TRACE(" %*s(%p) DefWindowProc: [%04x] %s returned %08lx\n", + indent, "", hWnd, msg, sp_e.msg_name, lReturn ); break; case SPY_RESULT_OK: - TRACE(" %*s(%p) %-16s message [%04x] %s returned %08lx\n", + TRACE(" %*s(%p) %-16s [%04x] %s returned %08lx\n", indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, lReturn ); SPY_DumpStructure(&sp_e, FALSE); break; - } - SetLastError( save_error ); -} - - -/*********************************************************************** - * SPY_Init - */ -int SPY_Init(void) -{ - int i; - UINT j; - char buffer[1024]; - const SPY_NOTIFY *p; - const USER_MSG *q; - HKEY hkey; - - if (!TRACE_ON(message)) return TRUE; - - indent_tls_index = TlsAlloc(); - /* @@ Wine registry key: HKCU\Software\Wine\Debug */ - if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\ReactOS\\Debug", &hkey)) - { - DWORD type, count = sizeof(buffer); - - buffer[0] = 0; - if (!RegQueryValueExA(hkey, "SpyInclude", 0, &type, (LPBYTE) buffer, &count) && - strcmp( buffer, "INCLUDEALL" )) - { - TRACE("Include=%s\n", buffer ); - for (i = 0; i <= SPY_MAX_MSGNUM; i++) - SPY_Exclude[i] = (MessageTypeNames[i] && !strstr(buffer,MessageTypeNames[i])); - } - - count = sizeof(buffer); - buffer[0] = 0; - if (!RegQueryValueExA(hkey, "SpyExclude", 0, &type, (LPBYTE) buffer, &count)) - { - TRACE("Exclude=%s\n", buffer ); - if (!strcmp( buffer, "EXCLUDEALL" )) - for (i = 0; i <= SPY_MAX_MSGNUM; i++) SPY_Exclude[i] = TRUE; - else - for (i = 0; i <= SPY_MAX_MSGNUM; i++) - SPY_Exclude[i] = (MessageTypeNames[i] && strstr(buffer,MessageTypeNames[i])); - } - - SPY_ExcludeDWP = 0; - count = sizeof(buffer); - if(!RegQueryValueExA(hkey, "SpyExcludeDWP", 0, &type, (LPBYTE) buffer, &count)) - SPY_ExcludeDWP = atoi(buffer); - - RegCloseKey(hkey); } - - /* find last good entry in spy notify array and save addr for b-search */ - p = &spnfy_array[0]; - j = 0xffffffff; - while (p->name) { - if ((UINT)p->value > (UINT)j) { - ERR("Notify message array out of order\n"); - ERR(" between values [%08x] %s and [%08x] %s\n", - j, (p-1)->name, p->value, p->name); - break; - } - j = p->value; - p++; - } - p--; - end_spnfy_array = p; - - /* find last good entry in each common control message array - * and save addr for b-search. - */ - i = 0; - while (cc_array[i].classname) { - - j = 0x0400; /* minimum entry in array */ - q = cc_array[i].classmsg; - while(q->name) { - if (q->value <= j) { - ERR("Class message array out of order for class %s\n", - debugstr_w(cc_array[i].classname)); - ERR(" between values [%04x] %s and [%04x] %s\n", - j, (q-1)->name, q->value, q->name); - break; - } - j = q->value; - q++; - } - q--; - cc_array[i].lastmsg = (USER_MSG *)q; - - i++; - } - - return 1; -} + SetLastError( save_error ); +}

1 0

[akhaldi] 59614: [KERNEL32] * Sync GetLocaleInfoW with Wine 1.5.26. CORE-7281
by akhaldi＠svn.reactos.org 01 Aug '13

01 Aug '13

Author: akhaldi Date: Thu Aug 1 16:15:11 2013 New Revision: 59614 URL: http://svn.reactos.org/svn/reactos?rev=59614&view=rev Log: [KERNEL32] * Sync GetLocaleInfoW with Wine 1.5.26. CORE-7281 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Thu Aug 1 16:15:11 2013 @@ -754,6 +754,10 @@ return ret; } +static int get_value_base_by_lctype( LCTYPE lctype ) +{ + return lctype == LOCALE_ILANGUAGE || lctype == LOCALE_IDEFAULTLANGUAGE ? 16 : 10; +} /****************************************************************************** * GetLocaleInfoW (KERNEL32.@) @@ -807,7 +811,7 @@ if (ret > 0) { WCHAR *end; - UINT number = strtolW( tmp, &end, 10 ); + UINT number = strtolW( tmp, &end, get_value_base_by_lctype( lctype ) ); if (*end) /* invalid number */ { SetLastError( ERROR_INVALID_FLAGS ); @@ -880,7 +884,7 @@ if (!tmp) return 0; memcpy( tmp, p + 1, *p * sizeof(WCHAR) ); tmp[*p] = 0; - number = strtolW( tmp, &end, 10 ); + number = strtolW( tmp, &end, get_value_base_by_lctype( lctype ) ); if (!*end) memcpy( buffer, &number, sizeof(number) ); else /* invalid number */

1 0

[akhaldi] 59613: [NOTEPAD] * Improve the file description. By Lee Schroeder. CORE-7320 #resolved #comment Committed in r59612. Thanks.
by akhaldi＠svn.reactos.org 01 Aug '13

01 Aug '13

Author: akhaldi Date: Thu Aug 1 15:43:43 2013 New Revision: 59613 URL: http://svn.reactos.org/svn/reactos?rev=59613&view=rev Log: [NOTEPAD] * Improve the file description. By Lee Schroeder. CORE-7320 #resolved #comment Committed in r59612. Thanks. Modified: trunk/reactos/base/applications/notepad/rsrc.rc Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Thu Aug 1 15:43:43 2013 @@ -22,7 +22,7 @@ #include "notepad_res.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Editor\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Notepad\0" #define REACTOS_STR_INTERNAL_NAME "notepad\0" #define REACTOS_STR_ORIGINAL_FILENAME "notepad.exe\0"

1 0

[akhaldi] 59612: [CMD] * Plug a memory leak. Based on a patch by Samuel Serapion. CORE-7297 #resolve #comment Fixed in r59611. Thanks.
by akhaldi＠svn.reactos.org 01 Aug '13

01 Aug '13

Author: akhaldi Date: Thu Aug 1 15:40:34 2013 New Revision: 59612 URL: http://svn.reactos.org/svn/reactos?rev=59612&view=rev Log: [CMD] * Plug a memory leak. Based on a patch by Samuel Serapion. CORE-7297 #resolve #comment Fixed in r59611. Thanks. Modified: trunk/reactos/base/shell/cmd/misc.c Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Thu Aug 1 15:40:34 2013 @@ -194,6 +194,7 @@ *arg = cmd_realloc (oldarg, (*ac + 2) * sizeof (LPTSTR)); if (NULL == *arg) { + cmd_free (q); *arg = oldarg; return FALSE; }

1 0

[akhaldi] 59611: [FULLFAT] * Silence some warnings.
by akhaldi＠svn.reactos.org 01 Aug '13

01 Aug '13

Author: akhaldi Date: Thu Aug 1 15:28:54 2013 New Revision: 59611 URL: http://svn.reactos.org/svn/reactos?rev=59611&view=rev Log: [FULLFAT] * Silence some warnings. Modified: trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt Modified: trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/fullfat/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] Thu Aug 1 15:28:54 2013 @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat) - add_definitions(-D__NTDRIVER__) list(APPEND SOURCE @@ -20,3 +19,7 @@ add_library(fullfat ${SOURCE}) allow_warnings(fullfat) add_dependencies(fullfat bugcodes) + +if(NOT MSVC) + add_target_compile_flags(fullfat "-Wno-unused-but-set-variable") +endif()

1 0

[akhaldi] 59610: [DDK] * Fix annotations for INSTANCE_BASIC_INFORMATION, INSTANCE_PARTIAL_INFORMATION and INSTANCE_FULL_INFORMATION.
by akhaldi＠svn.reactos.org 01 Aug '13

01 Aug '13

Author: akhaldi Date: Thu Aug 1 14:35:54 2013 New Revision: 59610 URL: http://svn.reactos.org/svn/reactos?rev=59610&view=rev Log: [DDK] * Fix annotations for INSTANCE_BASIC_INFORMATION, INSTANCE_PARTIAL_INFORMATION and INSTANCE_FULL_INFORMATION. Modified: trunk/reactos/include/ddk/fltuserstructures.h Modified: trunk/reactos/include/ddk/fltuserstructures.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/fltuserstructu… ============================================================================== --- trunk/reactos/include/ddk/fltuserstructures.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/fltuserstructures.h [iso-8859-1] Thu Aug 1 14:35:54 2013 @@ -195,15 +195,17 @@ WCHAR FilterVolumeName[1]; } FILTER_VOLUME_BASIC_INFORMATION, *PFILTER_VOLUME_BASIC_INFORMATION; +typedef _Struct_size_bytes_(sizeof(INSTANCE_BASIC_INFORMATION) * InstanceNameLength) -typedef struct _INSTANCE_BASIC_INFORMATION { +struct _INSTANCE_BASIC_INFORMATION { ULONG NextEntryOffset; USHORT InstanceNameLength; USHORT InstanceNameBufferOffset; } INSTANCE_BASIC_INFORMATION, *PINSTANCE_BASIC_INFORMATION; +typedef _Struct_size_bytes_(sizeof(INSTANCE_PARTIAL_INFORMATION) + InstanceNameLength + AltitudeLength) -typedef struct _INSTANCE_PARTIAL_INFORMATION { +struct _INSTANCE_PARTIAL_INFORMATION { ULONG NextEntryOffset; USHORT InstanceNameLength; USHORT InstanceNameBufferOffset; @@ -211,8 +213,9 @@ USHORT AltitudeBufferOffset; } INSTANCE_PARTIAL_INFORMATION, *PINSTANCE_PARTIAL_INFORMATION; +typedef _Struct_size_bytes_(sizeof(INSTANCE_FULL_INFORMATION) + InstanceNameLength + AltitudeLength + VolumeNameLength + FilterNameLength) -typedef struct _INSTANCE_FULL_INFORMATION { +struct _INSTANCE_FULL_INFORMATION { ULONG NextEntryOffset; USHORT InstanceNameLength; USHORT InstanceNameBufferOffset;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs