Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[akhaldi] 68277: [DDK] Explicitly mark the function pointers as NTAPI. CORE-9882

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 26 16:20:37 2015 New Revision: 68277 URL: http://svn.reactos.org/svn/reactos?rev=68277&view=rev Log: [DDK] Explicitly mark the function pointers as NTAPI. CORE-9882 Modified: trunk/reactos/include/ddk/hdaudio.h Modified: trunk/reactos/include/ddk/hdaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hdaudio.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/hdaudio.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/hdaudio.h [iso-8859-1] Fri Jun 26 16:20:37 2015 @@ -100,9 +100,9 @@ RunState = 2 } HDAUDIO_STREAM_STATE, *PHDAUDIO_STREAM_STATE; -typedef VOID (*PHDAUDIO_TRANSFER_COMPLETE_CALLBACK)(HDAUDIO_CODEC_TRANSFER *, PVOID); - -typedef VOID (*PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK)(HDAUDIO_CODEC_RESPONSE, PVOID); +typedef VOID (NTAPI *PHDAUDIO_TRANSFER_COMPLETE_CALLBACK)(HDAUDIO_CODEC_TRANSFER *, PVOID); + +typedef VOID (NTAPI *PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK)(HDAUDIO_CODEC_RESPONSE, PVOID); typedef struct _HDAUDIO_DEVICE_INFORMATION { @@ -121,20 +121,20 @@ } HDAUDIO_BUFFER_DESCRIPTOR, *PHDAUDIO_BUFFER_DESCRIPTOR; -typedef NTSTATUS (*PTRANSFER_CODEC_VERBS) (IN PVOID _context, IN ULONG Count, IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, IN PVOID Context); -typedef NTSTATUS (*PALLOCATE_CAPTURE_DMA_ENGINE) (IN PVOID _context, IN UCHAR CodecAddress, IN PHDAUDIO_STREAM_FORMAT StreamFormat, OUT PHANDLE Handle, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); -typedef NTSTATUS (*PALLOCATE_RENDER_DMA_ENGINE) (IN PVOID _context, IN PHDAUDIO_STREAM_FORMAT StreamFormat, IN BOOLEAN Stripe, OUT PHANDLE Handle, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); -typedef NTSTATUS (*PCHANGE_BANDWIDTH_ALLOCATION) (IN PVOID _context, IN HANDLE Handle, IN PHDAUDIO_STREAM_FORMAT StreamFormat, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); -typedef NTSTATUS (*PALLOCATE_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle, IN SIZE_T RequestedBufferSize, OUT PMDL *BufferMdl, OUT PSIZE_T AllocatedBufferSize, OUT PUCHAR StreamId, OUT PULONG FifoSize); -typedef NTSTATUS (*PFREE_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle); -typedef NTSTATUS (*PFREE_DMA_ENGINE) (IN PVOID _context, IN HANDLE Handle); -typedef NTSTATUS (*PSET_DMA_ENGINE_STATE) (IN PVOID _context, IN HDAUDIO_STREAM_STATE StreamState, IN ULONG NumberOfHandles, IN PHANDLE Handles); -typedef VOID (*PGET_WALL_CLOCK_REGISTER) (IN PVOID _context, OUT PULONG *Wallclock); -typedef NTSTATUS (*PGET_LINK_POSITION_REGISTER) (IN PVOID _context, IN HANDLE Handle, OUT PULONG *Position); -typedef NTSTATUS (*PREGISTER_EVENT_CALLBACK) (IN PVOID _context, IN PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, IN PVOID Context, OUT PUCHAR Tag); -typedef NTSTATUS (*PUNREGISTER_EVENT_CALLBACK) (IN PVOID _context, IN UCHAR Tag); -typedef NTSTATUS (*PGET_DEVICE_INFORMATION) (IN PVOID _context, IN OUT PHDAUDIO_DEVICE_INFORMATION DeviceInformation); -typedef VOID (*PGET_RESOURCE_INFORMATION) (IN PVOID _context, OUT PUCHAR CodecAddress, OUT PUCHAR FunctionGroupStartNode); +typedef NTSTATUS (NTAPI *PTRANSFER_CODEC_VERBS) (IN PVOID _context, IN ULONG Count, IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, IN PVOID Context); +typedef NTSTATUS (NTAPI *PALLOCATE_CAPTURE_DMA_ENGINE) (IN PVOID _context, IN UCHAR CodecAddress, IN PHDAUDIO_STREAM_FORMAT StreamFormat, OUT PHANDLE Handle, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); +typedef NTSTATUS (NTAPI *PALLOCATE_RENDER_DMA_ENGINE) (IN PVOID _context, IN PHDAUDIO_STREAM_FORMAT StreamFormat, IN BOOLEAN Stripe, OUT PHANDLE Handle, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); +typedef NTSTATUS (NTAPI *PCHANGE_BANDWIDTH_ALLOCATION) (IN PVOID _context, IN HANDLE Handle, IN PHDAUDIO_STREAM_FORMAT StreamFormat, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); +typedef NTSTATUS (NTAPI *PALLOCATE_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle, IN SIZE_T RequestedBufferSize, OUT PMDL *BufferMdl, OUT PSIZE_T AllocatedBufferSize, OUT PUCHAR StreamId, OUT PULONG FifoSize); +typedef NTSTATUS (NTAPI *PFREE_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle); +typedef NTSTATUS (NTAPI *PFREE_DMA_ENGINE) (IN PVOID _context, IN HANDLE Handle); +typedef NTSTATUS (NTAPI *PSET_DMA_ENGINE_STATE) (IN PVOID _context, IN HDAUDIO_STREAM_STATE StreamState, IN ULONG NumberOfHandles, IN PHANDLE Handles); +typedef VOID (NTAPI *PGET_WALL_CLOCK_REGISTER) (IN PVOID _context, OUT PULONG *Wallclock); +typedef NTSTATUS (NTAPI *PGET_LINK_POSITION_REGISTER) (IN PVOID _context, IN HANDLE Handle, OUT PULONG *Position); +typedef NTSTATUS (NTAPI *PREGISTER_EVENT_CALLBACK) (IN PVOID _context, IN PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, IN PVOID Context, OUT PUCHAR Tag); +typedef NTSTATUS (NTAPI *PUNREGISTER_EVENT_CALLBACK) (IN PVOID _context, IN UCHAR Tag); +typedef NTSTATUS (NTAPI *PGET_DEVICE_INFORMATION) (IN PVOID _context, IN OUT PHDAUDIO_DEVICE_INFORMATION DeviceInformation); +typedef VOID (NTAPI *PGET_RESOURCE_INFORMATION) (IN PVOID _context, OUT PUCHAR CodecAddress, OUT PUCHAR FunctionGroupStartNode); typedef struct _HDAUDIO_BUS_INTERFACE { @@ -160,12 +160,12 @@ PGET_RESOURCE_INFORMATION GetResourceInformation; } HDAUDIO_BUS_INTERFACE, *PHDAUDIO_BUS_INTERFACE; -typedef void (*PHDAUDIO_BDL_ISR) (IN VOID *Context, IN ULONG InterruptBitMask); - -typedef NTSTATUS (*PALLOCATE_CONTIGUOUS_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle, +typedef void (NTAPI *PHDAUDIO_BDL_ISR) (IN VOID *Context, IN ULONG InterruptBitMask); + +typedef NTSTATUS (NTAPI *PALLOCATE_CONTIGUOUS_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle, ULONG RequestedBufferSize, OUT PVOID *DataBuffer, OUT PHDAUDIO_BUFFER_DESCRIPTOR *BdlBuffer); -typedef NTSTATUS (*PFREE_CONTIGUOUS_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle); -typedef NTSTATUS (*PSETUP_DMA_ENGINE_WITH_BDL) (IN PVOID _context, IN HANDLE Handle, IN ULONG BufferLength, +typedef NTSTATUS (NTAPI *PFREE_CONTIGUOUS_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle); +typedef NTSTATUS (NTAPI *PSETUP_DMA_ENGINE_WITH_BDL) (IN PVOID _context, IN HANDLE Handle, IN ULONG BufferLength, IN ULONG Lvi, IN PHDAUDIO_BDL_ISR Isr, IN PVOID Context, OUT PUCHAR StreamId, OUT PULONG FifoSize); typedef struct _HDAUDIO_BUS_INTERFACE_BDL @@ -193,7 +193,7 @@ PGET_RESOURCE_INFORMATION GetResourceInformation; } HDAUDIO_BUS_INTERFACE_BDL, *PHDAUDIO_BUS_INTERFACE_BDL; -typedef NTSTATUS (*PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, +typedef NTSTATUS (NTAPI *PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, IN HANDLE Handle, IN ULONG NotificationCount, IN SIZE_T RequestedBufferSize, @@ -203,16 +203,16 @@ OUT PUCHAR StreamId, OUT PULONG FifoSize); -typedef NTSTATUS (*PFREE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, +typedef NTSTATUS (NTAPI *PFREE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, IN HANDLE Handle, IN PMDL BufferMdl, IN SIZE_T BufferSize); -typedef NTSTATUS (*PREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, +typedef NTSTATUS (NTAPI *PREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, IN HANDLE Handle, IN PKEVENT NotificationEvent); -typedef NTSTATUS (*PUNREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, +typedef NTSTATUS (NTAPI *PUNREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, IN HANDLE Handle, IN PKEVENT NotificationEvent);

