Changeset 545

Timestamp:

Nov 26, 2015, 3:24:03 AM (8 years ago)

Author:

roman

Message:

Added previously not included hooks; added IFilterMapper3 hook suppors; template library related updates; added FGT to replace ROT (to access services in particular) - work in progress; fixed class enumeration hook

Location:

trunk/DirectShowSpy

Files:

• Common.h (modified) (2 diffs)
• DirectShowSpy.vcxproj (modified) (6 diffs)
• FilterGraphList.h (modified) (1 diff)
• FilterGraphSpy.cpp (modified) (1 diff)
• FilterGraphSpy.h (modified) (1 diff)
• FilterGraphTable.h (added)
• FilterMapperSpy.h (modified) (21 diffs)
• GenericClass (Both).rgs (added)
• Module.rc (modified) (previous)
• SystemDeviceEnumeratorSpy.h (modified) (47 diffs)

trunk/DirectShowSpy/Common.h

@@ -43 +43 @@
 public:
 // CProcessTokenPrivileges
-        CProcessTokenPrivileges() throw() :
+        CProcessTokenPrivileges() :
                 m_bTakeOwnershipPrivilegeEnabled(FALSE),
                 m_bRestorePrivilegeEnabled(FALSE)
@@ -66 +66 @@
                 __E(m_ProcessToken.EnablePrivilege(SE_RESTORE_NAME));
                 m_bRestorePrivilegeEnabled = TRUE;
+        }
+        BOOL IsTakeOwnershipPrivilegeEnabled() const
+        {
+                return m_bTakeOwnershipPrivilegeEnabled;
+        }
+        BOOL IsRestorePrivilegeEnabled() const
+        {
+                return m_bRestorePrivilegeEnabled;
         }
 };

trunk/DirectShowSpy/DirectShowSpy.vcxproj

@@ -163 +163 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
@@ -200 +202 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
@@ -243 +247 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
@@ -288 +294 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
@@ -334 +342 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
@@ -379 +389 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>

trunk/DirectShowSpy/FilterGraphList.h

