Changeset 503

Timestamp:

Sep 4, 2015, 11:47:45 PM (7 years ago)

Author:

roman

Message:

Improved event code logging, added non-ROT FGT (incomplete)

Location:

trunk/DirectShowSpy

Files:

• DirectShowSpy.vcxproj (modified) (2 diffs)
• DirectShowSpy.vcxproj.filters (modified) (3 diffs)
• FilterGraphList.h (modified) (3 diffs)
• FilterGraphSpy.h (modified) (9 diffs)
• GenericClass.rgs (deleted)
• Helper.cpp (modified) (3 diffs)
• Module.idl (modified) (1 diff)
• Module.rc (modified) (previous)
• _Bin/DirectShowSpy-Win32.dll (modified) (previous)
• _Bin/DirectShowSpy-x64.dll (modified) (previous)
• resource.h (modified) (1 diff)

trunk/DirectShowSpy/DirectShowSpy.vcxproj

@@ -456 +456 @@
     <None Include="Module.def" />
     <None Include="Module.rgs" />
-    <None Include="FilterGraphSpy.rgs" />
-    <None Include="FilterMapperSpy.rgs" />
-    <None Include="GenericClass.rgs" />
+    <None Include="GenericClass %28Both%29.rgs" />
     <None Include="GenericPropertyPage.rgs" />
   </ItemGroup>
@@ -472 +470 @@
     <ClInclude Include="FilterGraphList.h" />
     <ClInclude Include="FilterGraphSpy.h" />
+    <ClInclude Include="FilterGraphTable.h" />
     <ClInclude Include="FilterMapperSpy.h" />
     <ClInclude Include="GraphBuilderCallbackPropertySheet.h" />

trunk/DirectShowSpy/DirectShowSpy.vcxproj.filters

@@ -43 +43 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="FilterGraphSpy.rgs">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="FilterMapperSpy.rgs">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="GenericClass.rgs">
-      <Filter>Resource Files</Filter>
-    </None>
     <None Include="..\..\Repository-Private\Utilities\EmailTools\_Bin\Win32\Release\EmailTools\EmailTools.tlb">
       <Filter>Resource Files</Filter>
@@ -65 +56 @@
     </None>
     <None Include="..\..\Repository-Private\Utilities\EmailTools\_Bin\EmailTools-Win32.tlb" />
+    <None Include="GenericClass %28Both%29.rgs">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
@@ -118 +112 @@
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="FilterGraphTable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>

trunk/DirectShowSpy/FilterGraphList.h

@@ -23 +23 @@
 #include "FilterGraphHelper.h"
 #include "AboutDialog.h"
+#include "FilterGraphTable.h"
 
 #pragma comment(lib, "psapi.lib")
@@ -248 +249 @@
                 {
                         return ((CListPropertyPage*) nParameter)->SortGraphListViewItems(nItemParameter1, nItemParameter2);
+                }
+                static BOOL FindItem(CRoMapT<CStringW, CItem>& ItemMap, const CFilterGraphTable::CItem& TableItem)
+                {
+                        for(auto&& MapItem: ItemMap.GetValues())
+                        {
+                                if(MapItem.m_nProcessIdentifier != TableItem.m_nProcessIdentifier)
+                                        continue;
+                                if(abs((LONG_PTR) MapItem.m_nInstance - (LONG_PTR) TableItem.m_nInstance) > 32) //if(MapItem.m_nInstance != TableItem.m_nInstance)
+                                        continue;
+                                return TRUE;
+                        }
+                        return FALSE;
                 }
                 static VOID EnumerateItems(IRunningObjectTable* pRunningObjectTable, CRoMapT<CStringW, CItem>& ItemMap, const LONG* pnProcessIdentifier = NULL)
@@ -294 +307 @@
                                         }
                                 }