9 years, 3 months

[janderwald] 68276: [DDK] - add hdaudio.h

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Jun 26 14:42:09 2015 New Revision: 68276 URL: http://svn.reactos.org/svn/reactos?rev=68276&view=rev Log: [DDK] - add hdaudio.h Added: trunk/reactos/include/ddk/hdaudio.h (with props) Added: trunk/reactos/include/ddk/hdaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hdaudio.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/hdaudio.h (added) +++ trunk/reactos/include/ddk/hdaudio.h [iso-8859-1] Fri Jun 26 14:42:09 2015 @@ -0,0 +1,253 @@ +#ifndef _HDAUDIO_H_ +#define _HDAUDIO_H_ + +#ifdef _MSC_VER +#pragma warning(disable:4201) +#pragma warning(disable:4214) +#endif + +DEFINE_GUID (GUID_HDAUDIO_BUS_INTERFACE, 0xd2eaf88b, 0xab18, 0x41a8, 0xb6, 0x64, 0x8d, 0x59, 0x21, 0x67, 0x67, 0x1b); +DEFINE_GUID(GUID_HDAUDIO_BUS_INTERFACE_BDL, 0xb4d65397, 0x5634, 0x40b0, 0xb0, 0x68, 0xf5, 0xb9, 0xf8, 0xb9, 0x67, 0xa5); +DEFINE_GUID (GUID_HDAUDIO_BUS_INTERFACE_V2, 0xb52af5fb, 0x424b, 0x4bb9, 0xa1, 0x60, 0x5b, 0x38, 0xbe, 0x94, 0xe5, 0x68); +DEFINE_GUID (GUID_HDAUDIO_BUS_CLASS, 0xbbd1a745, 0xadd6, 0x4575, 0x9c, 0x2e, 0x9b, 0x42, 0x8d, 0x1c, 0x32, 0x66); + +#ifndef _HDAUDIO_CODEC_TRANSFER_ +#define _HDAUDIO_CODEC_TRANSFER_ + +typedef struct _HDAUDIO_CODEC_COMMAND +{ + union + { + struct + { + ULONG Data : 8; + ULONG VerbId : 12; + ULONG Node : 8; + ULONG CodecAddress : 4; + } Verb8; + struct + { + ULONG Data : 16; + ULONG VerbId : 4; + ULONG Node : 8; + ULONG CodecAddress : 4; + } Verb16; + ULONG Command; + }; +} HDAUDIO_CODEC_COMMAND, *PHDAUDIO_CODEC_COMMAND; + +typedef struct _HDAUDIO_CODEC_RESPONSE +{ + union + { + struct + { + union + { + struct + { + ULONG Response : 26; + ULONG Tag : 6; + } Unsolicited; + ULONG Response; + }; + ULONG SDataIn : 4; + ULONG IsUnsolicitedResponse : 1; + ULONG :25; + ULONG HasFifoOverrun : 1; + ULONG IsValid : 1; + }; + ULONGLONG CompleteResponse; + }; +} HDAUDIO_CODEC_RESPONSE, *PHDAUDIO_CODEC_RESPONSE; + +typedef struct _HDAUDIO_CODEC_TRANSFER +{ + HDAUDIO_CODEC_COMMAND Output; + HDAUDIO_CODEC_RESPONSE Input; +} HDAUDIO_CODEC_TRANSFER, *PHDAUDIO_CODEC_TRANSFER; +#endif + +typedef struct _HDAUDIO_STREAM_FORMAT +{ + ULONG SampleRate; + USHORT ValidBitsPerSample; + USHORT ContainerSize; + USHORT NumberOfChannels; +} HDAUDIO_STREAM_FORMAT, *PHDAUDIO_STREAM_FORMAT; + +typedef struct _HDAUDIO_CONVERTER_FORMAT +{ + union + { + struct + { + USHORT NumberOfChannels : 4; + USHORT BitsPerSample : 3; + USHORT : 1; + USHORT SampleRate : 7; + USHORT StreamType : 1; + }; + USHORT ConverterFormat; + }; +} HDAUDIO_CONVERTER_FORMAT, *PHDAUDIO_CONVERTER_FORMAT; + +typedef enum _HDAUDIO_STREAM_STATE +{ + ResetState = 0, + StopState = 1, + PauseState = 1, + RunState = 2 +} HDAUDIO_STREAM_STATE, *PHDAUDIO_STREAM_STATE; + +typedef VOID (*PHDAUDIO_TRANSFER_COMPLETE_CALLBACK)(HDAUDIO_CODEC_TRANSFER *, PVOID); + +typedef VOID (*PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK)(HDAUDIO_CODEC_RESPONSE, PVOID); + +typedef struct _HDAUDIO_DEVICE_INFORMATION +{ + USHORT Size; // size of this structure + USHORT DeviceVersion; // maj.min (maj is high byte, min is low byte) + USHORT DriverVersion; // maj.min (maj is high byte, min is low byte) + USHORT CodecsDetected; // mask of codecs present. Bit number == SDI line number + BOOLEAN IsStripingSupported; // TRUE if striping (2 SDO lines) is supported +} HDAUDIO_DEVICE_INFORMATION, *PHDAUDIO_DEVICE_INFORMATION; + +typedef struct _HDAUDIO_BUFFER_DESCRIPTOR +{ + PHYSICAL_ADDRESS Address; + ULONG Length; + ULONG InterruptOnCompletion; +} HDAUDIO_BUFFER_DESCRIPTOR, *PHDAUDIO_BUFFER_DESCRIPTOR; + + +typedef NTSTATUS (*PTRANSFER_CODEC_VERBS) (IN PVOID _context, IN ULONG Count, IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, IN PVOID Context); +typedef NTSTATUS (*PALLOCATE_CAPTURE_DMA_ENGINE) (IN PVOID _context, IN UCHAR CodecAddress, IN PHDAUDIO_STREAM_FORMAT StreamFormat, OUT PHANDLE Handle, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); +typedef NTSTATUS (*PALLOCATE_RENDER_DMA_ENGINE) (IN PVOID _context, IN PHDAUDIO_STREAM_FORMAT StreamFormat, IN BOOLEAN Stripe, OUT PHANDLE Handle, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); +typedef NTSTATUS (*PCHANGE_BANDWIDTH_ALLOCATION) (IN PVOID _context, IN HANDLE Handle, IN PHDAUDIO_STREAM_FORMAT StreamFormat, OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); +typedef NTSTATUS (*PALLOCATE_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle, IN SIZE_T RequestedBufferSize, OUT PMDL *BufferMdl, OUT PSIZE_T AllocatedBufferSize, OUT PUCHAR StreamId, OUT PULONG FifoSize); +typedef NTSTATUS (*PFREE_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle); +typedef NTSTATUS (*PFREE_DMA_ENGINE) (IN PVOID _context, IN HANDLE Handle); +typedef NTSTATUS (*PSET_DMA_ENGINE_STATE) (IN PVOID _context, IN HDAUDIO_STREAM_STATE StreamState, IN ULONG NumberOfHandles, IN PHANDLE Handles); +typedef VOID (*PGET_WALL_CLOCK_REGISTER) (IN PVOID _context, OUT PULONG *Wallclock); +typedef NTSTATUS (*PGET_LINK_POSITION_REGISTER) (IN PVOID _context, IN HANDLE Handle, OUT PULONG *Position); +typedef NTSTATUS (*PREGISTER_EVENT_CALLBACK) (IN PVOID _context, IN PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, IN PVOID Context, OUT PUCHAR Tag); +typedef NTSTATUS (*PUNREGISTER_EVENT_CALLBACK) (IN PVOID _context, IN UCHAR Tag); +typedef NTSTATUS (*PGET_DEVICE_INFORMATION) (IN PVOID _context, IN OUT PHDAUDIO_DEVICE_INFORMATION DeviceInformation); +typedef VOID (*PGET_RESOURCE_INFORMATION) (IN PVOID _context, OUT PUCHAR CodecAddress, OUT PUCHAR FunctionGroupStartNode); + +typedef struct _HDAUDIO_BUS_INTERFACE +{ + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + + PTRANSFER_CODEC_VERBS TransferCodecVerbs; + PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; + PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; + PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; + PALLOCATE_DMA_BUFFER AllocateDmaBuffer; + PFREE_DMA_BUFFER FreeDmaBuffer; + PFREE_DMA_ENGINE FreeDmaEngine; + PSET_DMA_ENGINE_STATE SetDmaEngineState; + PGET_WALL_CLOCK_REGISTER GetWallClockRegister; + PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; + PREGISTER_EVENT_CALLBACK RegisterEventCallback; + PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; + PGET_DEVICE_INFORMATION GetDeviceInformation; + PGET_RESOURCE_INFORMATION GetResourceInformation; +} HDAUDIO_BUS_INTERFACE, *PHDAUDIO_BUS_INTERFACE; + +typedef void (*PHDAUDIO_BDL_ISR) (IN VOID *Context, IN ULONG InterruptBitMask); + +typedef NTSTATUS (*PALLOCATE_CONTIGUOUS_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle, + ULONG RequestedBufferSize, OUT PVOID *DataBuffer, OUT PHDAUDIO_BUFFER_DESCRIPTOR *BdlBuffer); +typedef NTSTATUS (*PFREE_CONTIGUOUS_DMA_BUFFER) (IN PVOID _context, IN HANDLE Handle); +typedef NTSTATUS (*PSETUP_DMA_ENGINE_WITH_BDL) (IN PVOID _context, IN HANDLE Handle, IN ULONG BufferLength, + IN ULONG Lvi, IN PHDAUDIO_BDL_ISR Isr, IN PVOID Context, OUT PUCHAR StreamId, OUT PULONG FifoSize); + +typedef struct _HDAUDIO_BUS_INTERFACE_BDL +{ + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + + PTRANSFER_CODEC_VERBS TransferCodecVerbs; + PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; + PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; + PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; + PALLOCATE_CONTIGUOUS_DMA_BUFFER AllocateContiguousDmaBuffer; + PSETUP_DMA_ENGINE_WITH_BDL SetupDmaEngineWithBdl; + PFREE_CONTIGUOUS_DMA_BUFFER FreeContiguousDmaBuffer; + PFREE_DMA_ENGINE FreeDmaEngine; + PSET_DMA_ENGINE_STATE SetDmaEngineState; + PGET_WALL_CLOCK_REGISTER GetWallClockRegister; + PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; + PREGISTER_EVENT_CALLBACK RegisterEventCallback; + PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; + PGET_DEVICE_INFORMATION GetDeviceInformation; + PGET_RESOURCE_INFORMATION GetResourceInformation; +} HDAUDIO_BUS_INTERFACE_BDL, *PHDAUDIO_BUS_INTERFACE_BDL; + +typedef NTSTATUS (*PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, + IN HANDLE Handle, + IN ULONG NotificationCount, + IN SIZE_T RequestedBufferSize, + OUT PMDL *BufferMdl, + OUT PSIZE_T AllocatedBufferSize, + OUT PSIZE_T OffsetFromFirstPage, + OUT PUCHAR StreamId, + OUT PULONG FifoSize); + +typedef NTSTATUS (*PFREE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, + IN HANDLE Handle, + IN PMDL BufferMdl, + IN SIZE_T BufferSize); + +typedef NTSTATUS (*PREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, + IN HANDLE Handle, + IN PKEVENT NotificationEvent); + +typedef NTSTATUS (*PUNREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, + IN HANDLE Handle, + IN PKEVENT NotificationEvent); + +typedef struct _HDAUDIO_BUS_INTERFACE_V2 +{ + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + + PTRANSFER_CODEC_VERBS TransferCodecVerbs; + PALLOCATE_CAPTURE_DMA_ENGINE AllocateCaptureDmaEngine; + PALLOCATE_RENDER_DMA_ENGINE AllocateRenderDmaEngine; + PCHANGE_BANDWIDTH_ALLOCATION ChangeBandwidthAllocation; + PALLOCATE_DMA_BUFFER AllocateDmaBuffer; + PFREE_DMA_BUFFER FreeDmaBuffer; + PFREE_DMA_ENGINE FreeDmaEngine; + PSET_DMA_ENGINE_STATE SetDmaEngineState; + PGET_WALL_CLOCK_REGISTER GetWallClockRegister; + PGET_LINK_POSITION_REGISTER GetLinkPositionRegister; + PREGISTER_EVENT_CALLBACK RegisterEventCallback; + PUNREGISTER_EVENT_CALLBACK UnregisterEventCallback; + PGET_DEVICE_INFORMATION GetDeviceInformation; + PGET_RESOURCE_INFORMATION GetResourceInformation; + PALLOCATE_DMA_BUFFER_WITH_NOTIFICATION AllocateDmaBufferWithNotification; + PFREE_DMA_BUFFER_WITH_NOTIFICATION FreeDmaBufferWithNotification; + PREGISTER_NOTIFICATION_EVENT RegisterNotificationEvent; + PUNREGISTER_NOTIFICATION_EVENT UnregisterNotificationEvent; +} HDAUDIO_BUS_INTERFACE_V2, *PHDAUDIO_BUS_INTERFACE_V2; + +#ifdef _MSC_VER +#pragma warning(default:4201) +#pragma warning(default:4214) +#endif + +#endif // _HDAUDIO_H_ + Propchange: trunk/reactos/include/ddk/hdaudio.h ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