@@ -275 +275 @@
                                 {
                                         CComPtr<IMoniker> pMoniker;
-                                        if(pEnumMoniker->Next(1, &pMoniker, NULL) != S_OK)
+                                        ULONG nElementCount;
+                                        if(pEnumMoniker->Next(1, &pMoniker, &nElementCount) != S_OK)
                                                 break;
                                         _ATLTRY

trunk/DirectShowSpy/FilterGraphSpy.cpp

@@ -16 +16 @@
 #include "stdafx.h"
 #include "resource.h"
+#include "FilterGraphSpy.h"
+#include "FilterMapperSpy.h"
+#include "SystemDeviceEnumeratorSpy.h"
 
 ////////////////////////////////////////////////////////////

trunk/DirectShowSpy/FilterGraphSpy.h

@@ -412 +412 @@
                 public CComObjectRootEx<CComMultiThreadModelNoCS>,
                 public CComCoClass<CLogFilter, &__uuidof(CLogFilterBase)>,
-                public CTransformationFilterT<CLogFilter>,
+                public CTransformFilterT<CLogFilter>,
                 public CBasePersistT<CLogFilter>
         {

trunk/DirectShowSpy/FilterMapperSpy.h

@@ -17 +17 @@
 
 #include "rodshow.h"
-#include <..\Samples\multimedia\directshow\misc\mapper\fil_data.h>
+#include "fil_data.h" //<..\Samples\multimedia\directshow\misc\mapper\fil_data.h>
 #include "Module_i.h"
 #include "Common.h"
@@ -31 +31 @@
         public IDispatchImpl<IFilterMapperSpy>,
         public IAMFilterData,
-        public IFilterMapper2
+        public IFilterMapper,
+        public IFilterMapper3
 {
         typedef CFilterMapperSpyT<T, t_pFilterMapperClassIdentifier> CFilterMapperSpy;
@@ -44 +45 @@
 DECLARE_GET_CONTROLLING_UNKNOWN()
 
-DECLARE_QI_TRACE(CFilterMapperSpy)
-
-BEGIN_COM_MAP(CFilterMapperSpy)
+DECLARE_QI_TRACE(CFilterMapperSpyT)
+
+BEGIN_COM_MAP(CFilterMapperSpyT)
         COM_INTERFACE_ENTRY(IFilterMapperSpy)
         COM_INTERFACE_ENTRY(IAMFilterData)
+        COM_INTERFACE_ENTRY(IFilterMapper3)
         COM_INTERFACE_ENTRY(IFilterMapper2)
+        COM_INTERFACE_ENTRY(IFilterMapper)
         COM_INTERFACE_ENTRY_AGGREGATE_BLIND(m_pInnerUnknown)
         //COM_INTERFACE_ENTRY(IDispatch)
@@ -58 +61 @@
         HINSTANCE m_hQuartzModule;
         CComPtr<IUnknown> m_pInnerUnknown;
-        CComPtr<IFilterMapper2> m_pFilterMapper2;
+        CComPtr<IFilterMapper3> m_pFilterMapper3;
+        CComPtr<IFilterMapper> m_pFilterMapper;
         CComPtr<IAMFilterData> m_pAmFilterData;
 
@@ -64 +68 @@
         {
                 _A(pFilterInformation);
-                _Z4(atlTraceCOM, 4, _T("pFilterInformation { dwVersion %d, dwMerit 0x%08x, cPins2 %d }\n"), pFilterInformation->dwVersion, pFilterInformation->dwMerit, pFilterInformation->cPins2);
+                _Z4(atlTraceCOM, 4, _T("pFilterInformation { dwVersion %d, dwMerit 0x%08X, cPins2 %d }\n"), pFilterInformation->dwVersion, pFilterInformation->dwMerit, pFilterInformation->cPins2);
                 if(pFilterInformation->dwVersion == 2)
                         for(ULONG nPinIndex = 0; nPinIndex < pFilterInformation->cPins2; nPinIndex++)
                         {
                                 const REGFILTERPINS2& Pin = pFilterInformation->rgPins2[nPinIndex];
-                                _Z4(atlTraceCOM, 4, _T("pFilterInformation->rgPins2[%d] { dwFlags 0x%x, cInstances %d, nMediaTypes %d, nMediums %d }\n"), nPinIndex, Pin.dwFlags, Pin.cInstances, Pin.nMediaTypes, Pin.nMediums, Pin.clsPinCategory ? (LPCWSTR) _PersistHelper::StringFromIdentifier(*Pin.clsPinCategory) : L"NULL");
+                                _Z4(atlTraceCOM, 4, _T("pFilterInformation->rgPins2[%d] { dwFlags 0x%X, cInstances %d, nMediaTypes %d, nMediums %d }\n"), nPinIndex, Pin.dwFlags, Pin.cInstances, Pin.nMediaTypes, Pin.nMediums, Pin.clsPinCategory ? (LPCWSTR) _PersistHelper::StringFromIdentifier(*Pin.clsPinCategory) : L"NULL");
                                 for(UINT nIndex = 0; nIndex < Pin.nMediaTypes; nIndex++)
                                 {
@@ -78 +82 @@
                                 {
                                         const REGPINMEDIUM& Medium = Pin.lpMedium[nIndex];
-                                        _Z4(atlTraceCOM, 4, _T("pFilterInformation->rgPins2[...].lpMedium[%d] { clsMedium %ls, dw1 0x%x, dw2 0x%x }\n"), nIndex, _PersistHelper::StringFromIdentifier(Medium.clsMedium), Medium.dw1, Medium.dw2);
+                                        _Z4(atlTraceCOM, 4, _T("pFilterInformation->rgPins2[...].lpMedium[%d] { clsMedium %ls, dw1 0x%X, dw2 0x%X }\n"), nIndex, _PersistHelper::StringFromIdentifier(Medium.clsMedium), Medium.dw1, Medium.dw2);
                                 }
                         }
         }
-        BOOL IsAggregated() const throw()
+        BOOL IsAggregated() const
         {
                 return (ULONG) m_dwRef >= 0x00001000;
@@ -89 +93 @@
 public:
 // CFilterMapperSpyT
-        static LPCTSTR GetOriginalLibraryName() throw()
+        static LPCTSTR GetOriginalLibraryName()
         {
                 return _T("quartz.dll");
@@ -97 +101 @@
                 return _StringHelper::GetLine(T::IDR, 2);
         }
-        static HRESULT WINAPI UpdateRegistry(BOOL bRegister) throw()
+        static HRESULT WINAPI UpdateRegistry(BOOL bRegister)
         {
                 _Z2(atlTraceRegistrar, 2, _T("bRegister %d\n"), bRegister);
@@ -110 +114 @@
                 return S_OK;
         }
-        CFilterMapperSpyT() throw() :
+        CFilterMapperSpyT() :
                 m_hQuartzModule(NULL)
         {
                 _Z4_THIS();
         }
-        ~CFilterMapperSpyT() throw()
+        ~CFilterMapperSpyT()
         {
                 _Z4_THIS();
         }
-        HRESULT FinalConstruct() throw()
+        HRESULT FinalConstruct()
         {
                 _ATLTRY
@@ -126 +130 @@
                         TCHAR pszPath[MAX_PATH] = { 0 };
                         _W(GetModuleFileName(NULL, pszPath, DIM(pszPath)));
-                        _Z4(atlTraceRefcount, 4, _T("pszPath \"%s\", this 0x%08x, m_dwRef %d, m_bIsAggregated %d\n"), pszPath, this, m_dwRef, m_bIsAggregated);
+                        _Z4(atlTraceRefcount, 4, _T("pszPath \"%s\", this 0x%p, m_dwRef %d, m_bIsAggregated %d\n"), pszPath, this, m_dwRef, m_bIsAggregated);
                         const HINSTANCE hModule = CoLoadLibrary(const_cast<LPOLESTR>((LPCOLESTR) CT2COLE(GetOriginalLibraryName())), TRUE);
                         _ATLTRY
@@ -140 +144 @@
                                         CComPtr<IUnknown> pUnknown;
                                         __C(pClassFactory->CreateInstance(pControllingUnknown, __uuidof(IUnknown), (VOID**) &pUnknown));
-                                        const CComQIPtr<IFilterMapper2> pFilterMapper2 = pUnknown;
-                                        __D(pFilterMapper2, E_NOINTERFACE);
-                                        pFilterMapper2.p->Release();
+                                        const CComQIPtr<IFilterMapper3> pFilterMapper3 = pUnknown;
+                                        __D(pFilterMapper3, E_NOINTERFACE);
+                                        pFilterMapper3.p->Release();
+                                        const CComQIPtr<IFilterMapper> pFilterMapper = pUnknown;
+                                        __D(pFilterMapper, E_NOINTERFACE);
+                                        pFilterMapper.p->Release();
                                         const CComQIPtr<IAMFilterData> pAmFilterData = pUnknown;
                                         __D(pAmFilterData, E_NOINTERFACE);
                                         pAmFilterData.p->Release();
                                         m_pInnerUnknown = pUnknown;
-                                        m_pFilterMapper2 = pFilterMapper2;
+                                        m_pFilterMapper3 = pFilterMapper3;
+                                        m_pFilterMapper = pFilterMapper;
                                         m_pAmFilterData = pAmFilterData;
                                 }
@@ -165 +173 @@
                 return S_OK;
         }
-        VOID FinalRelease() throw()
-        {
-                _Z5(atlTraceRefcount, 5, _T("m_dwRef 0x%x\n"), m_dwRef);
+        VOID FinalRelease()
+        {
+                _Z5(atlTraceRefcount, 5, _T("m_dwRef 0x%X\n"), m_dwRef);
                 CComPtr<IUnknown> pControllingUnknown = GetControllingUnknown();
-                if(m_pFilterMapper2)
+                if(m_pFilterMapper3)
                 {
                         pControllingUnknown.p->AddRef();
-                        m_pFilterMapper2 = NULL;
+                        m_pFilterMapper3.Release();
+                }
+                if(m_pFilterMapper)
+                {
+                        pControllingUnknown.p->AddRef();
+                        m_pFilterMapper.Release();
                 }
                 if(m_pAmFilterData)
                 {
                         pControllingUnknown.p->AddRef();
-                        m_pAmFilterData = NULL;
+                        m_pAmFilterData.Release();
                 }
                 _ATLTRY
                 {
-                        m_pInnerUnknown = NULL;
+                        m_pInnerUnknown.Release();
                 }
                 _ATLCATCHALL()
@@ -199 +212 @@
 
 // IAMFilterData
-        STDMETHOD(ParseFilterData)(BYTE* pnFilterData, ULONG nFilterDataSize, BYTE** ppFilterInformation) throw()
+        STDMETHOD(ParseFilterData)(BYTE* pnFilterData, ULONG nFilterDataSize, BYTE** ppFilterInformation) override
         {
                 _Z4(atlTraceCOM, 4, _T("nFilterDataSize %d\n"), nFilterDataSize);
@@ -214 +227 @@
                 return nResult;
         }
-        STDMETHOD(CreateFilterData)(REGFILTER2* pFilterInformation, BYTE** ppnFilterData, ULONG* pnFilterDataSize) throw()
+        STDMETHOD(CreateFilterData)(REGFILTER2* pFilterInformation, BYTE** ppnFilterData, ULONG* pnFilterDataSize) override
         {
                 _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -229 +242 @@
         }
 
+// IFilterMapper3
+        STDMETHOD(GetICreateDevEnum)(ICreateDevEnum** ppEnum) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper3->GetICreateDevEnum(ppEnum);
+        }
+
 // IFilterMapper2
-        STDMETHOD(CreateCategory)(REFCLSID CategoryIdentifier, DWORD nMerit, LPCWSTR pszDescription) throw()
-        {
-                _Z4(atlTraceCOM, 4, _T("CategoryIdentifier %ls, nMerit 0x%08x, pszDescription \"%s\"\n"), _PersistHelper::StringFromIdentifier(CategoryIdentifier), nMerit, CString(pszDescription));
-                return m_pFilterMapper2->CreateCategory(CategoryIdentifier, nMerit, pszDescription);
-        }
-        STDMETHOD(UnregisterFilter)(const CLSID* pCategoryIdentifier, LPCOLESTR pszInstance, REFCLSID FilterClassIdentifier) throw()
+        STDMETHOD(CreateCategory)(REFCLSID CategoryIdentifier, DWORD nMerit, LPCWSTR pszDescription) override
+        {
+                _Z4(atlTraceCOM, 4, _T("CategoryIdentifier %ls, nMerit 0x%08X, pszDescription \"%s\"\n"), _PersistHelper::StringFromIdentifier(CategoryIdentifier), nMerit, CString(pszDescription));
+                return m_pFilterMapper3->CreateCategory(CategoryIdentifier, nMerit, pszDescription);
+        }
+        STDMETHOD(UnregisterFilter)(const CLSID* pCategoryIdentifier, LPCOLESTR pszInstance, REFCLSID FilterClassIdentifier) override
         {
                 _Z4(atlTraceCOM, 4, _T("pCategoryIdentifier %ls, pszInstance %s, FilterClassIdentifier %ls\n"), pCategoryIdentifier ? (LPCWSTR) _PersistHelper::StringFromIdentifier(*pCategoryIdentifier) : L"NULL", pszInstance ? (LPCTSTR) AtlFormatString(_T("\"%s\""), CString(pszInstance)) : _T("NULL"), _PersistHelper::StringFromIdentifier(FilterClassIdentifier));
-                return m_pFilterMapper2->UnregisterFilter(pCategoryIdentifier, pszInstance, FilterClassIdentifier);
-        }
-        STDMETHOD(RegisterFilter)(REFCLSID FilterClassIdentifier, LPCWSTR pszName, IMoniker** ppMoniker, const CLSID* pCategoryIdentifier, LPCOLESTR pszInstance, const REGFILTER2* pFilterInformation) throw()
+                return m_pFilterMapper3->UnregisterFilter(pCategoryIdentifier, pszInstance, FilterClassIdentifier);
+        }
+        STDMETHOD(RegisterFilter)(REFCLSID FilterClassIdentifier, LPCWSTR pszName, IMoniker** ppMoniker, const CLSID* pCategoryIdentifier, LPCOLESTR pszInstance, const REGFILTER2* pFilterInformation) override
         {
                 _Z4(atlTraceCOM, 4, _T("FilterClassIdentifier %ls, pszName \"%s\", pCategoryIdentifier %ls, pszInstance %s\n"), _PersistHelper::StringFromIdentifier(FilterClassIdentifier), CString(pszName), pCategoryIdentifier ? (LPCWSTR) _PersistHelper::StringFromIdentifier(*pCategoryIdentifier) : L"NULL", pszInstance ? (LPCTSTR) AtlFormatString(_T("\"%s\""), CString(pszInstance)) : _T("NULL"));
@@ -252 +272 @@
                                 _Z_EXCEPTION();
                         }
-                return m_pFilterMapper2->RegisterFilter(FilterClassIdentifier, pszName, ppMoniker, pCategoryIdentifier, pszInstance, pFilterInformation);
-        }
-        STDMETHOD(EnumMatchingFilters)(IEnumMoniker** ppEnumMoniker, DWORD nFlags, BOOL bExactMatch, DWORD nMinimalMerit, BOOL bInputNeeded, DWORD nInputTypeCount, const GUID* pInputTypes, const REGPINMEDIUM* pInputMedium, const CLSID* pInputPinCategory, BOOL bRender, BOOL bOutputNeeded, DWORD nOutputTypeCount, const GUID* pOutputTypes, const REGPINMEDIUM* pOutputMedium, const CLSID* pOutputPinCategory) throw()
-        {
-                _Z4(atlTraceCOM, 4, _T("nFlags 0x%x, bExactMatch %d, nMinimalMerit 0x%08x, bInputNeeded %d, nInputTypeCount %d, pInputPinCategory %ls, bRender %d, bOutputNeeded %d, nOutputTypeCount %d, pOutputPinCategory %ls\n"), nFlags, bExactMatch, nMinimalMerit, bInputNeeded, nInputTypeCount, pInputPinCategory ? (LPCWSTR) _PersistHelper::StringFromIdentifier(*pInputPinCategory) : L"NULL", bRender, bOutputNeeded, nOutputTypeCount, pOutputPinCategory ? (LPCWSTR) _PersistHelper::StringFromIdentifier(*pOutputPinCategory) : L"NULL");
+                return m_pFilterMapper3->RegisterFilter(FilterClassIdentifier, pszName, ppMoniker, pCategoryIdentifier, pszInstance, pFilterInformation);
+        }
+        STDMETHOD(EnumMatchingFilters)(IEnumMoniker** ppEnumMoniker, DWORD nFlags, BOOL bExactMatch, DWORD nMinimalMerit, BOOL bInputNeeded, DWORD nInputTypeCount, const GUID* pInputTypes, const REGPINMEDIUM* pInputMedium, const CLSID* pInputPinCategory, BOOL bRender, BOOL bOutputNeeded, DWORD nOutputTypeCount, const GUID* pOutputTypes, const REGPINMEDIUM* pOutputMedium, const CLSID* pOutputPinCategory) override
+        {
+                _Z4(atlTraceCOM, 4, _T("nFlags 0x%X, bExactMatch %d, nMinimalMerit 0x%08X, bInputNeeded %d, nInputTypeCount %d, pInputPinCategory %ls, bRender %d, bOutputNeeded %d, nOutputTypeCount %d, pOutputPinCategory %ls\n"), nFlags, bExactMatch, nMinimalMerit, bInputNeeded, nInputTypeCount, pInputPinCategory ? (LPCWSTR) _PersistHelper::StringFromIdentifier(*pInputPinCategory) : L"NULL", bRender, bOutputNeeded, nOutputTypeCount, pOutputPinCategory ? (LPCWSTR) _PersistHelper::StringFromIdentifier(*pOutputPinCategory) : L"NULL");
                 for(DWORD nInputTypeIndex = 0; nInputTypeIndex < nInputTypeCount; nInputTypeIndex++)
                 {
@@ -264 +284 @@
                 }
                 if(pInputMedium)
-                        _Z4(atlTraceCOM, 4, _T("pInputMedium { clsMedium %ls, dw1 0x%x, dw2 0x%x }\n"), _PersistHelper::StringFromIdentifier(pInputMedium->clsMedium), pInputMedium->dw1, pInputMedium->dw2);
+                        _Z4(atlTraceCOM, 4, _T("pInputMedium { clsMedium %ls, dw1 0x%X, dw2 0x%X }\n"), _PersistHelper::StringFromIdentifier(pInputMedium->clsMedium), pInputMedium->dw1, pInputMedium->dw2);
                 for(DWORD nOutputTypeIndex = 0; nOutputTypeIndex < nOutputTypeCount; nOutputTypeIndex++)
                 {
@@ -272 +292 @@
                 }
                 if(pOutputMedium)
-                        _Z4(atlTraceCOM, 4, _T("pOutputMedium { clsMedium %ls, dw1 0x%x, dw2 0x%x }\n"), _PersistHelper::StringFromIdentifier(pOutputMedium->clsMedium), pOutputMedium->dw1, pOutputMedium->dw2);
-                const HRESULT nResult = m_pFilterMapper2->EnumMatchingFilters(ppEnumMoniker, nFlags, bExactMatch, nMinimalMerit, bInputNeeded, nInputTypeCount, pInputTypes, pInputMedium, pInputPinCategory, bRender, bOutputNeeded, nOutputTypeCount, pOutputTypes, pOutputMedium, pOutputPinCategory);
+                        _Z4(atlTraceCOM, 4, _T("pOutputMedium { clsMedium %ls, dw1 0x%X, dw2 0x%X }\n"), _PersistHelper::StringFromIdentifier(pOutputMedium->clsMedium), pOutputMedium->dw1, pOutputMedium->dw2);
+                const HRESULT nResult = m_pFilterMapper3->EnumMatchingFilters(ppEnumMoniker, nFlags, bExactMatch, nMinimalMerit, bInputNeeded, nInputTypeCount, pInputTypes, pInputMedium, pInputPinCategory, bRender, bOutputNeeded, nOutputTypeCount, pOutputTypes, pOutputMedium, pOutputPinCategory);
                 if(SUCCEEDED(nResult))
                         _ATLTRY
@@ -279 +299 @@
                                 const CComPtr<IEnumMoniker>& pEnumMoniker = reinterpret_cast<const CComPtr<IEnumMoniker>&>(*ppEnumMoniker);
                                 __C(pEnumMoniker->Reset());
-                                CComPtr<IMoniker> pMoniker;
-                                while(pEnumMoniker->Next(1, &pMoniker, NULL) == S_OK)
+                                for(; ; )
                                 {
-                                        _Z4(atlTraceCOM, 4, _T("pMoniker %ls\n"), _FilterGraphHelper::GetMonikerDisplayName(pMoniker));
+                                        CComPtr<IMoniker> pMoniker;
+                                        ULONG nElementCount;
+                                        if(pEnumMoniker->Next(1, &pMoniker, &nElementCount) != S_OK)
+                                                break;
+                                        _Z4(atlTraceGeneral, 4, _T("pMoniker %ls\n"), _FilterGraphHelper::GetMonikerDisplayName(pMoniker));
                                         CComPtr<IBindCtx> pBindCtx;
                                         __C(CreateBindCtx(0, &pBindCtx));
@@ -291 +314 @@
                                         const CStringW sDevicePath = _FilterGraphHelper::ReadPropertyBagString(pPropertyBag, OLESTR("DevicePath"));
                                         _Z4(atlTraceCOM, 4, _T("sFriendlyName \"%ls\", sDescription \"%ls\", sDevicePath \"%ls\"\n"), sFriendlyName, sDescription, sDevicePath);
-                                        pMoniker.Release();
                                 }
                                 __C(pEnumMoniker->Reset());
@@ -300 +322 @@
                         }
                 return nResult;
+        }
+
+// IFilterMapper
+        STDMETHOD(RegisterFilter)(CLSID FilterClassIdentifier, LPCWSTR pszName, DWORD nMerit) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper->RegisterFilter(FilterClassIdentifier, pszName, nMerit);
+        }
+        STDMETHOD(RegisterFilterInstance)(CLSID FilterClassIdentifier, LPCWSTR pszName, CLSID* pMediaResourceIdentifier) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper->RegisterFilterInstance(FilterClassIdentifier, pszName, pMediaResourceIdentifier);
+        }
+        STDMETHOD(RegisterPin)(CLSID Filter, LPCWSTR pszName, BOOL bRendered, BOOL bOutput, BOOL bZero, BOOL bMany, CLSID ConnectsToFilter, LPCWSTR pszConnectsToPin) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper->RegisterPin(Filter, pszName, bRendered, bOutput, bZero, bMany, ConnectsToFilter, pszConnectsToPin);
+        }
+        STDMETHOD(RegisterPinType)(CLSID FilterClassIdentifier, LPCWSTR pszName, CLSID MajorType, CLSID Subtype) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper->RegisterPinType(FilterClassIdentifier, pszName, MajorType, Subtype);
+        }
+        STDMETHOD(UnregisterFilter)(CLSID FilterClassIdentifier) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper->UnregisterFilter(FilterClassIdentifier);
+        }
+        STDMETHOD(UnregisterFilterInstance)(CLSID MediaResourceIdentifier) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper->UnregisterFilterInstance(MediaResourceIdentifier);
+        }
+        STDMETHOD(UnregisterPin)(CLSID FilterClassIdentifier, LPCWSTR pszName) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper->UnregisterPin(FilterClassIdentifier, pszName);
+        }
+        STDMETHOD(EnumMatchingFilters)(IEnumRegFilters** ppEnum, DWORD nMerit, BOOL bInputNeeded, CLSID clsInMaj, CLSID clsInSub, BOOL bRender, BOOL bOutputNeeded, CLSID clsOutMaj, CLSID clsOutSub) override
+        {
+                _Z4(atlTraceCOM, 4, _T("...\n"));
+                return m_pFilterMapper->EnumMatchingFilters(ppEnum, nMerit, bInputNeeded, clsInMaj, clsInSub, bRender, bOutputNeeded, clsOutMaj, clsOutSub);
         }
 };

