Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 46646: [MSDVBNP] - Remove DebugBreak - Implement IPin::Connect, IPin::ReceiveConnection, IPin::Disconnect, IPin::ConnectedTo - Remove spaces - DVBT Network Provider can now connect tv tuner in ReactOS
by janderwald＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: janderwald Date: Thu Apr 1 21:20:12 2010 New Revision: 46646 URL: http://svn.reactos.org/svn/reactos?rev=46646&view=rev Log: [MSDVBNP] - Remove DebugBreak - Implement IPin::Connect, IPin::ReceiveConnection, IPin::Disconnect, IPin::ConnectedTo - Remove spaces - DVBT Network Provider can now connect tv tuner in ReactOS Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp trunk/reactos/dll/directx/msdvbnp/networkprovider.cpp trunk/reactos/dll/directx/msdvbnp/pin.cpp Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/msdvbn… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] Thu Apr 1 21:20:12 2010 @@ -122,7 +122,7 @@ { UINT i; HRESULT hres = E_OUTOFMEMORY; - IClassFactory * pcf = NULL; + IClassFactory * pcf = NULL; if (!ppv) return E_INVALIDARG; @@ -138,7 +138,7 @@ } } - if (!pcf) + if (!pcf) { return CLASS_E_CLASSNOTAVAILABLE; } Modified: trunk/reactos/dll/directx/msdvbnp/networkprovider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/networ… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/networkprovider.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/networkprovider.cpp [iso-8859-1] Thu Apr 1 21:20:12 2010 @@ -201,7 +201,6 @@ swprintf(Buffer, L"CNetworkProvider::QueryInterface: NoInterface for %s !!!\n", lpstr); OutputDebugStringW(Buffer); CoTaskMemFree(lpstr); - DebugBreak(); return E_NOINTERFACE; } Modified: trunk/reactos/dll/directx/msdvbnp/pin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/pin.cp… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/pin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/pin.cpp [iso-8859-1] Thu Apr 1 21:20:12 2010 @@ -51,7 +51,7 @@ HRESULT STDMETHODCALLTYPE EndFlush(); HRESULT STDMETHODCALLTYPE NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); - CPin(IBaseFilter * ParentFilter) : m_Ref(0), m_ParentFilter(ParentFilter){}; + CPin(IBaseFilter * ParentFilter); virtual ~CPin(){}; static LPCWSTR PIN_ID; @@ -59,10 +59,30 @@ protected: LONG m_Ref; IBaseFilter * m_ParentFilter; + AM_MEDIA_TYPE m_MediaType; + IPin * m_Pin; }; LPCWSTR CPin::PIN_ID = L"Antenna Out"; + + +CPin::CPin( + IBaseFilter * ParentFilter) : m_Ref(0), + m_ParentFilter(ParentFilter), + m_Pin(0) +{ + m_MediaType.majortype = KSDATAFORMAT_TYPE_BDA_ANTENNA; + m_MediaType.subtype = MEDIASUBTYPE_None; + m_MediaType.formattype = FORMAT_None; + m_MediaType.bFixedSizeSamples = true; + m_MediaType.bTemporalCompression = false; + m_MediaType.lSampleSize = sizeof(CHAR); + m_MediaType.pUnk = NULL; + m_MediaType.cbFormat = 0; + m_MediaType.pbFormat = NULL; +} + HRESULT STDMETHODCALLTYPE @@ -100,36 +120,97 @@ STDMETHODCALLTYPE CPin::Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { + HRESULT hr; OutputDebugStringW(L"CPin::Connect called\n"); - return E_NOTIMPL; + + if (pmt) + { + hr = pReceivePin->QueryAccept(pmt); + if (FAILED(hr)) + { + OutputDebugStringW(L"CPin::Connect QueryAccept failed\n"); + return hr; + } + } + else + { + // query accept + hr = pReceivePin->QueryAccept(&m_MediaType); + if (FAILED(hr)) + { + OutputDebugStringW(L"CPin::Connect QueryAccept pmt default failed\n"); + return hr; + } + + pmt = &m_MediaType; + } + + // receive connection; + hr = pReceivePin->ReceiveConnection((IPin*)this, pmt); + if (SUCCEEDED(hr)) + { + // increment reference count + pReceivePin->AddRef(); + m_Pin = pReceivePin; + OutputDebugStringW(L"CPin::Connect success\n"); + } + + return hr; } HRESULT STDMETHODCALLTYPE CPin::ReceiveConnection(IPin *pConnector, const AM_MEDIA_TYPE *pmt) { - OutputDebugStringW(L"CPin::ReceiveConnection called\n"); - return E_NOTIMPL; -} + return E_UNEXPECTED; +} + HRESULT STDMETHODCALLTYPE CPin::Disconnect( void) { - OutputDebugStringW(L"CPin::Disconnect called\n"); - return E_NOTIMPL; +#ifdef MSDVBNP_TRACE + OutputDebugStringW(L"CPin::Disconnect\n"); +#endif + + if (!m_Pin) + { + // pin was not connected + return S_FALSE; + } + + m_Pin->Release(); + m_Pin = NULL; + + return S_OK; } HRESULT STDMETHODCALLTYPE CPin::ConnectedTo(IPin **pPin) { - OutputDebugStringW(L"CPin::ConnectedTo called\n"); +#ifdef MSDVBNP_TRACE + OutputDebugStringW(L"CPin::ConnectedTo\n"); +#endif + + if (!pPin) + return E_POINTER; + + if (m_Pin) + { + // increment reference count + m_Pin->AddRef(); + *pPin = m_Pin; + return S_OK; + } + + *pPin = NULL; return VFW_E_NOT_CONNECTED; } HRESULT STDMETHODCALLTYPE CPin::ConnectionMediaType(AM_MEDIA_TYPE *pmt) { - OutputDebugStringW(L"CPin::ConnectionMediaType called\n"); + OutputDebugStringW(L"CPin::ConnectionMediaType NotImplemented\n"); return E_NOTIMPL; } HRESULT @@ -170,7 +251,7 @@ STDMETHODCALLTYPE CPin::QueryAccept(const AM_MEDIA_TYPE *pmt) { - OutputDebugStringW(L"CPin::QueryAccept called\n"); + OutputDebugStringW(L"CPin::QueryAccept NotImplemented\n"); return E_NOTIMPL; } HRESULT @@ -200,35 +281,35 @@ STDMETHODCALLTYPE CPin::QueryInternalConnections(IPin **apPin, ULONG *nPin) { - OutputDebugStringW(L"CPin::QueryInternalConnections called\n"); + OutputDebugStringW(L"CPin::QueryInternalConnections NotImplemented\n"); return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CPin::EndOfStream( void) { - OutputDebugStringW(L"CPin::EndOfStream called\n"); + OutputDebugStringW(L"CPin::EndOfStream NotImplemented\n"); return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CPin::BeginFlush( void) { - OutputDebugStringW(L"CPin::BeginFlush called\n"); + OutputDebugStringW(L"CPin::BeginFlush NotImplemented\n"); return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CPin::EndFlush( void) { - OutputDebugStringW(L"CPin::EndFlush called\n"); + OutputDebugStringW(L"CPin::EndFlush NotImplemented\n"); return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CPin::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) { - OutputDebugStringW(L"CPin::NewSegment called\n"); + OutputDebugStringW(L"CPin::NewSegment NotImplemented\n"); return E_NOTIMPL; }

1 0

[sir_richard] 46645: [PCI]: New PCI driver, for the future. Needed for embedded support (ARM/etc) and anything other than your 3 emulators and neighboor's custom-made-to-barely-boot-your-OS machine.
by sir_richard＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: sir_richard Date: Thu Apr 1 21:07:40 2010 New Revision: 46645 URL: http://svn.reactos.org/svn/reactos?rev=46645&view=rev Log: [PCI]: New PCI driver, for the future. Needed for embedded support (ARM/etc) and anything other than your 3 emulators and neighboor's custom-made-to-barely-boot-your-OS machine. Added: trunk/reactos/drivers/bus/pcix/ trunk/reactos/drivers/bus/pcix/arb/ trunk/reactos/drivers/bus/pcix/arb/ar_busno.c (with props) trunk/reactos/drivers/bus/pcix/arb/ar_memio.c (with props) trunk/reactos/drivers/bus/pcix/arb/arb_comn.c (with props) trunk/reactos/drivers/bus/pcix/arb/tr_irq.c (with props) trunk/reactos/drivers/bus/pcix/debug.c (with props) trunk/reactos/drivers/bus/pcix/device.c (with props) trunk/reactos/drivers/bus/pcix/dispatch.c (with props) trunk/reactos/drivers/bus/pcix/enum.c (with props) trunk/reactos/drivers/bus/pcix/fdo.c (with props) trunk/reactos/drivers/bus/pcix/guid.c (with props) trunk/reactos/drivers/bus/pcix/hookhal.c (with props) trunk/reactos/drivers/bus/pcix/init.c (with props) trunk/reactos/drivers/bus/pcix/intrface/ trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c (with props) trunk/reactos/drivers/bus/pcix/intrface/busintrf.c (with props) trunk/reactos/drivers/bus/pcix/intrface/cardbus.c (with props) trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c (with props) trunk/reactos/drivers/bus/pcix/intrface/intrface.c (with props) trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c (with props) trunk/reactos/drivers/bus/pcix/intrface/locintrf.c (with props) trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c (with props) trunk/reactos/drivers/bus/pcix/intrface/routintf.c (with props) trunk/reactos/drivers/bus/pcix/pci/ trunk/reactos/drivers/bus/pcix/pci.h (with props) trunk/reactos/drivers/bus/pcix/pci.rc (with props) trunk/reactos/drivers/bus/pcix/pci/busno.c (with props) trunk/reactos/drivers/bus/pcix/pci/config.c (with props) trunk/reactos/drivers/bus/pcix/pci/devhere.c (with props) trunk/reactos/drivers/bus/pcix/pci/id.c (with props) trunk/reactos/drivers/bus/pcix/pci/ppbridge.c (with props) trunk/reactos/drivers/bus/pcix/pci/romimage.c (with props) trunk/reactos/drivers/bus/pcix/pci/state.c (with props) trunk/reactos/drivers/bus/pcix/pcivrify.c (with props) trunk/reactos/drivers/bus/pcix/pcix.rbuild (with props) trunk/reactos/drivers/bus/pcix/pdo.c (with props) trunk/reactos/drivers/bus/pcix/power.c (with props) trunk/reactos/drivers/bus/pcix/usage.c (with props) trunk/reactos/drivers/bus/pcix/utils.c (with props) Modified: trunk/reactos/drivers/bus/directory.rbuild Modified: trunk/reactos/drivers/bus/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/directory.rbui… ============================================================================== --- trunk/reactos/drivers/bus/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/directory.rbuild [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -10,4 +10,7 @@ <directory name="pci"> <xi:include href="pci/pci.rbuild" /> </directory> +<directory name="pcix"> + <xi:include href="pcix/pcix.rbuild" /> +</directory> </group> Added: trunk/reactos/drivers/bus/pcix/arb/ar_busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/ar_bu… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/ar_busno.c (added) +++ trunk/reactos/drivers/bus/pcix/arb/ar_busno.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/arb/ar_busno.c + * PURPOSE: Bus Number Arbitration + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/arb/ar_busno.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/arb/ar_memio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/ar_me… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/ar_memio.c (added) +++ trunk/reactos/drivers/bus/pcix/arb/ar_memio.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/arb/ar_memiono.c + * PURPOSE: Memory and I/O Port Resource Arbitration + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/arb/ar_memio.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/arb_c… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/arb_comn.c (added) +++ trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/arb/arb_comn.c + * PURPOSE: Common Arbitration Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/arb/tr_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/tr_ir… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/tr_irq.c (added) +++ trunk/reactos/drivers/bus/pcix/arb/tr_irq.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/arb/tr_irq.c + * PURPOSE: IRQ Resource Translation + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/arb/tr_irq.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/debug.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/debug.c (added) +++ trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/debug.c + * PURPOSE: Debug Helpers + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/debug.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c (added) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/device.c + * PURPOSE: Device Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/device.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/dispatch.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/dispatch.c (added) +++ trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/dispatch.c + * PURPOSE: WDM Dispatch Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/dispatch.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c (added) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/enum.c + * PURPOSE: PCI Bus/Device Enumeration + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/enum.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c (added) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/fdo.c + * PURPOSE: FDO Device Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/guid.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/guid.c (added) +++ trunk/reactos/drivers/bus/pcix/guid.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/guid.c + * PURPOSE: GUID Data + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/hookhal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/hookhal.c… ============================================================================== --- trunk/reactos/drivers/bus/pcix/hookhal.c (added) +++ trunk/reactos/drivers/bus/pcix/hookhal.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/hookhal.c + * PURPOSE: HAL Bus Handler Dispatch Routine Support + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/hookhal.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/init.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/init.c (added) +++ trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,30 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/init.c + * PURPOSE: Driver Initialization + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + DPRINT1("PCI: DriverEntry!\n"); + + /* FIXME: TODO */ + return STATUS_NOT_SUPPORTED; +} + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/init.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/agpintrf.c + * PURPOSE: AGP Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/busintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/busintrf.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/busintrf.c + * PURPOSE: Bus Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/busintrf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/cardbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/cardbus.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/cardbus.c + * PURPOSE: CardBus Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/cardbus.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/ideintrf.c + * PURPOSE: IDE Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/intrface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/intrface.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/intrface.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/intrface.c + * PURPOSE: Common Interface Support Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/intrface.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/lddintrf.c + * PURPOSE: Legacy Device Detection Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/locintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/locintrf.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/locintrf.c + * PURPOSE: Location Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/locintrf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/pmeintf.c + * PURPOSE: Power Management Event# Signal Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/intrface/routintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/routintf.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/routinf.c + * PURPOSE: Routing Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/routintf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h (added) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,11 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pci.h + * PURPOSE: Main Header File + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include <ntddk.h> + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pci.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.rc?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.rc (added) +++ trunk/reactos/drivers/bus/pcix/pci.rc [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "PCI Bus Driver\0" +#define REACTOS_STR_INTERNAL_NAME "pci\0" +#define REACTOS_STR_ORIGINAL_FILENAME "pci.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/bus/pcix/pci.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci/busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/busno… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/busno.c (added) +++ trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pci/busno.c + * PURPOSE: Bus Number Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pci/busno.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c (added) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pci/config.c + * PURPOSE: PCI Configuration Space Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pci/config.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci/devhere.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/devhe… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/devhere.c (added) +++ trunk/reactos/drivers/bus/pcix/pci/devhere.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pci/devhere.c + * PURPOSE: PCI Device Detection and Location + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pci/devhere.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci/id.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/id.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/id.c (added) +++ trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pci/id.c + * PURPOSE: PCI Device Identification + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pci/id.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci/ppbridge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/ppbri… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/ppbridge.c (added) +++ trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pci/ppbridge.c + * PURPOSE: PCI-to-PCI Bridge Support + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pci/ppbridge.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci/romimage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/romim… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/romimage.c (added) +++ trunk/reactos/drivers/bus/pcix/pci/romimage.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pci/romimage.c + * PURPOSE: PCI ROM Image Support + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pci/romimage.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pci/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/state… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/state.c (added) +++ trunk/reactos/drivers/bus/pcix/pci/state.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pci/state.c + * PURPOSE: Bus/Device State Support + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pci/state.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pcivrify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcivrify.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcivrify.c (added) +++ trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pcivrify.c + * PURPOSE: PCI Driver Verifier Support + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pcivrify.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pcix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcix.rbui… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcix.rbuild (added) +++ trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,49 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="pcix" type="kernelmodedriver" installbase="system32/drivers" installname="pcix.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> + <include base="pcix">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <directory name="arb"> + <file>ar_busno.c</file> + <file>ar_memio.c</file> + <file>arb_comn.c</file> + <file>tr_irq.c</file> + </directory> + <directory name="intrface"> + <file>agpintrf.c</file> + <file>busintrf.c</file> + <file>cardbus.c</file> + <file>ideintrf.c</file> + <file>intrface.c</file> + <file>lddintrf.c</file> + <file>locintrf.c</file> + <file>pmeintf.c</file> + <file>routintf.c</file> + </directory> + <directory name="pci"> + <file>busno.c</file> + <file>config.c</file> + <file>devhere.c</file> + <file>id.c</file> + <file>ppbridge.c</file> + <file>romimage.c</file> + <file>state.c</file> + </directory> + <file>debug.c</file> + <file>device.c</file> + <file>dispatch.c</file> + <file>enum.c</file> + <file>fdo.c</file> + <file>guid.c</file> + <file>hookhal.c</file> + <file>init.c</file> + <file>pcivrify.c</file> + <file>pdo.c</file> + <file>power.c</file> + <file>usage.c</file> + <file>utils.c</file> + <file>pci.rc</file> + <pch>pci.h</pch> +</module> Propchange: trunk/reactos/drivers/bus/pcix/pcix.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pdo.c (added) +++ trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/pdo.c + * PURPOSE: PDO Device Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/power.c (added) +++ trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/power.c + * PURPOSE: Bus/Device Power Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/power.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/usage.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/usage.c (added) +++ trunk/reactos/drivers/bus/pcix/usage.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/usage.c + * PURPOSE: Bus/Device Usage Reporting + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/usage.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c (added) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Thu Apr 1 21:07:40 2010 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/utils.c + * PURPOSE: Utility/Helper Support Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/utils.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 46644: [NTOSKRNL] - Store the device's assigned resources (raw and translated) in the RESOURCEMAP key - Implement IopUpdateResourceMap which is responsible for updating the key with new resource information and setting the DNF_RESOURCE_ASSIGNED flag - Fix IoGetDeviceProperty which was returning incorrect information for DevicePropertyPhysicalDeviceObjectName - Take a look at HKLM\Hardware\ResourceMap\PnP Manager\PnpManager and see the beautiful resource lists ; ) - NOTE: Regedit has a
by cgutman＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: cgutman Date: Thu Apr 1 20:17:25 2010 New Revision: 46644 URL: http://svn.reactos.org/svn/reactos?rev=46644&view=rev Log: [NTOSKRNL] - Store the device's assigned resources (raw and translated) in the RESOURCEMAP key - Implement IopUpdateResourceMap which is responsible for updating the key with new resource information and setting the DNF_RESOURCE_ASSIGNED flag - Fix IoGetDeviceProperty which was returning incorrect information for DevicePropertyPhysicalDeviceObjectName - Take a look at HKLM\Hardware\ResourceMap\PnP Manager\PnpManager and see the beautiful resource lists ;) - NOTE: Regedit has a bug so the "\Device\" prefix is hidden but you will see that it is there if you look with explorer's NT object viewer Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu Apr 1 20:17:25 2010 @@ -55,6 +55,10 @@ IopTranslateDeviceResources( IN PDEVICE_NODE DeviceNode, IN ULONG RequiredSize); + +NTSTATUS +IopUpdateResourceMap( + IN PDEVICE_NODE DeviceNode); PDEVICE_NODE FASTCALL @@ -159,7 +163,11 @@ Status = IopTranslateDeviceResources(DeviceNode, RequiredLength); if (NT_SUCCESS(Status)) { - IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_ASSIGNED); + Status = IopUpdateResourceMap(DeviceNode); + if (!NT_SUCCESS(Status)) + { + DPRINT("IopUpdateResourceMap() failed (Status 0x%08lx)\n", Status); + } } else { @@ -726,6 +734,128 @@ return STATUS_UNSUCCESSFUL; } +NTSTATUS +IopUpdateResourceMap(IN PDEVICE_NODE DeviceNode) +{ + NTSTATUS Status; + ULONG Disposition; + HANDLE PnpMgrLevel1, PnpMgrLevel2, ResourceMapKey; + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + 0, + NULL); + Status = ZwCreateKey(&ResourceMapKey, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status)) + return Status; + + RtlInitUnicodeString(&KeyName, L"PnP Manager"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + ResourceMapKey, + NULL); + Status = ZwCreateKey(&PnpMgrLevel1, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + &Disposition); + ZwClose(ResourceMapKey); + if (!NT_SUCCESS(Status)) + return Status; + + RtlInitUnicodeString(&KeyName, L"PnpManager"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + PnpMgrLevel1, + NULL); + Status = ZwCreateKey(&PnpMgrLevel2, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + &Disposition); + ZwClose(PnpMgrLevel1); + if (!NT_SUCCESS(Status)) + return Status; + + if (DeviceNode->ResourceList) + { + WCHAR NameBuff[256]; + UNICODE_STRING NameU; + UNICODE_STRING Suffix; + ULONG OldLength; + + ASSERT(DeviceNode->ResourceListTranslated); + + NameU.Buffer = NameBuff; + NameU.Length = 0; + NameU.MaximumLength = 256 * sizeof(WCHAR); + + Status = IoGetDeviceProperty(DeviceNode->PhysicalDeviceObject, + DevicePropertyPhysicalDeviceObjectName, + NameU.MaximumLength, + NameU.Buffer, + &OldLength); + ASSERT(Status == STATUS_SUCCESS); + + NameU.Length = (USHORT)OldLength; + + RtlInitUnicodeString(&Suffix, L".Raw"); + RtlAppendUnicodeStringToString(&NameU, &Suffix); + + Status = ZwSetValueKey(PnpMgrLevel2, + &NameU, + 0, + REG_RESOURCE_LIST, + DeviceNode->ResourceList, + CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceList)); + if (!NT_SUCCESS(Status)) + { + ZwClose(PnpMgrLevel2); + return Status; + } + + /* "Remove" the suffix by setting the length back to what it used to be */ + NameU.Length = (USHORT)OldLength; + + RtlInitUnicodeString(&Suffix, L".Translated"); + RtlAppendUnicodeStringToString(&NameU, &Suffix); + + Status = ZwSetValueKey(PnpMgrLevel2, + &NameU, + 0, + REG_RESOURCE_LIST, + DeviceNode->ResourceListTranslated, + CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceListTranslated)); + ZwClose(PnpMgrLevel2); + if (!NT_SUCCESS(Status)) + return Status; + } + else + { + ZwClose(PnpMgrLevel2); + } + + IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_ASSIGNED); + + return STATUS_SUCCESS; +} NTSTATUS IopSetDeviceInstanceData(HANDLE InstanceKey, @@ -3069,7 +3199,7 @@ /* PUBLIC FUNCTIONS **********************************************************/ /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -3085,6 +3215,8 @@ PVOID Data = NULL; PWSTR Ptr; NTSTATUS Status; + POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; + ULONG RequiredLength, ObjectNameInfoLength; DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty); @@ -3298,9 +3430,36 @@ break; case DevicePropertyPhysicalDeviceObjectName: - /* InstancePath buffer is NULL terminated, so we can do this */ - Length = DeviceNode->InstancePath.MaximumLength; - Data = DeviceNode->InstancePath.Buffer; + Status = ObQueryNameString(DeviceNode->PhysicalDeviceObject, + NULL, + 0, + &RequiredLength); + if (Status == STATUS_SUCCESS) + { + Length = 0; + Data = L""; + } + else if (Status == STATUS_INFO_LENGTH_MISMATCH) + { + ObjectNameInfoLength = RequiredLength; + ObjectNameInfo = ExAllocatePool(PagedPool, ObjectNameInfoLength); + if (!ObjectNameInfo) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = ObQueryNameString(DeviceNode->PhysicalDeviceObject, + ObjectNameInfo, + ObjectNameInfoLength, + &RequiredLength); + if (NT_SUCCESS(Status)) + { + Length = ObjectNameInfo->Name.Length; + Data = ObjectNameInfo->Name.Buffer; + } + else + return Status; + } + else + return Status; break; default: @@ -3310,12 +3469,21 @@ /* Prepare returned values */ *ResultLength = Length; if (BufferLength < Length) + { + if (ObjectNameInfo != NULL) + ExFreePool(ObjectNameInfo); + return STATUS_BUFFER_TOO_SMALL; + } RtlCopyMemory(PropertyBuffer, Data, Length); /* NULL terminate the string (if required) */ - if (DeviceProperty == DevicePropertyEnumeratorName) + if (DeviceProperty == DevicePropertyEnumeratorName || + DeviceProperty == DevicePropertyPhysicalDeviceObjectName) ((LPWSTR)PropertyBuffer)[Length / sizeof(WCHAR)] = UNICODE_NULL; + + if (ObjectNameInfo != NULL) + ExFreePool(ObjectNameInfo); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Thu Apr 1 20:17:25 2010 @@ -34,6 +34,10 @@ NTSTATUS IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode, PVOID Context); + +NTSTATUS +IopUpdateResourceMap( + IN PDEVICE_NODE DeviceNode); /* PRIVATE FUNCTIONS *********************************************************/ @@ -268,7 +272,7 @@ { Status = IopTranslateDeviceResources(DeviceNode, RequiredLength); if (NT_SUCCESS(Status)) - IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_ASSIGNED); + Status = IopUpdateResourceMap(DeviceNode); } IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES);