[tfaber] 68275: [MSIMTF] - Add a stub implementation for IActiveIMMMessagePumpOwner. - Use #ifdef __REACTOS__ to mark a ROS-diff CORE-4953 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 26 12:27:54 2015 New Revision: 68275 URL: http://svn.reactos.org/svn/reactos?rev=68275&view=rev Log: [MSIMTF] - Add a stub implementation for IActiveIMMMessagePumpOwner. - Use #ifdef __REACTOS__ to mark a ROS-diff CORE-4953 #resolve Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c trunk/reactos/dll/win32/msimtf/msimtf_ros.diff trunk/reactos/dll/win32/msimtf/precomp.h trunk/reactos/include/psdk/dimm.idl Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… ============================================================================== --- trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] Fri Jun 26 12:27:54 2015 @@ -22,6 +22,7 @@ typedef struct tagActiveIMMApp { IActiveIMMApp IActiveIMMApp_iface; + IActiveIMMMessagePumpOwner IActiveIMMMessagePumpOwner_iface; LONG refCount; } ActiveIMMApp; @@ -46,6 +47,10 @@ { *ppvOut = This; } + else if (IsEqualIID(iid, &IID_IActiveIMMMessagePumpOwner)) + { + *ppvOut = &This->IActiveIMMMessagePumpOwner_iface; + } if (*ppvOut) { @@ -639,7 +644,9 @@ static HRESULT WINAPI ActiveIMMApp_OnDefWindowProc(IActiveIMMApp* This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) { - //FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); +#ifndef __REACTOS__ + FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); +#endif return E_FAIL; } @@ -792,6 +799,80 @@ ActiveIMMApp_EnumInputContext }; +static inline ActiveIMMApp *impl_from_IActiveIMMMessagePumpOwner(IActiveIMMMessagePumpOwner *iface) +{ + return CONTAINING_RECORD(iface, ActiveIMMApp, IActiveIMMMessagePumpOwner_iface); +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_QueryInterface(IActiveIMMMessagePumpOwner* iface, + REFIID iid, LPVOID *ppvOut) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_QueryInterface(&This->IActiveIMMApp_iface, iid, ppvOut); +} + +static ULONG WINAPI ActiveIMMMessagePumpOwner_AddRef(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_AddRef(&This->IActiveIMMApp_iface); +} + +static ULONG WINAPI ActiveIMMMessagePumpOwner_Release(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_Release(&This->IActiveIMMApp_iface); +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Start(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_End(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_OnTranslateMessage(IActiveIMMMessagePumpOwner* iface, + const MSG *msg) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%p): stub\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Pause(IActiveIMMMessagePumpOwner* iface, + DWORD *cookie) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%p): stub\n", This, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Resume(IActiveIMMMessagePumpOwner* iface, + DWORD cookie) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%u): stub\n", This, cookie); + return E_NOTIMPL; +} + +static const IActiveIMMMessagePumpOwnerVtbl ActiveIMMMessagePumpOwnerVtbl = +{ + ActiveIMMMessagePumpOwner_QueryInterface, + ActiveIMMMessagePumpOwner_AddRef, + ActiveIMMMessagePumpOwner_Release, + ActiveIMMMessagePumpOwner_Start, + ActiveIMMMessagePumpOwner_End, + ActiveIMMMessagePumpOwner_OnTranslateMessage, + ActiveIMMMessagePumpOwner_Pause, + ActiveIMMMessagePumpOwner_Resume, +}; + DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; @@ -803,6 +884,7 @@ return E_OUTOFMEMORY; This->IActiveIMMApp_iface.lpVtbl = &ActiveIMMAppVtbl; + This->IActiveIMMMessagePumpOwner_iface.lpVtbl = &ActiveIMMMessagePumpOwnerVtbl; This->refCount = 1; TRACE("returning %p\n",This); Modified: trunk/reactos/dll/win32/msimtf/msimtf_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/msimtf_ro… ============================================================================== --- trunk/reactos/dll/win32/msimtf/msimtf_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/msimtf_ros.diff [iso-8859-1] Fri Jun 26 12:27:54 2015 @@ -1,13 +1,14 @@ Index: activeimmapp.c =================================================================== ---- activeimmapp.c (revision 48273) +--- activeimmapp.c (Wine c4be28ed) +++ activeimmapp.c (working copy) -@@ -655,7 +655,7 @@ +@@ -664,7 +644,9 @@ static HRESULT WINAPI ActiveIMMApp_OnDefWindowProc(IActiveIMMApp* This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) { -- FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); -+ //FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); ++#ifndef __REACTOS__ + FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); ++#endif return E_FAIL; } Modified: trunk/reactos/dll/win32/msimtf/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/msimtf/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/precomp.h [iso-8859-1] Fri Jun 26 12:27:54 2015 @@ -14,6 +14,7 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <winuser.h> #include <objbase.h> #include <dimm.h> Modified: trunk/reactos/include/psdk/dimm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dimm.idl?rev=… ============================================================================== --- trunk/reactos/include/psdk/dimm.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dimm.idl [iso-8859-1] Fri Jun 26 12:27:54 2015 @@ -581,6 +581,20 @@ } [ + object, + uuid(b5cf2cfa-8aeb-11d1-9364-0060b067b86e), + pointer_default(unique) +] +interface IActiveIMMMessagePumpOwner : IUnknown +{ + HRESULT Start(); + HRESULT End(); + HRESULT OnTranslateMessage([in] const MSG *msg); + HRESULT Pause([out] DWORD *cookie); + HRESULT Resume([in] DWORD cookie); +} + +[ uuid(4955dd33-b159-11d0-8fcf-00aa006bcc59) ] coclass CActiveIMM @@ -588,6 +602,5 @@ [default] interface IActiveIMMApp; /* interface IActiveIMMIME; */ /* interface IActiveIMMRegistrar; */ - /* interface IActiveIMMMessagePumpOwner; */ + interface IActiveIMMMessagePumpOwner; } -

