Changeset 116

Timestamp:

Sep 8, 2012, 2:50:30 AM (11 years ago)

Author:

roman

Message:

Added NS_ identifiers

Location:

trunk/Utilities/ShowHresult

Files:

• NotifyIconWindow.h (modified) (3 diffs)
• ShowHresult.rc (modified) (previous)
• ShowHresult.vcxproj (modified) (1 diff)
• ShowHresult.vcxproj.filters (modified) (1 diff)
• WmIdentifier.inc (added)
• _Bin/Release/ShowHresult.exe (modified) (previous)

trunk/Utilities/ShowHresult/NotifyIconWindow.h

@@ -9 +9 @@
 #include <vfwmsgs.h>
 #include <asferr.h> // FACILITY_NS
+#include <nserror.h> // FACILITY_NS
 #include <mferror.h> // FACILITY_MF
 #include <wmcodecdsp.h> // FACILITY_WMAAECMA
@@ -114 +115 @@
                         *psMessage = sMessage;
                 return TRUE;
+        }
+        static BOOL LookupWmIdentifier(HRESULT nValue, CString& sIdentifier)
+        {
+                static const struct { HRESULT nValue; LPCSTR pszName; } g_pMap[] = 
+                {
+                        #define A(x) { x, #x },
+                        #include "WmIdentifier.inc"
+                        #undef A
+                };
+                for(SIZE_T nIndex = 0; nIndex < DIM(g_pMap); nIndex++)
+                        if(g_pMap[nIndex].nValue == nValue)
+                        {
+                                sIdentifier = CString(g_pMap[nIndex].pszName);
+                                return TRUE;
+                        }
+                return FALSE;
         }
         static BOOL IsMfResult(HRESULT nResult, CString* psMessage = NULL)
@@ -480 +497 @@
                         sTitle = _T("DirectShow");
                 } else if(IsWmResult(nResult, &sMessage))
+                {
+                        LookupWmIdentifier(nResult, sIdentifier);
                         sTitle = _T("Windows Media");
-                else if(IsMfResult(nResult, &sMessage) || LookupMfIdentifier(nResult, sIdentifier))
+                } else if(IsMfResult(nResult, &sMessage) || LookupMfIdentifier(nResult, sIdentifier))
                         sTitle = _T("Media Foundation");
                 ////////////////////////////////////////////////////

trunk/Utilities/ShowHresult/ShowHresult.vcxproj

@@ -291 +291 @@
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="WmIdentifier.inc" />
     <None Include="D2dIdentifier.inc">
       <FileType>CppHeader</FileType>

trunk/Utilities/ShowHresult/ShowHresult.vcxproj.filters

@@ -48 +48 @@
     <ClInclude Include="NotifyIconWindow.h">
       <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WmIdentifier.inc">
+      <Filter>Header Files\Include Files</Filter>
     </ClInclude>
   </ItemGroup>