+                                #pragma region Filter Graph Table
+                                _ATLTRY
+                                {
+                                        CLocalObjectPtr<CFilterGraphTable> pFilterGraphTable;
+                                        CFilterGraphTable::CItemArray ItemArray;
+                                        if(pFilterGraphTable->GetItems(ItemArray))
+                                        {
+                                                for(auto&& TableItem: ItemArray)
+                                                {
+                                                        if(FindItem(ItemMap, TableItem))
+                                                                continue;
+                                                        if(pnProcessIdentifier && TableItem.m_nProcessIdentifier != (DWORD) *pnProcessIdentifier)
+                                                                continue; // Skip
+                                                        const CStringW sDisplayName = AtlFormatStringW(L"!FilterGraph %p pid %08x; FGT", TableItem.m_nInstance, TableItem.m_nProcessIdentifier);
+                                                        CItem Item;
+                                                        Item.m_sDisplayName = sDisplayName;
+                                                        Item.m_nInstance = TableItem.m_nInstance;
+                                                        Item.m_nProcessIdentifier = TableItem.m_nProcessIdentifier;
+                                                        Item.m_pFilterGraphUnknown = TableItem.m_pFilterGraph;
+                                                        Item.m_pFilterGraph = TableItem.m_pFilterGraph;
+                                                        SYSTEMTIME Time;
+                                                        _W(FileTimeToSystemTime(&reinterpret_cast<const FILETIME&>(TableItem.m_nTime), &Time));
+                                                        Item.m_sTime = AtlFormatString(_T("%02d:%02d:%02d"), Time.wHour, Time.wMinute, Time.wSecond);
+                                                        _W(ItemMap.SetAt(sDisplayName, Item) >= 0);
+                                                }
+                                        }
+                                }
+                                _ATLCATCHALL()
+                                {
+                                        _Z_EXCEPTION();
+                                }
+                                #pragma endregion 
                         }
                         _ATLCATCHALL()

trunk/DirectShowSpy/FilterGraphSpy.h

@@ -21 +21 @@
 #include "RunPropertyBag.h"
 #include "MediaSampleTrace.h"
+#include "FilterGraphTable.h"
 
 HRESULT FilterGraphHelper_OpenGraphStudioNext(LONG nParentWindowHandle, LPCWSTR pszMonikerDisplayName, VARIANT_BOOL* pbResult);
@@ -681 +682 @@
         _FilterGraphHelper::CRotRunningFilterGraph m_RunningFilterGraph;
         INT m_nRunningFilterGraphReference;
+        CLocalObjectPtr<CFilterGraphTableItem> m_pFilterGraphTableItem;
         SYSTEMTIME m_Time;
         CStringW m_sMonikerDisplayName;
@@ -712 +714 @@
                 CStringW sMonikerDisplayName;
                 static CConstIntegerRegistryValue g_nEnableRotMonikerItemNameSuffix(_T("Enable ROT Moniker Item Name Suffix")); // 0 Default (Enabled), 1 Disabled, 2 Enabled
-                if(g_nEnableRotMonikerItemNameSuffix != 1)
+                if(g_nEnableRotMonikerItemNameSuffix != 1) // Disabled
                 {
                         TCHAR pszPath[MAX_PATH] = { 0 };
@@ -727 +729 @@
                         m_sMonikerDisplayName = sMonikerDisplayName;
                 }
+                #pragma region Filter Graph Table Item
+                static CConstIntegerRegistryValue g_nAutomaticFilterGraphTableItem(_T("Automatic Filter Graph Table Item")); // 0 Default (Disabled), 1 Disabled, 2 Enabled
+                if(g_nAutomaticFilterGraphTableItem == 2) // Enabled
+                        _ATLTRY
+                        {
+                                _A(!m_pFilterGraphTableItem->IsFilterGraphAvailable());
+                                m_pFilterGraphTableItem->SetFilterGraph(this);
+                                Release();
+                        }
+                        _ATLCATCHALL()
+                        {
+                                _Z_EXCEPTION();
+                        }
+                #pragma endregion
                 if(!m_bIsAggregated)
                 {
@@ -744 +760 @@
                 if(!m_RunningFilterGraph.GetCookie())
                         return;
+                #pragma region Filter Graph Table Item
+                _ATLTRY
+                {
+                        if(m_pFilterGraphTableItem->IsFilterGraphAvailable())
+                        {
+                                AddRef();
+                                m_pFilterGraphTableItem->SetFilterGraph(NULL);
+                        }
+                }
+                _ATLCATCHALL()
+                {
+                        _Z_EXCEPTION();
+                }
+                #pragma endregion
                 if(m_nRunningFilterGraphReference != 2)
                         AddRef();
@@ -1029 +1059 @@
                 return FALSE;
         }
