Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 68281: [IEFRAME] Add some missing quotes to ieframe.rc. NFC. Spotted by Jared Smudde. CORE-9843
by akhaldi＠svn.reactos.org 26 Jun '15

26 Jun '15

Author: akhaldi Date: Fri Jun 26 17:33:45 2015 New Revision: 68281 URL: http://svn.reactos.org/svn/reactos?rev=68281&view=rev Log: [IEFRAME] Add some missing quotes to ieframe.rc. NFC. Spotted by Jared Smudde. CORE-9843 Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Fri Jun 26 17:33:45 2015 @@ -67,14 +67,14 @@ #include <wine/wine_common_ver.rc> /* @makedep: ietoolbar.bmp */ -IDB_IETOOLBAR BITMAP resources/ietoolbar.bmp +IDB_IETOOLBAR BITMAP "resources/ietoolbar.bmp" #ifdef __REACTOS__ IDC_PAGEICO ICON "resources/pages.ico" #endif /* @makedep: ieframe.rgs */ -1 WINE_REGISTRY ieframe.rgs +1 WINE_REGISTRY "ieframe.rgs" 2 WINE_REGISTRY "ieframe_v1.rgs" 3 WINE_REGISTRY "ieframe_v1.tlb.rgs"

1 0

[akhaldi] 68280: [KBSWITCH] Re-register the systray icon after explorer restart. By Joachim Henze. CORE-9869
by akhaldi＠svn.reactos.org 26 Jun '15

26 Jun '15

Author: akhaldi Date: Fri Jun 26 17:18:26 2015 New Revision: 68280 URL: http://svn.reactos.org/svn/reactos?rev=68280&view=rev Log: [KBSWITCH] Re-register the systray icon after explorer restart. By Joachim Henze. CORE-9869 Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Fri Jun 26 17:18:26 2015 @@ -390,6 +390,7 @@ { static HMENU hRightPopupMenu; static TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH]; + static UINT s_uTaskbarRestart; switch (Message) { @@ -400,6 +401,7 @@ hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); ActivateLayout(hwnd, ulCurrentLayoutNum); + s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); return 0; } @@ -506,6 +508,11 @@ return 0; } + + default: + if(Message == s_uTaskbarRestart) + AddTrayIcon(hwnd); + break; } return DefWindowProc(hwnd, Message, wParam, lParam);

1 0

[akhaldi] 68279: [DDK] Annotate hdaudio.h. CORE-9882
by akhaldi＠svn.reactos.org 26 Jun '15

26 Jun '15