9 years, 3 months

[tfaber] 68274: [NTOS:MM] - Do not request a page in MiAllocatePagesForMdl if no pages are available. Fixes kmtest:MmMdl. CORE-9879 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 26 11:02:40 2015 New Revision: 68274 URL: http://svn.reactos.org/svn/reactos?rev=68274&view=rev Log: [NTOS:MM] - Do not request a page in MiAllocatePagesForMdl if no pages are available. Fixes kmtest:MmMdl. CORE-9879 #resolve Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Fri Jun 26 11:02:40 2015 @@ -232,7 +232,12 @@ /* Grab a page */ MI_SET_USAGE(MI_USAGE_MDL); MI_SET_PROCESS2("Kernel"); - Page = MiRemoveAnyPage(0); + + /* FIXME: This check should be smarter */ + Page = 0; + if (MmAvailablePages != 0) + Page = MiRemoveAnyPage(0); + if (Page == 0) { /* This is not good... hopefully we have at least SOME pages */

9 years, 3 months

[tfaber] 68273: [NTOS:MM] - Mark the page as being on the standby list before dereferencing it in MmFreePagesFromMdl. Since the PFN is marked as deleted, MiDecrementReferenceCount will correctly in...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 26 10:40:49 2015 New Revision: 68273 URL: http://svn.reactos.org/svn/reactos?rev=68273&view=rev Log: [NTOS:MM] - Mark the page as being on the standby list before dereferencing it in MmFreePagesFromMdl. Since the PFN is marked as deleted, MiDecrementReferenceCount will correctly insert it into the free list, but this is required to satisfy MiDecrementReferenceCount's sanity check. CORE-9877 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Fri Jun 26 10:40:49 2015 @@ -270,6 +270,7 @@ // Pfn1->u3.e1.StartOfAllocation = 0; Pfn1->u3.e1.EndOfAllocation = 0; + Pfn1->u3.e1.PageLocation = StandbyPageList; Pfn1->u2.ShareCount = 0; //