trunk/DirectShowSpy/SystemDeviceEnumeratorSpy.h

@@ -44 +44 @@
 DECLARE_GET_CONTROLLING_UNKNOWN()
 
-DECLARE_QI_TRACE(CSystemDeviceEnumeratorSpy)
-
-BEGIN_COM_MAP(CSystemDeviceEnumeratorSpy)
+DECLARE_QI_TRACE(CSystemDeviceEnumeratorSpyT)
+
+BEGIN_COM_MAP(CSystemDeviceEnumeratorSpyT)
         COM_INTERFACE_ENTRY(ISystemDeviceEnumeratorSpy)
         COM_INTERFACE_ENTRY(ICreateDevEnum)
@@ -95 +95 @@
 
         // IPropertyBag
-                STDMETHOD(Read)(LPCOLESTR pszPropertyName, VARIANT* pvValue, IErrorLog* pErrorLog) throw()
+                STDMETHOD(Read)(LPCOLESTR pszPropertyName, VARIANT* pvValue, IErrorLog* pErrorLog) override
                 {
                         _Z4(atlTraceCOM, 4, _T("pszPropertyName %s\n"), CString(pszPropertyName));
@@ -104 +104 @@
                                 //if(nResult == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) && pszPropertyName && _wcsicmp(pszPropertyName, L"DevicePath") == 0 && pvValue)
                                 //{
-                                //      _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                //      _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 //      CComVariant vValue = L"\\\\?\\fake";
                                 //      _V(vValue.Detach(pvValue));
@@ -116 +116 @@
                                         if(SUCCEEDED(vStringValue.ChangeType(VT_BSTR, pvValue)))
                                                 sValue = CString(vStringValue.bstrVal);
-                                        _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x, pvValue->vt 0x%x, %s\n"), nResult, pvValue->vt, sValue);
+                                        _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X, pvValue->vt 0x%X, %s\n"), nResult, pvValue->vt, sValue);
                                 } else
                                 {
-                                        _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                        _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 }
                                 return nResult;
