Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[gedmurphy] 68334: [DEVMGR] - Implement dynamic context menu for device and class nodes - Fix CanUninstall to return correct results - Strings hardcoded for now, will fix soon

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jul 3 06:56:58 2015 New Revision: 68334 URL: http://svn.reactos.org/svn/reactos?rev=68334&view=rev Log: [DEVMGR] - Implement dynamic context menu for device and class nodes - Fix CanUninstall to return correct results - Strings hardcoded for now, will fix soon Modified: trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp 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/Node.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Node.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp [iso-8859-1] Fri Jul 3 06:56:58 2015 @@ -16,7 +16,7 @@ _In_ LPGUID ClassGuid, _In_ PSP_CLASSIMAGELIST_DATA ImageListData ) : - CNode(ImageListData) + CNode(ClassNode, ImageListData) { CopyMemory(&m_ClassGuid, ClassGuid, sizeof(GUID)); } 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 Jul 3 06:56:58 2015 @@ -16,7 +16,7 @@ _In_opt_ DEVINST Device, _In_ PSP_CLASSIMAGELIST_DATA ImageListData ) : - CNode(ImageListData), + CNode(DeviceNode, ImageListData), m_DevInst(Device), m_hDevInfo(NULL), m_Status(0), @@ -260,11 +260,12 @@ NULL); if (cr == CR_SUCCESS) { - return ((m_Status & DN_DISABLEABLE) != 0 && - (m_Status & DN_ROOT_ENUMERATED) == 0); - } - - return false; + if ((m_Status & DN_ROOT_ENUMERATED) != 0 && + (m_Status & DN_DISABLEABLE) == 0) + return false; + } + + return true; } bool 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 Jul 3 06:56:58 2015 @@ -27,10 +27,11 @@ bool HasProblem(); bool IsHidden(); bool CanDisable(); - bool IsDisabled(); + virtual bool IsDisabled(); bool IsStarted(); bool IsInstalled(); bool CanUninstall(); + virtual bool CanUpdate() { return true; } // unimplemented bool EnableDevice( _In_ bool Enable, 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 Jul 3 06:56:58 2015 @@ -49,7 +49,6 @@ m_hTreeView(NULL), m_hPropertyDialog(NULL), m_hMenu(NULL), - m_hContextMenu(NULL), m_ViewType(DevicesByType), m_ShowHidden(FALSE), m_RootClassImage(-1), @@ -92,9 +91,7 @@ SetWindowTheme(m_hTreeView, L"explorer", NULL); } - // Create the context menu and make properties the default item - m_hContextMenu = CreatePopupMenu(); - SetMenuDefaultItem(m_hContextMenu, IDC_PROPERTIES, FALSE); + return !!(m_hTreeView); } @@ -109,8 +106,6 @@ SetupDiDestroyClassImageList(&m_ImageListData); ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA)); } - - DestroyMenu(m_hContextMenu); return true; } @@ -168,26 +163,14 @@ PtInRect(&rc, pt)) { - CNode *Node = GetSelectedNode(); - if (Node && Node->HasProperties()) - { - - } - - - - - - INT xPos = GET_X_LPARAM(lParam); INT yPos = GET_Y_LPARAM(lParam); - TrackPopupMenuEx(m_hContextMenu, - TPM_RIGHTBUTTON, - xPos, - yPos, - m_hMainWnd, - NULL); + CNode *Node = GetSelectedNode(); + if (Node) + { + BuildContextMenuForNode(Node, xPos, yPos); + } } } @@ -807,6 +790,100 @@ return TreeView_InsertItem(m_hTreeView, &tvins); } +void +CDeviceView::BuildContextMenuForNode( + _In_ CNode *Node, + _In_ INT xPos, + _In_ INT yPos + ) +{ + // Create the context menu + HMENU hContextMenu = CreatePopupMenu(); + + // Create a seperator structure + MENUITEMINFOW MenuSeperator = { 0 }; + MenuSeperator.cbSize = sizeof(MENUITEMINFOW); + MenuSeperator.fType = MFT_SEPARATOR; + + // Setup the + MENUITEMINFOW MenuItemInfo = { 0 }; + MenuItemInfo.cbSize = sizeof(MENUITEMINFOW); + MenuItemInfo.fMask = MIIM_ID | MIIM_STRING | MIIM_DATA | MIIM_SUBMENU; + MenuItemInfo.fType = MFT_STRING; + + int i = 0; + + // Device nodes have extra data + if (Node->GetNodeType() == DeviceNode) + { + CDeviceNode *DeviceNode = dynamic_cast<CDeviceNode *>(Node); + + if (DeviceNode->CanUpdate()) + { + MenuItemInfo.wID = IDC_UPDATE_DRV; + MenuItemInfo.dwTypeData = L"Update driver software..."; + InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + i++; + } + + if (DeviceNode->IsDisabled()) + { + MenuItemInfo.wID = IDC_ENABLE_DRV; + MenuItemInfo.dwTypeData = L"Enable"; + InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + i++; + } + + if (DeviceNode->CanDisable() && !DeviceNode->IsDisabled()) + { + MenuItemInfo.wID = IDC_DISABLE_DRV; + MenuItemInfo.dwTypeData = L"Disable"; + InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + i++; + } + + if (DeviceNode->CanUninstall()) + { + MenuItemInfo.wID = IDC_UNINSTALL_DRV; + MenuItemInfo.dwTypeData = L"Uninstall"; + InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + i++; + } + + InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator); + i++; + } + + // All nodes have the scan option + MenuItemInfo.wID = IDC_SCAN_HARDWARE; + MenuItemInfo.dwTypeData = L"Scan for hardware changes"; + InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + i++; + + if (Node->HasProperties()) + { + InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator); + i++; + + MenuItemInfo.wID = IDC_PROPERTIES; + MenuItemInfo.dwTypeData = L"Properties"; + InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + i++; + + SetMenuDefaultItem(hContextMenu, IDC_PROPERTIES, FALSE); + } + + // Display the menu + TrackPopupMenuEx(hContextMenu, + TPM_RIGHTBUTTON, + xPos, + yPos, + m_hMainWnd, + NULL); + + DestroyMenu(hContextMenu); +} + HTREEITEM CDeviceView::RecurseFindDevice( _In_ HTREEITEM hParentItem, @@ -828,6 +905,7 @@ if (TreeView_GetItem(m_hTreeView, &tvItem) && tvItem.lParam != NULL) { + // check for a matching deviceid Node = reinterpret_cast<CNode *>(tvItem.lParam); if (Node->GetDeviceId() && (wcscmp(Node->GetDeviceId(), DeviceId) == 0)) @@ -840,7 +918,7 @@ FoundItem = RecurseFindDevice(hItem, DeviceId); if (FoundItem) return FoundItem; - // Delete all the siblings + // Loop all the siblings for (;;) { // Get the next item at this level @@ -852,6 +930,7 @@ tvItem.mask = TVIF_PARAM; if (TreeView_GetItem(m_hTreeView, &tvItem)) { + // check for a matching deviceid Node = reinterpret_cast<CNode *>(tvItem.lParam); if (Node->GetDeviceId() && wcscmp(Node->GetDeviceId(), DeviceId) == 0) @@ -879,14 +958,19 @@ 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); - } + // If we don't want to set select a node, just select root + if (DeviceId == NULL) + { + TreeView_SelectItem(m_hTreeView, hRoot); + return; + } + + // Scan the tree looking for the node we want + hItem = RecurseFindDevice(hRoot, DeviceId); + if (hItem) + { + TreeView_SelectItem(m_hTreeView, hItem); + TreeView_Expand(m_hTreeView, hItem, TVM_EXPAND); } else { 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 Jul 3 06:56:58 2015 @@ -20,7 +20,6 @@ HWND m_hTreeView; HWND m_hPropertyDialog; HMENU m_hMenu; - HMENU m_hContextMenu; ViewType m_ViewType; HTREEITEM m_hTreeRoot; DEVINST m_RootDevInst; @@ -128,6 +127,12 @@ _In_ CNode *Node ); + void BuildContextMenuForNode( + _In_ CNode *Node, + _In_ INT xPos, + _In_ INT yPos + ); + HTREEITEM RecurseFindDevice( _In_ HTREEITEM hParentItem, _In_ LPWSTR DeviceId 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 Jul 3 06:56:58 2015 @@ -14,7 +14,9 @@ /* PUBLIC METHODS *******************************************/ -CNode::CNode(_In_ PSP_CLASSIMAGELIST_DATA ImageListData) : +CNode::CNode(_In_ NodeType Type, + _In_ PSP_CLASSIMAGELIST_DATA ImageListData) : + m_NodeType(Type), m_ImageListData(ImageListData), m_DeviceId(NULL), m_ClassImage(0) Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Node.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Node.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Node.h [iso-8859-1] Fri Jul 3 06:56:58 2015 @@ -1,6 +1,13 @@ #pragma once #define DISPLAY_NAME_LEN 256 + +enum NodeType +{ + RootNode, + ClassNode, + DeviceNode +}; class CNode { @@ -10,9 +17,11 @@ WCHAR m_DisplayName[DISPLAY_NAME_LEN]; GUID m_ClassGuid; INT m_ClassImage; + NodeType m_NodeType; public: CNode( + _In_ NodeType Type, _In_ PSP_CLASSIMAGELIST_DATA ImageListData ); @@ -20,6 +29,7 @@ virtual bool SetupNode() = 0; + NodeType GetNodeType() { return m_NodeType; } LPGUID GetClassGuid() { return &m_ClassGuid; } LPWSTR GetDisplayName() { return m_DisplayName; } INT GetClassImage() { return m_ClassImage; }