1 0

[janderwald] 46643: [KS] - Partly implement pin property handling by using supplied pin descriptor properties - Dynamically allocate connection format and put in pin's object bag - Remove bogus assert as pins don't have to provide a PinDispatchCreate function - Tuner device filter and capture device filter now successfully connect and instantiate corresponding input / output pins
by janderwald＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: janderwald Date: Thu Apr 1 19:22:21 2010 New Revision: 46643 URL: http://svn.reactos.org/svn/reactos?rev=46643&view=rev Log: [KS] - Partly implement pin property handling by using supplied pin descriptor properties - Dynamically allocate connection format and put in pin's object bag - Remove bogus assert as pins don't have to provide a PinDispatchCreate function - Tuner device filter and capture device filter now successfully connect and instantiate corresponding input / output pins Modified: trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Thu Apr 1 19:22:21 2010 @@ -746,8 +746,11 @@ } } - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } /* done */ return Status; Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Thu Apr 1 19:22:21 2010 @@ -906,6 +906,69 @@ } NTSTATUS +IKsPin_DispatchKsProperty( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + IKsPinImpl * This) +{ + NTSTATUS Status; + PKSPROPERTY Property; + PIO_STACK_LOCATION IoStack; + UNICODE_STRING GuidString; + ULONG PropertySetsCount = 0, PropertyItemSize = 0; + const KSPROPERTY_SET* PropertySets = NULL; + + /* sanity check */ + ASSERT(This->Pin.Descriptor); + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + + if (This->Pin.Descriptor->AutomationTable) + { + /* use available driver property sets */ + PropertySetsCount = This->Pin.Descriptor->AutomationTable->PropertySetsCount; + PropertySets = This->Pin.Descriptor->AutomationTable->PropertySets; + PropertyItemSize = This->Pin.Descriptor->AutomationTable->PropertyItemSize; + } + + + /* try driver provided property sets */ + Status = KspPropertyHandler(Irp, + PropertySetsCount, + PropertySets, + NULL, + PropertyItemSize); + + DPRINT("IKsPin_DispatchKsProperty PropertySetCount %lu Status %lu\n", PropertySetsCount, Status); + + if (Status != STATUS_NOT_FOUND) + { + /* property was handled by driver */ + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + return Status; + } + + /* property was not handled */ + Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + RtlStringFromGUID(&Property->Set, &GuidString); + DPRINT("IKsPin_DispatchKsProperty Unhandled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + RtlFreeUnicodeString(&GuidString); + + Irp->IoStatus.Status = STATUS_NOT_FOUND; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_NOT_FOUND; + +} + +NTSTATUS NTAPI IKsPin_DispatchDeviceIoControl( IN PDEVICE_OBJECT DeviceObject, @@ -926,10 +989,17 @@ /* get the object header */ ObjectHeader = (PKSIOBJECT_HEADER)IoStack->FileObject->FsContext2; - /* locate ks pin implemention fro KSPIN offset */ + /* locate ks pin implemention from KSPIN offset */ This = (IKsPinImpl*)CONTAINING_RECORD(ObjectHeader->ObjectType, IKsPinImpl, Pin); - if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_WRITE_STREAM && IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) + { + /* handle ks properties */ + return IKsPin_DispatchKsProperty(DeviceObject, Irp, This); + } + + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_WRITE_STREAM && IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_READ_STREAM) { UNIMPLEMENTED; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; @@ -1084,10 +1154,10 @@ PDEVICE_EXTENSION DeviceExtension; PKSOBJECT_CREATE_ITEM CreateItem; NTSTATUS Status; + PKSDATAFORMAT DataFormat; /* sanity checks */ ASSERT(Descriptor->Dispatch); - ASSERT(Descriptor->Dispatch->Create); DPRINT("KspCreatePin\n"); @@ -1134,9 +1204,6 @@ InitializeListHead(&This->IrpList); KeInitializeSpinLock(&This->IrpListLock); - /* initialize ks pin descriptor */ - This->Pin.Descriptor = Descriptor; - This->Pin.Id = Connect->PinId; /* allocate object bag */ This->Pin.Bag = AllocateItem(NonPagedPool, sizeof(KSIOBJECT_BAG)); @@ -1151,12 +1218,33 @@ /* initialize object bag */ Device->lpVtbl->InitializeObjectBag(Device, This->Pin.Bag, &This->BasicHeader.ControlMutex); /* is using control mutex right? */ + /* get format */ + DataFormat = (PKSDATAFORMAT)(Connect + 1); + + /* initialize ks pin descriptor */ + This->Pin.Descriptor = Descriptor; + This->Pin.Context = NULL; + This->Pin.Id = Connect->PinId; This->Pin.Communication = Descriptor->PinDescriptor.Communication; - This->Pin.ConnectionIsExternal = FALSE; /* FIXME */ - //FIXME This->Pin.ConnectionInterface = Descriptor->PinDescriptor.Interfaces; - //FIXME This->Pin.ConnectionMedium = Descriptor->PinDescriptor.Mediums; - //FIXME This->Pin.ConnectionPriority = KSPRIORITY_NORMAL; - This->Pin.ConnectionFormat = (PKSDATAFORMAT) (Connect + 1); + This->Pin.ConnectionIsExternal = FALSE; //FIXME + RtlMoveMemory(&This->Pin.ConnectionInterface, &Connect->Interface, sizeof(KSPIN_INTERFACE)); + RtlMoveMemory(&This->Pin.ConnectionMedium, &Connect->Medium, sizeof(KSPIN_MEDIUM)); + RtlMoveMemory(&This->Pin.ConnectionPriority, &Connect->Priority, sizeof(KSPRIORITY)); + + /* allocate format */ + Status = _KsEdit(This->Pin.Bag, (PVOID*)&This->Pin.ConnectionFormat, DataFormat->FormatSize, DataFormat->FormatSize, 0); + if (!NT_SUCCESS(Status)) + { + /* failed to allocate format */ + KsFreeObjectBag((KSOBJECT_BAG)This->Pin.Bag); + FreeItem(This); + FreeItem(CreateItem); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* copy format */ + RtlMoveMemory((PVOID)This->Pin.ConnectionFormat, DataFormat, DataFormat->FormatSize); + This->Pin.AttributeList = NULL; //FIXME This->Pin.StreamHeaderSize = sizeof(KSSTREAM_HEADER); This->Pin.DataFlow = Descriptor->PinDescriptor.DataFlow;