9 years, 3 months

[gedmurphy] 68272: [DEVMGR] - Add support for selecting any device when refreshing the view. This allows us to re-select a device after it's been enabled instead of collapsing the tree and losing t...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 26 08:45:49 2015 New Revision: 68272 URL: http://svn.reactos.org/svn/reactos?rev=68272&view=rev Log: [DEVMGR] - Add support for selecting any device when refreshing the view. This allows us to re-select a device after it's been enabled instead of collapsing the tree and losing track of what you did. - Plug some memory leaks - HeapAlloc -> new Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Fri Jun 26 08:45:49 2015 @@ -18,6 +18,7 @@ ) : CNode(ImageListData), m_DevInst(Device), + m_hDevInfo(NULL), m_Status(0), m_ProblemNumber(0), m_OverlayImage(0) @@ -27,7 +28,7 @@ CDeviceNode::~CDeviceNode() { - SetupDiDestroyDeviceInfoList(m_hDevInfo); + Cleanup(); } bool @@ -37,37 +38,31 @@ ULONG ulLength; CONFIGRET cr; - // ATLASSERT(m_DeviceId == NULL); - - // Get the length of the device id string cr = CM_Get_Device_ID_Size(&ulLength, m_DevInst, 0); if (cr == CR_SUCCESS) { // We alloc heap here because this will be stored in the lParam of the TV - m_DeviceId = (LPWSTR)HeapAlloc(GetProcessHeap(), - 0, - (ulLength + 1) * sizeof(WCHAR)); - if (m_DeviceId) + m_DeviceId = new WCHAR[ulLength + 1]; + + // Now get the actual device id + cr = CM_Get_Device_IDW(m_DevInst, + m_DeviceId, + ulLength + 1, + 0); + if (cr != CR_SUCCESS) { - // Now get the actual device id - cr = CM_Get_Device_IDW(m_DevInst, - m_DeviceId, - ulLength + 1, - 0); - if (cr != CR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, m_DeviceId); - m_DeviceId = NULL; - } + delete[] m_DeviceId; + m_DeviceId = NULL; } + } // Make sure we got the string if (m_DeviceId == NULL) return false; - //SP_DEVINFO_DATA DevinfoData; + // Build up a handle a and devinfodata struct m_hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, @@ -83,28 +78,14 @@ } - - // Get the current status of the device - cr = CM_Get_DevNode_Status_Ex(&m_Status, - &m_ProblemNumber, - m_DevInst, - 0, - NULL); - if (cr != CR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, m_DeviceId); - m_DeviceId = NULL; - return false; - } - - // Check if the device has a problem - if (m_Status & DN_HAS_PROBLEM) + // Set the overlay if the device has a problem + if (HasProblem()) { m_OverlayImage = 1; } // The disabled overlay takes precidence over the problem overlay - if (m_ProblemNumber & (CM_PROB_DISABLED | CM_PROB_HARDWARE_DISABLED)) + if (IsDisabled()) { m_OverlayImage = 2; } @@ -158,11 +139,11 @@ // Cleanup if something failed if (cr != CR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, m_DeviceId); - m_DeviceId = NULL; - } - - return (cr == CR_SUCCESS ? true : false); + Cleanup(); + return false; + } + + return true; } bool @@ -340,7 +321,7 @@ if (Enable) { - // config specific enablling first, then global enabling. + // config specific enabling first, then global enabling. // The global appears to be the one that starts the device pcp.Scope = DICS_FLAG_GLOBAL; if (SetupDiSetClassInstallParamsW(m_hDevInfo, @@ -362,6 +343,23 @@ return true; } +/* PRIVATE METHODS ******************************************************/ + +void +CDeviceNode::Cleanup() +{ + if (m_DeviceId) + { + delete[] m_DeviceId; + m_DeviceId = NULL; + } + if (m_hDevInfo) + { + SetupDiDestroyDeviceInfoList(m_hDevInfo); + m_hDevInfo = NULL; + } +} + DWORD CDeviceNode::GetFlags( ) Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] Fri Jun 26 08:45:49 2015 @@ -38,6 +38,9 @@ ); private: + void Cleanup( + ); + bool SetFlags( _In_ DWORD Flags, _In_ DWORD FlagsEx Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Fri Jun 26 08:45:49 2015 @@ -36,6 +36,7 @@ CDeviceView *This; BOOL ScanForChanges; BOOL UpdateView; + LPWSTR DeviceId; }; @@ -198,7 +199,8 @@ CDeviceView::Refresh( _In_ ViewType Type, _In_ bool ScanForChanges, - _In_ bool UpdateView + _In_ bool UpdateView, + _In_opt_ LPWSTR DeviceId ) { // Enum devices on a seperate thread to keep the gui responsive @@ -210,6 +212,16 @@ ThreadData->This = this; ThreadData->ScanForChanges = ScanForChanges; ThreadData->UpdateView = UpdateView; + ThreadData->DeviceId = NULL; + + if (DeviceId) + { + // Node gets deleted on refresh so we copy it to another block + size_t Length = wcslen(DeviceId) + 1; + ThreadData->DeviceId = new WCHAR[Length]; + wcscpy_s(ThreadData->DeviceId, Length, DeviceId); + } + HANDLE hThread; hThread = (HANDLE)_beginthreadex(NULL, @@ -309,29 +321,29 @@ ) { CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); - if (Node) - { - if (Enable == false) - { - CAtlStringW str; - if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE)) + if (Node == nullptr) return false; + + if (Enable == false) + { + CAtlStringW str; + if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE)) + { + if (MessageBoxW(m_hMainWnd, + str, + Node->GetDisplayName(), + MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) { - if (MessageBoxW(m_hMainWnd, - str, - Node->GetDisplayName(), - MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) - { - return false; - } + return false; } } - - if (Node->EnableDevice(Enable, NeedsReboot)) - { - Refresh(m_ViewType, true, true); - return true; - } - } + } + + if (Node->EnableDevice(Enable, NeedsReboot)) + { + Refresh(m_ViewType, true, true, Node->GetDeviceId()); + return true; + } + return false; } @@ -462,6 +474,11 @@ break; } + + This->SelectNode(ThreadData->DeviceId); + + if (ThreadData->DeviceId) + delete[] ThreadData->DeviceId; delete ThreadData; return 0; @@ -650,7 +667,7 @@ // Get the cached device node CDeviceNode *DeviceNode; DeviceNode = dynamic_cast<CDeviceNode *>(GetDeviceNode(Device)); - if (DeviceNode == NULL) + if (DeviceNode == nullptr) { ATLASSERT(FALSE); return false; @@ -684,7 +701,7 @@ if (bSuccess == FALSE) break; DeviceNode = dynamic_cast<CDeviceNode *>(GetDeviceNode(Device)); - if (DeviceNode == NULL) + if (DeviceNode == nullptr) { ATLASSERT(FALSE); } @@ -790,17 +807,20 @@ return TreeView_InsertItem(m_hTreeView, &tvins); } -void -CDeviceView::RecurseDeviceView( - _In_ HTREEITEM hParentItem - ) -{ +HTREEITEM +CDeviceView::RecurseFindDevice( + _In_ HTREEITEM hParentItem, + _In_ LPWSTR DeviceId + ) +{ + HTREEITEM FoundItem; HTREEITEM hItem; TVITEMW tvItem; + CNode *Node; // Check if this node has any children hItem = TreeView_GetChild(m_hTreeView, hParentItem); - if (hItem == NULL) return; + if (hItem == NULL) return NULL; // The lParam contains the node pointer data tvItem.hItem = hItem; @@ -808,12 +828,17 @@ if (TreeView_GetItem(m_hTreeView, &tvItem) && tvItem.lParam != NULL) { - // Delete the node class - //delete reinterpret_cast<CNode *>(tvItem.lParam); + Node = reinterpret_cast<CNode *>(tvItem.lParam); + if (Node->GetDeviceId() && + (wcscmp(Node->GetDeviceId(), DeviceId) == 0)) + { + return hItem; + } } // This node may have its own children - RecurseDeviceView(hItem); + FoundItem = RecurseFindDevice(hItem, DeviceId); + if (FoundItem) return FoundItem; // Delete all the siblings for (;;) @@ -827,12 +852,45 @@ tvItem.mask = TVIF_PARAM; if (TreeView_GetItem(m_hTreeView, &tvItem)) { - //if (tvItem.lParam != NULL) - // delete reinterpret_cast<CNode *>(tvItem.lParam); + Node = reinterpret_cast<CNode *>(tvItem.lParam); + if (Node->GetDeviceId() && + wcscmp(Node->GetDeviceId(), DeviceId) == 0) + { + return hItem; + } } // This node may have its own children - RecurseDeviceView(hItem); + FoundItem = RecurseFindDevice(hItem, DeviceId); + if (FoundItem) return FoundItem; + } + + return hItem; +} + +void +CDeviceView::SelectNode( + _In_ LPWSTR DeviceId + ) +{ + HTREEITEM hRoot, hItem; + + // Check if there are any items in the tree + hRoot = TreeView_GetRoot(m_hTreeView); + if (hRoot == NULL) return; + + if (DeviceId) + { + hItem = RecurseFindDevice(hRoot, DeviceId); + if (hItem) + { + TreeView_SelectItem(m_hTreeView, hItem); + TreeView_Expand(m_hTreeView, hItem, TVM_EXPAND); + } + } + else + { + TreeView_SelectItem(m_hTreeView, hRoot); } } @@ -840,20 +898,8 @@ void CDeviceView::EmptyDeviceView() { - HTREEITEM hItem; - - // Check if there are any items in the tree - hItem = TreeView_GetRoot(m_hTreeView); - if (hItem == NULL) return; - - // Free all the class nodes - //RecurseDeviceView(hItem); - - // Delete all the items (VOID)TreeView_DeleteAllItems(m_hTreeView); } - - CClassNode* @@ -972,6 +1018,8 @@ { m_ClassNodeList.AddTail(ClassNode); } + + SetupDiDestroyDeviceInfoList(hDevInfo); } ClassIndex++; } while (Success); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Fri Jun 26 08:45:49 2015 @@ -55,7 +55,8 @@ VOID Refresh( _In_ ViewType Type, _In_ bool ScanForChanges, - _In_ bool UpdateView + _In_ bool UpdateView, + _In_opt_ LPWSTR DeviceId ); VOID DisplayPropertySheet(); @@ -127,11 +128,16 @@ _In_ CNode *Node ); - VOID RecurseDeviceView( - _In_ HTREEITEM hParentItem + HTREEITEM RecurseFindDevice( + _In_ HTREEITEM hParentItem, + _In_ LPWSTR DeviceId ); - VOID EmptyDeviceView( + void SelectNode( + _In_ LPWSTR DeviceId + ); + + void EmptyDeviceView( ); CNode* GetNode( @@ -145,6 +151,7 @@ CDeviceNode* GetDeviceNode( _In_ DEVINST Device ); - void EmptyLists(); + void EmptyLists( + ); }; Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Fri Jun 26 08:45:49 2015 @@ -212,7 +212,7 @@ BOOL bSuccess; // Refreshed the cached view - m_DeviceView->Refresh(Type, FALSE, TRUE); + m_DeviceView->Refresh(Type, FALSE, TRUE, NULL); // Get the menu item id switch (Type) @@ -240,7 +240,8 @@ // Refresh the cache and and display m_DeviceView->Refresh(m_DeviceView->GetCurrentView(), true, - true); + true, + NULL); return true; } @@ -618,7 +619,8 @@ // Refresh the device view m_DeviceView->Refresh(m_DeviceView->GetCurrentView(), false, - true); + true, + NULL); break; } Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] Fri Jun 26 08:45:49 2015 @@ -24,19 +24,4 @@ CNode::~CNode() { - Cleanup(); } - - -/* PRIVATE METHODS ******************************************/ - - -void -CNode::Cleanup() -{ - if (m_DeviceId) - { - HeapFree(GetProcessHeap(), 0, m_DeviceId); - m_DeviceId = NULL; - } -}

