Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Side by Side Diff: chrome_elf/blacklist/blacklist.cc

Issue 335073002: Revert of Blacklists virtualCamera.ax (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_elf/blacklist/blacklist.h" 5 #include "chrome_elf/blacklist/blacklist.h"
6 6
7 #include <assert.h> 7 #include <assert.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 15 matching lines...) Expand all
26 const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = { 26 const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = {
27 L"datamngr.dll", // Unknown (suspected adware). 27 L"datamngr.dll", // Unknown (suspected adware).
28 L"hk.dll", // Unknown (keystroke logger). 28 L"hk.dll", // Unknown (keystroke logger).
29 L"libsvn_tsvn32.dll", // TortoiseSVN. 29 L"libsvn_tsvn32.dll", // TortoiseSVN.
30 L"lmrn.dll", // Unknown. 30 L"lmrn.dll", // Unknown.
31 L"activedetect32.dll", // Lenovo One Key Theater. 31 L"activedetect32.dll", // Lenovo One Key Theater.
32 // See crbug.com/379218. 32 // See crbug.com/379218.
33 L"windowsapihookdll32.dll", // Lenovo One Key Theater. 33 L"windowsapihookdll32.dll", // Lenovo One Key Theater.
34 L"activedetect64.dll", // Lenovo One Key Theater. 34 L"activedetect64.dll", // Lenovo One Key Theater.
35 L"windowsapihookdll64.dll", // Lenovo One Key Theater. 35 L"windowsapihookdll64.dll", // Lenovo One Key Theater.
36 L"virtualCamera.ax", // %PROGRAMFILES%\ASUS\VirtualCamera.
37 // See crbug.com/383715.
38 // Keep this null pointer here to mark the end of the list. 36 // Keep this null pointer here to mark the end of the list.
39 NULL, 37 NULL,
40 }; 38 };
41 39
42 bool g_blocked_dlls[kTroublesomeDllsMaxCount] = {}; 40 bool g_blocked_dlls[kTroublesomeDllsMaxCount] = {};
43 int g_num_blocked_dlls = 0; 41 int g_num_blocked_dlls = 0;
44 42
45 } // namespace blacklist 43 } // namespace blacklist
46 44
47 // Allocate storage for thunks in a page of this module to save on doing 45 // Allocate storage for thunks in a page of this module to save on doing
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 388 }
391 389
392 // Delete the finch registry key to clear the values. 390 // Delete the finch registry key to clear the values.
393 result = ::RegDeleteKey(key, L""); 391 result = ::RegDeleteKey(key, L"");
394 392
395 ::RegCloseKey(key); 393 ::RegCloseKey(key);
396 return result == ERROR_SUCCESS; 394 return result == ERROR_SUCCESS;
397 } 395 }
398 396
399 } // namespace blacklist 397 } // namespace blacklist
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698