Changeset 455

Timestamp:

May 22, 2015, 2:54:31 PM (8 years ago)

Author:

roman

Message:

Cosmetic

Location:

trunk/DirectShowSpy

Files:

• Common.h (modified) (1 diff)
• MediaSampleTrace.h (modified) (7 diffs)
• Module.rc (modified) (previous)
• _Bin/DirectShowSpy-Win32.dll (modified) (previous)
• _Bin/DirectShowSpy-x64.dll (modified) (previous)

trunk/DirectShowSpy/Common.h

@@ -17 +17 @@
 
 #include "AboutDialog.h"
-#include "..\..\Repository-Private\Utilities\EmailTools\Message.h"
+namespace EmailTools
+{
+        #include "Module_i.h"
+        #undef __Module_i_h__
+        #include "..\..\Repository-Private\Utilities\EmailTools\Module_i.h"
+        #include "..\..\Repository-Private\Utilities\EmailTools\Message.h"
+}
+using namespace EmailTools;
 #define  BZ_NO_STDIO
 #include "..\..\Repository-Private\Utilities\DeflateTools\Bzip2Item.h"

trunk/DirectShowSpy/MediaSampleTrace.h

@@ -107 +107 @@
                         } MediaSample;
                 } Data;
-                WCHAR pszComment[64];
+                WCHAR pszComment[96];
         } PAGEITEM;
 
@@ -686 +686 @@
 // CMediaSampleTracePropertySheet
 
+// SUGG: Thread, Type fitlers
+
 class CMediaSampleTracePropertySheet :
         public CSizablePropertySheetT<CMediaSampleTracePropertySheet>,
@@ -911 +913 @@
                                                 continue;
                                         IdentifierArray.Add(Item.m_Item.nFilterGraphIdentifier);
-                                        ValueArray.Add(CFilterGraphValue(Item.m_Item.nFilterGraphIdentifier, AtlFormatStringW(L"0x%p %ls", (UINT_PTR) Item.m_Item.nFilterGraphIdentifier, Item.m_Item.pszFilterGraphName)));
+                                        ValueArray.Add(CFilterGraphValue(Item.m_Item.nFilterGraphIdentifier, GetFilterGraphFriendlyName(Item.m_Item)));
                                 }
                                 _SortHelper::QuickSort<CFilterGraphValueSortTraits>(ValueArray);
@@ -941 +943 @@
                                                 continue;
                                         IdentifierArray.Add(Item.m_PageItem.nFilterIdentifier);
-                                        ValueArray.Add(CFilterValue(Item.m_PageItem.nFilterIdentifier, AtlFormatStringW(L"0x%p %ls", (UINT_PTR) Item.m_PageItem.nFilterIdentifier, Item.m_PageItem.pszFilterName)));
+                                        ValueArray.Add(CFilterValue(Item.m_PageItem.nFilterIdentifier, GetFilterFriendlyName(Item.m_PageItem)));
                                 }
                                 _SortHelper::QuickSort<CFilterValueSortTraits>(ValueArray);
@@ -1123 +1125 @@
                         FileTimeToSystemTime(&reinterpret_cast<const FILETIME&>(nTime), &Time);
                         return AtlFormatString(_T("%02d:%02d:%02d.%03d"), Time.wHour, Time.wMinute, Time.wSecond, Time.wMilliseconds);
+                }
+                static CString GetFilterGraphFriendlyName(const ITEM& Item)
+                {
+                        CString sFriendlyName(Item.pszFilterGraphName);
+                        if(!sFriendlyName.IsEmpty())
+                                sFriendlyName.AppendFormat(_T(" (0x%p)"), (UINT_PTR) Item.nFilterGraphIdentifier);
+                        else
+                                sFriendlyName.AppendFormat(_T("0x%p"), (UINT_PTR) Item.nFilterGraphIdentifier);
+                        return sFriendlyName;
+                }
+                static CString GetFilterFriendlyName(const PAGEITEM& PageItem)
+                {
+                        CString sFriendlyName(PageItem.pszFilterName);
+                        if(!sFriendlyName.IsEmpty())
+                                sFriendlyName.AppendFormat(_T(" (0x%p)"), (UINT_PTR) PageItem.nFilterIdentifier);
+                        else
+                                sFriendlyName.AppendFormat(_T("0x%p"), (UINT_PTR) PageItem.nFilterIdentifier);
+                        return sFriendlyName;
                 }
                 CStringA CreateText()
@@ -1300 +1320 @@
                                         break;
                                 case 3: // Filter Graph
-                                        sTextBuffer = AtlFormatString(_T("0x%p %ls"), (UINT_PTR) Item.m_Item.nFilterGraphIdentifier, Item.m_Item.pszFilterGraphName);
+                                        sTextBuffer = GetFilterGraphFriendlyName(Item.m_Item);
                                         break;
                                 case 4: // Filter
-                                        sTextBuffer = AtlFormatString(_T("0x%p %ls"), (UINT_PTR) Item.m_PageItem.nFilterIdentifier, Item.m_PageItem.pszFilterName);
+                                        sTextBuffer = GetFilterFriendlyName(Item.m_PageItem);
                                         break;
                                 case 5: // Stream
@@ -1356 +1376 @@
                         sTextBuffer.AppendFormat(_T("Process: %d\r\n"), (UINT_PTR) Item.m_Item.nProcessIdentifier);
                         sTextBuffer.AppendFormat(_T("Thread: %d\r\n"), (UINT_PTR) Item.m_PageItem.nThreadIdentifier);
-                        sTextBuffer.AppendFormat(_T("Filter Graph: 0x%p %ls\r\n"), (UINT_PTR) Item.m_Item.nFilterGraphIdentifier, Item.m_Item.pszFilterGraphName);
-                        sTextBuffer.AppendFormat(_T("Filter: 0x%p %ls\r\n"), (UINT_PTR) Item.m_PageItem.nFilterIdentifier, Item.m_PageItem.pszFilterName);
+                        sTextBuffer.AppendFormat(_T("Filter Graph: %s\r\n"), GetFilterGraphFriendlyName(Item.m_Item));
+                        sTextBuffer.AppendFormat(_T("Filter: %s\r\n"), GetFilterFriendlyName(Item.m_PageItem));
                         sTextBuffer.AppendFormat(_T("Stream: %ls\r\n"), Item.m_PageItem.pszStreamName);
                         sTextBuffer.AppendFormat(_T("Type: %s\r\n"), Item.FormatType());