zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Review URL: http://webrtc-codereview.appspot.com/347012

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@1423 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
braveyao@webrtc.org
2012-01-13 10:22:44 +00:00
parent 117c119501
commit 5f9a7baaea
1 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/modules/audio_device/main/source/win/audio_device_core_win.cc
View File

@ -189,7 +189,7 @@ bool AudioDeviceWindowsCore::CoreAudioIsSupported()
HRESULT hr(S_OK); HRESULT hr(S_OK);
TCHAR buf[MAXERRORLENGTH]; TCHAR buf[MAXERRORLENGTH];
LPCTSTR errorText; TCHAR errorText[MAXERRORLENGTH];
// 1) Initializes the COM library for use by the calling thread. // 1) Initializes the COM library for use by the calling thread.
@ -238,13 +238,35 @@ bool AudioDeviceWindowsCore::CoreAudioIsSupported()
if (FAILED(hr)) if (FAILED(hr))
{ {
_com_error error(hr);
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
"AudioDeviceWindowsCore::CoreAudioIsSupported() Failed to create the required COM object", hr); "AudioDeviceWindowsCore::CoreAudioIsSupported() Failed to create the required COM object", hr);
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, -1, WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, -1,
"AudioDeviceWindowsCore::CoreAudioIsSupported() CoCreateInstance(MMDeviceEnumerator) failed (hr=0x%x)", hr); "AudioDeviceWindowsCore::CoreAudioIsSupported() CoCreateInstance(MMDeviceEnumerator) failed (hr=0x%x)", hr);
const DWORD dwFlags = FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS;
const DWORD dwLangID = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US);
// Gets the system's human readable message string for this HRESULT.
// All error message in English by default.
DWORD messageLength = ::FormatMessageW(dwFlags,
0,
hr,
dwLangID,
errorText,
MAXERRORLENGTH,
NULL);
assert(messageLength <= MAXERRORLENGTH);
// Trims tailing white space (FormatMessage() leaves a trailing cr-lf.).
for (; messageLength && ::isspace(errorText[messageLength - 1]);
--messageLength)
{
errorText[messageLength - 1] = '\0';
}
StringCchPrintf(buf, MAXERRORLENGTH, TEXT("Error details: ")); StringCchPrintf(buf, MAXERRORLENGTH, TEXT("Error details: "));
errorText = error.ErrorMessage();
StringCchCat(buf, MAXERRORLENGTH, errorText); StringCchCat(buf, MAXERRORLENGTH, errorText);
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, -1, "%S", buf); WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, -1, "%S", buf);
} }
@ -5055,10 +5077,30 @@ Exit:
void AudioDeviceWindowsCore::_TraceCOMError(HRESULT hr) const void AudioDeviceWindowsCore::_TraceCOMError(HRESULT hr) const
{ {
TCHAR buf[MAXERRORLENGTH]; TCHAR buf[MAXERRORLENGTH];
LPCTSTR errorText; TCHAR errorText[MAXERRORLENGTH];
_com_error error(hr); const DWORD dwFlags = FORMAT_MESSAGE_FROM_SYSTEM |
errorText = error.ErrorMessage(); FORMAT_MESSAGE_IGNORE_INSERTS;
const DWORD dwLangID = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US);
// Gets the system's human readable message string for this HRESULT.
// All error message in English by default.
DWORD messageLength = ::FormatMessageW(dwFlags,
0,
hr,
dwLangID,
errorText,
MAXERRORLENGTH,
NULL);
assert(messageLength <= MAXERRORLENGTH);
// Trims tailing white space (FormatMessage() leaves a trailing cr-lf.).
for (; messageLength && ::isspace(errorText[messageLength - 1]);
--messageLength)
{
errorText[messageLength - 1] = '\0';
}
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id,
"Core Audio method failed (hr=0x%x)", hr); "Core Audio method failed (hr=0x%x)", hr);