@@ -129 +129 @@
                         return S_OK;
                 }
-                STDMETHOD(Write)(LPCOLESTR pszPropertyName, VARIANT* pvValue) throw()
-                {
-                        _Z4(atlTraceCOM, 4, _T("pszPropertyName %s, pvValue->vt 0x%x\n"), CString(pszPropertyName), pvValue->vt);
+                STDMETHOD(Write)(LPCOLESTR pszPropertyName, VARIANT* pvValue) override
+                {
+                        _Z4(atlTraceCOM, 4, _T("pszPropertyName %s, pvValue->vt 0x%X\n"), CString(pszPropertyName), pvValue->vt);
                         _ATLTRY
                         {
                                 const HRESULT nResult = m_pPropertyBag->Write(pszPropertyName, pvValue);
-                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 return nResult;
                         }
@@ -146 +146 @@
 
         // IPropertyBag2
-                STDMETHOD(Read)(ULONG cProperties, PROPBAG2 *pPropBag, IErrorLog *pErrLog, VARIANT *pvarValue, HRESULT *phrError) throw()
+                STDMETHOD(Read)(ULONG cProperties, PROPBAG2 *pPropBag, IErrorLog *pErrLog, VARIANT *pvarValue, HRESULT *phrError) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -152 +152 @@
                         {
                                 const HRESULT nResult = m_pPropertyBag2->Read(cProperties, pPropBag, pErrLog, pvarValue, phrError);
-                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 return nResult;
                         }
@@ -161 +161 @@
                         return S_OK;
                 }
-                STDMETHOD(Write)(ULONG cProperties, PROPBAG2 *pPropBag, VARIANT *pvarValue) throw()
+                STDMETHOD(Write)(ULONG cProperties, PROPBAG2 *pPropBag, VARIANT *pvarValue) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -167 +167 @@
                         {
                                 const HRESULT nResult = m_pPropertyBag2->Write(cProperties, pPropBag, pvarValue);
-                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 return nResult;
                         }
@@ -176 +176 @@
                         return S_OK;
                 }