Author: akhaldi Date: Fri Jun 26 16:44:31 2015 New Revision: 68279 URL: http://svn.reactos.org/svn/reactos?rev=68279&view=rev Log: [DDK] Annotate hdaudio.h. 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:44:31 2015 @@ -110,97 +110,121 @@ ULONG InterruptOnCompletion; } HDAUDIO_BUFFER_DESCRIPTOR, *PHDAUDIO_BUFFER_DESCRIPTOR; -typedef NTSTATUS +typedef +_Must_inspect_result_ +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 + _In_ PVOID _context, + _In_ ULONG Count, + _Inout_updates_(Count) PHDAUDIO_CODEC_TRANSFER CodecTransfer, + _In_opt_ PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, + _In_opt_ PVOID Context); + +typedef +_Must_inspect_result_ +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 + _In_ PVOID _context, + _In_ UCHAR CodecAddress, + _In_ PHDAUDIO_STREAM_FORMAT StreamFormat, + _Out_ PHANDLE Handle, + _Out_ PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef +_Must_inspect_result_ +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 + _In_ PVOID _context, + _In_ PHDAUDIO_STREAM_FORMAT StreamFormat, + _In_ BOOLEAN Stripe, + _Out_ PHANDLE Handle, + _Out_ PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PCHANGE_BANDWIDTH_ALLOCATION)( - IN PVOID _context, - IN HANDLE Handle, - IN PHDAUDIO_STREAM_FORMAT StreamFormat, - OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ PHDAUDIO_STREAM_FORMAT StreamFormat, + _Out_ PHDAUDIO_CONVERTER_FORMAT ConverterFormat); + +typedef +_Must_inspect_result_ +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 + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ SIZE_T RequestedBufferSize, + _Out_ PMDL *BufferMdl, + _Out_ PSIZE_T AllocatedBufferSize, + _Out_ PUCHAR StreamId, + _Out_ PULONG FifoSize); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PFREE_DMA_BUFFER)( - IN PVOID _context, - IN HANDLE Handle); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PFREE_DMA_ENGINE)( - IN PVOID _context, - IN HANDLE Handle); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PSET_DMA_ENGINE_STATE)( - IN PVOID _context, - IN HDAUDIO_STREAM_STATE StreamState, - IN ULONG NumberOfHandles, - IN PHANDLE Handles); + _In_ PVOID _context, + _In_ HDAUDIO_STREAM_STATE StreamState, + _In_ ULONG NumberOfHandles, + _In_reads_(NumberOfHandles) PHANDLE Handles); typedef VOID (NTAPI *PGET_WALL_CLOCK_REGISTER)( - IN PVOID _context, - OUT PULONG *Wallclock); - -typedef NTSTATUS + _In_ PVOID _context, + _Out_ PULONG *Wallclock); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PGET_LINK_POSITION_REGISTER)( - IN PVOID _context, - IN HANDLE Handle, - OUT PULONG *Position); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _Out_ PULONG *Position); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PREGISTER_EVENT_CALLBACK)( - IN PVOID _context, - IN PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, - IN PVOID Context, - OUT PUCHAR Tag); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, + _In_opt_ PVOID Context, + _Out_ PUCHAR Tag); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PUNREGISTER_EVENT_CALLBACK)( - IN PVOID _context, - IN UCHAR Tag); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ UCHAR Tag); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PGET_DEVICE_INFORMATION)( - IN PVOID _context, - IN OUT PHDAUDIO_DEVICE_INFORMATION DeviceInformation); + _In_ PVOID _context, + _Out_ PHDAUDIO_DEVICE_INFORMATION DeviceInformation); typedef VOID (NTAPI *PGET_RESOURCE_INFORMATION)( - IN PVOID _context, - OUT PUCHAR CodecAddress, - OUT PUCHAR FunctionGroupStartNode); + _In_ PVOID _context, + _Out_ PUCHAR CodecAddress, + _Out_ PUCHAR FunctionGroupStartNode); typedef struct _HDAUDIO_BUS_INTERFACE { USHORT Size; @@ -226,32 +250,38 @@ typedef void (NTAPI *PHDAUDIO_BDL_ISR)( - IN VOID *Context, - IN ULONG InterruptBitMask); - -typedef NTSTATUS + _In_ VOID *Context, + _In_ ULONG InterruptBitMask); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PALLOCATE_CONTIGUOUS_DMA_BUFFER)( - IN PVOID _context, - IN HANDLE Handle, + _In_ PVOID _context, + _In_ HANDLE Handle, ULONG RequestedBufferSize, - OUT PVOID *DataBuffer, - OUT PHDAUDIO_BUFFER_DESCRIPTOR *BdlBuffer); - -typedef NTSTATUS + _Out_ PVOID *DataBuffer, + _Out_ PHDAUDIO_BUFFER_DESCRIPTOR *BdlBuffer); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PFREE_CONTIGUOUS_DMA_BUFFER)( - IN PVOID _context, - IN HANDLE Handle); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle); + +typedef +_Must_inspect_result_ +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); + _In_reads_bytes_(BufferLength) 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; @@ -276,36 +306,44 @@ PGET_RESOURCE_INFORMATION GetResourceInformation; } HDAUDIO_BUS_INTERFACE_BDL, *PHDAUDIO_BUS_INTERFACE_BDL; -typedef NTSTATUS +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *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 + _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 +_Must_inspect_result_ +NTSTATUS (NTAPI *PFREE_DMA_BUFFER_WITH_NOTIFICATION)( - IN PVOID _context, - IN HANDLE Handle, - IN PMDL BufferMdl, - IN SIZE_T BufferSize); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ PMDL BufferMdl, + _In_ SIZE_T BufferSize); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PREGISTER_NOTIFICATION_EVENT)( - IN PVOID _context, - IN HANDLE Handle, - IN PKEVENT NotificationEvent); - -typedef NTSTATUS + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ PKEVENT NotificationEvent); + +typedef +_Must_inspect_result_ +NTSTATUS (NTAPI *PUNREGISTER_NOTIFICATION_EVENT)( - IN PVOID _context, - IN HANDLE Handle, - IN PKEVENT NotificationEvent); + _In_ PVOID _context, + _In_ HANDLE Handle, + _In_ PKEVENT NotificationEvent); typedef struct _HDAUDIO_BUS_INTERFACE_V2 { USHORT Size;

