Changeset 167

Timestamp:

Jan 29, 2013, 5:26:02 AM (11 years ago)

Author:

roman

Message:

Added AVIERR_*

Location:

trunk/Utilities/ShowHresult

Files:

• AviIdentifier.inc (added)
• NotifyIconWindow.h (modified) (4 diffs)
• ShowHresult.rc (modified) (previous)
• ShowHresult.vcxproj (modified) (2 diffs)
• ShowHresult.vcxproj.filters (modified) (1 diff)
• ShowHresult_i.c (modified) (1 diff)
• ShowHresult_i.h (modified) (1 diff)
• _Bin/Release/ShowHresult.exe (modified) (previous)

trunk/Utilities/ShowHresult/NotifyIconWindow.h

@@ -8 +8 @@
 
 #include <vfwmsgs.h>
+#include <vfw.h> // FACILITY_ITF, AVIERR_
 #include <asferr.h> // FACILITY_NS
 #include <nserror.h> // FACILITY_NS
@@ -477 +478 @@
                         #define A(x) { x, #x },
                         #include "SlIdentifier.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 IsAviResult(HRESULT nResult, CString* psMessage = NULL, CString* psIdentifier = NULL)
+        {
+                if(HRESULT_FACILITY(nResult) != FACILITY_ITF && HRESULT_CODE(nResult) - (0x4000 + 100) < 100)
+                        return FALSE;
+                psMessage;
+                CString sIdentifier;
+                if(!LookupAviIdentifier(nResult, sIdentifier))
+                        return FALSE;
+                if(psIdentifier)
+                        *psIdentifier = sIdentifier;
+                return TRUE;
+        }
+        static BOOL LookupAviIdentifier(HRESULT nValue, CString& sIdentifier)
+        {
+                static const struct { HRESULT nValue; LPCSTR pszName; } g_pMap[] = 
+                {
+                        #define A(x) { x, #x },
+                        #include "AviIdentifier.inc"
                         #undef A
                 };
@@ -665 +694 @@
                 else if(IsSlResult(nResult, &sMessage, &sIdentifier) || LookupSlIdentifier(nResult, sIdentifier))
                         sTitle = _T("Software Licensing");
+                else if(IsAviResult(nResult, &sMessage, &sIdentifier) || LookupAviIdentifier(nResult, sIdentifier))
+                        sTitle = _T("AVI");
                 else 
                 {
@@ -725 +756 @@
                 //Process(AtlFormatString(_T("0x%x"), HRESULT_FROM_WIN32(WSAEADDRINUSE))); // WSAEADDRINUSE
                 //Process(AtlFormatString(_T("0x%x"), HRESULT_FROM_WIN32(ERROR_WINHTTP_AUTODETECTION_FAILED))); // ERROR_WINHTTP_AUTODETECTION_FAILED
-                Process(_T("0x80131029L"));
+                Process(_T("0x8004406a"));
                 //Process(_T("-2147312566"));
                 #endif // defined(_DEBUG)

trunk/Utilities/ShowHresult/ShowHresult.vcxproj

@@ -294 +294 @@
       <FileType>CppHeader</FileType>
     </None>
+    <None Include="AviIdentifier.inc">
+      <FileType>CppHeader</FileType>
+    </None>
     <None Include="P2pIdentifier.inc">
       <FileType>CppHeader</FileType>
@@ -306 +309 @@
     <ClInclude Include="Resource.h" />
     <ClInclude Include="ShowHresult_i.h" />
-    <ClInclude Include="SlIdentifier.inc" />
+    <ClInclude Include="SlIdentifier.inc">
+      <FileType>CppHeader</FileType>
+    </ClInclude>
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />

trunk/Utilities/ShowHresult/ShowHresult.vcxproj.filters

@@ -104 +104 @@
       <Filter>Header Files\Include Files</Filter>
     </None>
+    <None Include="AviIdentifier.inc">
+      <Filter>Header Files\Include Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>

trunk/Utilities/ShowHresult/ShowHresult_i.c

@@ -7 +7 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Tue Dec 04 12:57:03 2012
+/* at Tue Jan 29 15:23:58 2013
  */
 /* Compiler settings for ShowHresult.idl:

trunk/Utilities/ShowHresult/ShowHresult_i.h

@@ -5 +5 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Tue Dec 04 12:57:03 2012
+/* at Tue Jan 29 15:23:58 2013
  */
 /* Compiler settings for ShowHresult.idl: