Changeset 146 for trunk

Timestamp:

Nov 18, 2012, 9:35:14 AM (11 years ago)

Author:

roman

Message:

Added FACILITY_AUDCLNT

Location:

trunk/Utilities/ShowHresult

Files:

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

trunk/Utilities/ShowHresult/NotifyIconWindow.h

@@ -19 +19 @@
 #include <wia_lh.h> // FACILITY_WIA
 #include <corerror.h> // FACILITY_URT
+#include <audioclient.h> // FACILITY_AUDCLNT
 #include "rowinhttp.h"
 #include "AboutDialog.h"
@@ -149 +150 @@
                         #define A(x) { x, #x },
                         #include "MfIdentifier.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 IsAudioClientResult(HRESULT nResult, CString* psMessage = NULL, CString* psIdentifier = NULL)
+        {
+                if(HRESULT_FACILITY(nResult) != FACILITY_AUDCLNT)
+                        return FALSE;
+                psMessage;
+                CString sIdentifier;
+                if(!LookupAudioClientIdentifier(nResult, sIdentifier))
+                        return FALSE;
+                if(psIdentifier)
+                        *psIdentifier = sIdentifier;
+                return TRUE;
+        }
+        static BOOL LookupAudioClientIdentifier(HRESULT nValue, CString& sIdentifier)
+        {
+                static const struct { HRESULT nValue; LPCSTR pszName; } g_pMap[] = 
+                {
+                        #define A(x) { x, #x },
+                        #include "AudioClientIdentifier.inc"
                         #undef A
                 };
@@ -524 +553 @@
                         LookupMfIdentifier(nResult, sIdentifier);
                         sTitle = _T("Media Foundation");
-                }
+                } else if(IsAudioClientResult(nResult, &sMessage, &sIdentifier) || LookupAudioClientIdentifier(nResult, sIdentifier))
+                        sTitle = _T("Audio Client");
                 #pragma region Obsolete?
                 // NOTE: These are perhaps useless in Windows 7, but I am under impression they are helpful in earlier systems

trunk/Utilities/ShowHresult/ShowHresult.vcxproj

@@ -291 +291 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="AudioClientIdentifier.inc" />
     <None Include="WmIdentifier.inc">
       <FileType>Document</FileType>

trunk/Utilities/ShowHresult/ShowHresult.vcxproj.filters

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