1 0

[akhaldi] 68278: [DDK] Bring hdaudio.h to DDK formatting. NFC.
by akhaldi＠svn.reactos.org 26 Jun '15

26 Jun '15

Author: akhaldi Date: Fri Jun 26 16:32:40 2015 New Revision: 68278 URL: http://svn.reactos.org/svn/reactos?rev=68278&view=rev Log: [DDK] Bring hdaudio.h to DDK formatting. NFC. 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:32:40 2015 @@ -6,242 +6,331 @@ #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, 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); +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; +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; + 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; +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 SDataIn:4; + ULONG IsUnsolicitedResponse:1; ULONG :25; - ULONG HasFifoOverrun : 1; - ULONG IsValid : 1; + ULONG HasFifoOverrun:1; + ULONG IsValid:1; }; ULONGLONG CompleteResponse; }; } HDAUDIO_CODEC_RESPONSE, *PHDAUDIO_CODEC_RESPONSE; -typedef struct _HDAUDIO_CODEC_TRANSFER -{ - HDAUDIO_CODEC_COMMAND Output; +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; + +#endif /* _HDAUDIO_CODEC_TRANSFER_ */ + +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; +typedef struct _HDAUDIO_CONVERTER_FORMAT { + union { + struct { + USHORT NumberOfChannels:4; + USHORT BitsPerSample:3; + USHORT :1; + USHORT SampleRate:7; + USHORT StreamType:1; }; - USHORT ConverterFormat; + USHORT ConverterFormat; }; } HDAUDIO_CONVERTER_FORMAT, *PHDAUDIO_CONVERTER_FORMAT; -typedef enum _HDAUDIO_STREAM_STATE -{ +typedef enum _HDAUDIO_STREAM_STATE { ResetState = 0, - StopState = 1, + StopState = 1, PauseState = 1, - RunState = 2 + RunState = 2 } HDAUDIO_STREAM_STATE, *PHDAUDIO_STREAM_STATE; -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 -{ - 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 +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 { + 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; +typedef struct _HDAUDIO_BUFFER_DESCRIPTOR { + PHYSICAL_ADDRESS Address; + ULONG Length; + ULONG InterruptOnCompletion; } HDAUDIO_BUFFER_DESCRIPTOR, *PHDAUDIO_BUFFER_DESCRIPTOR; - -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 -{ - 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; +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 { + 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 (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 (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 -{ - 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; +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 +(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 { + 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; + 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 (NTAPI *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 (NTAPI *PFREE_DMA_BUFFER_WITH_NOTIFICATION) (IN PVOID _context, - IN HANDLE Handle, - IN PMDL BufferMdl, - IN SIZE_T BufferSize); - -typedef NTSTATUS (NTAPI *PREGISTER_NOTIFICATION_EVENT) (IN PVOID _context, - IN HANDLE Handle, - IN PKEVENT NotificationEvent); - -typedef NTSTATUS (NTAPI *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; +typedef NTSTATUS +(NTAPI *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 +(NTAPI *PFREE_DMA_BUFFER_WITH_NOTIFICATION)( + IN PVOID _context, + IN HANDLE Handle, + IN PMDL BufferMdl, + IN SIZE_T BufferSize); + +typedef NTSTATUS +(NTAPI *PREGISTER_NOTIFICATION_EVENT)( + IN PVOID _context, + IN HANDLE Handle, + IN PKEVENT NotificationEvent); + +typedef NTSTATUS +(NTAPI *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 @@ -249,5 +338,4 @@ #pragma warning(default:4214) #endif -#endif // _HDAUDIO_H_ - +#endif /* _HDAUDIO_H_ */

1 0

[akhaldi] 68277: [DDK] Explicitly mark the function pointers as NTAPI. CORE-9882
by akhaldi＠svn.reactos.org 26 Jun '15

26 Jun '15

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);

1 0

[janderwald] 68276: [DDK] - add hdaudio.h
by janderwald＠svn.reactos.org 26 Jun '15

26 Jun '15

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

1 0

[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 26 Jun '15

26 Jun '15

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; } -

1 0

[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 26 Jun '15

26 Jun '15

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 */

1 0

[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 26 Jun '15

26 Jun '15

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; //

1 0

[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 26 Jun '15

26 Jun '15

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; - } -}

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