9 years, 2 months

[pschweitzer] 68333: [NTFS] Kill a magic value. Dedicated to Hervé :-)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jul 2 20:11:11 2015 New Revision: 68333 URL: http://svn.reactos.org/svn/reactos?rev=68333&view=rev Log: [NTFS] Kill a magic value. Dedicated to Hervé :-) 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 Jul 2 20:11:11 2015 @@ -681,7 +681,7 @@ IndexBuffer = (PINDEX_BUFFER)IndexRecord; ASSERT(IndexBuffer->Ntfs.Type == NRH_INDX_TYPE); - ASSERT(IndexBuffer->Header.AllocatedSize + 0x18 == IndexBlockSize); + ASSERT(IndexBuffer->Header.AllocatedSize + FIELD_OFFSET(INDEX_BUFFER, Header) == IndexBlockSize); IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize));

9 years, 2 months

[janderwald] 68332: [DDK] - add missing PcUnregisterAdapterPowerManagement

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jul 2 15:40:49 2015 New Revision: 68332 URL: http://svn.reactos.org/svn/reactos?rev=68332&view=rev Log: [DDK] - add missing PcUnregisterAdapterPowerManagement Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Thu Jul 2 15:40:49 2015 @@ -2348,6 +2348,10 @@ IN PVOID pvContext1); PORTCLASSAPI NTSTATUS NTAPI +PcUnregisterAdapterPowerManagement( + IN PDEVICE_OBJECT DeviceObject); + +PORTCLASSAPI NTSTATUS NTAPI PcRequestNewPowerState( IN PDEVICE_OBJECT pDeviceObject, IN DEVICE_POWER_STATE RequestedNewState);