-        static BOOL LookupEventCodeName(LONG nEventCode, LPCSTR& pszName)
-        {
-                // NOTE: See Windows SDK evcode.h
-                static const struct { LONG nEventCode; LPCSTR pszName; } g_pMap[] = 
-                {
-                        #define A(x) { x, #x },
-                        A(EC_COMPLETE)
-                        A(EC_USERABORT)
-                        A(EC_ERRORABORT)
-                        A(EC_TIME)
-                        A(EC_REPAINT)
-                        A(EC_STREAM_ERROR_STOPPED)
-                        A(EC_STREAM_ERROR_STILLPLAYING)
-                        A(EC_ERROR_STILLPLAYING)
-                        A(EC_PALETTE_CHANGED)
-                        A(EC_VIDEO_SIZE_CHANGED)
-                        A(EC_QUALITY_CHANGE)
-                        A(EC_SHUTTING_DOWN)
-                        A(EC_CLOCK_CHANGED)
-                        A(EC_PAUSED)
-                        A(EC_OPENING_FILE)
-                        A(EC_BUFFERING_DATA)
-                        A(EC_FULLSCREEN_LOST)
-                        A(EC_ACTIVATE)
-                        A(EC_NEED_RESTART)
-                        A(EC_WINDOW_DESTROYED)
-                        A(EC_DISPLAY_CHANGED)
-                        A(EC_STARVATION)
-                        A(EC_OLE_EVENT)
-                        A(EC_NOTIFY_WINDOW)
-                        A(EC_STREAM_CONTROL_STOPPED)
-                        A(EC_STREAM_CONTROL_STARTED)
-                        A(EC_END_OF_SEGMENT)
-                        A(EC_SEGMENT_STARTED)
-                        A(EC_LENGTH_CHANGED)
-                        A(EC_DEVICE_LOST)
-                        A(EC_SAMPLE_NEEDED)
-                        A(EC_PROCESSING_LATENCY)
-                        A(EC_SAMPLE_LATENCY)
-                        A(EC_SCRUB_TIME)
-                        A(EC_STEP_COMPLETE)
-                        #undef A
-                };
-                for(SIZE_T nIndex = 0; nIndex < DIM(g_pMap); nIndex++)
-                        if(g_pMap[nIndex].nEventCode == nEventCode)
-                        {
-                                pszName = g_pMap[nIndex].pszName;
-                                return TRUE;
-                        }
-                return FALSE;
-        }
         CStringW GetMonikerDisplayName() const
         {
@@ -1560 +1539 @@
     STDMETHOD(Notify)(LONG nEventCode, LONG_PTR nParameter1, LONG_PTR nParameter2)
         {
-                #if TRUE
-                        LPCSTR pszEventName = NULL;
-                        if(LookupEventCodeName(nEventCode, pszEventName))
-                        {
-                                _Z4(atlTraceCOM, 4, _T("nEventCode %hs (0x%02X), nParameter1 0x%p, nParameter2 0x%p\n"), pszEventName, nEventCode, nParameter1, nParameter2);
-                        } else
-                #endif
-                _Z4(atlTraceCOM, 4, _T("nEventCode 0x%02X, nParameter1 0x%p, nParameter2 0x%p\n"), nEventCode, nParameter1, nParameter2);
+                _Z4(atlTraceCOM, 4, _T("nEventCode %s, nParameter1 0x%p, nParameter2 0x%p\n"), _FilterGraphHelper::FormatEventCode(nEventCode), nParameter1, nParameter2);
                 #if defined(_M_IX86)
                         // WARN: Guarding section around might be preventing from walknig frame up the stack
@@ -1593 +1565 @@
                 const HRESULT nGetEventResult = m_pInnerMediaEventEx->GetEvent(pnEventCode, pnParameter1, pnParameter2, nTimeout);
                 if(pnEventCode && pnParameter1 && pnParameter2)
-                        _Z4(atlTraceCOM, (nGetEventResult != E_ABORT) ? 4 : 5, _T("nGetEventResult 0x%x, *pnEventCode 0x%02X, *pnParameter1 0x%p, *pnParameter2 0x%p\n"), nGetEventResult, *pnEventCode, *pnParameter1, *pnParameter2);
+                        _Z4(atlTraceCOM, (nGetEventResult != E_ABORT) ? 4 : 5, _T("nGetEventResult 0x%08X, *pnEventCode %s, *pnParameter1 0x%p, *pnParameter2 0x%p\n"), nGetEventResult, _FilterGraphHelper::FormatEventCode(*pnEventCode), *pnParameter1, *pnParameter2);
                 return nGetEventResult;
         }
@@ -1601 +1573 @@
                 const HRESULT nWaitForCompletionResult = m_pInnerMediaEventEx->WaitForCompletion(nTimeout, pnEventCode);
                 if(pnEventCode)
-                        _Z4(atlTraceCOM, 4, _T("nWaitForCompletionResult 0x%x, *pnEventCode 0x%02X\n"), nWaitForCompletionResult, *pnEventCode);
+                        _Z4(atlTraceCOM, 4, _T("nWaitForCompletionResult 0x%08X, *pnEventCode %s\n"), nWaitForCompletionResult, _FilterGraphHelper::FormatEventCode(*pnEventCode));
                 return nWaitForCompletionResult;
         }
         STDMETHOD(CancelDefaultHandling)(LONG nEventCode)
         {
-                #if TRUE
-                        LPCSTR pszEventName = NULL;
-                        if(LookupEventCodeName(nEventCode, pszEventName))
-                        {
-                                _Z4(atlTraceCOM, 4, _T("nEventCode %hs (0x%02X)\n"), pszEventName, nEventCode);
-                        } else
-                #endif
-                _Z4(atlTraceCOM, 4, _T("nEventCode 0x%02X\n"), nEventCode);
+                _Z4(atlTraceCOM, 4, _T("nEventCode %s\n"), _FilterGraphHelper::FormatEventCode(nEventCode));
                 return m_pInnerMediaEventEx->CancelDefaultHandling(nEventCode);
         }
         STDMETHOD(RestoreDefaultHandling)(LONG nEventCode)
         {
-                #if TRUE
-                        LPCSTR pszEventName = NULL;
-                        if(LookupEventCodeName(nEventCode, pszEventName))
-                        {
-                                _Z4(atlTraceCOM, 4, _T("nEventCode %hs (0x%02X)\n"), pszEventName, nEventCode);
-                        } else
-                #endif
-                _Z4(atlTraceCOM, 4, _T("nEventCode 0x%02X\n"), nEventCode);
+                _Z4(atlTraceCOM, 4, _T("nEventCode %s\n"), _FilterGraphHelper::FormatEventCode(nEventCode));
                 return m_pInnerMediaEventEx->RestoreDefaultHandling(nEventCode);
         }
         STDMETHOD(FreeEventParams)(LONG nEventCode, LONG_PTR nParameter1, LONG_PTR nParameter2)
         {
-                _Z4(atlTraceCOM, 4, _T("nEventCode 0x%02X, nParameter1 0x%p, nParameter2 0x%p\n"), nEventCode, nParameter1, nParameter2);
+                _Z4(atlTraceCOM, 4, _T("nEventCode %s, nParameter1 0x%p, nParameter2 0x%p\n"), _FilterGraphHelper::FormatEventCode(nEventCode), nParameter1, nParameter2);
                 return m_pInnerMediaEventEx->FreeEventParams(nEventCode, nParameter1, nParameter2);
         }