9 years, 3 months

[tfaber] 68271: [KMTESTS:MM] - Add a test for MmAllocatePagesForMdl

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 26 07:31:01 2015 New Revision: 68271 URL: http://svn.reactos.org/svn/reactos?rev=68271&view=rev Log: [KMTESTS:MM] - Add a test for MmAllocatePagesForMdl Added: trunk/rostests/kmtests/ntos_mm/MmMdl.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Jun 26 07:31:01 2015 @@ -64,6 +64,7 @@ ntos_ke/KeProcessor.c ntos_ke/KeSpinLock.c ntos_ke/KeTimer.c + ntos_mm/MmMdl.c ntos_mm/MmSection.c ntos_mm/ZwAllocateVirtualMemory.c ntos_mm/ZwCreateSection.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Jun 26 07:31:01 2015 @@ -39,6 +39,7 @@ KMT_TESTFUNC Test_KeSpinLock; KMT_TESTFUNC Test_KeTimer; KMT_TESTFUNC Test_KernelType; +KMT_TESTFUNC Test_MmMdl; KMT_TESTFUNC Test_MmSection; KMT_TESTFUNC Test_NpfsConnect; KMT_TESTFUNC Test_NpfsCreate; @@ -98,6 +99,7 @@ { "KeSpinLock", Test_KeSpinLock }, { "KeTimer", Test_KeTimer }, { "-KernelType", Test_KernelType }, + { "MmMdl", Test_MmMdl }, { "MmSection", Test_MmSection }, { "NpfsConnect", Test_NpfsConnect }, { "NpfsCreate", Test_NpfsCreate }, Added: trunk/rostests/kmtests/ntos_mm/MmMdl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMdl.c?r… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMdl.c (added) +++ trunk/rostests/kmtests/ntos_mm/MmMdl.c [iso-8859-1] Fri Jun 26 07:31:01 2015 @@ -0,0 +1,168 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite MDL test + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +static +VOID +TestMmAllocatePagesForMdl(VOID) +{ + PMDL Mdl; + PHYSICAL_ADDRESS LowAddress; + PHYSICAL_ADDRESS HighAddress; + PHYSICAL_ADDRESS SkipBytes; + PVOID SystemVa; + PMDL Mdls[32]; + PVOID SystemVas[32]; + ULONG i; + + LowAddress.QuadPart = 0; + HighAddress.QuadPart = -1; + SkipBytes.QuadPart = 0; + /* simple allocate/free */ + Mdl = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 2 * 1024 * 1024); + ok(Mdl != NULL, "MmAllocatePagesForMdl failed\n"); + if (skip(Mdl != NULL, "No Mdl\n")) + return; + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmFreePagesFromMdl(Mdl); + + /* Now map/unmap it */ + Mdl = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 2 * 1024 * 1024); + ok(Mdl != NULL, "MmAllocatePagesForMdl failed\n"); + if (skip(Mdl != NULL, "No Mdl\n")) + return; + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + SystemVa = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + NormalPagePriority); + ok(SystemVa != NULL, "MmMapLockedPagesSpecifyCache failed\n"); + if (!skip(SystemVa != NULL, "No system VA\n")) + { + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p, System VA: %p\n", MmGetMdlVirtualAddress(Mdl), SystemVa); + ok(Mdl->MappedSystemVa == SystemVa, "MappedSystemVa: %p, System VA: %p\n", Mdl->MappedSystemVa, SystemVa); + ok((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmUnmapLockedPages(SystemVa, Mdl); + } + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmFreePagesFromMdl(Mdl); + + /* Now map it, and free without unmapping */ + Mdl = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 2 * 1024 * 1024); + ok(Mdl != NULL, "MmAllocatePagesForMdl failed\n"); + if (skip(Mdl != NULL, "No Mdl\n")) + return; + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + SystemVa = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + NormalPagePriority); + ok(SystemVa != NULL, "MmMapLockedPagesSpecifyCache failed\n"); + ok(MmGetMdlByteCount(Mdl) == 2 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p, System VA: %p\n", MmGetMdlVirtualAddress(Mdl), SystemVa); + ok(Mdl->MappedSystemVa == SystemVa, "MappedSystemVa: %p, System VA: %p\n", Mdl->MappedSystemVa, SystemVa); + ok((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmFreePagesFromMdl(Mdl); + + /* try to allocate 2 GB -- should succeed but not map */ + Mdl = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 2UL * 1024 * 1024 * 1024); + ok(Mdl != NULL, "MmAllocatePagesForMdl failed for 2 GB\n"); + if (Mdl != NULL) + { + ok(MmGetMdlByteCount(Mdl) != 2UL * 1024 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + SystemVa = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + NormalPagePriority); + ok(SystemVa == NULL, "MmMapLockedPagesSpecifyCache succeeded for 2 GB\n"); + if (SystemVa != NULL) + MmUnmapLockedPages(SystemVa, Mdl); + ok(MmGetMdlByteCount(Mdl) != 2UL * 1024 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); + ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); + MmFreePagesFromMdl(Mdl); + } + + /* now allocate and map 32 MB Mdls until we fail */ + for (i = 0; i < sizeof(Mdls) / sizeof(Mdls[0]); i++) + { + Mdls[i] = MmAllocatePagesForMdl(LowAddress, + HighAddress, + SkipBytes, + 32 * 1024 * 1024); + if (Mdls[i] == NULL) + { + trace("MmAllocatePagesForMdl failed with i = %lu\n", i); + break; + } + ok(MmGetMdlVirtualAddress(Mdls[i]) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdls[i])); + ok(!(Mdls[i]->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdls[i]->MdlFlags); + SystemVas[i] = MmMapLockedPagesSpecifyCache(Mdls[i], + KernelMode, + MmCached, + NULL, + FALSE, + NormalPagePriority); + if (SystemVas[i] == NULL) + { + ok(MmGetMdlByteCount(Mdls[i]) <= 32 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdls[i])); + ok(MmGetMdlVirtualAddress(Mdls[i]) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdls[i])); + ok(!(Mdls[i]->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdls[i]->MdlFlags); + trace("MmMapLockedPagesSpecifyCache failed with i = %lu\n", i); + break; + } + ok(MmGetMdlByteCount(Mdls[i]) == 32 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdls[i])); + ok(MmGetMdlVirtualAddress(Mdls[i]) == NULL, "Virtual address: %p, System VA: %p\n", MmGetMdlVirtualAddress(Mdls[i]), SystemVas[i]); + ok(Mdls[i]->MappedSystemVa == SystemVas[i], "MappedSystemVa: %p\n", Mdls[i]->MappedSystemVa, SystemVas[i]); + ok((Mdls[i]->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdls[i]->MdlFlags); + } + for (i = 0; i < sizeof(Mdls) / sizeof(Mdls[0]); i++) + { + if (Mdls[i] == NULL) + break; + if (SystemVas[i] != NULL) + MmUnmapLockedPages(SystemVas[i], Mdls[i]); + MmFreePagesFromMdl(Mdls[i]); + if (SystemVas[i] == NULL) + break; + } +} + +START_TEST(MmMdl) +{ + TestMmAllocatePagesForMdl(); +} Propchange: trunk/rostests/kmtests/ntos_mm/MmMdl.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