-                STDMETHOD(CountProperties)(ULONG *pcProperties) throw()
+                STDMETHOD(CountProperties)(ULONG *pcProperties) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -182 +182 @@
                         {
                                 const HRESULT nResult = m_pPropertyBag2->CountProperties(pcProperties);
-                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 return nResult;
                         }
@@ -191 +191 @@
                         return S_OK;
                 }
-                STDMETHOD(GetPropertyInfo)(ULONG iProperty, ULONG cProperties, PROPBAG2* pPropBag, ULONG *pcProperties) throw()
+                STDMETHOD(GetPropertyInfo)(ULONG iProperty, ULONG cProperties, PROPBAG2* pPropBag, ULONG *pcProperties) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -197 +197 @@
                         {
                                 const HRESULT nResult = m_pPropertyBag2->GetPropertyInfo(iProperty, cProperties, pPropBag, pcProperties);
-                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 return nResult;
                         }
@@ -206 +206 @@
                         return S_OK;
                 }
-                STDMETHOD(LoadObject)(LPCOLESTR pstrName, DWORD dwHint, IUnknown *pUnkObject, IErrorLog *pErrLog) throw()
+                STDMETHOD(LoadObject)(LPCOLESTR pstrName, DWORD dwHint, IUnknown *pUnkObject, IErrorLog *pErrLog) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -212 +212 @@
                         {
                                 const HRESULT nResult = m_pPropertyBag2->LoadObject(pstrName, dwHint, pUnkObject, pErrLog);
-                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 return nResult;
                         }