9 years, 2 months

[janderwald] 68331: [PORTCLS] - implement & export PcUnregisterAdapterPowerManagement

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jul 2 15:35:19 2015 New Revision: 68331 URL: http://svn.reactos.org/svn/reactos?rev=68331&view=rev Log: [PORTCLS] - implement & export PcUnregisterAdapterPowerManagement Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec [iso-8859-1] Thu Jul 2 15:35:19 2015 @@ -41,6 +41,7 @@ ; Power Management @ stdcall PcRegisterAdapterPowerManagement(ptr ptr) @ stdcall PcRequestNewPowerState(ptr long) +@ stdcall PcUnregisterAdapterPowerManagement(ptr) ; Properties @ stdcall PcCompletePendingPropertyRequest(ptr long) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] Thu Jul 2 15:35:19 2015 @@ -48,6 +48,30 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +PcUnregisterAdapterPowerManagement( + IN PDEVICE_OBJECT DeviceObject) +{ + PPCLASS_DEVICE_EXTENSION DeviceExt; + + DPRINT("PcUnregisterAdapterPowerManagement pUnknown %p pvContext %p\n", DeviceObject); + PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + if (!DeviceObject) + return STATUS_INVALID_PARAMETER; + + DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExt->AdapterPowerManagement) + { + DeviceExt->AdapterPowerManagement->Release(); + } + DeviceExt->AdapterPowerManagement = NULL; + return STATUS_SUCCESS; +} + + static VOID