[cwittich] 68270: [VIDEOPRT] export functions needed by gfx drivers patch by Mike Nordell CORE-9808

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jun 26 06:14:15 2015 New Revision: 68270 URL: http://svn.reactos.org/svn/reactos?rev=68270&view=rev Log: [VIDEOPRT] export functions needed by gfx drivers patch by Mike Nordell CORE-9808 Modified: trunk/reactos/include/ddk/video.h trunk/reactos/win32ss/drivers/videoprt/funclist.c Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=68… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Fri Jun 26 06:14:15 2015 @@ -1536,7 +1536,7 @@ VPAPI VOID NTAPI -VideoPortUnLockBuffer( +VideoPortUnlockBuffer( IN PVOID HwDeviceExtension, IN PVOID Mdl); Modified: trunk/reactos/win32ss/drivers/videoprt/funclist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/f… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/funclist.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/funclist.c [iso-8859-1] Fri Jun 26 06:14:15 2015 @@ -26,49 +26,59 @@ typedef struct _VIDEO_PORT_FUNCTION_TABLE { PVOID Address; - PUCHAR Name; + PCSZ Name; } *PVIDEO_PORT_FUNCTION_TABLE, VIDEO_PORT_FUNCTION_TABLE; /* GLOBAL VARIABLES ***********************************************************/ -#define VP_EXPORTED_FUNCS 6 +#define VP_EXPORTED_FUNCS (sizeof(VideoPortExports) / sizeof(*VideoPortExports)) -UCHAR FN_VideoPortClearEvent[] = "VideoPortClearEvent"; -UCHAR FN_VideoPortCreateEvent[] = "VideoPortCreateEvent"; -UCHAR FN_VideoPortCreateSecondaryDisplay[] = "VideoPortCreateSecondaryDisplay"; -UCHAR FN_VideoPortDeleteEvent[] = "VideoPortDeleteEvent"; -UCHAR FN_VideoPortQueueDpc[] = "VideoPortQueueDpc"; -UCHAR FN_VideoPortSetEvent[] = "VideoPortSetEvent"; - -VIDEO_PORT_FUNCTION_TABLE VideoPortExports[] = { - {VideoPortClearEvent, FN_VideoPortClearEvent}, - {VideoPortCreateEvent, FN_VideoPortCreateEvent}, - {VideoPortCreateSecondaryDisplay, FN_VideoPortCreateSecondaryDisplay}, - {VideoPortDeleteEvent, FN_VideoPortDeleteEvent}, - {VideoPortQueueDpc, FN_VideoPortQueueDpc}, - {VideoPortSetEvent, FN_VideoPortSetEvent} +/* Create an array of entries with pfn, psz, for IntVideoPortGetProcAddress */ +#define MAKE_ENTRY(FUNCTIONNAME) { FUNCTIONNAME, #FUNCTIONNAME } +const VIDEO_PORT_FUNCTION_TABLE VideoPortExports[] = { + MAKE_ENTRY(VideoPortQueueDpc), + MAKE_ENTRY(VideoPortAllocatePool), + MAKE_ENTRY(VideoPortFreePool), + MAKE_ENTRY(VideoPortReleaseCommonBuffer), + MAKE_ENTRY(VideoPortAllocateCommonBuffer), + MAKE_ENTRY(VideoPortCreateSecondaryDisplay), + MAKE_ENTRY(VideoPortGetDmaAdapter), + MAKE_ENTRY(VideoPortGetVersion), + MAKE_ENTRY(VideoPortLockBuffer), + MAKE_ENTRY(VideoPortUnlockBuffer), + MAKE_ENTRY(VideoPortSetEvent), + MAKE_ENTRY(VideoPortClearEvent), + MAKE_ENTRY(VideoPortReadStateEvent), + MAKE_ENTRY(VideoPortRegisterBugcheckCallback), + MAKE_ENTRY(VideoPortCreateEvent), + MAKE_ENTRY(VideoPortDeleteEvent), + MAKE_ENTRY(VideoPortWaitForSingleObject), + MAKE_ENTRY(VideoPortCheckForDeviceExistence), + MAKE_ENTRY(VideoPortFlushRegistry), + MAKE_ENTRY(VideoPortQueryPerformanceCounter), }; +#undef MAKE_ENTRY PVOID NTAPI IntVideoPortGetProcAddress( IN PVOID HwDeviceExtension, IN PUCHAR FunctionName) { - ULONG i = 0; + ULONG i = 0; - TRACE_(VIDEOPRT, "VideoPortGetProcAddress(%s)\n", FunctionName); + TRACE_(VIDEOPRT, "VideoPortGetProcAddress(%s)\n", FunctionName); /* Search by name */ - for (i = 0; i < VP_EXPORTED_FUNCS; i++) - { - if (!_strnicmp((PCHAR)FunctionName, (PCHAR)VideoPortExports[i].Name, - strlen((PCHAR)FunctionName))) - { - return (PVOID)VideoPortExports[i].Address; - } - } - WARN_(VIDEOPRT, "VideoPortGetProcAddress: Can't resolve symbol %s\n", FunctionName); + for (i = 0; i < VP_EXPORTED_FUNCS; i++) + { + if (!strcmp((PCHAR)FunctionName, VideoPortExports[i].Name)) + { + return (PVOID)VideoPortExports[i].Address; + } + } + + ERR_(VIDEOPRT, "VideoPortGetProcAddress: Can't resolve symbol %s\n", FunctionName); return NULL; }