1 0

[janderwald] 46642: [BDASUP] - Register an empty filter descriptor as pins, nodes, connections will be added later dynamically - Fixes the duplicate input / output pins visible with graphedt - Add the filter automation table to the object bag so it gets deleted when filter factory is destroyed
by janderwald＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: janderwald Date: Thu Apr 1 19:18:13 2010 New Revision: 46642 URL: http://svn.reactos.org/svn/reactos?rev=46642&view=rev Log: [BDASUP] - Register an empty filter descriptor as pins, nodes, connections will be added later dynamically - Fixes the duplicate input / output pins visible with graphedt - Add the filter automation table to the object bag so it gets deleted when filter factory is destroyed Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Thu Apr 1 19:18:13 2010 @@ -275,6 +275,14 @@ /* copy filter descriptor template */ RtlMoveMemory(FilterDescriptor, pFilterDescriptor, sizeof(KSFILTER_DESCRIPTOR)); + /* erase pin / nodes / connections from filter descriptor */ + FilterDescriptor->PinDescriptorsCount = 0; + FilterDescriptor->PinDescriptors = NULL; + FilterDescriptor->NodeDescriptorsCount = 0; + FilterDescriptor->NodeDescriptors = NULL; + FilterDescriptor->ConnectionsCount = 0; + FilterDescriptor->Connections = NULL; + /* merge the automation tables */ Status = KsMergeAutomationTables((PKSAUTOMATION_TABLE*)&FilterDescriptor->AutomationTable, (PKSAUTOMATION_TABLE)pFilterDescriptor->AutomationTable, &FilterAutomationTable, NULL); @@ -301,17 +309,21 @@ /* check for success */ if (NT_SUCCESS(Status)) { - - /* add the item to filter object bag */ - Status = KsAddItemToObjectBag(FilterFactory->Bag, FilterInstance, FreeFilterInstance); - if (!NT_SUCCESS(Status)) + if (FilterDescriptor->AutomationTable != &FilterAutomationTable) { - /* destroy filter instance */ - DPRINT1("KsAddItemToObjectBag failed with %lx\n", Status); - FreeItem(FilterDescriptor); - FreeItem(FilterInstance); - KsDeleteFilterFactory(FilterFactory); - return Status; + /* add the item to filter object bag */ + KsAddItemToObjectBag(FilterFactory->Bag, (PVOID)FilterDescriptor->AutomationTable, FreeFilterInstance); + } + else + { + /* make sure the automation table is not-read only */ + Status = _KsEdit(FilterFactory->Bag, (PVOID*)&FilterDescriptor->AutomationTable, sizeof(KSAUTOMATION_TABLE), sizeof(KSAUTOMATION_TABLE), 0); + + /* sanity check */ + ASSERT(Status == STATUS_SUCCESS); + + /* add to object bag */ + KsAddItemToObjectBag(FilterFactory->Bag, (PVOID)FilterDescriptor->AutomationTable, FreeFilterInstance); } /* initialize filter instance entry */ @@ -338,7 +350,7 @@ { /* failed to create filter factory */ FreeItem(FilterInstance); - DPRINT1("KsCreateFilterFactory failed with %lx\n", Status); + FreeItem(FilterDescriptor); } /* done */

1 0

[dreimer] 46641: Add a own built wav play tool made in cpp for the Batch RosBE and remove the PowerBasic one I added yesterday. PRO: We can build it ourselves and its silent in the console. CONS: None.
by dreimer＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: dreimer Date: Thu Apr 1 17:11:05 2010 New Revision: 46641 URL: http://svn.reactos.org/svn/reactos?rev=46641&view=rev Log: Add a own built wav play tool made in cpp for the Batch RosBE and remove the PowerBasic one I added yesterday. PRO: We can build it ourselves and its silent in the console. CONS: None. Added: trunk/tools/RosBE/RosBE-Windows/Tools/playwav.cpp (with props) Removed: trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd trunk/tools/RosBE/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Thu Apr 1 17:11:05 2010 @@ -75,7 +75,7 @@ } # The Update Server. -$_ROSBE_URL = "http://dreimer.bplaced.net/rosbe" +$_ROSBE_URL = "http://svn.reactos.org/downloads/rosbe" # Save the recent dir to cd back there at the end. $_ROSBE_OPATH = "$pwd" Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Thu Apr 1 17:11:05 2010 @@ -64,7 +64,7 @@ :: Highlight the fact that building has ended. cd /d "%_ROSBE_BASEDIR%\samples" -wav.exe Notification.wav +playwav.exe Notification.wav flash.exe Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Thu Apr 1 17:11:05 2010 @@ -17,7 +17,7 @@ title Updating... :: The Update Server. -set _ROSBE_URL=http://dreimer.bplaced.net/rosbe +set _ROSBE_URL=http://svn.reactos.org/downloads/rosbe :: Save the recent dir to cd back there at the end. set _ROSBE_OPATH=%CD% Removed: trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/WA… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/WAV.BAS (removed) @@ -1,42 +1,0 @@ -'============================================================================== -' -' WAV.EXE - Command line .WAV file player -' Copyright (c) 1998 by PowerBASIC, Inc. All Rights Reserved. -' -'============================================================================== - -$INCLUDE "WIN32API.INC" - -FUNCTION PbMain() AS LONG - - DIM wav AS ASCIIZ * 256 - - wav = COMMAND$ - - STDOUT "WAV.EXE v1.0 - Command line .WAV file player" - STDOUT "Copyright (c) 1998 by PowerBASIC, Inc." - STDOUT "" - - IF LEN(wav) = 0 THEN - STDOUT "Usage: WAV filename.wav - - SndPlaySound BYVAL %NULL, %SND_SYNC 'stop anything currently playing - - FUNCTION = 1 - EXIT FUNCTION - END IF - - IF INSTR(wav, ".") = 0 THEN - wav = wav + ".WAV" - END IF - - IF LEN(DIR$(wav)) THEN - STDOUT "Playing " & wav - SndPlaySound wav, %SND_SYNC - ELSE - STDOUT "File not found: " & wav - FUNCTION = 1 - END IF - -END FUNCTION - Modified: trunk/tools/RosBE/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ma… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/makefile [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/makefile [iso-8859-1] Thu Apr 1 17:11:05 2010 @@ -8,7 +8,7 @@ SUFFIX := .exe WINVER := 0x500 -all: buildtime chknewer chkslash echoh flash getdate rquote tee +all: buildtime chknewer chkslash echoh flash getdate playwav rquote tee buildtime: buildtime.c ${CC} ${CFLAGS} buildtime$(SUFFIX) buildtime.c @@ -34,6 +34,10 @@ ${CC} ${CFLAGS} getdate getdate.c $(STRIP) getdate$(SUFFIX) +playwav: playwav.cpp + ${CC} ${CFLAGS} playwav playwav.cpp -lwinmm + $(STRIP) playwav$(SUFFIX) + rquote: rquote.c ${CC} ${CFLAGS} rquote rquote.c $(STRIP) rquote$(SUFFIX) @@ -43,4 +47,4 @@ $(STRIP) tee$(SUFFIX) clean: - del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe rquote.exe tee.exe + del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe playwav.exe rquote.exe tee.exe Added: trunk/tools/RosBE/RosBE-Windows/Tools/playwav.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/pl… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/playwav.cpp (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/playwav.cpp [iso-8859-1] Thu Apr 1 17:11:05 2010 @@ -1,0 +1,18 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) + * FILE: Tools/playwav.c + * PURPOSE: WAVE Player + * COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> + * + */ + +#include <windows.h> +#include <tchar.h> +#include <mmsystem.h> + +int _tmain(int argc, TCHAR* argv[]) +{ + PlaySound(argv[1],NULL,SND_FILENAME|SND_SYNC); + return 0; +} Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/playwav.cpp ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 46640: [KS] - Refactor & bugfix handling of KSPROPERTY_PIN_INTERFACES - Refactor & bugfix IKsFilter_fnAddProcessPin for filter centric pins - Fix handling of filter pin property sets - Copy filter pin templates when filter is initialized. - Pins are now able to instantiated but processing is pin requests is not yet implemented
by janderwald＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: janderwald Date: Thu Apr 1 16:53:16 2010 New Revision: 46640 URL: http://svn.reactos.org/svn/reactos?rev=46640&view=rev Log: [KS] - Refactor & bugfix handling of KSPROPERTY_PIN_INTERFACES - Refactor & bugfix IKsFilter_fnAddProcessPin for filter centric pins - Fix handling of filter pin property sets - Copy filter pin templates when filter is initialized. - Pins are now able to instantiated but processing is pin requests is not yet implemented Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Thu Apr 1 16:53:16 2010 @@ -392,34 +392,18 @@ break; } - /* calculate size */ - Size = sizeof(KSMULTIPLE_ITEM); - Size += max(1, Descriptor[Pin->PinId].InterfacesCount) * sizeof(KSPIN_INTERFACE); - - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) - { - Irp->IoStatus.Information = Size; - Status = STATUS_MORE_ENTRIES; - break; - } - - Item = (KSMULTIPLE_ITEM*)Buffer; - Item->Size = Size; - - if (Descriptor[Pin->PinId].InterfacesCount) - { - Item->Count = Descriptor[Pin->PinId].InterfacesCount; - RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].Interfaces, Descriptor[Pin->PinId].InterfacesCount * sizeof(KSPIN_INTERFACE)); + if (Descriptor[Pin->PinId].Interfaces) + { + /* use mediums provided by driver */ + return KsHandleSizedListQuery(Irp, Descriptor[Pin->PinId].InterfacesCount, sizeof(KSPIN_MEDIUM), Descriptor[Pin->PinId].Interfaces); } else { - Item->Count = 1; - RtlMoveMemory((PVOID)(Item + 1), &StandardPinInterface, sizeof(KSPIN_INTERFACE)); - } - - Status = STATUS_SUCCESS; - Irp->IoStatus.Information = Size; - break; + /* use standard medium */ + return KsHandleSizedListQuery(Irp, 1, sizeof(KSPIN_INTERFACE), &StandardPinInterface); + } + break; + case KSPROPERTY_PIN_MEDIUMS: Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Thu Apr 1 16:53:16 2010 @@ -288,43 +288,30 @@ IKsFilter * iface, IN PKSPROCESSPIN ProcessPin) { - PKSPROCESSPIN *Pins; + NTSTATUS Status; IKsFilterImpl * This = (IKsFilterImpl*)CONTAINING_RECORD(iface, IKsFilterImpl, lpVtbl); /* first acquire processing mutex */ KeWaitForSingleObject(&This->ProcessingMutex, Executive, KernelMode, FALSE, NULL); - /* allocate new pins array */ - Pins = AllocateItem(NonPagedPool, sizeof(PKSPROCESSPIN) * (This->ProcessPinIndex.Count + 1)); - - /* check if allocation succeeded */ - if (Pins) - { - if (This->ProcessPinIndex.Count) - { - /* copy old pin index */ - RtlMoveMemory(Pins, This->ProcessPinIndex.Pins, sizeof(PKSPROCESSPIN) * This->ProcessPinIndex.Count); - } - + /* edit process pin descriptor */ + Status = _KsEdit(This->Filter.Bag, + (PVOID*)&This->ProcessPinIndex.Pins, + (This->ProcessPinIndex.Count + 1) * sizeof(PKSPROCESSPIN), + (This->ProcessPinIndex.Count) * sizeof(PKSPROCESSPIN), + 0); + + if (NT_SUCCESS(Status)) + { /* add new process pin */ - Pins[This->ProcessPinIndex.Count] = ProcessPin; - - /* free old process pin */ - FreeItem(This->ProcessPinIndex.Pins); - - /* store new process pin index */ - This->ProcessPinIndex.Pins = Pins; + This->ProcessPinIndex.Pins[This->ProcessPinIndex.Count] = ProcessPin; This->ProcessPinIndex.Count++; } /* release process mutex */ KeReleaseMutex(&This->ProcessingMutex, FALSE); - if (Pins) - return STATUS_SUCCESS; - else - return STATUS_INSUFFICIENT_RESOURCES; - + return Status; } NTSTATUS @@ -530,7 +517,7 @@ KSPIN_CINSTANCES * Instances; KSP_PIN * Pin = (KSP_PIN*)Request; - if (!This->Factory->FilterDescriptor || !This->Factory->FilterDescriptor->PinDescriptorsCount) + if (!This->Factory->FilterDescriptor || !This->PinDescriptorCount) { /* no filter / pin descriptor */ IoStatus->Status = STATUS_NOT_IMPLEMENTED; @@ -539,11 +526,11 @@ /* ignore custom structs for now */ ASSERT(This->Factory->FilterDescriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); - ASSERT(This->Factory->FilterDescriptor->PinDescriptorsCount > Pin->PinId); + ASSERT(This->PinDescriptorCount > Pin->PinId); Instances = (KSPIN_CINSTANCES*)Data; /* max instance count */ - Instances->PossibleCount = This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].InstancesPossible; + Instances->PossibleCount = This->PinDescriptorsEx[Pin->PinId].InstancesPossible; /* current instance count */ Instances->CurrentCount = This->PinInstanceCount[Pin->PinId]; @@ -562,7 +549,7 @@ PULONG Result; KSP_PIN * Pin = (KSP_PIN*)Request; - if (!This->Factory->FilterDescriptor || !This->Factory->FilterDescriptor->PinDescriptorsCount) + if (!This->Factory->FilterDescriptor || !This->PinDescriptorCount) { /* no filter / pin descriptor */ IoStatus->Status = STATUS_NOT_IMPLEMENTED; @@ -571,10 +558,10 @@ /* ignore custom structs for now */ ASSERT(This->Factory->FilterDescriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); - ASSERT(This->Factory->FilterDescriptor->PinDescriptorsCount > Pin->PinId); + ASSERT(This->PinDescriptorCount > Pin->PinId); Result = (PULONG)Data; - *Result = This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].InstancesNecessary; + *Result = This->PinDescriptorsEx[Pin->PinId].InstancesNecessary; IoStatus->Information = sizeof(ULONG); IoStatus->Status = STATUS_SUCCESS; @@ -600,7 +587,7 @@ MultipleItem = (PKSMULTIPLE_ITEM)(Pin + 1); DataRange = (PKSDATARANGE)(MultipleItem + 1); - if (!This->Factory->FilterDescriptor || !This->Factory->FilterDescriptor->PinDescriptorsCount) + if (!This->Factory->FilterDescriptor || !This->PinDescriptorCount) { /* no filter / pin descriptor */ IoStatus->Status = STATUS_NOT_IMPLEMENTED; @@ -609,11 +596,11 @@ /* ignore custom structs for now */ ASSERT(This->Factory->FilterDescriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); - ASSERT(This->Factory->FilterDescriptor->PinDescriptorsCount > Pin->PinId); - - if (This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].IntersectHandler == NULL || - This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].PinDescriptor.DataRanges == NULL || - This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].PinDescriptor.DataRangesCount == 0) + ASSERT(This->PinDescriptorCount > Pin->PinId); + + if (This->PinDescriptorsEx[Pin->PinId].IntersectHandler == NULL || + This->PinDescriptors[Pin->PinId].DataRanges == NULL || + This->PinDescriptors[Pin->PinId].DataRangesCount == 0) { /* no driver supported intersect handler / no provided data ranges */ IoStatus->Status = STATUS_NOT_IMPLEMENTED; @@ -623,14 +610,14 @@ for(Index = 0; Index < MultipleItem->Count; Index++) { /* Call miniport's properitary handler */ - Status = This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].IntersectHandler(NULL, /* context */ - Irp, - Pin, - DataRange, - (PKSDATAFORMAT)This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].PinDescriptor.DataRanges, - DataLength, - Data, - &Length); + Status = This->PinDescriptorsEx[Pin->PinId].IntersectHandler(NULL, /* context */ + Irp, + Pin, + DataRange, + (PKSDATAFORMAT)This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].PinDescriptor.DataRanges, + DataLength, + Data, + &Length); if (Status == STATUS_SUCCESS) { @@ -696,6 +683,9 @@ UNIMPLEMENTED Status = STATUS_UNSUCCESSFUL; } + DPRINT("KspPinPropertyHandler Pins %lu Request->Id %lu Status %lx\n", This->PinDescriptorCount, Request->Id, Status); + + return Status; } @@ -784,9 +774,9 @@ KSFILTER_DESCRIPTOR* FilterDescriptor) { ULONG Index = 0; + NTSTATUS Status; /* initialize pin descriptors */ - This->PinInstanceCount = NULL; This->FirstPin = NULL; This->PinInstanceCount = NULL; This->PinDescriptors = NULL; @@ -799,6 +789,69 @@ This->Topology.TopologyNodesCount = FilterDescriptor->NodeDescriptorsCount; This->Topology.TopologyConnectionsCount = FilterDescriptor->ConnectionsCount; This->Topology.TopologyConnections = FilterDescriptor->Connections; + + /* are there any templates */ + if (FilterDescriptor->PinDescriptorsCount) + { + /* sanity check */ + ASSERT(FilterDescriptor->PinDescriptors); + + /* FIXME handle variable sized pin descriptors */ + ASSERT(FilterDescriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); + + /* store pin descriptors ex */ + Status = _KsEdit(This->Filter.Bag, (PVOID*)&This->PinDescriptorsEx, sizeof(KSPIN_DESCRIPTOR_EX) * FilterDescriptor->PinDescriptorsCount, + sizeof(KSPIN_DESCRIPTOR_EX) * FilterDescriptor->PinDescriptorsCount, 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IKsFilter_CreateDescriptors _KsEdit failed %lx\n", Status); + return Status; + } + + /* store pin descriptors */ + Status = _KsEdit(This->Filter.Bag, (PVOID*)&This->PinDescriptors, sizeof(KSPIN_DESCRIPTOR) * FilterDescriptor->PinDescriptorsCount, + sizeof(KSPIN_DESCRIPTOR) * FilterDescriptor->PinDescriptorsCount, 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IKsFilter_CreateDescriptors _KsEdit failed %lx\n", Status); + return Status; + } + + /* store pin instance count ex */ + Status = _KsEdit(This->Filter.Bag, (PVOID*)&This->PinInstanceCount, sizeof(ULONG) * FilterDescriptor->PinDescriptorsCount, + sizeof(ULONG) * FilterDescriptor->PinDescriptorsCount, 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IKsFilter_CreateDescriptors _KsEdit failed %lx\n", Status); + return Status; + } + + /* store instantiated pin arrays */ + Status = _KsEdit(This->Filter.Bag, (PVOID*)&This->FirstPin, sizeof(PKSPIN) * FilterDescriptor->PinDescriptorsCount, + sizeof(PKSPIN) * FilterDescriptor->PinDescriptorsCount, 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IKsFilter_CreateDescriptors _KsEdit failed %lx\n", Status); + return Status; + } + + + + /* add new pin factory */ + RtlMoveMemory(This->PinDescriptorsEx, FilterDescriptor->PinDescriptors, sizeof(KSPIN_DESCRIPTOR_EX) * FilterDescriptor->PinDescriptorsCount); + + for(Index = 0; Index < FilterDescriptor->PinDescriptorsCount; Index++) + { + RtlMoveMemory(&This->PinDescriptors[Index], &FilterDescriptor->PinDescriptors[Index].PinDescriptor, sizeof(KSPIN_DESCRIPTOR)); + } + + /* store new pin descriptor count */ + This->PinDescriptorCount = FilterDescriptor->PinDescriptorsCount; + } if (FilterDescriptor->NodeDescriptorsCount) { @@ -923,24 +976,40 @@ PKSPIN_CONNECT Connect; NTSTATUS Status; + DPRINT("IKsFilter_DispatchCreatePin\n"); + /* get the create item */ CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); /* get the filter object */ This = (IKsFilterImpl*)CreateItem->Context; + /* sanity check */ + ASSERT(This->Header.Type == KsObjectTypeFilter); + /* acquire control mutex */ KeWaitForSingleObject(&This->Header.ControlMutex, Executive, KernelMode, FALSE, NULL); /* now validate the connect request */ Status = KsValidateConnectRequest(Irp, This->PinDescriptorCount, This->PinDescriptors, &Connect); + DPRINT("IKsFilter_DispatchCreatePin KsValidateConnectRequest %lx\n", Status); + if (NT_SUCCESS(Status)) { - if (This->PinInstanceCount[Connect->PinId] < This->Filter.Descriptor->PinDescriptors[Connect->PinId].InstancesPossible) + /* sanity check */ + ASSERT(Connect->PinId < This->PinDescriptorCount); + + DPRINT("IKsFilter_DispatchCreatePin KsValidateConnectRequest PinId %lu CurrentInstanceCount %lu MaxPossible %lu\n", Connect->PinId, + This->PinInstanceCount[Connect->PinId], + This->PinDescriptorsEx[Connect->PinId].InstancesPossible); + + if (This->PinInstanceCount[Connect->PinId] < This->PinDescriptorsEx[Connect->PinId].InstancesPossible) { /* create the pin */ - Status = KspCreatePin(DeviceObject, Irp, This->Header.KsDevice, This->FilterFactory, (IKsFilter*)&This->lpVtbl, Connect, (KSPIN_DESCRIPTOR_EX*)&This->Filter.Descriptor->PinDescriptors[Connect->PinId]); + Status = KspCreatePin(DeviceObject, Irp, This->Header.KsDevice, This->FilterFactory, (IKsFilter*)&This->lpVtbl, Connect, &This->PinDescriptorsEx[Connect->PinId]); + + DPRINT("IKsFilter_DispatchCreatePin KspCreatePin %lx\n", Status); if (NT_SUCCESS(Status)) { @@ -952,6 +1021,7 @@ { /* maximum instance count reached, bye-bye */ Status = STATUS_UNSUCCESSFUL; + DPRINT("IKsFilter_DispatchCreatePin MaxInstance %lu CurInstance %lu %lx\n", This->PinDescriptorsEx[Connect->PinId].InstancesPossible, This->PinInstanceCount[Connect->PinId]); } } @@ -964,7 +1034,9 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); } + /* done */ + DPRINT("IKsFilter_DispatchCreatePin Result %lx\n", Status); return Status; } Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Thu Apr 1 16:53:16 2010 @@ -1089,6 +1089,8 @@ ASSERT(Descriptor->Dispatch); ASSERT(Descriptor->Dispatch->Create); + DPRINT("KspCreatePin\n"); + /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -1112,6 +1114,7 @@ { /* not enough memory */ FreeItem(This); + DPRINT("KspCreatePin OutOfMemory\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1184,6 +1187,7 @@ if (!NT_SUCCESS(Status)) { /* failed to create object header */ + DPRINT("KspCreatePin KsAllocateObjectHeader failed %lx\n", Status); KsFreeObjectBag((KSOBJECT_BAG)This->Pin.Bag); FreeItem(This); FreeItem(CreateItem); @@ -1208,6 +1212,8 @@ */ Status = Filter->lpVtbl->AddProcessPin(Filter, &This->ProcessPin); + DPRINT("KspCreatePin AddProcessPin %lx\n", Status); + if (!NT_SUCCESS(Status)) { /* failed to add process pin */ @@ -1226,7 +1232,10 @@ { /* now inform the driver to create a new pin */ Status = Descriptor->Dispatch->Create(&This->Pin, Irp); - } + DPRINT("KspCreatePin DispatchCreate %lx\n", Status); + } + + DPRINT("KspCreatePin Status %lx\n", Status); if (!NT_SUCCESS(Status) && Status != STATUS_PENDING) {

