Constify TCHARToUTF8, dump IMMNotificationClient callback params

Author: eiz

SarAsio/sarclient.cpp

@@ -522,21 +522,31 @@ HRESULT STDMETHODCALLTYPE SarClient::NotificationClient::OnDeviceStateChanged(
     _In_  LPCWSTR pwstrDeviceId,
     _In_  DWORD dwNewState)
 {
-    OutputDebugString(_T("OnDeviceStateChanged"));
+    std::ostringstream os;
+
+    os << "OnDeviceStateChanged(" << TCHARToUTF8(pwstrDeviceId)
+       << ", " << dwNewState << ")";
+    OutputDebugStringA(os.str().c_str());
     return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE SarClient::NotificationClient::OnDeviceAdded(
     _In_  LPCWSTR pwstrDeviceId)
 {
-    OutputDebugString(_T("OnDeviceAdded"));
+    std::ostringstream os;
+
+    os << "OnDeviceAdded(" << TCHARToUTF8(pwstrDeviceId) << ")";
+    OutputDebugStringA(os.str().c_str());
     return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE SarClient::NotificationClient::OnDeviceRemoved(
     _In_  LPCWSTR pwstrDeviceId)
 {
-    OutputDebugString(_T("OnDeviceRemoved"));
+    std::ostringstream os;
+
+    os << "OnDeviceRemoved(" << TCHARToUTF8(pwstrDeviceId) << ")";
+    OutputDebugStringA(os.str().c_str());
     return S_OK;
 }
 
@@ -545,15 +555,25 @@ HRESULT STDMETHODCALLTYPE SarClient::NotificationClient::OnDefaultDeviceChanged(
     _In_  ERole role,
     _In_  LPCWSTR pwstrDefaultDeviceId)
 {
-    OutputDebugString(_T("OnDefaultDeviceChanged"));
+    std::ostringstream os;
+
+    os << "OnDefaultDeviceChanged(" << flow << ", " << role << ", "
+       << TCHARToUTF8(pwstrDefaultDeviceId) << ")";
+    OutputDebugStringA(os.str().c_str());
     return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE SarClient::NotificationClient::OnPropertyValueChanged(
     _In_  LPCWSTR pwstrDeviceId,
     _In_  const PROPERTYKEY key)
 {
-    OutputDebugString(_T("OnPropertyValueChanged"));
+    std::ostringstream os;
+    CComBSTR bstr(key.fmtid);
+    std::wstring wstr(bstr);
+
+    os << "OnPropertyValueChanged(" << TCHARToUTF8(pwstrDeviceId)
+       << ", " << TCHARToUTF8(wstr.c_str()) << ")";
+    OutputDebugStringA(os.str().c_str());
     return S_OK;
 }
 

SarAsio/utility.cpp

@@ -19,7 +19,7 @@
 
 namespace Sar {
 
-std::string TCHARToUTF8(TCHAR *ptr)
+std::string TCHARToUTF8(const TCHAR *ptr)
 {
     std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
 

SarAsio/utility.h

@@ -23,7 +23,7 @@ namespace Sar {
 #error "SarAsio must be built with unicode"
 #endif
 
-std::string TCHARToUTF8(TCHAR *ptr);
+std::string TCHARToUTF8(const TCHAR *ptr);
 std::string ConfigurationPath(const std::string& name);
 std::wstring UTF8ToWide(const std::string& str);