9 years, 3 months

[pschweitzer] 68269: [NTFS] In NtfsFindFileAt() directly print first entry value instead of its address

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jun 25 20:51:30 2015 New Revision: 68269 URL: http://svn.reactos.org/svn/reactos?rev=68269&view=rev Log: [NTFS] In NtfsFindFileAt() directly print first entry value instead of its address Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Jun 25 20:51:30 2015 @@ -801,7 +801,7 @@ { NTSTATUS Status; - DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, MFTIndex, CurrentMFTIndex); + DPRINT("NtfsFindFileAt(%p, %wZ, %u, %p, %p, %I64x)\n", Vcb, SearchPattern, *FirstEntry, FileRecord, MFTIndex, CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); if (!NT_SUCCESS(Status))

9 years, 3 months

[pschweitzer] 68268: [NTFS] Don't attempt to read the unnamed stream of the $DATA attribute of each file matching: - We don't need such attribute later on - In case there's no such unammed stream, ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jun 25 20:49:40 2015 New Revision: 68268 URL: http://svn.reactos.org/svn/reactos?rev=68268&view=rev Log: [NTFS] Don't attempt to read the unnamed stream of the $DATA attribute of each file matching: - We don't need such attribute later on - In case there's no such unammed stream, finding the file fails, whereas the file really exist This fixes (at least here) browsing Win7 NTFS system drives, where our driver was always failing on pagefile.sys Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Thu Jun 25 20:49:40 2015 @@ -38,7 +38,6 @@ static NTSTATUS NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PNTFS_ATTR_CONTEXT DataContext, PFILE_NAMES_INFORMATION Info, ULONG BufferLength) { @@ -66,7 +65,6 @@ static NTSTATUS NtfsGetDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PNTFS_ATTR_CONTEXT DataContext, ULONGLONG MFTIndex, PFILE_DIRECTORY_INFORMATION Info, ULONG BufferLength) @@ -112,7 +110,6 @@ static NTSTATUS NtfsGetFullDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PNTFS_ATTR_CONTEXT DataContext, ULONGLONG MFTIndex, PFILE_FULL_DIRECTORY_INFORMATION Info, ULONG BufferLength) @@ -159,7 +156,6 @@ static NTSTATUS NtfsGetBothDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, - PNTFS_ATTR_CONTEXT DataContext, ULONGLONG MFTIndex, PFILE_BOTH_DIR_INFORMATION Info, ULONG BufferLength) @@ -236,7 +232,6 @@ PFILE_OBJECT FileObject; NTSTATUS Status = STATUS_SUCCESS; PFILE_RECORD_HEADER FileRecord; - PNTFS_ATTR_CONTEXT DataContext; ULONGLONG MFTRecord, OldMFTRecord = 0; UNICODE_STRING Pattern; @@ -315,7 +310,6 @@ &Pattern, &Ccb->Entry, &FileRecord, - &DataContext, &MFTRecord, Fcb->MFTIndex); @@ -338,7 +332,6 @@ case FileNameInformation: Status = NtfsGetNameInformation(DeviceExtension, FileRecord, - DataContext, (PFILE_NAMES_INFORMATION)Buffer, BufferLength); break; @@ -346,7 +339,6 @@ case FileDirectoryInformation: Status = NtfsGetDirectoryInformation(DeviceExtension, FileRecord, - DataContext, MFTRecord, (PFILE_DIRECTORY_INFORMATION)Buffer, BufferLength); @@ -355,7 +347,6 @@ case FileFullDirectoryInformation: Status = NtfsGetFullDirectoryInformation(DeviceExtension, FileRecord, - DataContext, MFTRecord, (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, BufferLength); @@ -364,7 +355,6 @@ case FileBothDirectoryInformation: Status = NtfsGetBothDirectoryInformation(DeviceExtension, FileRecord, - DataContext, MFTRecord, (PFILE_BOTH_DIR_INFORMATION)Buffer, BufferLength); Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Jun 25 20:49:40 2015 @@ -796,13 +796,12 @@ PUNICODE_STRING SearchPattern, PULONG FirstEntry, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex) { NTSTATUS Status; - DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); + DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, MFTIndex, CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) @@ -826,21 +825,6 @@ return Status; } - if (!((*FileRecord)->Flags & FRH_DIRECTORY)) - { - Status = FindAttribute(Vcb, *FileRecord, AttributeData, L"", 0, DataContext); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtfsFindFileAt: Can't find data attribute\n"); - ExFreePoolWithTag(*FileRecord, TAG_NTFS); - return Status; - } - } - else - { - *DataContext = NULL; - } - *MFTIndex = CurrentMFTIndex; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Jun 25 20:49:40 2015 @@ -739,7 +739,6 @@ PUNICODE_STRING SearchPattern, PULONG FirstEntry, PFILE_RECORD_HEADER *FileRecord, - PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex);

9 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2015