1 0

[cgutman] 46639: [NTOSKRNL] - Change PnpRootCreateDevice's ServiceName parameter to be a full service name so it can be used by IoReportDetectedDevice (for reporting devices without the "LEGACY_" prefix) and change all of its callers accordingly - Remove the broken implementation of IoReportDetectedDevice and replace it with a fully working implementation - There is still a bug that it creates a new device instance every boot, but unlike the previous code, at least it creates one ; -)
by cgutman＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: cgutman Date: Thu Apr 1 08:58:32 2010 New Revision: 46639 URL: http://svn.reactos.org/svn/reactos?rev=46639&view=rev Log: [NTOSKRNL] - Change PnpRootCreateDevice's ServiceName parameter to be a full service name so it can be used by IoReportDetectedDevice (for reporting devices without the "LEGACY_" prefix) and change all of its callers accordingly - Remove the broken implementation of IoReportDetectedDevice and replace it with a fully working implementation - There is still a bug that it creates a new device instance every boot, but unlike the previous code, at least it creates one ;-) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu Apr 1 08:58:32 2010 @@ -46,11 +46,12 @@ /* FUNCTIONS *****************************************************************/ -static NTSTATUS +NTSTATUS IopAssignDeviceResources( IN PDEVICE_NODE DeviceNode, OUT ULONG *pRequiredSize); -static NTSTATUS + +NTSTATUS IopTranslateDeviceResources( IN PDEVICE_NODE DeviceNode, IN ULONG RequiredSize); @@ -361,6 +362,8 @@ PDEVICE_NODE Node; NTSTATUS Status; KIRQL OldIrql; + UNICODE_STRING FullServiceName; + UNICODE_STRING LegacyPrefix = RTL_CONSTANT_STRING(L"LEGACY_"); DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p ServiceName %wZ\n", ParentNode, PhysicalDeviceObject, ServiceName); @@ -375,7 +378,22 @@ if (!PhysicalDeviceObject) { - Status = PnpRootCreateDevice(ServiceName, &PhysicalDeviceObject); + if (ServiceName) + { + FullServiceName.MaximumLength = LegacyPrefix.Length + ServiceName->Length; + FullServiceName.Length = 0; + FullServiceName.Buffer = ExAllocatePool(PagedPool, FullServiceName.MaximumLength); + if (!FullServiceName.Buffer) + { + ExFreePool(Node); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeStringToString(&FullServiceName, &LegacyPrefix); + RtlAppendUnicodeStringToString(&FullServiceName, ServiceName); + } + + Status = PnpRootCreateDevice(ServiceName ? &FullServiceName : NULL, &PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { DPRINT1("PnpRootCreateDevice() failed with status 0x%08X\n", Status); @@ -709,7 +727,6 @@ } -static NTSTATUS IopSetDeviceInstanceData(HANDLE InstanceKey, PDEVICE_NODE DeviceNode) @@ -799,7 +816,7 @@ } -static NTSTATUS +NTSTATUS IopAssignDeviceResources( IN PDEVICE_NODE DeviceNode, OUT ULONG *pRequiredSize) @@ -1014,7 +1031,7 @@ } -static NTSTATUS +NTSTATUS IopTranslateDeviceResources( IN PDEVICE_NODE DeviceNode, IN ULONG RequiredSize) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Thu Apr 1 08:58:32 2010 @@ -3,7 +3,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/pnpmgr/pnpreport.c * PURPOSE: Device Changes Reporting Functions - * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -11,6 +11,90 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +NTSTATUS +NTAPI +IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath, + OUT PHANDLE Handle); + +NTSTATUS +IopAssignDeviceResources( + IN PDEVICE_NODE DeviceNode, + OUT ULONG *pRequiredSize); + +NTSTATUS +IopSetDeviceInstanceData(HANDLE InstanceKey, + PDEVICE_NODE DeviceNode); + +NTSTATUS +IopTranslateDeviceResources( + IN PDEVICE_NODE DeviceNode, + IN ULONG RequiredSize); + +NTSTATUS +IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode, + PVOID Context); + +/* PRIVATE FUNCTIONS *********************************************************/ + +PWCHAR +IopGetInterfaceTypeString(INTERFACE_TYPE IfType) +{ + switch (IfType) + { + case Internal: + return L"Internal"; + + case Isa: + return L"Isa"; + + case Eisa: + return L"Eisa"; + + case MicroChannel: + return L"MicroChannel"; + + case TurboChannel: + return L"TurboChannel"; + + case PCIBus: + return L"PCIBus"; + + case VMEBus: + return L"VMEBus"; + + case NuBus: + return L"NuBus"; + + case PCMCIABus: + return L"PCMCIABus"; + + case CBus: + return L"CBus"; + + case MPIBus: + return L"MPIBus"; + + case MPSABus: + return L"MPSABus"; + + case ProcessorInternal: + return L"ProcessorInternal"; + + case PNPISABus: + return L"PNPISABus"; + + case PNPBus: + return L"PNPBus"; + + case Vmcs: + return L"Vmcs"; + + default: + DPRINT1("Invalid bus type: %d\n", IfType); + return NULL; + } +} /* PUBLIC FUNCTIONS **********************************************************/ @@ -30,29 +114,56 @@ { PDEVICE_NODE DeviceNode; PDEVICE_OBJECT Pdo; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("__FUNCTION__ (DeviceObject %p, *DeviceObject %p)\n", + NTSTATUS Status; + HANDLE InstanceKey; + ULONG RequiredLength; + UNICODE_STRING ValueName, ServiceName; + WCHAR HardwareId[256]; + PWCHAR IfString; + ULONG IdLength; + + DPRINT("IoReportDetectedDevice (DeviceObject %p, *DeviceObject %p)\n", DeviceObject, DeviceObject ? *DeviceObject : NULL); - /* if *DeviceObject is not NULL, we must use it as a PDO, and don't create a new one */ + /* Create the service name (eg. ACPI_HAL) */ + ServiceName.Buffer = DriverObject->DriverName.Buffer + + sizeof(DRIVER_ROOT_NAME) / sizeof(WCHAR) - 1; + ServiceName.Length = DriverObject->DriverName.Length - + sizeof(DRIVER_ROOT_NAME) + sizeof(WCHAR); + ServiceName.MaximumLength = ServiceName.Length; + + /* If the interface type is unknown, treat it as internal */ + if (LegacyBusType == InterfaceTypeUndefined) + LegacyBusType = Internal; + + /* Get the string equivalent of the interface type */ + IfString = IopGetInterfaceTypeString(LegacyBusType); + + /* If NULL is returned then it's a bad type */ + if (!IfString) + return STATUS_INVALID_PARAMETER; + + /* We use the caller's PDO if they supplied one */ if (DeviceObject && *DeviceObject) { Pdo = *DeviceObject; + DeviceNode = IopGetDeviceNode(*DeviceObject); } else { - UNICODE_STRING ServiceName; - ServiceName.Buffer = DriverObject->DriverName.Buffer + - sizeof(DRIVER_ROOT_NAME) / sizeof(WCHAR) - 1; - ServiceName.Length = DriverObject->DriverName.Length - - sizeof(DRIVER_ROOT_NAME) + sizeof(WCHAR); - ServiceName.MaximumLength = ServiceName.Length; - - /* create a new PDO and return it in *DeviceObject */ + /* Create the PDO */ + Status = PnpRootCreateDevice(&ServiceName, + &Pdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("PnpRootCreateDevice() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Create the device node for the new PDO */ Status = IopCreateDeviceNode(IopRootDeviceNode, + Pdo, NULL, - &ServiceName, &DeviceNode); if (!NT_SUCCESS(Status)) @@ -60,13 +171,129 @@ DPRINT("IopCreateDeviceNode() failed (Status 0x%08lx)\n", Status); return Status; } - - Pdo = DeviceNode->PhysicalDeviceObject; - if (DeviceObject) *DeviceObject = Pdo; - } - - /* we don't need to call AddDevice and send IRP_MN_START_DEVICE */ - return Status; + } + + /* We don't call AddDevice for devices reported this way */ + IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); + + /* We don't send IRP_MN_START_DEVICE */ + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + + /* This is a legacy driver for this device */ + IopDeviceNodeSetFlag(DeviceNode, DNF_LEGACY_DRIVER); + + /* Perform a manual configuration of our device */ + IopActionInterrogateDeviceStack(DeviceNode, DeviceNode->Parent); + IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); + + /* Open a handle to the instance path key */ + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey); + if (!NT_SUCCESS(Status)) + return Status; + + /* Add DETECTEDInterfaceType\DriverName */ + IdLength = 0; + IdLength += swprintf(&HardwareId[IdLength], + L"DETECTED%ls\\%wZ", + IfString, + &ServiceName); + HardwareId[IdLength++] = UNICODE_NULL; + + /* Add DETECTED\DriverName */ + IdLength += swprintf(&HardwareId[IdLength], + L"DETECTED\\%wZ", + &ServiceName); + HardwareId[IdLength++] = UNICODE_NULL; + + /* Terminate the string with another null */ + HardwareId[IdLength] = UNICODE_NULL; + + /* Store the value for CompatibleIDs */ + RtlInitUnicodeString(&ValueName, L"CompatibleIDs"); + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_MULTI_SZ, HardwareId, IdLength * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to write the compatible IDs: 0x%x\n", Status); + ZwClose(InstanceKey); + return Status; + } + + /* Add a hardware ID if the driver didn't report one */ + RtlInitUnicodeString(&ValueName, L"HardwareID"); + if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* Just use our most specific compatible ID */ + IdLength = 0; + IdLength += swprintf(&HardwareId[IdLength], + L"DETECTED%ls\\%wZ", + IfString, + &ServiceName); + HardwareId[++IdLength] = UNICODE_NULL; + + /* Write the value to the registry */ + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_SZ, HardwareId, IdLength * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to write the hardware ID: 0x%x\n", Status); + ZwClose(InstanceKey); + return Status; + } + } + + /* Assign the resources to the device node */ + DeviceNode->BootResources = ResourceList; + DeviceNode->ResourceRequirements = ResourceRequirements; + + /* Set appropriate flags */ + if (DeviceNode->BootResources) + IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG); + + if (DeviceNode->ResourceRequirements) + IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_REPORTED); + else + IopDeviceNodeSetFlag(DeviceNode, DNF_NO_RESOURCE_REQUIRED); + + /* Write the resource information to the registry */ + IopSetDeviceInstanceData(InstanceKey, DeviceNode); + + /* Close the instance key handle */ + ZwClose(InstanceKey); + + /* If the caller didn't get the resources assigned for us, do it now */ + if (!ResourceAssigned) + { + IopDeviceNodeSetFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); + Status = IopAssignDeviceResources(DeviceNode, &RequiredLength); + if (NT_SUCCESS(Status)) + { + Status = IopTranslateDeviceResources(DeviceNode, RequiredLength); + if (NT_SUCCESS(Status)) + IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_ASSIGNED); + } + IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); + + /* See if we failed */ + if (!NT_SUCCESS(Status)) + { + DPRINT("Assigning resources failed: 0x%x\n", Status); + return Status; + } + } + + /* Report the device's enumeration to umpnpmgr */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ENUMERATED, + &DeviceNode->InstancePath); + + /* Report the device's arrival to umpnpmgr */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &DeviceNode->InstancePath); + + DPRINT1("Reported device: %S (%wZ)\n", HardwareId, &DeviceNode->InstancePath); + + /* Return the PDO */ + if (DeviceObject) *DeviceObject = Pdo; + + return STATUS_SUCCESS; } /* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Thu Apr 1 08:58:32 2010 @@ -134,7 +134,7 @@ IN PDEVICE_OBJECT *PhysicalDeviceObject) { PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - UNICODE_STRING UnknownServiceName = RTL_CONSTANT_STRING(L"UNKNOWN"); + UNICODE_STRING UnknownServiceName = RTL_CONSTANT_STRING(L"LEGACY_UNKNOWN"); PUNICODE_STRING LocalServiceName; PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension; WCHAR DevicePath[MAX_PATH + 1]; @@ -154,7 +154,7 @@ DPRINT("Creating a PnP root device for service '%wZ'\n", LocalServiceName); /* Search for a free instance ID */ - _snwprintf(DevicePath, sizeof(DevicePath) / sizeof(WCHAR), L"%s\\LEGACY_%wZ", REGSTR_KEY_ROOTENUM, LocalServiceName); + _snwprintf(DevicePath, sizeof(DevicePath) / sizeof(WCHAR), L"%s\\%wZ", REGSTR_KEY_ROOTENUM, LocalServiceName); for (i = 0; i < 9999; i++) { _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", i);