@@ -261 +261 @@
 
         // IPersist
-                STDMETHOD(GetClassID)(CLSID* pClassIdentifier) throw()
+                STDMETHOD(GetClassID)(CLSID* pClassIdentifier) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -268 +268 @@
 
     // IPersistStream
-                STDMETHOD(IsDirty)() throw()
+                STDMETHOD(IsDirty)() override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
                         return m_pMoniker->IsDirty();
                 }
-                STDMETHOD(Load)(IStream* pStream) throw()
+                STDMETHOD(Load)(IStream* pStream) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
                         return m_pMoniker->Load(pStream);
                 }
-                STDMETHOD(Save)(IStream* pStream, BOOL bClearDirty) throw()
+                STDMETHOD(Save)(IStream* pStream, BOOL bClearDirty) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
                         return m_pMoniker->Save(pStream, bClearDirty);
                 }
-                STDMETHOD(GetSizeMax)(ULARGE_INTEGER* pnMaximalSize) throw()
+                STDMETHOD(GetSizeMax)(ULARGE_INTEGER* pnMaximalSize) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -290 +290 @@
 
         // IMoniker
-                STDMETHOD(BindToObject)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, REFIID InterfaceIdentifier, VOID** ppvObject) throw()
+                STDMETHOD(BindToObject)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, REFIID InterfaceIdentifier, VOID** ppvObject) override
                 {
                         _Z4(atlTraceCOM, 4, _T("pBindCtx 0x%p, pLeftMoniker 0x%p, InterfaceIdentifier %ls\n"), pBindCtx, pLeftMoniker, _PersistHelper::StringFromInterfaceIdentifier(InterfaceIdentifier));
@@ -303 +303 @@
                         return S_OK;
                 }
-                STDMETHOD(BindToStorage)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, REFIID InterfaceIdentifier, VOID** ppvObject) throw()
+                STDMETHOD(BindToStorage)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, REFIID InterfaceIdentifier, VOID** ppvObject) override
                 {
                         _Z4(atlTraceCOM, 4, _T("pBindCtx 0x%p, pLeftMoniker 0x%p, InterfaceIdentifier %ls\n"), pBindCtx, pLeftMoniker, _PersistHelper::StringFromInterfaceIdentifier(InterfaceIdentifier));
@@ -327 +327 @@
                         return S_OK;
                 }
-                STDMETHOD(Reduce)(IBindCtx* pBindCtx, DWORD nDepth, IMoniker** ppLeftMoniker, IMoniker** ppReducedMoniker) throw()
+                STDMETHOD(Reduce)(IBindCtx* pBindCtx, DWORD nDepth, IMoniker** ppLeftMoniker, IMoniker** ppReducedMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -340 +340 @@
                         return S_OK;
                 }
-                STDMETHOD(ComposeWith)(IMoniker* pRightMoniker, BOOL bOnlyIfNotGeneric, IMoniker** ppCompositeMoniker) throw()
+                STDMETHOD(ComposeWith)(IMoniker* pRightMoniker, BOOL bOnlyIfNotGeneric, IMoniker** ppCompositeMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -353 +353 @@
                         return S_OK;
                 }
-                STDMETHOD(Enum)(BOOL bForward, IEnumMoniker** ppEnumMoniker) throw()
+                STDMETHOD(Enum)(BOOL bForward, IEnumMoniker** ppEnumMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("bForward %d\n"), bForward);
@@ -366 +366 @@
                         return S_OK;
                 }
-                STDMETHOD(IsEqual)(IMoniker* pMoniker) throw()
+                STDMETHOD(IsEqual)(IMoniker* pMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -379 +379 @@
                         return S_OK;
                 }
-                STDMETHOD(Hash)(DWORD* pnHashValue) throw()
+                STDMETHOD(Hash)(DWORD* pnHashValue) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -392 +392 @@
                         return S_OK;
                 }
-                STDMETHOD(IsRunning)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, IMoniker* pNewlyRunning) throw()
+                STDMETHOD(IsRunning)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, IMoniker* pNewlyRunning) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -405 +405 @@
                         return S_OK;
                 }
-                STDMETHOD(GetTimeOfLastChange)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, FILETIME* pFileTime) throw()
+                STDMETHOD(GetTimeOfLastChange)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, FILETIME* pFileTime) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -418 +418 @@
                         return S_OK;
                 }
-                STDMETHOD(Inverse)(IMoniker** ppMoniker) throw()
+                STDMETHOD(Inverse)(IMoniker** ppMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -431 +431 @@
                         return S_OK;
                 }
-                STDMETHOD(CommonPrefixWith)(IMoniker* pMoniker, IMoniker** ppPrefixMoniker) throw()
+                STDMETHOD(CommonPrefixWith)(IMoniker* pMoniker, IMoniker** ppPrefixMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -444 +444 @@
                         return S_OK;
                 }