9 years, 2 months

[janderwald] 68330: [HDAUDBUS] - partly implement HDA_TransferCodecVerbs - stubplement HDAUDIO_BUS_INTERFACE_V2 - silence traces

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jul 2 11:07:39 2015 New Revision: 68330 URL: http://svn.reactos.org/svn/reactos?rev=68330&view=rev Log: [HDAUDBUS] - partly implement HDA_TransferCodecVerbs - stubplement HDAUDIO_BUS_INTERFACE_V2 - silence traces Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp [iso-8859-1] Thu Jul 2 11:07:39 2015 @@ -27,15 +27,37 @@ NTSTATUS NTAPI HDA_TransferCodecVerbs( -IN PVOID _context, -IN ULONG Count, -IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, -IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, -IN PVOID Context) -{ - UNIMPLEMENTED; - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + IN PVOID _context, + IN ULONG Count, + IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, + IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, + IN PVOID Context) +{ + ULONG Verbs[MAX_CODEC_RESPONSES], Responses[MAX_CODEC_RESPONSES]; + ULONG Index; + PHDA_PDO_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("HDA_TransferCodecVerbs Coun %lu CodecTransfer %p Callback %p Context %p\n", Count, CodecTransfer, Callback, Context); + + /* get device extension */ + DeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)_context; + ASSERT(DeviceExtension->IsFDO == FALSE); + + /* FIXME handle callback*/ + ASSERT(Callback == NULL); + + for (Index = 0; Index < Count; Index++) + { + Verbs[Index] = CodecTransfer[Index].Output.Command; + } + + HDA_SendVerbs(DeviceExtension->FDO, DeviceExtension->Codec, Verbs, Responses, Count); + + for (Index = 0; Index < DeviceExtension->Codec->ResponseCount; Index++) + { + CodecTransfer[Index].Input.Response = DeviceExtension->Codec->Responses[Index]; + } + return STATUS_SUCCESS; } NTSTATUS @@ -216,12 +238,70 @@ } NTSTATUS +NTAPI +HDA_AllocateDmaBufferWithNotification( + 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) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; + +} +NTSTATUS +NTAPI +HDA_FreeDmaBufferWithNotification( + IN PVOID _context, + IN HANDLE Handle, + IN PMDL BufferMdl, + IN SIZE_T BufferSize) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; + +} + +NTSTATUS +NTAPI +HDA_RegisterNotificationEvent( + PVOID _context, + HANDLE Handle, + IN PKEVENT NotificationEvent) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; + +} + +NTSTATUS +NTAPI +HDA_UnregisterNotificationEvent( + IN PVOID _context, + IN HANDLE Handle, + IN PKEVENT NotificationEvent) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS HDA_PDOHandleQueryInterface( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - PHDAUDIO_BUS_INTERFACE InterfaceHDA; + PHDAUDIO_BUS_INTERFACE_V2 InterfaceHDA; PHDA_PDO_DEVICE_EXTENSION DeviceExtension; /* get device extension */ @@ -232,10 +312,12 @@ if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, GUID_HDAUDIO_BUS_INTERFACE)) { - InterfaceHDA = (PHDAUDIO_BUS_INTERFACE)IoStack->Parameters.QueryInterface.Interface; + InterfaceHDA = (PHDAUDIO_BUS_INTERFACE_V2)IoStack->Parameters.QueryInterface.Interface; InterfaceHDA->Version = IoStack->Parameters.QueryInterface.Version; - InterfaceHDA->Size = IoStack->Parameters.QueryInterface.Size; + InterfaceHDA->Size = sizeof(HDAUDIO_BUS_INTERFACE); InterfaceHDA->Context = DeviceExtension; + InterfaceHDA->InterfaceReference = HDA_InterfaceReference; + InterfaceHDA->InterfaceDereference = HDA_InterfaceDereference; InterfaceHDA->TransferCodecVerbs = HDA_TransferCodecVerbs; InterfaceHDA->AllocateCaptureDmaEngine = HDA_AllocateCaptureDmaEngine; @@ -251,11 +333,40 @@ InterfaceHDA->UnregisterEventCallback = HDA_UnregisterEventCallback; InterfaceHDA->GetDeviceInformation = HDA_GetDeviceInformation; InterfaceHDA->GetResourceInformation = HDA_GetResourceInformation; - return STATUS_SUCCESS; } + else if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, GUID_HDAUDIO_BUS_INTERFACE_V2)) + { + InterfaceHDA = (PHDAUDIO_BUS_INTERFACE_V2)IoStack->Parameters.QueryInterface.Interface; + InterfaceHDA->Version = IoStack->Parameters.QueryInterface.Version; + InterfaceHDA->Size = sizeof(HDAUDIO_BUS_INTERFACE_V2); + InterfaceHDA->Context = DeviceExtension; + InterfaceHDA->InterfaceReference = HDA_InterfaceReference; + InterfaceHDA->InterfaceDereference = HDA_InterfaceDereference; + + InterfaceHDA->TransferCodecVerbs = HDA_TransferCodecVerbs; + InterfaceHDA->AllocateCaptureDmaEngine = HDA_AllocateCaptureDmaEngine; + InterfaceHDA->AllocateRenderDmaEngine = HDA_AllocateRenderDmaEngine; + InterfaceHDA->ChangeBandwidthAllocation = HDA_ChangeBandwidthAllocation; + InterfaceHDA->AllocateDmaBuffer = HDA_AllocateDmaBuffer; + InterfaceHDA->FreeDmaBuffer = HDA_FreeDmaBuffer; + InterfaceHDA->FreeDmaEngine = HDA_FreeDmaEngine; + InterfaceHDA->SetDmaEngineState = HDA_SetDmaEngineState; + InterfaceHDA->GetWallClockRegister = HDA_GetWallClockRegister; + InterfaceHDA->GetLinkPositionRegister = HDA_GetLinkPositionRegister; + InterfaceHDA->RegisterEventCallback = HDA_RegisterEventCallback; + InterfaceHDA->UnregisterEventCallback = HDA_UnregisterEventCallback; + InterfaceHDA->GetDeviceInformation = HDA_GetDeviceInformation; + InterfaceHDA->GetResourceInformation = HDA_GetResourceInformation; + + InterfaceHDA->AllocateDmaBufferWithNotification = HDA_AllocateDmaBufferWithNotification; + InterfaceHDA->FreeDmaBufferWithNotification = HDA_FreeDmaBufferWithNotification; + InterfaceHDA->RegisterNotificationEvent = HDA_RegisterNotificationEvent; + InterfaceHDA->UnregisterNotificationEvent = HDA_UnregisterNotificationEvent; + } // FIXME - // implement support for GUID_HDAUDIO_BUS_INTERFACE_BDL, GUID_HDAUDIO_BUS_INTERFACE_V2 + // implement support for GUID_HDAUDIO_BUS_INTERFACE_BDL + UNIMPLEMENTED; return STATUS_NOT_SUPPORTED; } Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] Thu Jul 2 11:07:39 2015 @@ -127,6 +127,7 @@ /* get device extension */ DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension->IsFDO); /* reset response count */ Codec->ResponseCount = 0; @@ -249,6 +250,7 @@ ChildDeviceExtension->IsFDO = FALSE; ChildDeviceExtension->Codec = Entry; ChildDeviceExtension->AudioGroup = AudioGroup; + ChildDeviceExtension->FDO = DeviceObject; /* setup flags */ AudioGroup->ChildPDO->Flags |= DO_POWER_PAGABLE; Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] Thu Jul 2 11:07:39 2015 @@ -98,18 +98,14 @@ //ChildDeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("HDA_Pnp Minor: %u IsFDO%d\n", IoStack->MinorFunction, FDODeviceExtension->IsFDO); - if (FDODeviceExtension->IsFDO) { if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { - DPRINT1("IRP_MN_START_DEVICE\n"); Status = HDA_FDOStartDevice(DeviceObject, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) { - DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS\n"); /* handle bus device relations */ if (IoStack->Parameters.QueryDeviceRelations.Type == BusRelations) { @@ -130,25 +126,21 @@ { if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { - DPRINT1("IRP_MN_START_DEVICE\n"); /* no op for pdo */ Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_BUS_INFORMATION) { - DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); /* query bus information */ Status = HDA_PDOQueryBusInformation(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) { - DPRINT1("IRP_MN_QUERY_PNP_DEVICE_STATE\n"); /* query pnp state */ Status = HDA_PDOQueryBusDevicePnpState(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) { - DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS\n"); if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { /* handle target device relations */ @@ -180,35 +172,29 @@ } else if (IoStack->MinorFunction == IRP_MN_QUERY_CAPABILITIES) { - DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); /* query capabilities */ Status = HDA_PDOQueryBusDeviceCapabilities(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCE_REQUIREMENTS) { - DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); /* no op */ Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCES) { - DPRINT1("IRP_MN_QUERY_RESOURCES\n"); /* no op */ Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_ID) { - DPRINT1("IRP_MN_QUERY_ID\n"); Status = HDA_PDOQueryId(DeviceObject, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_TEXT) { - DPRINT1("IRP_MN_QUERY_DEVICE_TEXT\n"); Status = HDA_PDOHandleQueryDeviceText(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_INTERFACE) { - DPRINT1("IRP_MN_QUERY_INTERFACE\n"); Status = HDA_PDOHandleQueryInterface(DeviceObject, Irp); } else Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h [iso-8859-1] Thu Jul 2 11:07:39 2015 @@ -85,6 +85,7 @@ BOOLEAN IsFDO; PHDA_CODEC_ENTRY Codec; PHDA_CODEC_AUDIO_GROUP AudioGroup; + PDEVICE_OBJECT FDO; }HDA_PDO_DEVICE_EXTENSION, *PHDA_PDO_DEVICE_EXTENSION; @@ -131,6 +132,14 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +VOID +HDA_SendVerbs( + IN PDEVICE_OBJECT DeviceObject, + IN PHDA_CODEC_ENTRY Codec, + IN PULONG Verbs, + OUT PULONG Responses, + IN ULONG Count); + /* pdo.cpp*/ NTSTATUS

9 years, 2 months

[pschweitzer] 68329: [NTFS_TEST] No need for such test anylonger, we have NTFSInfo now which is better :-)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jul 1 11:17:22 2015 New Revision: 68329 URL: http://svn.reactos.org/svn/reactos?rev=68329&view=rev Log: [NTFS_TEST] No need for such test anylonger, we have NTFSInfo now which is better :-) Removed: trunk/rostests/tests/ntfs/

9 years, 2 months

[janderwald] 68328: [PORTCLS] - check if there are enough irp stack locations

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jul 1 07:39:35 2015 New Revision: 68328 URL: http://svn.reactos.org/svn/reactos?rev=68328&view=rev Log: [PORTCLS] - check if there are enough irp stack locations Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Wed Jul 1 07:39:35 2015 @@ -548,7 +548,11 @@ // initialize the notification event KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); + // are there enough irp stack locations + if (Irp->CurrentLocation < Irp->StackCount + 1) + { + IoCopyCurrentIrpStackLocationToNext(Irp); + } IoSetCompletionRoutine(Irp, CompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE);

9 years, 2 months

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 July 2015