trunk/DirectShowSpy/Helper.cpp

@@ -17 +17 @@
 #include "resource.h"
 #include "FilterGraphHelper.h"
+#include "FilterGraphTable.h"
 #include "MediaSampleTrace.h"
 
@@ -64 +65 @@
 #endif // _DEVELOPMENT
 
-#if _DEVELOPMENT //&& FALSE
+#if _DEVELOPMENT && FALSE
 
 COMPILER_MESSAGE("Development: MediaSampleTrace test as Test")
@@ -266 +267 @@
 
 #endif // _DEVELOPMENT
+
+#if _DEVELOPMENT //&& FALSE
+
+COMPILER_MESSAGE("Development: CFilterGraphHelper::DoPropertyFrameModal as Test")
+
+#if defined(_WIN64)
+        extern "C" __declspec(dllexport) 
+#else
+        #pragma comment(linker, "/EXPORT:Test=_Test@0,PRIVATE")
+        extern "C" // __declspec(dllexport) 
+#endif // defined(_WIN64)
+
+HRESULT STDMETHODCALLTYPE Test()
+{
+        _ATLTRY
+        {
+                CSingleThreadedApartment SingleThreadedApartment;
+/*
+                CGenericFilterGraph FilterGraph;
+                FilterGraph.CoCreateInstance();
+                __C(FilterGraph.m_pFilterGraph->RenderFile(_T("E:\\Media\\Robotica_1080.wmv"), NULL));
+                _ATLTRY
+                {
+                        const CComQIPtr<ISpy> pSpy = FilterGraph.m_pFilterGraph;
+                        if(pSpy)
+                                __C(pSpy->put_FriendlyName(CComBSTR(_T("Test"))));
+                }
+                _ATLCATCHALL()
+                {
+                        _Z_EXCEPTION();
+                }
+                //CLocalObjectPtr<CFilterGraphTableItem> pFilterGraphTableItem;
+                //__C(pFilterGraphTableItem->put_FilterGraph(FilterGraph.m_pFilterGraph));
+                //CLocalObjectPtr<CFilterGraphTable> pFilterGraphTable;
+*/
+                CLocalObjectPtr<CFilterGraphHelper> pFilterGraphHelper;
+                pFilterGraphHelper->DoFilterGraphListModal(0);
+                //__C(pFilterGraphTableItem->put_FilterGraph(NULL));
+        }
+        _ATLCATCH(Exception)
+        {
+                _C(Exception);
+        }
+        return S_OK;
+}
+
+#endif // _DEVELOPMENT
+

