webrtc/modules/audio_device/win/audio_mixer_manager_win.cc - Issue 1593713013: Roll chromium_revision 7a4fb8d..f527e86 (370025:370073)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_device/win/audio_mixer_manager_win.cc

Issue 1593713013: Roll chromium_revision 7a4fb8d..f527e86 (370025:370073) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Fix/disable Win Clang warnings Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_device/win/audio_device_wave_win.cc ('k') | webrtc/modules/video_capture/windows/video_capture_ds.cc » ('j') | webrtc/modules/video_capture/windows/video_capture_ds.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_device/win/audio_mixer_manager_win.cc

diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc

index 368b54c746ff59c3258fea7c23d4126bc88adb6f..ae2d00faeb89ecb899e8dddd7dd63e5fbb5bde53 100644

--- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc

+++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc

@@ -2709,7 +2709,7 @@ char* AudioMixerManager::WideToUTF8(const TCHAR* src) const {

const size_t kStrLen = sizeof(_str);

memset(_str, 0, kStrLen);

// Get required size (in bytes) to be able to complete the conversion.

- int required_size = WideCharToMultiByte(CP_UTF8, 0, src, -1, _str, 0, 0, 0);

+ unsigned int required_size = (unsigned int)WideCharToMultiByte(CP_UTF8, 0, src, -1, _str, 0, 0, 0);

if (required_size <= kStrLen)

{

// Process the entire input string, including the terminating null char.