-                STDMETHOD(RelativePathTo)(IMoniker* pMoniker, IMoniker** ppRelativeMoniker) throw()
+                STDMETHOD(RelativePathTo)(IMoniker* pMoniker, IMoniker** ppRelativeMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -457 +457 @@
                         return S_OK;
                 }
-                STDMETHOD(GetDisplayName)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, LPOLESTR* ppszDisplayName) throw()
+                STDMETHOD(GetDisplayName)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, LPOLESTR* ppszDisplayName) override
                 {
                         _Z4(atlTraceCOM, 4, _T("pBindCtx 0x%p, pLeftMoniker 0x%p\n"), pBindCtx, pLeftMoniker);
@@ -464 +464 @@
                                 const HRESULT nResult = m_pMoniker->GetDisplayName(pBindCtx, pLeftMoniker, ppszDisplayName);
                                 if(SUCCEEDED(nResult))
-                                        _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x, *ppszDisplayName %s\n"), nResult, CString(*ppszDisplayName));
+                                        _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X, *ppszDisplayName %s\n"), nResult, CString(*ppszDisplayName));
                                 else
-                                        _Z4(atlTraceGeneral, 4, _T("nResult 0x%08x\n"), nResult);
+                                        _Z4(atlTraceGeneral, 4, _T("nResult 0x%08X\n"), nResult);
                                 return nResult;
                         }
@@ -475 +475 @@
                         return S_OK;
                 }
-                STDMETHOD(ParseDisplayName)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, LPOLESTR pszDisplayName, ULONG* pnEatenLength, IMoniker** ppOutputMoniker) throw()
+                STDMETHOD(ParseDisplayName)(IBindCtx* pBindCtx, IMoniker* pLeftMoniker, LPOLESTR pszDisplayName, ULONG* pnEatenLength, IMoniker** ppOutputMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("pBindCtx 0x%p, pLeftMoniker 0x%p, pszDisplayName %s\n"), pBindCtx, pLeftMoniker, CString(pszDisplayName));
@@ -488 +488 @@
                         return S_OK;
                 }
-                STDMETHOD(IsSystemMoniker)(DWORD* pnSystemMonikerType) throw()
+                STDMETHOD(IsSystemMoniker)(DWORD* pnSystemMonikerType) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -539 +539 @@
 
         // IEnumMoniker