trunk/DirectShowSpy/Module.idl

@@ -276 +276 @@
                 [default] interface IUnknown; //IPropertyPage;
         };
+        [
+                object,
+                uuid(ECDC55A1-FFD7-4999-BAB5-579D5773F0B6),
+                dual,
+                oleautomation,
+                nonextensible,
+                pointer_default(unique)
+        ]
+        interface IFilterGraphTableItem : IDispatch
+        {
+                [id(DISPID_VALUE), propget] HRESULT FilterGraph([out, retval] IUnknown** ppFilterGraphUnknown);
+                [id(DISPID_VALUE), propput] HRESULT FilterGraph([in] IUnknown* pFilterGraphUnknown);
+                [id(1), propget] HRESULT Time([out, retval] DATE* pfTime);
+        };
+        [
+                uuid(7B2E1768-3037-4975-ABA1-BA626397BF08)
+        ]
+        coclass FilterGraphTableItem
+        {
+                [default] interface IFilterGraphTableItem;
+        };
+        [
+                object,
+                uuid(15078C09-6D0C-4284-924C-F6CD13CA39F6),
+                dual,
+                oleautomation,
+                nonextensible,
+                pointer_default(unique)
+        ]
+        interface IFilterGraphTable : IDispatch
+        {
+                [id(DISPID_NEWENUM), propget, restricted] HRESULT _NewEnum([out, retval] IUnknown** ppEnum);
+                [id(DISPID_VALUE), propget] HRESULT Item([in] VARIANT vIndex, [out, retval] VARIANT* pvItem);
+                [id(1), propget] HRESULT Count([out, retval] LONG* pnCount);
+        };
+        [
+                uuid(44EF31BC-CC5F-4163-8832-BDC79ED59162)
+        ]
+        coclass FilterGraphTable
+        {
+                [default] interface IFilterGraphTable;
+        };
+        [
+                object,
+                uuid(D9A734F0-3230-4574-81FA-71DE297ACDF8),
+                dual,
+                oleautomation,
+                nonextensible,
+                pointer_default(unique)
+        ]
+        interface IFilterGraphTableActiveObject : IDispatch
+        {
+                [id(1)] HRESULT GetFilterGraphs([out] LONG* pnProcessIdentifier, [out] VARIANT* pvArray);
+        };
 };

trunk/DirectShowSpy/resource.h

@@ -156 +156 @@
 #define IDR_SYSTEMDEVICEENUMERATORSPY   25003
 #define IDR_FILTERGRAPHHELPER           25050
+#define IDR_FILTERGRAPHTABLEITEM                25051
+#define IDR_FILTERGRAPHTABLE                    25052
 #define IDD_ABOUT                       29900
 #define IDC_ABOUT_ICON                  29901