1 0

[tkreuzer] 46638: [WIN32K] Just dereference the PDEV's surface and let the driver free it.
by tkreuzer＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: tkreuzer Date: Thu Apr 1 07:44:09 2010 New Revision: 46638 URL: http://svn.reactos.org/svn/reactos?rev=46638&view=rev Log: [WIN32K] Just dereference the PDEV's surface and let the driver free it. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Thu Apr 1 07:44:09 2010 @@ -57,10 +57,11 @@ /* Check if references are left */ if (ppdev->cPdevRefs == 0) { - /* Release surface */ + /* Do we have a surface? */ if(ppdev->pSurface) { - SURFACE_FreeSurface(ppdev->pSurface); + /* Release the surface and let the driver free it */ + SURFACE_ShareUnlockSurface(ppdev->pSurface); ppdev->pfn.DisableSurface(ppdev->dhpdev); }

1 0

[tkreuzer] 46637: merge r46636
by tkreuzer＠svn.reactos.org 01 Apr '10

01 Apr '10

Author: tkreuzer Date: Thu Apr 1 06:24:21 2010 New Revision: 46637 URL: http://svn.reactos.org/svn/reactos?rev=46637&view=rev Log: merge r46636 Modified: branches/reactos-yarotows/hal/halx86/generic/misc.c Modified: branches/reactos-yarotows/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/hal/halx86/gen… ============================================================================== --- branches/reactos-yarotows/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ branches/reactos-yarotows/hal/halx86/generic/misc.c [iso-8859-1] Thu Apr 1 06:24:21 2010 @@ -18,6 +18,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#ifndef _MINIHAL_ NTSTATUS NTAPI HalpOpenRegistryKey(IN PHANDLE KeyHandle, @@ -58,6 +59,7 @@ /* We're done */ return Status; } +#endif VOID NTAPI

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