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

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

Issue 838683002: Reblacklist virtualCamera.ax, it's causing renderer hangs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 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 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 L"libwinhook.dll", // V-Bates. 48 L"libwinhook.dll", // V-Bates.
49 L"lmrn.dll", // Unknown. 49 L"lmrn.dll", // Unknown.
50 L"minisp.dll", // Unknown (suspected malware). 50 L"minisp.dll", // Unknown (suspected malware).
51 L"safetynut.dll", // Unknown (suspected adware). 51 L"safetynut.dll", // Unknown (suspected adware).
52 L"systemk.dll", // Unknown (suspected adware). 52 L"systemk.dll", // Unknown (suspected adware).
53 L"wajam_goblin_64.dll", // Wajam Internet Technologies. 53 L"wajam_goblin_64.dll", // Wajam Internet Technologies.
54 L"wajam_goblin.dll", // Wajam Internet Technologies. 54 L"wajam_goblin.dll", // Wajam Internet Technologies.
55 L"windowsapihookdll32.dll", // Lenovo One Key Theater. 55 L"windowsapihookdll32.dll", // Lenovo One Key Theater.
56 // See crbug.com/379218. 56 // See crbug.com/379218.
57 L"windowsapihookdll64.dll", // Lenovo One Key Theater. 57 L"windowsapihookdll64.dll", // Lenovo One Key Theater.
58 L"virtualCamera.ax", // %PROGRAMFILES%\ASUS\VirtualCamera.
59 // See crbug.com/422522.
58 L"YCWebCameraSource.ax", // CyberLink Youcam, crbug.com/424159 60 L"YCWebCameraSource.ax", // CyberLink Youcam, crbug.com/424159
59 // Keep this null pointer here to mark the end of the list. 61 // Keep this null pointer here to mark the end of the list.
60 NULL, 62 NULL,
61 }; 63 };
62 64
63 bool g_blocked_dlls[kTroublesomeDllsMaxCount] = {}; 65 bool g_blocked_dlls[kTroublesomeDllsMaxCount] = {};
64 int g_num_blocked_dlls = 0; 66 int g_num_blocked_dlls = 0;
65 67
66 } // namespace blacklist 68 } // namespace blacklist
67 69
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 break; 436 break;
435 value_buffer[value_len - 1] = L'\0'; 437 value_buffer[value_len - 1] = L'\0';
436 AddDllToBlacklist(&value_buffer[0]); 438 AddDllToBlacklist(&value_buffer[0]);
437 } 439 }
438 440
439 ::RegCloseKey(key); 441 ::RegCloseKey(key);
440 return; 442 return;
441 } 443 }
442 444
443 } // namespace blacklist 445 } // 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