generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase webrtc/base with r6232:

Browse Source 
cd webrtc/base
svn diff -r 6231:6232 http://webrtc.googlecode.com/svn/trunk/talk/base > 6232.diff
patch -p0 -i 6232.diff

BUG=3379
TBR=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14599004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6239 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-05-23 18:40:46 +00:00
parent 39eccefbde
commit ddc79d0418
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
webrtc/base/proxydetect.cc
View File

@ -621,27 +621,27 @@ bool IsDefaultBrowserFirefox() {
if (ERROR_SUCCESS != result) if (ERROR_SUCCESS != result)
return false; return false;
wchar_t* value = NULL;
DWORD size, type; DWORD size, type;
bool success = false;
result = RegQueryValueEx(key, L"", 0, &type, NULL, &size); result = RegQueryValueEx(key, L"", 0, &type, NULL, &size);
if (REG_SZ != type) { if (result == ERROR_SUCCESS && type == REG_SZ) {
result = ERROR_ACCESS_DENIED; // Any error is fine wchar_t* value = new wchar_t[size+1];
} else if (ERROR_SUCCESS == result) {
value = new wchar_t[size+1];
BYTE* buffer = reinterpret_cast<BYTE*>(value); BYTE* buffer = reinterpret_cast<BYTE*>(value);
result = RegQueryValueEx(key, L"", 0, &type, buffer, &size); result = RegQueryValueEx(key, L"", 0, &type, buffer, &size);
} if (result == ERROR_SUCCESS) {
RegCloseKey(key); // Size returned by RegQueryValueEx is in bytes, convert to number of
// wchar_t's.
bool success = false; size /= sizeof(value[0]);
if (ERROR_SUCCESS == result) { value[size] = L'\0';
value[size] = L'\0'; for (size_t i = 0; i < size; ++i) {
for (size_t i = 0; i < size; ++i) { value[i] = tolowercase(value[i]);
value[i] = tolowercase(value[i]); }
success = (NULL != strstr(value, L"firefox.exe"));
} }
success = (NULL != strstr(value, L"firefox.exe")); delete[] value;
} }
delete [] value;
RegCloseKey(key);
return success; return success;
} }