-                STDMETHOD(Next)(ULONG nElementCount, IMoniker** ppMoniker, ULONG* pnFetchedElementCount) throw()
+                STDMETHOD(Next)(ULONG nElementCount, IMoniker** ppMoniker, ULONG* pnFetchElementCount) override
                 {
                         _Z4(atlTraceCOM, 4, _T("nElementCount %d\n"), nElementCount);
                         _ATLTRY
                         {
-                                const HRESULT nNextResult = m_pEnumMoniker->Next(nElementCount, ppMoniker, pnFetchedElementCount);
-                                _Z4(atlTraceGeneral, 4, _T("nNextResult 0x%08x, *pnFetchedElementCount %s\n"), nNextResult, pnFetchedElementCount ? (LPCTSTR) AtlFormatString(_T("%d"), *pnFetchedElementCount) : _T("(null)"));
+                                const HRESULT nNextResult = m_pEnumMoniker->Next(nElementCount, ppMoniker, pnFetchElementCount);
+                                CRoArrayT<CString> Array;
+                                if(pnFetchElementCount)
+                                        Array.Add(AtlFormatString(_T("*pnFetchElementCount %d"), *pnFetchElementCount));
+                                _Z4(atlTraceGeneral, 4, _T("nNextResult 0x%08X, %s\n"), nNextResult, _StringHelper::Join(Array, _T(", ")));
                                 if(SUCCEEDED(nNextResult))
                                 {
                                         ULONG nFetchedElementCount = nElementCount;
-                                        if(nNextResult != S_OK && pnFetchedElementCount)
-                                                nFetchedElementCount = *pnFetchedElementCount;
-                                        for(SIZE_T nIndex = 0; nIndex < nFetchedElementCount; nIndex++)
+                                        if(nNextResult != S_OK && pnFetchElementCount)
+                                                nFetchedElementCount = *pnFetchElementCount;
+                                        for(ULONG nIndex = 0; nIndex < nFetchedElementCount; nIndex++)
                                         {
                                                 CComPtr<IMoniker>& pMoniker = reinterpret_cast<CComPtr<IMoniker>&>(ppMoniker[nIndex]);
@@ -569 +572 @@
                         return S_OK;
                 }
-                STDMETHOD(Skip)(ULONG nElementCount) throw()
+                STDMETHOD(Skip)(ULONG nElementCount) override
                 {
                         _Z4(atlTraceCOM, 4, _T("nElementCount %d\n"), nElementCount);
@@ -582 +585 @@
                         return S_OK;
                 }
-                STDMETHOD(Reset)() throw()
+                STDMETHOD(Reset)() override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -595 +598 @@
                         return S_OK;
                 }
-                STDMETHOD(Clone)(IEnumMoniker** ppEnumMoniker) throw()
+                STDMETHOD(Clone)(IEnumMoniker** ppEnumMoniker) override
                 {
                         _Z4(atlTraceCOM, 4, _T("...\n"));
@@ -627 +630 @@
                 return S_OK;
         }
-        static HRESULT WINAPI QuerySystemDeviceEnumInterface(VOID* pvInstance, REFIID InterfaceIdentifier, VOID** ppvObject, DWORD)
+        static HRESULT WINAPI QuerySystemDeviceEnumInterface(VOID* pvInstance, REFIID InterfaceIdentifier, VOID** ppvObject, DWORD_PTR)
         {
                 return ((CSystemDeviceEnumeratorSpy*) pvInstance)->QuerySystemDeviceEnumInterface(InterfaceIdentifier, ppvObject);
@@ -634 +637 @@
 public:
 // CSystemDeviceEnumeratorSpyT
-        static LPCTSTR GetOriginalLibraryName() throw()
+        static LPCTSTR GetOriginalLibraryName()
         {
                 return _T("devenum.dll");
@@ -642 +645 @@
                 return _StringHelper::GetLine(T::IDR, 2);
         }
-        static HRESULT WINAPI UpdateRegistry(BOOL bRegister) throw()
+        static HRESULT WINAPI UpdateRegistry(BOOL bRegister)
         {
                 _Z2(atlTraceRegistrar, 2, _T("bRegister %d\n"), bRegister);
@@ -655 +658 @@
                 return S_OK;
         }
-        CSystemDeviceEnumeratorSpyT() throw() :
+        CSystemDeviceEnumeratorSpyT() :
                 m_hDevEnumModule(NULL)
         {
                 _Z4_THIS();
         }
-        ~CSystemDeviceEnumeratorSpyT() throw()
+        ~CSystemDeviceEnumeratorSpyT()
         {
                 _Z4_THIS();
         }
-        HRESULT FinalConstruct() throw()
+        HRESULT FinalConstruct()
         {
                 _ATLTRY
@@ -670 +673 @@
                         TCHAR pszPath[MAX_PATH] = { 0 };
                         _W(GetModuleFileName(NULL, pszPath, DIM(pszPath)));
-                        _Z4(atlTraceRefcount, 4, _T("pszPath \"%s\", this 0x%08x, m_dwRef %d\n"), pszPath, this, m_dwRef);
+                        _Z4(atlTraceRefcount, 4, _T("pszPath \"%s\", this 0x%p, m_dwRef %d\n"), pszPath, this, m_dwRef);
                         const HINSTANCE hModule = CoLoadLibrary(const_cast<LPOLESTR>((LPCOLESTR) CT2COLE(GetOriginalLibraryName())), TRUE);
                         _ATLTRY
@@ -704 +707 @@
                 return S_OK;
         }
-        VOID FinalRelease() throw()
-        {
-                _Z5(atlTraceRefcount, 5, _T("m_dwRef 0x%x\n"), m_dwRef);
-                m_pSystemDeviceEnum = NULL;
-                m_pCreateDevEnum = NULL;
+        VOID FinalRelease()
+        {
+                _Z5(atlTraceRefcount, 5, _T("m_dwRef 0x%X\n"), m_dwRef);
+                m_pSystemDeviceEnum.Release();
+                m_pCreateDevEnum.Release();
                 if(m_hDevEnumModule)
                 {
@@ -717 +720 @@
         static CString FormatDeviceCategory(const GUID& DeviceCategory)
         {
-                static const struct { const GUID* pIdentifier; LPCSTR pszName; } g_pMap[] = 
+                static const struct 
+                { 
+                        const GUID* pIdentifier; 
+                        LPCSTR pszName; 
+                } g_pMap[] = 
                 {
                         #define A(x) { &x, #x },
@@ -735 +742 @@
                         #undef A
                 };
-                for(SIZE_T nIndex = 0; nIndex < DIM(g_pMap); nIndex++)
-                        if(*g_pMap[nIndex].pIdentifier == DeviceCategory)
-                                return CString(g_pMap[nIndex].pszName);
+                for(auto&& Item: g_pMap)
+                        if(*Item.pIdentifier == DeviceCategory)
+                                return CString(Item.pszName);
                 return CString(_PersistHelper::StringFromIdentifier(DeviceCategory));
         }
@@ -744 +751 @@
 
 // ICreateDevEnum
-        STDMETHOD(CreateClassEnumerator)(REFCLSID DeviceCategory, IEnumMoniker** ppEnumMoniker, DWORD nFlags) throw()
-        {
-                _Z4(atlTraceCOM, 4, _T("DeviceCategory %s, nFlags 0x%x\n"), FormatDeviceCategory(DeviceCategory), nFlags);
+        STDMETHOD(CreateClassEnumerator)(REFCLSID DeviceCategory, IEnumMoniker** ppEnumMoniker, DWORD nFlags) override
+        {
+                _Z4(atlTraceCOM, 4, _T("DeviceCategory %s, nFlags 0x%X\n"), FormatDeviceCategory(DeviceCategory), nFlags);
                 _ATLTRY
                 {
-                        __C(m_pCreateDevEnum->CreateClassEnumerator(DeviceCategory, ppEnumMoniker, nFlags));
+                        const HRESULT nCreateClassEnumeratorResult = m_pCreateDevEnum->CreateClassEnumerator(DeviceCategory, ppEnumMoniker, nFlags);
+                        __C(nCreateClassEnumeratorResult);
+                        _D(nCreateClassEnumeratorResult == S_OK, nCreateClassEnumeratorResult);
                         CComPtr<IEnumMoniker>& pEnumMoniker = reinterpret_cast<CComPtr<IEnumMoniker>&>(*ppEnumMoniker);
                         if(pEnumMoniker)
                         {
-                                #pragma region Trace Monikers
+                                #pragma region Trace Moniker
                                 __C(pEnumMoniker->Reset());
-                                CComPtr<IMoniker> pMoniker;
-                                while(pEnumMoniker->Next(1, &pMoniker, NULL) == S_OK)
+                                for(; ; )
                                 {
-                                        _Z4(atlTraceCOM, 4, _T("pMoniker %ls\n"), _FilterGraphHelper::GetMonikerDisplayName(pMoniker));
+                                        CComPtr<IMoniker> pMoniker;
+                                        ULONG nElementCount;
+                                        if(pEnumMoniker->Next(1, &pMoniker, &nElementCount) != S_OK)
+                                                break;
+                                        _Z4(atlTraceGeneral, 4, _T("pMoniker %ls\n"), _FilterGraphHelper::GetMonikerDisplayName(pMoniker));
                                         CComPtr<IBindCtx> pBindCtx;
                                         __C(CreateBindCtx(0, &pBindCtx));
@@ -767 +779 @@
                                         const CStringW sDevicePath = _FilterGraphHelper::ReadPropertyBagString(pPropertyBag, OLESTR("DevicePath"));
                                         _Z4(atlTraceCOM, 4, _T("sFriendlyName \"%ls\", sDescription \"%ls\", sDevicePath \"%ls\"\n"), sFriendlyName, sDescription, sDevicePath);
-                                        pMoniker.Release();
                                 }
                                 __C(pEnumMoniker->Reset());